Update to 8.4p1

1 files changed, 19 insertions, 11 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 960e9f407839..d1ed6ca3b92a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,11 +1,13 @@
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
+# Maintainer: Christoph Gysin <christoph.gysin@gmail.com>
+# Contributor: Levente Polyak <anthraxx[at]archlinux[dot]org>
+# Contributor: Giancarlo Razzolini <grazzolini@archlinux.org>
+# Contributor: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Aaron Griffin <aaron@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
-# Contributor: Christoph Gysin <christoph.gysin@gmail.com>
 
 pkgname=openssh-gssapi
 _pkgname=openssh
-pkgver=8.2p1
+pkgver=8.4p1
 pkgrel=1
 pkgdesc='Premier connectivity tool for remote login with the SSH protocol'
 url='https://www.openssh.com/portable.html'
@@ -13,27 +15,30 @@ license=('custom:BSD')
 conflicts=(${_pkgname})
 provides=(${_pkgname})
 arch=('x86_64')
-makedepends=('linux-headers' 'git' 'libfido2')
-depends=('krb5' 'openssl' 'libedit' 'ldns')
+depends=('glibc' 'krb5' 'openssl' 'libedit' 'ldns' 'libxcrypt' 'libcrypt.so' 'zlib' 'pam')
+makedepends=('linux-headers' 'libfido2' 'git')
+checkdepends=('inetutils')
 optdepends=('xorg-xauth: X11 forwarding'
             'x11-ssh-askpass: input passphrase in X'
             'libfido2: FIDO/U2F support')
+
 validpgpkeys=('59C2118ED206D927E667EBE3D3E5F56B6D920D30')
+#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}
+        "https://sources.debian.org/data/main/o/openssh/1:${pkgver}-5/debian/patches/gssapi.patch"
         'sshdgenkeys.service'
         'sshd.service'
         'sshd.conf'
         'sshd.pam'
-        'glibc-2.31.patch'
-        'openssh-gssapi-debian.patch')
-sha256sums=('43925151e6cf6cee1450190c0e9af4dc36b41c12737619edff8bcebdff64e671'
+        'glibc-2.31.patch')
+sha256sums=('5a01d22e407eb1c05ba8a8f7c654d388a13e9f226e4ed33bd38748dafa1d2b24'
             'SKIP'
+            '15139c42894dd0ebd182608ecd7151a9eef6158aed30c676e7685e8407c6d1cb'
             '4031577db6416fcbaacf8a26a024ecd3939e5c10fe6a86ee3f0eea5093d533b7'
             'e40f8b7c8e5e2ecf3084b3511a6c36d5b5c9f9e61f2bb13e3726c71dc7d4fbc7'
             '4effac1186cc62617f44385415103021f72f674f8b8e26447fc1139c670090f6'
             '64576021515c0a98b0aaf0a0ae02e0f5ebe8ee525b1e647ab68f369f81ecd846'
-            '25b4a4d9e2d9d3289ef30636a30e85fa1c71dd930d5efd712cca1a01a5019f93'
-            '10441cbd6116b45f409afd95aa0b682b1ed389c771996a8d9eb117633131f6fa')
+            '25b4a4d9e2d9d3289ef30636a30e85fa1c71dd930d5efd712cca1a01a5019f93')
 
 backup=('etc/ssh/ssh_config' 'etc/ssh/sshd_config' 'etc/pam.d/sshd')
 
@@ -41,8 +46,10 @@ install=install
 
 prepare() {
     cd "${srcdir}/${_pkgname}-${pkgver}"
+
     patch -p1 -i ../glibc-2.31.patch
-    patch -p1 -i ../openssh-gssapi-debian.patch
+    patch -p1 -i ../gssapi.patch
+
     autoreconf
 }
 
@@ -73,6 +80,7 @@ build() {
 
 check() {
     cd "${srcdir}/${_pkgname}-${pkgver}"
+
     # Tests require openssh to be already installed system-wide,
     # also connectivity tests will fail under makechrootpkg since
     # it runs as nobody which has /bin/false as login shell.