From 3646186e415cbb43f06bae8bd87a8512577acf3d Mon Sep 17 00:00:00 2001 From: Patrick J Volkerding Date: Tue, 28 Jan 2020 21:39:57 +0000 Subject: Tue Jan 28 21:39:57 UTC 2020 ap/mariadb-10.4.12-x86_64-1.txz: Upgraded. This fixes a potential denial-of-service vulnerability. For more information, see: https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2020-2574 (* Security fix *) l/imagemagick-7.0.9_20-x86_64-1.txz: Upgraded. n/dhcpcd-8.1.6-x86_64-1.txz: Upgraded. n/samba-4.11.6-x86_64-1.txz: Upgraded. x/mesa-19.3.3-x86_64-1.txz: Upgraded. --- source/ap/mariadb/mysql_install_db.nopam.diff | 44 +++++++++++++-------------- 1 file changed, 22 insertions(+), 22 deletions(-) (limited to 'source/ap/mariadb/mysql_install_db.nopam.diff') diff --git a/source/ap/mariadb/mysql_install_db.nopam.diff b/source/ap/mariadb/mysql_install_db.nopam.diff index 3d67d2bf5..70503865a 100644 --- a/source/ap/mariadb/mysql_install_db.nopam.diff +++ b/source/ap/mariadb/mysql_install_db.nopam.diff @@ -1,45 +1,45 @@ ---- ./scripts/mysql_install_db.sh.orig 2019-08-01 13:25:00.406477885 -0500 -+++ ./scripts/mysql_install_db.sh 2019-08-01 13:27:53.316490799 -0500 +--- ./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 -- 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." -- exit 1 -- fi -- if test -z "$srcdir" +- 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 "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: -+ #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." -+ # exit 1 -+ #fi -+ #if test -z "$srcdir" ++ #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 "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 -- cgit v1.2.3