[arch-commits] Commit in openssh/trunk (2 files)

Giancarlo Razzolini grazzolini at archlinux.org
Wed Mar 3 03:47:25 UTC 2021


    Date: Wednesday, March 3, 2021 @ 03:47:25
  Author: grazzolini
Revision: 409093

upgpkg: openssh 8.5p1-1

Modified:
  openssh/trunk/PKGBUILD
Deleted:
  openssh/trunk/0001-Fix-EOF-command-not-found-error-in-ssh-copy-id.patch

-----------------------------------------------------------+
 0001-Fix-EOF-command-not-found-error-in-ssh-copy-id.patch |   33 ------------
 PKGBUILD                                                  |   17 ++----
 2 files changed, 6 insertions(+), 44 deletions(-)

Deleted: 0001-Fix-EOF-command-not-found-error-in-ssh-copy-id.patch
===================================================================
--- 0001-Fix-EOF-command-not-found-error-in-ssh-copy-id.patch	2021-03-03 00:07:14 UTC (rev 409092)
+++ 0001-Fix-EOF-command-not-found-error-in-ssh-copy-id.patch	2021-03-03 03:47:25 UTC (rev 409093)
@@ -1,33 +0,0 @@
-From d9e727dcc04a52caaac87543ea1d230e9e6b5604 Mon Sep 17 00:00:00 2001
-From: Oleg <Fallmay at users.noreply.github.com>
-Date: Thu, 1 Oct 2020 12:09:08 +0300
-Subject: [PATCH] Fix `EOF: command not found` error in ssh-copy-id
-
----
- contrib/ssh-copy-id | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/contrib/ssh-copy-id b/contrib/ssh-copy-id
-index 392f64f9..a7690771 100644
---- a/contrib/ssh-copy-id
-+++ b/contrib/ssh-copy-id
-@@ -247,7 +247,7 @@ installkeys_sh() {
-   #    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 @@ installkeys_sh() {
- 	  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}"
--- 
-2.29.1
-

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-03-03 00:07:14 UTC (rev 409092)
+++ PKGBUILD	2021-03-03 03:47:25 UTC (rev 409093)
@@ -5,8 +5,8 @@
 # Contributor: judd <jvinet at zeroflux.org>
 
 pkgname=openssh
-pkgver=8.4p1
-pkgrel=2
+pkgver=8.5p1
+pkgrel=1
 pkgdesc='Premier connectivity tool for remote login with the SSH protocol'
 url='https://www.openssh.com/portable.html'
 license=('custom:BSD')
@@ -17,7 +17,7 @@
 optdepends=('xorg-xauth: X11 forwarding'
             'x11-ssh-askpass: input passphrase in X'
             'libfido2: FIDO/U2F support')
-validpgpkeys=('59C2118ED206D927E667EBE3D3E5F56B6D920D30')
+validpgpkeys=('7168B983815A5EEF59A4ADFD2A3F414E736060BA')
 #source=("git://anongit.mindrot.org/openssh.git?signed#tag=V_8_2_P1"
 source=("https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver}.tar.gz"{,.asc}
         'sshdgenkeys.service'
@@ -24,16 +24,14 @@
         'sshd.service'
         'sshd.conf'
         'sshd.pam'
-        'glibc-2.31.patch'
-        '0001-Fix-EOF-command-not-found-error-in-ssh-copy-id.patch')
-sha256sums=('5a01d22e407eb1c05ba8a8f7c654d388a13e9f226e4ed33bd38748dafa1d2b24'
+        'glibc-2.31.patch')
+sha256sums=('f52f3f41d429aa9918e38cf200af225ccdd8e66f052da572870c89737646ec25'
             'SKIP'
             '4031577db6416fcbaacf8a26a024ecd3939e5c10fe6a86ee3f0eea5093d533b7'
             'e40f8b7c8e5e2ecf3084b3511a6c36d5b5c9f9e61f2bb13e3726c71dc7d4fbc7'
             '4effac1186cc62617f44385415103021f72f674f8b8e26447fc1139c670090f6'
             '64576021515c0a98b0aaf0a0ae02e0f5ebe8ee525b1e647ab68f369f81ecd846'
-            '25b4a4d9e2d9d3289ef30636a30e85fa1c71dd930d5efd712cca1a01a5019f93'
-            'a9093693586ea1150ac50249ce8937f86cde7977efa54a324e3f1155110aff49')
+            '25b4a4d9e2d9d3289ef30636a30e85fa1c71dd930d5efd712cca1a01a5019f93')
 
 backup=('etc/ssh/ssh_config' 'etc/ssh/sshd_config' 'etc/pam.d/sshd')
 
@@ -44,9 +42,6 @@
 
 	patch -p1 -i ../glibc-2.31.patch
 
-        # Fix `EOF: command not found` error in ssh-copy-id
-        patch -p1 -i ../0001-Fix-EOF-command-not-found-error-in-ssh-copy-id.patch
-        
 	autoreconf
 }
 



More information about the arch-commits mailing list