From b22bcef8a48210e2abd55e7e5f653d4c0086958f Mon Sep 17 00:00:00 2001 From: Patrick J Volkerding Date: Sat, 14 Nov 2020 02:43:46 +0000 Subject: Sat Nov 14 02:43:46 UTC 2020 a/kernel-firmware-20201113_2ea8667-noarch-1.txz: Upgraded. d/gcc-9.3.0-x86_64-3.txz: Rebuilt. Recompiled against isl-0.23. d/gcc-brig-9.3.0-x86_64-3.txz: Rebuilt. Recompiled against isl-0.23. d/gcc-g++-9.3.0-x86_64-3.txz: Rebuilt. Recompiled against isl-0.23. d/gcc-gdc-9.3.0-x86_64-3.txz: Rebuilt. Recompiled against isl-0.23. d/gcc-gfortran-9.3.0-x86_64-3.txz: Rebuilt. Recompiled against isl-0.23. d/gcc-gnat-9.3.0-x86_64-3.txz: Rebuilt. Recompiled against isl-0.23. d/gcc-go-9.3.0-x86_64-3.txz: Rebuilt. Recompiled against isl-0.23. d/gcc-objc-9.3.0-x86_64-3.txz: Rebuilt. Recompiled against isl-0.23. l/isl-0.23-x86_64-1.txz: Upgraded. Shared library .so-version bump. l/python-urllib3-1.26.2-x86_64-1.txz: Upgraded. n/gpgme-1.15.0-x86_64-1.txz: Upgraded. n/openssh-8.4p1-x86_64-3.txz: Rebuilt. Fix ssh-copy-id EOF bug. Thanks to OldHolborn. n/php-7.4.12-x86_64-3.txz: Rebuilt. Don't include c-client information in php-config output. Thanks to Chalapticus. xap/xine-lib-1.2.10-x86_64-4.txz: Rebuilt. Recompiled against imagemagick-7.0.10_37. Thanks to RandomTroll. extra/pure-alsa-system/xine-lib-1.2.10-x86_64-4_alsa.txz: Rebuilt. Recompiled against imagemagick-7.0.10_37. Thanks to RandomTroll. testing/packages/gcc10/gcc-10.2.0-x86_64-2.txz: Rebuilt. Recompiled against isl-0.23. testing/packages/gcc10/gcc-brig-10.2.0-x86_64-2.txz: Rebuilt. Recompiled against isl-0.23. testing/packages/gcc10/gcc-g++-10.2.0-x86_64-2.txz: Rebuilt. Recompiled against isl-0.23. testing/packages/gcc10/gcc-gdc-10.2.0-x86_64-2.txz: Rebuilt. Recompiled against isl-0.23. testing/packages/gcc10/gcc-gfortran-10.2.0-x86_64-2.txz: Rebuilt. Recompiled against isl-0.23. testing/packages/gcc10/gcc-gnat-10.2.0-x86_64-2.txz: Rebuilt. Recompiled against isl-0.23. testing/packages/gcc10/gcc-go-10.2.0-x86_64-2.txz: Rebuilt. Recompiled against isl-0.23. testing/packages/gcc10/gcc-objc-10.2.0-x86_64-2.txz: Rebuilt. Recompiled against isl-0.23. testing/packages/vtown/deps/dvdauthor-0.7.2-x86_64-1_vtown_2.txz: Rebuilt. Recompiled against imagemagick-7.0.10_37. testing/source/vtown/kde/digikam-7.1.0-x86_64-1_vtown_2.txz: Rebuilt. Recompiled against imagemagick-7.0.10_37. Thanks to etienne. --- source/a/aaa_elflibs/symlinks-to-tracked-libs-tmp | 2 +- source/d/gcc/gcc.SlackBuild | 2 +- source/l/isl/slack-desc | 8 ++++---- source/n/gpgme/gpgme.SlackBuild | 2 +- source/n/openssh/openssh.SlackBuild | 5 ++++- source/n/openssh/ssh-copy-id.diff | 19 +++++++++++++++++++ source/n/php/php.SlackBuild | 6 +++++- source/xap/xine-lib/xine-lib.SlackBuild | 2 +- 8 files changed, 36 insertions(+), 10 deletions(-) create mode 100644 source/n/openssh/ssh-copy-id.diff (limited to 'source') diff --git a/source/a/aaa_elflibs/symlinks-to-tracked-libs-tmp b/source/a/aaa_elflibs/symlinks-to-tracked-libs-tmp index 0a9289aea..b5967eff3 100644 --- a/source/a/aaa_elflibs/symlinks-to-tracked-libs-tmp +++ b/source/a/aaa_elflibs/symlinks-to-tracked-libs-tmp @@ -5,7 +5,7 @@ # # We need these libraries here or we won't be able to recompile gcc # after any of them get a shared library .so-version bump: -/usr/lib/libisl.so.22 +/usr/lib/libisl.so.23 /usr/lib/libmpc.so.3 /usr/lib/libmpfr.so.6 /usr/lib/libgmp.so.10 diff --git a/source/d/gcc/gcc.SlackBuild b/source/d/gcc/gcc.SlackBuild index c154888e6..853e41b33 100755 --- a/source/d/gcc/gcc.SlackBuild +++ b/source/d/gcc/gcc.SlackBuild @@ -57,7 +57,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=gcc SRCVER=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} VERSION=$(echo $SRCVER | cut -f 1 -d _) -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} # How many jobs to run in parallel: NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} diff --git a/source/l/isl/slack-desc b/source/l/isl/slack-desc index 8fdcd80e1..f96ea71e9 100644 --- a/source/l/isl/slack-desc +++ b/source/l/isl/slack-desc @@ -1,17 +1,17 @@ # HOW TO EDIT THIS FILE: # The "handy ruler" below makes it easier to edit a package description. Line # up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| isl: isl (Integer Set Library) isl: isl: isl is a thread-safe C library for manipulating sets and relations -isl: of integer points bounded by affine constraints. The descriptions of +isl: of integer points bounded by affine constraints. The descriptions of isl: the sets and relations may involve both parameters and existentially -isl: quantified variables. All computations are performed in exact integer +isl: quantified variables. All computations are performed in exact integer isl: arithmetic using GMP. isl: isl: Homepage: http://isl.gforge.inria.fr diff --git a/source/n/gpgme/gpgme.SlackBuild b/source/n/gpgme/gpgme.SlackBuild index f8ea2e3da..b3728391d 100755 --- a/source/n/gpgme/gpgme.SlackBuild +++ b/source/n/gpgme/gpgme.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=gpgme 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 diff --git a/source/n/openssh/openssh.SlackBuild b/source/n/openssh/openssh.SlackBuild index 3a423c91f..5e9331ea1 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:-2} +BUILD=${BUILD:-3} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} @@ -86,6 +86,9 @@ 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 + # 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 new file mode 100644 index 000000000..269879bfa --- /dev/null +++ b/source/n/openssh/ssh-copy-id.diff @@ -0,0 +1,19 @@ +--- ./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/php.SlackBuild b/source/n/php/php.SlackBuild index a670e9ffe..b2a4cb853 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:-3} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -271,6 +271,10 @@ CXXFLAGS="$SLKCFLAGS -DU_USING_ICU_NAMESPACE=1 -DU_DEFINE_FALSE_AND_TRUE=1" \ make $NUMJOBS || make || exit 1 make install INSTALL_ROOT=$PKG || exit 1 +# Don't include the c-client library in php-config output: +sed -i "s| -L/usr/local/lib${LIBDIRSUFFIX}/c-client/lib${LIBDIRSUFFIX}||g" $PKG/usr/bin/php-config +sed -i "s| -lc-client||g" $PKG/usr/bin/php-config + mkdir -p $PKG/etc/{rc.d,php-fpm.d} cp sapi/fpm/init.d.php-fpm $PKG/etc/rc.d/rc.php-fpm.new chmod 644 $PKG/etc/rc.d/rc.php-fpm.new diff --git a/source/xap/xine-lib/xine-lib.SlackBuild b/source/xap/xine-lib/xine-lib.SlackBuild index 3975d67a0..1358688a6 100755 --- a/source/xap/xine-lib/xine-lib.SlackBuild +++ b/source/xap/xine-lib/xine-lib.SlackBuild @@ -32,7 +32,7 @@ DIRVER=1.2.10 # Version used for the Slackware package PKGVER=1.2.10 -BUILD=${BUILD:-3} +BUILD=${BUILD:-4} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then -- cgit v1.2.3