diff options
author | Patrick J Volkerding <volkerdi@slackware.com> | 2021-10-25 19:30:42 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2021-10-26 08:59:55 +0200 |
commit | b38f92681d3acd242c2e5b0e37d353d4e2a683c2 (patch) | |
tree | d43bb7dffe24376bc530e55b46bdddfb32f402d0 /source/ap/mariadb | |
parent | 9d31c53bf5c7a326a03f0b37e534d6ae40cf5d8f (diff) | |
download | current-b38f92681d3acd242c2e5b0e37d353d4e2a683c2.tar.gz current-b38f92681d3acd242c2e5b0e37d353d4e2a683c2.tar.xz |
Mon Oct 25 19:30:42 UTC 202120211025193042
ap/slackpkg-15.0.8-noarch-1.txz: Upgraded.
Author: piterpunk <piterpunk@slackware.com>
To make it easier to do an unattended slackpkg update/upgrade process,
this commit provides different exit codes for many situations:
0 Successful slackpkg execution.
1 Something wrong happened.
20 No package found to be downloaded, installed, reinstalled,
upgraded, or removed.
50 Slackpkg itself was upgraded and you need to re-run it.
100 There are pending updates.
Code and the main manpage are updated accordingly.
In addition, this commit also:
- removes the ChangeLog.txt in doinst.sh, so the needed
'slackpkg update' after Slackpkg upgrade won't say it's all OK
and doesn't need to redo the package lists
- removes AUTHORS from manpage. Nowadays there is code from many
people in Slackpkg and it seems a bit unfair to have only my and
Evaldo's name listed there.
Signed-off-by: Robby Workman <rworkman@slackware.com>
d/meson-0.60.0-x86_64-1.txz: Upgraded.
l/ffmpeg-4.4.1-x86_64-1.txz: Upgraded.
l/imagemagick-7.1.0_11-x86_64-1.txz: Upgraded.
l/libcap-2.60-x86_64-1.txz: Upgraded.
l/libsoup-2.74.1-x86_64-1.txz: Upgraded.
l/sip-4.19.25-x86_64-3.txz: Rebuilt.
Drop the Qt4 modules. Thanks to gmgf.
n/dhcpcd-9.4.1-x86_64-1.txz: Upgraded.
testing/packages/linux-5.14.x/kernel-generic-5.14.14-x86_64-3.txz: Rebuilt.
testing/packages/linux-5.14.x/kernel-headers-5.14.14-x86-3.txz: Rebuilt.
testing/packages/linux-5.14.x/kernel-huge-5.14.14-x86_64-3.txz: Rebuilt.
testing/packages/linux-5.14.x/kernel-modules-5.14.14-x86_64-3.txz: Rebuilt.
testing/packages/linux-5.14.x/kernel-source-5.14.14-noarch-3.txz: Rebuilt.
Let's enable SCHED_AUTOGROUP, which should improve desktop latency under a
heavy CPU load while being mostly inert on servers. It may be disabled at
boot time with a "noautogroup" kernel parameter, or at runtime like this:
echo 0 > /proc/sys/kernel/sched_autogroup_enabled
Thanks to gbschenkel.
SCHED_AUTOGROUP n -> y
Diffstat (limited to 'source/ap/mariadb')
-rwxr-xr-x | source/ap/mariadb/mariadb.SlackBuild | 7 | ||||
-rw-r--r-- | source/ap/mariadb/mysql.no.plugin_auth_pam.diff | 11 | ||||
-rw-r--r-- | source/ap/mariadb/mysql_install_db.nopam.diff | 48 |
3 files changed, 0 insertions, 66 deletions
diff --git a/source/ap/mariadb/mariadb.SlackBuild b/source/ap/mariadb/mariadb.SlackBuild index 634280605..bfbff136b 100755 --- a/source/ap/mariadb/mariadb.SlackBuild +++ b/source/ap/mariadb/mariadb.SlackBuild @@ -90,13 +90,6 @@ rm -rf ${PKGNAM}-$VERSION tar xvf $CWD/${PKGNAM}-$VERSION.tar.?z || exit 1 cd ${PKGNAM}-$VERSION || exit 1 -# Fix mysql_install_db if PAM is not installed: -if [ ! -L /lib${LIBDIRSUFFIX}/libpam.so.? ]; then - zcat $CWD/mysql_install_db.nopam.diff.gz | patch -p1 --verbose || exit 1 - # Also no PAM plugin then: - zcat $CWD/mysql.no.plugin_auth_pam.diff.gz | patch -p1 --verbose || exit 1 -fi - chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ diff --git a/source/ap/mariadb/mysql.no.plugin_auth_pam.diff b/source/ap/mariadb/mysql.no.plugin_auth_pam.diff deleted file mode 100644 index 34eedf5af..000000000 --- a/source/ap/mariadb/mysql.no.plugin_auth_pam.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- ./cmake/build_configurations/mysql_release.cmake.orig 2019-09-08 16:02:29.000000000 -0500 -+++ ./cmake/build_configurations/mysql_release.cmake 2019-09-11 14:56:53.845129062 -0500 -@@ -124,7 +124,7 @@ - - IF(UNIX) - SET(WITH_EXTRA_CHARSETS all CACHE STRING "") -- SET(PLUGIN_AUTH_PAM YES) -+ SET(PLUGIN_AUTH_PAM NO) - - IF(CMAKE_SYSTEM_NAME STREQUAL "Linux") - IF(NOT IGNORE_AIO_CHECK) diff --git a/source/ap/mariadb/mysql_install_db.nopam.diff b/source/ap/mariadb/mysql_install_db.nopam.diff deleted file mode 100644 index 70503865a..000000000 --- a/source/ap/mariadb/mysql_install_db.nopam.diff +++ /dev/null @@ -1,48 +0,0 @@ ---- ./scripts/mysql_install_db.sh.orig 2020-01-28 11:31:09.088303502 -0600 -+++ ./scripts/mysql_install_db.sh 2020-01-28 11:35:47.822283410 -0600 -@@ -480,25 +480,26 @@ - - if test -n "$user" - then -- if test -z "$srcdir" -a "$in_rpm" -eq 0 -- then -- chown 0 "$pamtooldir/auth_pam_tool_dir/auth_pam_tool" && \ -- chmod 04755 "$pamtooldir/auth_pam_tool_dir/auth_pam_tool" -- if test $? -ne 0 -- then -- echo "Couldn't set an owner to '$pamtooldir/auth_pam_tool_dir/auth_pam_tool'." -- echo "It must be root, the PAM authentication plugin doesn't work otherwise.." -- echo -- fi -- chown $user "$pamtooldir/auth_pam_tool_dir" && \ -- chmod 0700 "$pamtooldir/auth_pam_tool_dir" -- if test $? -ne 0 -- then -- echo "Cannot change ownership of the '$pamtooldir/auth_pam_tool_dir' directory" -- echo "to the '$user' user. Check that you have the necessary permissions and try again." -- echo -- fi -- fi -+ # Commented out since Slackware does not currently provide PAM: -+ #if test -z "$srcdir" -a "$in_rpm" -eq 0 -+ #then -+ # chown 0 "$pamtooldir/auth_pam_tool_dir/auth_pam_tool" && \ -+ # chmod 04755 "$pamtooldir/auth_pam_tool_dir/auth_pam_tool" -+ # if test $? -ne 0 -+ # then -+ # echo "Couldn't set an owner to '$pamtooldir/auth_pam_tool_dir/auth_pam_tool'." -+ # echo "It must be root, the PAM authentication plugin doesn't work otherwise.." -+ # echo -+ # fi -+ # chown $user "$pamtooldir/auth_pam_tool_dir" && \ -+ # chmod 0700 "$pamtooldir/auth_pam_tool_dir" -+ # if test $? -ne 0 -+ # then -+ # echo "Cannot change ownership of the '$pamtooldir/auth_pam_tool_dir' directory" -+ # echo "to the '$user' user. Check that you have the necessary permissions and try again." -+ # echo -+ # fi -+ #fi - args="$args --user=$user" - fi - |