diff options
Diffstat (limited to 'source/ap/mariadb')
| -rwxr-xr-x | source/ap/mariadb/mariadb.SlackBuild | 2 | ||||
| -rw-r--r-- | source/ap/mariadb/mysql_install_db.nopam.diff | 18 |
2 files changed, 12 insertions, 8 deletions
diff --git a/source/ap/mariadb/mariadb.SlackBuild b/source/ap/mariadb/mariadb.SlackBuild index 4c31d8c37..b3a2b8663 100755 --- a/source/ap/mariadb/mariadb.SlackBuild +++ b/source/ap/mariadb/mariadb.SlackBuild @@ -30,7 +30,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=mariadb VERSION=${VERSION:-$(echo ${PKGNAM}-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} # To reduce the package size, the embedded server may be omitted. Currently # only amarok uses this. To build without embedded support, set this to NO. diff --git a/source/ap/mariadb/mysql_install_db.nopam.diff b/source/ap/mariadb/mysql_install_db.nopam.diff index d1fd2ad23..3d67d2bf5 100644 --- a/source/ap/mariadb/mysql_install_db.nopam.diff +++ b/source/ap/mariadb/mysql_install_db.nopam.diff @@ -1,10 +1,11 @@ ---- ./scripts/mysql_install_db.sh.orig 2019-06-17 17:00:32.000000000 -0500 -+++ ./scripts/mysql_install_db.sh 2019-07-05 14:18:46.519035789 -0500 -@@ -467,23 +467,24 @@ +--- ./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 +@@ -480,25 +480,26 @@ if test -n "$user" then -- chown $user "$pamtooldir/auth_pam_tool_dir" +- 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" @@ -13,7 +14,8 @@ - fi - if test -z "$srcdir" - then -- chown 0 "$pamtooldir/auth_pam_tool_dir/auth_pam_tool" +- 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'." @@ -22,7 +24,8 @@ - fi - fi + # Commented out since Slackware does not currently provide PAM: -+ #chown $user "$pamtooldir/auth_pam_tool_dir" ++ #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" @@ -31,7 +34,8 @@ + #fi + #if test -z "$srcdir" + #then -+ # chown 0 "$pamtooldir/auth_pam_tool_dir/auth_pam_tool" ++ # 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'." |