diff options
Diffstat (limited to 'source')
| -rwxr-xr-x | source/a/elogind/elogind.SlackBuild | 2 | ||||
| -rwxr-xr-x | source/d/help2man/help2man.SlackBuild | 2 | ||||
| -rw-r--r-- | source/n/openssh/openssh-glibc-2.33.patch | 36 | ||||
| -rwxr-xr-x | source/n/openssh/openssh.SlackBuild | 10 | ||||
| -rw-r--r-- | source/n/openssh/ssh-copy-id.diff | 19 | ||||
| -rwxr-xr-x | source/n/php/fetch-php.sh | 4 | ||||
| -rwxr-xr-x | source/n/php/php.SlackBuild | 2 |
7 files changed, 6 insertions, 69 deletions
diff --git a/source/a/elogind/elogind.SlackBuild b/source/a/elogind/elogind.SlackBuild index 3df02a085..9438d08b6 100755 --- a/source/a/elogind/elogind.SlackBuild +++ b/source/a/elogind/elogind.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=elogind VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-3} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/d/help2man/help2man.SlackBuild b/source/d/help2man/help2man.SlackBuild index a48e420c8..d58e2217d 100755 --- a/source/d/help2man/help2man.SlackBuild +++ b/source/d/help2man/help2man.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=help2man VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | 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 diff --git a/source/n/openssh/openssh-glibc-2.33.patch b/source/n/openssh/openssh-glibc-2.33.patch deleted file mode 100644 index 9a236ad0d..000000000 --- a/source/n/openssh/openssh-glibc-2.33.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 41f221b4962b835a4f24a430d1ce0d90b90305ac Mon Sep 17 00:00:00 2001 -From: Nick Alcock <nick.alcock@oracle.com> -Date: Mon, 8 Feb 2021 15:10:00 +0000 -Subject: [PATCH] seccomp: allow futex_time64 and pselect6_time64 on Linux. - -Needed on many 32-bit Linux platforms using glibc 2.33. ---- - sandbox-seccomp-filter.c | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/sandbox-seccomp-filter.c b/sandbox-seccomp-filter.c -index e0768c06..46752c0b 100644 ---- a/sandbox-seccomp-filter.c -+++ b/sandbox-seccomp-filter.c -@@ -204,6 +204,9 @@ static const struct sock_filter preauth_insns[] = { - #ifdef __NR_futex - SC_ALLOW(__NR_futex), - #endif -+#ifdef __NR_futex -+ SC_ALLOW(__NR_futex_time64), -+#endif - #ifdef __NR_geteuid - SC_ALLOW(__NR_geteuid), - #endif -@@ -267,6 +270,9 @@ static const struct sock_filter preauth_insns[] = { - #ifdef __NR_pselect6 - SC_ALLOW(__NR_pselect6), - #endif -+#ifdef __NR_pselect6_time64 -+ SC_ALLOW(__NR_pselect6_time64), -+#endif - #ifdef __NR_read - SC_ALLOW(__NR_read), - #endif --- -2.30.0.252.gc27e85e57d diff --git a/source/n/openssh/openssh.SlackBuild b/source/n/openssh/openssh.SlackBuild index dfd50ed91..275d2558a 100755 --- a/source/n/openssh/openssh.SlackBuild +++ b/source/n/openssh/openssh.SlackBuild @@ -30,7 +30,7 @@ PKG=$TMP/package-openssh PKGNAM=openssh VERSION=${VERSION:-$(echo openssh-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-5} +BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} @@ -86,14 +86,6 @@ chown -R root:root . # Restore support for tcpwrappers: zcat $CWD/openssh.tcp_wrappers.diff.gz | patch -p1 --verbose || exit 1 -# Fix ssh-copy-id EOF bug: -zcat $CWD/ssh-copy-id.diff.gz | patch -p1 --verbose || exit 1 - -# Fix sandbox with glibc-2.33 (needed on 32-bit platforms): -if [ ! "$LIBDIRSUFFIX" = "64" ]; then - zcat $CWD/openssh-glibc-2.33.patch.gz | patch -p1 --verbose || exit 1 -fi - # Choose correct options depending on whether PAM is installed: if [ -L /lib${LIBDIRSUFFIX}/libpam.so.? ]; then PAM_OPTIONS="--with-pam --with-kerberos5" diff --git a/source/n/openssh/ssh-copy-id.diff b/source/n/openssh/ssh-copy-id.diff deleted file mode 100644 index 269879bfa..000000000 --- a/source/n/openssh/ssh-copy-id.diff +++ /dev/null @@ -1,19 +0,0 @@ ---- ./contrib/ssh-copy-id.orig 2020-09-27 02:25:01.000000000 -0500 -+++ ./contrib/ssh-copy-id 2020-11-12 19:01:42.049254763 -0600 -@@ -247,7 +247,7 @@ - # the -z `tail ...` checks for a trailing newline. The echo adds one if was missing - # the cat adds the keys we're getting via STDIN - # and if available restorecon is used to restore the SELinux context -- INSTALLKEYS_SH=$(tr '\t\n' ' ' <<-EOF) -+ INSTALLKEYS_SH=$(tr '\t\n' ' ' <<-EOF - cd; - umask 077; - mkdir -p $(dirname "${AUTH_KEY_FILE}") && -@@ -258,6 +258,7 @@ - restorecon -F .ssh ${AUTH_KEY_FILE}; - fi - EOF -+ ) - - # to defend against quirky remote shells: use 'exec sh -c' to get POSIX; - printf "exec sh -c '%s'" "${INSTALLKEYS_SH}" diff --git a/source/n/php/fetch-php.sh b/source/n/php/fetch-php.sh index f9a216a96..5fa8692cc 100755 --- a/source/n/php/fetch-php.sh +++ b/source/n/php/fetch-php.sh @@ -1,2 +1,2 @@ -lftpget http://us.php.net/distributions/php-7.4.15.tar.xz.asc -lftpget http://us.php.net/distributions/php-7.4.15.tar.xz +lftpget http://us.php.net/distributions/php-7.4.16.tar.xz.asc +lftpget http://us.php.net/distributions/php-7.4.16.tar.xz diff --git a/source/n/php/php.SlackBuild b/source/n/php/php.SlackBuild index d1d9ac183..74c8d4854 100755 --- a/source/n/php/php.SlackBuild +++ b/source/n/php/php.SlackBuild @@ -28,7 +28,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=php VERSION=${VERSION:-$(echo php-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} ALPINE=2.24 -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then |