Update to 9.6p1

3 files changed, 14 insertions, 22 deletions

diff --git a/.SRCINFO b/.SRCINFO
index fc63fe4ac32d..7deb59d32458 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = openssh-gssapi
 	pkgdesc = SSH protocol implementation with GSSAPI support
-	pkgver = 9.4p1
+	pkgver = 9.6p1
 	pkgrel = 1
 	url = https://www.openssh.com/portable.html
 	arch = x86_64
@@ -28,30 +28,27 @@ pkgbase = openssh-gssapi
 	backup = etc/pam.d/sshd
 	backup = etc/ssh/ssh_config
 	backup = etc/ssh/sshd_config
-	source = https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-9.4p1.tar.gz
-	source = https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-9.4p1.tar.gz.asc
+	source = https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-9.6p1.tar.gz
+	source = https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-9.6p1.tar.gz.asc
 	source = openssh-9.0p1-sshd_config.patch
-	source = openssh-gssapi-9.4p1-1-gssapi.patch::https://sources.debian.org/data/main/o/openssh/1:9.4p1-1/debian/patches/gssapi.patch
-	source = zlib-1.3.patch::https://github.com/openssh/openssh-portable/commit/cb4ed12ffc332d1f72d054ed92655b5f1c38f621.patch
+	source = openssh-gssapi-9.6p1-2-gssapi.patch::https://sources.debian.org/data/main/o/openssh/1:9.6p1-2/debian/patches/gssapi.patch
 	source = sshdgenkeys.service
 	source = sshd.service
 	source = sshd.conf
 	source = sshd.pam
 	validpgpkeys = 7168B983815A5EEF59A4ADFD2A3F414E736060BA
-	sha256sums = 3608fd9088db2163ceb3e600c85ab79d0de3d221e59192ea1923e23263866a85
+	sha256sums = 910211c07255a8c5ad654391b40ee59800710dd8119dd5362de09385aa7a777c
 	sha256sums = SKIP
 	sha256sums = 27e43dfd1506c8a821ec8186bae65f2dc43ca038616d6de59f322bd14aa9d07f
-	sha256sums = 9492c1db4307aa3fe6e12d77fff01376bf275af2980ae55b926a505aae9e9b14
-	sha256sums = 937d7d028574a06823e7aa92499a679a826245b3118e8f7cd4141d8d06012727
+	sha256sums = 03a32678a96cfd274482378d0d2889709018c403e40207b8d5dca41b7e9941bd
 	sha256sums = e5305767b2d317183ad1c5022a5f6705bd9014a8b22495a000fd482713738611
 	sha256sums = e40f8b7c8e5e2ecf3084b3511a6c36d5b5c9f9e61f2bb13e3726c71dc7d4fbc7
 	sha256sums = 4effac1186cc62617f44385415103021f72f674f8b8e26447fc1139c670090f6
 	sha256sums = 64576021515c0a98b0aaf0a0ae02e0f5ebe8ee525b1e647ab68f369f81ecd846
-	b2sums = d13d758129cce947d3f12edb6e88406aad10de6887b19ffa3ebd8e382b742a05f2a692a8824aec99939f6c7e13fbccc3bb14e5ee112f9a9255d4882eb87dcf53
+	b2sums = dd7f6747fe89f7b386be4faaf7fc43398a9bf439e45608ae61c2126cf8743c64ef7b5af45c75e9007b0bda525f8809261ca0f2fc47ce60177ba769a5324719dd
 	b2sums = SKIP
 	b2sums = 29e1a1c2744e0234830c6f93a46338ea8dc943370e20a24883d207d611025e54643da678f2826050c073a36be48dfdc7329d4cfb144c2ff90607a5f10f73dc59
-	b2sums = 70f7dae4cb4014499037cfdc661e4b9d5ec29a664c79e55e5442eb87483bc4391d59ca835e5d8dec33e2322845f3c239016f285063fc9f273dcc9642d464bea9
-	b2sums = d41f1ecea7b4ebcfb3003826fb51c2a0c27178590c755a61752389606df35544284cb24ea8bf4fcb280eec4c6c5cb410662862b27af47f3aca63f7f638efcc9f
+	b2sums = 04259cf6c40f76414c6afa0c3fd4cee259491709977558cf962e7910df3930c9687350f55d0c1c0eceac227c7a14e9c10fb8e70168ce4105c5f0c23ef6aa57f2
 	b2sums = 09fad3648f48f13ee80195b90913feeba21240d121b1178e0ce62f4a17b1f7e58e8edc22c04403e377ab300f5022a804c848f5be132765d5ca26a38aab262e50
 	b2sums = 07ad5c7fb557411a6646ff6830bc9d564c07cbddc4ce819641d31c05dbdf677bfd8a99907cf529a7ee383b8c250936a6423f4b4b97ba0f1c14f627bbd629bd4e
 	b2sums = 27571f728c3c10834a81652f3917188436474b588f8b047462e44b6c7a424f60d06ce8cb74839b691870177d7261592207d7f35d4ae6c79af87d6a7ea156d395
diff --git a/.gitignore b/.gitignore
index 9fa81992c784..7f1a5493d038 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,4 +2,3 @@
 /pkg/
 /src/
 /openssh-*-gssapi.patch
-/zlib-*.patch
diff --git a/PKGBUILD b/PKGBUILD
index 603cd7df9e42..5c38fd6575ad 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,8 +7,8 @@
 
 pkgname=openssh-gssapi
 _pkgname=openssh
-pkgver=9.4p1
-_patch=1
+pkgver=9.6p1
+_patch=2
 pkgrel=1
 pkgdesc="SSH protocol implementation with GSSAPI support"
 arch=('x86_64')
@@ -41,26 +41,23 @@ source=(
   "https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${_pkgname}-${pkgver}.tar.gz"{,.asc}
   "${_pkgname}-9.0p1-sshd_config.patch"
   "${pkgname}-${pkgver}-${_patch}-gssapi.patch::https://sources.debian.org/data/main/o/openssh/1:${pkgver}-${_patch}/debian/patches/gssapi.patch"
-  'zlib-1.3.patch::https://github.com/openssh/openssh-portable/commit/cb4ed12ffc332d1f72d054ed92655b5f1c38f621.patch'
   'sshdgenkeys.service'
   'sshd.service'
   'sshd.conf'
   'sshd.pam'
 )
-sha256sums=('3608fd9088db2163ceb3e600c85ab79d0de3d221e59192ea1923e23263866a85'
+sha256sums=('910211c07255a8c5ad654391b40ee59800710dd8119dd5362de09385aa7a777c'
             'SKIP'
             '27e43dfd1506c8a821ec8186bae65f2dc43ca038616d6de59f322bd14aa9d07f'
-            '9492c1db4307aa3fe6e12d77fff01376bf275af2980ae55b926a505aae9e9b14'
-            '937d7d028574a06823e7aa92499a679a826245b3118e8f7cd4141d8d06012727'
+            '03a32678a96cfd274482378d0d2889709018c403e40207b8d5dca41b7e9941bd'
             'e5305767b2d317183ad1c5022a5f6705bd9014a8b22495a000fd482713738611'
             'e40f8b7c8e5e2ecf3084b3511a6c36d5b5c9f9e61f2bb13e3726c71dc7d4fbc7'
             '4effac1186cc62617f44385415103021f72f674f8b8e26447fc1139c670090f6'
             '64576021515c0a98b0aaf0a0ae02e0f5ebe8ee525b1e647ab68f369f81ecd846')
-b2sums=('d13d758129cce947d3f12edb6e88406aad10de6887b19ffa3ebd8e382b742a05f2a692a8824aec99939f6c7e13fbccc3bb14e5ee112f9a9255d4882eb87dcf53'
+b2sums=('dd7f6747fe89f7b386be4faaf7fc43398a9bf439e45608ae61c2126cf8743c64ef7b5af45c75e9007b0bda525f8809261ca0f2fc47ce60177ba769a5324719dd'
         'SKIP'
         '29e1a1c2744e0234830c6f93a46338ea8dc943370e20a24883d207d611025e54643da678f2826050c073a36be48dfdc7329d4cfb144c2ff90607a5f10f73dc59'
-        '70f7dae4cb4014499037cfdc661e4b9d5ec29a664c79e55e5442eb87483bc4391d59ca835e5d8dec33e2322845f3c239016f285063fc9f273dcc9642d464bea9'
-        'd41f1ecea7b4ebcfb3003826fb51c2a0c27178590c755a61752389606df35544284cb24ea8bf4fcb280eec4c6c5cb410662862b27af47f3aca63f7f638efcc9f'
+        '04259cf6c40f76414c6afa0c3fd4cee259491709977558cf962e7910df3930c9687350f55d0c1c0eceac227c7a14e9c10fb8e70168ce4105c5f0c23ef6aa57f2'
         '09fad3648f48f13ee80195b90913feeba21240d121b1178e0ce62f4a17b1f7e58e8edc22c04403e377ab300f5022a804c848f5be132765d5ca26a38aab262e50'
         '07ad5c7fb557411a6646ff6830bc9d564c07cbddc4ce819641d31c05dbdf677bfd8a99907cf529a7ee383b8c250936a6423f4b4b97ba0f1c14f627bbd629bd4e'
         '27571f728c3c10834a81652f3917188436474b588f8b047462e44b6c7a424f60d06ce8cb74839b691870177d7261592207d7f35d4ae6c79af87d6a7ea156d395'
@@ -70,7 +67,6 @@ validpgpkeys=('7168B983815A5EEF59A4ADFD2A3F414E736060BA')
 prepare() {
   patch -Np1 -d "$_pkgname-$pkgver" -i ../${_pkgname}-9.0p1-sshd_config.patch
   patch -Np1 -d "$_pkgname-$pkgver" -i ../${pkgname}-${pkgver}-${_patch}-gssapi.patch
-  patch -Np1 -d "$_pkgname-$pkgver" -i ../zlib-1.3.patch
   cd "${srcdir}/${_pkgname}-${pkgver}"
   autoreconf
 }