diff options
| author | Patrick J Volkerding <volkerdi@slackware.com> | 2021-05-08 00:24:32 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2021-05-08 08:59:55 +0200 |
| commit | 83868622a733d0511241fe4bac84516caf3319db (patch) | |
| tree | ca723c36434dd2df0356289ed50e25df43e53a70 /source/ap | |
| parent | 33a4866bfe2f2c0cb2798db73596ce9cd43f523a (diff) | |
| download | current-83868622a733d0511241fe4bac84516caf3319db.tar.gz | |
Sat May 8 00:24:32 UTC 202120210508002432
a/kernel-generic-5.10.35-x86_64-1.txz: Upgraded.
a/kernel-huge-5.10.35-x86_64-1.txz: Upgraded.
a/kernel-modules-5.10.35-x86_64-1.txz: Upgraded.
a/lvm2-2.03.12-x86_64-1.txz: Upgraded.
ap/mariadb-10.5.10-x86_64-1.txz: Upgraded.
ap/mpg123-1.27.0-x86_64-1.txz: Upgraded.
d/kernel-headers-5.10.35-x86-1.txz: Upgraded.
k/kernel-source-5.10.35-noarch-1.txz: Upgraded.
n/httpd-2.4.46-x86_64-3.txz: Rebuilt.
Reverted to httpd-2.4.46. Apparently 2.4.47 isn't actually released yet.
Sorry for any problems this caused.
xfce/thunar-4.16.8-x86_64-1.txz: Upgraded.
isolinux/initrd.img: Rebuilt.
kernels/*: Upgraded.
testing/packages/linux-5.12.x/kernel-generic-5.12.2-x86_64-1.txz: Upgraded.
testing/packages/linux-5.12.x/kernel-headers-5.12.2-x86-1.txz: Upgraded.
testing/packages/linux-5.12.x/kernel-huge-5.12.2-x86_64-1.txz: Upgraded.
testing/packages/linux-5.12.x/kernel-modules-5.12.2-x86_64-1.txz: Upgraded.
testing/packages/linux-5.12.x/kernel-source-5.12.2-noarch-1.txz: Upgraded.
usb-and-pxe-installers/usbboot.img: Rebuilt.
Diffstat (limited to 'source/ap')
| -rw-r--r-- | source/ap/mariadb/mariadb.ConnectorName.cmake.diff | 12 | ||||
| -rwxr-xr-x | source/ap/mariadb/mariadb.SlackBuild | 5 |
2 files changed, 1 insertions, 16 deletions
diff --git a/source/ap/mariadb/mariadb.ConnectorName.cmake.diff b/source/ap/mariadb/mariadb.ConnectorName.cmake.diff deleted file mode 100644 index 75da7d99..00000000 --- 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 b83511e9..63428060 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 \) \ |