diff options
Diffstat (limited to 'source')
| -rw-r--r-- | source/ap/mariadb/doinst.sh | 7 | ||||
| -rwxr-xr-x | source/ap/mariadb/mariadb.SlackBuild | 5 | ||||
| -rw-r--r-- | source/d/python3/python.sysconfig.py.x86_64.diff | 9 | ||||
| -rwxr-xr-x | source/d/python3/python3.SlackBuild | 2 | ||||
| -rwxr-xr-x | source/n/fetchmail/fetchmail.SlackBuild | 2 |
5 files changed, 9 insertions, 16 deletions
diff --git a/source/ap/mariadb/doinst.sh b/source/ap/mariadb/doinst.sh index 12bad9bb9..b106e2fed 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 bfbff136b..a35a90384 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 diff --git a/source/d/python3/python.sysconfig.py.x86_64.diff b/source/d/python3/python.sysconfig.py.x86_64.diff index bf5adb0d0..3f607cb48 100644 --- a/source/d/python3/python.sysconfig.py.x86_64.diff +++ b/source/d/python3/python.sysconfig.py.x86_64.diff @@ -22,12 +22,3 @@ 'include': '{installed_base}/include/python', 'platinclude': '{installed_base}/include/python', 'scripts': '{base}/bin', -@@ -64,7 +64,7 @@ - 'posix_user': { - 'stdlib': '{userbase}/{platlibdir}/python{py_version_short}', - 'platstdlib': '{userbase}/{platlibdir}/python{py_version_short}', -- 'purelib': '{userbase}/lib/python{py_version_short}/site-packages', -+ 'purelib': '{userbase}/lib64/python{py_version_short}/site-packages', - 'platlib': '{userbase}/{platlibdir}/python{py_version_short}/site-packages', - 'include': '{userbase}/include/python{py_version_short}', - 'scripts': '{userbase}/bin', diff --git a/source/d/python3/python3.SlackBuild b/source/d/python3/python3.SlackBuild index c437325c4..b1090dd89 100755 --- a/source/d/python3/python3.SlackBuild +++ b/source/d/python3/python3.SlackBuild @@ -29,7 +29,7 @@ PKGNAM=python3 SRCNAM=Python VERSION=$(echo $SRCNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev) BRANCH_VERSION=$(echo $VERSION | cut -f 1,2 -d . ) -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} diff --git a/source/n/fetchmail/fetchmail.SlackBuild b/source/n/fetchmail/fetchmail.SlackBuild index 13530b769..2e74e15db 100755 --- a/source/n/fetchmail/fetchmail.SlackBuild +++ b/source/n/fetchmail/fetchmail.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=fetchmail VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then |