From abdca401c7c45e652987c030a41f12408b916eee Mon Sep 17 00:00:00 2001
From: Patrick J Volkerding <volkerdi@slackware.com>
Date: Tue, 27 Apr 2021 19:19:28 +0000
Subject: Tue Apr 27 19:19:28 UTC 2021

a/mkinitrd-1.4.11-x86_64-24.txz:  Rebuilt.
  Change mkinitrd shebang to #!/bin/bash. Thanks to mumahendras3.
  Still, don't point /bin/sh at a shell other than bash.
  Only include dm-snapshot if LVM is included. Thanks to j12i.
a/tcsh-6.22.04-x86_64-1.txz:  Upgraded.
ap/mariadb-10.6.0-x86_64-1.txz:  Upgraded.
  Removed TokuDB stuff from rc.mysqld. Thanks to gsl.
  This update fixes the illegal instruction regession on 32-bit with processors
  that do not support SSE4.1 instructions.
  Thanks to Noel and Charlie Wilder for reporting the issue upstream
  and Matteo Bernardini for helping with the debugging.
  And of course, thanks to the MariaDB upstream developers. :-)
---
 source/ap/mariadb/mariadb.ConnectorName.cmake.diff | 12 ------------
 source/ap/mariadb/mariadb.SlackBuild               |  5 +----
 2 files changed, 1 insertion(+), 16 deletions(-)
 delete mode 100644 source/ap/mariadb/mariadb.ConnectorName.cmake.diff

(limited to 'source/ap/mariadb')

diff --git a/source/ap/mariadb/mariadb.ConnectorName.cmake.diff b/source/ap/mariadb/mariadb.ConnectorName.cmake.diff
deleted file mode 100644
index 75da7d993..000000000
--- a/source/ap/mariadb/mariadb.ConnectorName.cmake.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -u -r --new-file mariadb-10.5.9.orig/libmariadb/cmake/ConnectorName.cmake mariadb-10.5.9/libmariadb/cmake/ConnectorName.cmake
---- mariadb-10.5.9.orig/libmariadb/cmake/ConnectorName.cmake	2021-02-16 08:50:36.000000000 -0600
-+++ mariadb-10.5.9/libmariadb/cmake/ConnectorName.cmake	2021-04-03 12:41:14.858993480 -0500
-@@ -22,7 +22,7 @@
-     SET(MACHINE_NAME "x64")
-   ELSE()
-     SET(MACHINE_NAME "32")
--  END()
-+  ENDIF()
- ENDIF()
- 
- SET(product_name "mysql-connector-c-${CPACK_PACKAGE_VERSION}-${PLATFORM_NAME}${CONCAT_SIGN}${MACHINE_NAME}")
diff --git a/source/ap/mariadb/mariadb.SlackBuild b/source/ap/mariadb/mariadb.SlackBuild
index b83511e95..634280605 100755
--- a/source/ap/mariadb/mariadb.SlackBuild
+++ b/source/ap/mariadb/mariadb.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright 2008, 2009, 2010, 2012, 2013, 2014, 2017, 2018, 2020  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2010, 2012, 2013, 2014, 2017, 2018, 2020, 2021  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # Copyright 2011, 2012, 2013, 2014, 2017  Heinz Wiesinger, Amsterdam, The Netherlands
 # All rights reserved.
 #
@@ -97,9 +97,6 @@ if [ ! -L /lib${LIBDIRSUFFIX}/libpam.so.? ]; then
   zcat $CWD/mysql.no.plugin_auth_pam.diff.gz | patch -p1 --verbose || exit 1
 fi
 
-# Fix a CMake syntax error:
-zcat $CWD/mariadb.ConnectorName.cmake.diff.gz | patch -p1 --verbose || exit 1
-
 chown -R root:root .
 find . \
  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
-- 
cgit v1.2.3