diff options
| author | Patrick J Volkerding <volkerdi@slackware.com> | 2021-11-20 20:23:50 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2021-11-21 08:59:57 +0100 |
| commit | 2cfe36fdb8556ea0df2b9997349efbc0d8ecab51 (patch) | |
| tree | 56040898931b9f95a8ec6039e778b9c34e20bfe7 /source/ap | |
| parent | f26dc376f71e097c67644da34c6c68951299f26e (diff) | |
| download | current-2cfe36fdb8556ea0df2b9997349efbc0d8ecab51.tar.gz | |
Sat Nov 20 20:23:50 UTC 202120211120202350
ap/mariadb-10.5.13-x86_64-2.txz: Rebuilt.
Install /etc/security/user_map.conf as /etc/security/user_map.conf.new to
protect it from being overwritten by future upgrades.
Thanks to Markus Wiesner.
d/python3-3.9.9-x86_64-2.txz: Rebuilt.
Do not patch posix_user platlib to use $HOME/.local/lib64 on 64-bit - use
$HOME/.local/lib for all platforms. This avoids a warning from pip about the
install location not matching between distutils and sysconfig. Note that this
might require already installed modules to be moved from $HOME/.local/lib64
to $HOME/.local/lib (or they could be removed and then reinstalled).
At first this seemed to be a non-optimal solution for this issue, but other
distributions are taking this same approach and it appears that the
posix_user platlib setting has always been ignored until recently.
If this causes any unexpected issues, let me know.
Thanks to redneonglow and alijkl.
n/fetchmail-6.4.24-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source/ap')
| -rw-r--r-- | source/ap/mariadb/doinst.sh | 7 | ||||
| -rwxr-xr-x | source/ap/mariadb/mariadb.SlackBuild | 5 |
2 files changed, 7 insertions, 5 deletions
diff --git a/source/ap/mariadb/doinst.sh b/source/ap/mariadb/doinst.sh index 12bad9bb..b106e2fe 100644 --- a/source/ap/mariadb/doinst.sh +++ b/source/ap/mariadb/doinst.sh @@ -28,8 +28,9 @@ config etc/my.cnf.d/server.cnf.new config etc/my.cnf.d/spider.cnf.new config etc/logrotate.d/mysql.new -# Not supported in every $ARCH: -if [ -r etc/my.cnf.d/tokudb.cnf.new ]; then - config etc/my.cnf.d/tokudb.cnf.new +# This one is only comments, so remove it if it's left behind: +if [ -r etc/security/user_map.conf.new ]; then + config etc/security/user_map.conf.new fi +rm -f etc/security/user_map.conf.new diff --git a/source/ap/mariadb/mariadb.SlackBuild b/source/ap/mariadb/mariadb.SlackBuild index bfbff136..a35a9038 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:-1} +BUILD=${BUILD:-2} # 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. @@ -208,8 +208,9 @@ install -m 644 scripts/mysqlaccess.conf $PKG/etc/mysqlaccess.conf.new # Mark config files under /etc as .new mv $PKG/etc/my.cnf $PKG/etc/my.cnf.new +mv $PKG/etc/security/user_map.conf $PKG/etc/security/user_map.conf.new mv $PKG/etc/logrotate.d/mysql $PKG/etc/logrotate.d/mysql.new -for i in client mysql-clients s3 server spider tokudb; do +for i in client mysql-clients s3 server spider ; do mv $PKG/etc/my.cnf.d/$i.cnf $PKG/etc/my.cnf.d/$i.cnf.new done |