diff options
author | Patrick J Volkerding <volkerdi@slackware.com> | 2020-11-14 02:43:46 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2020-11-14 08:59:53 +0100 |
commit | b22bcef8a48210e2abd55e7e5f653d4c0086958f (patch) | |
tree | 4c48bdf77ee11f7155fc638540272b846e54b4b0 /source/n/openssh | |
parent | 99ea674f03390ed00388dfc3a84e4d1537eb3696 (diff) | |
download | current-b22bcef8a48210e2abd55e7e5f653d4c0086958f.tar.gz |
Sat Nov 14 02:43:46 UTC 202020201114024346
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.
Diffstat (limited to 'source/n/openssh')
-rwxr-xr-x | source/n/openssh/openssh.SlackBuild | 5 | ||||
-rw-r--r-- | source/n/openssh/ssh-copy-id.diff | 19 |
2 files changed, 23 insertions, 1 deletions
diff --git a/source/n/openssh/openssh.SlackBuild b/source/n/openssh/openssh.SlackBuild index 3a423c91..5e9331ea 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 00000000..269879bf --- /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}" |