gentoo auto-resync : 21:08:2023 - 21:44:47

5 files changed, 28 insertions, 3 deletions

diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest
index 719b736bdfac..030dc193e6c2 100644
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -5,6 +5,7 @@ AUX openssh-9.3_p1-fix-putty-tests.patch 1691 BLAKE2B 8a92766bd2db65a4dab1254a35
 AUX openssh-9.3_p1-gss-use-HOST_NAME_MAX.patch 350 BLAKE2B 7baae8cf4140e7ace3486c5c1a34fecb8f8ce2dc2818f046645e11ac37fb87afb0d1bb15a5660e106b94867c24e22da72fbdc1c9255d2ce2ede164b9922a1484 SHA512 d5e13ec0ae1e7d73bfe15e7a0507730f92e4109ab5daa0d99c4d4a9800d3b8df19e26b56e0aa1b5cedb5635f40ef63d9806bb92ac4eb342a1e196e38380b1c13
 AUX openssh-9.3_p1-openssl-ignore-status.patch 765 BLAKE2B 6ddc498cef115a38054eb8f1fddac34048b94592e54f8e31dc11717fe872f3d66a7e6877d2449102fbe18a0ee2a35732991abe946b1fe10abfa48bbec6871b26 SHA512 ab15d6dfdb8d59946684501f6f30ac0eb82676855b7b57f19f2027a7ada072f9062fcb96911111a50cfc3838492faddd282db381ec83d22462644ccddccf0ae7
 AUX openssh-9.3_p1-openssl-version-compat-check.patch 2588 BLAKE2B 635e9d4e0ca515d4da190075371b85b5c1885fd7d9b621d6f21399be0faf0be96e5e31875611392386b897f74087d75a00203a74c9f9ecf0be447bf354fcf4a2 SHA512 a27afa1b07a47f0ecf74d30ca85e7b4f8c79857c8019d274aeaed88b81149ce6241fd16f1023f14dbdc701e8c9d8671f6aadda2e21d620a47af8778b8531b991
+AUX openssh-9.3_p2-zlib-1.3.patch 671 BLAKE2B 44a974e83faaee7336898227bc6f14ff4ab6e8e91e2d8f61d22f45b4d73e57a79b505143620d3a910c6e7cea91ab406e10ffcf23a802f447843f5c2836e37c34 SHA512 d2e5992c783b46b4859501aa32aa7b0acc5ec9e512589e18faebfa8660c52a3ad9ffa3d5a4cd5ba9a5fadb7ab86e51c32714dd23325054b05fa07194bd86f7d7
 AUX sshd-r1.confd 774 BLAKE2B df3f3f28cb4d35b49851399b52408c42e242ae3168ff3fc79add211903567da370cfe86a267932ca9cf13c3afbc38a8f1b53e753a31670ee61bf8ba8747832f8 SHA512 3a69752592126024319a95f1c1747af508fd639c86eca472106c5d6c23d5eeaa441ca74740d4b1aafaa0db759d38879e3c1cee742b08d6166ebc58cddac1e2fe
 AUX sshd-r1.initd 2675 BLAKE2B 47e87cec2d15b90aae362ce0c8e8ba08dada9ebc244e28be1fe67d24deb00675d3d9b8fef40def8a9224a3e2d15ab717574a3d837e099133c1cf013079588b55 SHA512 257d6437162b76c4a3a648ecc5d4739ca7eaa60b192fde91422c6c05d0de6adfa9635adc24d57dc3da6beb92b1b354ffe8fddad3db453efb610195d5509a4e27
 AUX sshd.pam_include.2 156 BLAKE2B 91ebefbb1264fe3fe98df0a72ac22a4cd8a787b3b391af5769798e0b0185f0a588bc089d229c76138fd2db39fbe6bd33924f0d53e0513074d9c2d7abf88dcb78 SHA512 d3f7e6ca8c9f2b5060ebccb259316bb59c9a7e158e8ef9466765a20db263a4043a590811f1a3ab072b718dbd70898bc69b77e0b19603d7f394b5ac1bd0a4a56c
@@ -17,7 +18,7 @@ DIST openssh-9.3p2.tar.gz 1835850 BLAKE2B 38f8d4ada263112b318fafccabf0a33a004d82
 DIST openssh-9.3p2.tar.gz.asc 833 BLAKE2B cfba3867d7f97cb2c904bd3ae111bd63e8a050464b66e3f3f22390839a153d57ef5819182f8ad99a6b520f27881143552dc64fccfc33dcc0483ffe1ef33a5a47 SHA512 759e512a36a3a62264803b517298a65c83e1daebd9867e28ea1ca4999c38539368815ccda86540a4f5d45fa79c539d8242995ba55f2918baf2a7404c105e337a
 DIST openssh-9.4p1.tar.gz 1845094 BLAKE2B d13d758129cce947d3f12edb6e88406aad10de6887b19ffa3ebd8e382b742a05f2a692a8824aec99939f6c7e13fbccc3bb14e5ee112f9a9255d4882eb87dcf53 SHA512 0aaedeced7dbc70419c7245eb0e9db4ef570e0e7739b890ebae04d56da5fe8d147e8e150f3c943f60730976569e3ac6cc8da62ec7e2a78e2ef47d295ca0b1d25
 DIST openssh-9.4p1.tar.gz.asc 833 BLAKE2B 95eedd9356766e5d0ea1261da3dc4c7869f054b418c626fb35815a0aa655b1ddbf54436b437d98c4344b05c9196c8fa1f592eac07b3ccf08bd3e980f8b6955af SHA512 983b4ebaa3b98e70831ce686cb503270926c065163a2510eef0c5102ef50b6e665b889ee15ea8c0bd7c4bbddb19270f036e1d554a8212ef2c292f9c682c8631a
-EBUILD openssh-9.3_p1-r1.ebuild 13404 BLAKE2B e90967abd981b984cabb0103e2137ced43b424de3e9bb26c1d7dac510566e167f6b88e0303dab44699a0ecac82ba438181c03a08330c3dd7f5dae108c4b81705 SHA512 6a12f83fb31479316e5573321beb82bab76752e2a01622c35073950edeeae819d791032056bf11fe5ea310a3cee0834e33cb814e87a8b3ad1dda9a4641702666
-EBUILD openssh-9.3_p2.ebuild 13528 BLAKE2B 730ded6f2bbb99f1856882edf535459e0e40769f9e28709f78b200a2261ffd9de611a1dc0615d60f6d7da45793ef25e9e9c02b1eabfb75bde447b3303a4e6299 SHA512 7b1144ce50bd7a20523581f4a7b4fca4887bf73ba9e21f92c1a080c87c72e7a5513703fff842faafb24aa42169f127071467e6dc3843721054fc92089f2bd70d
-EBUILD openssh-9.4_p1.ebuild 13409 BLAKE2B d067d0b20771b4e1e8a3e807b72785ac8785ef090a63109a0b73997b186873b49969cee2690bd145b8c0cf430a1d527d327954a19f36a48ecb4471fd23df6acc SHA512 4102d0bec500270c15c8645ba75c06015fa325a9b0e49874c28ae099cab539cc4fbbe3c2ad9c9a46348954dd9acd9727be8015183c4d2b8785ecacb017a7c852
+EBUILD openssh-9.3_p1-r1.ebuild 13455 BLAKE2B c45a4531688d14c3ed766f721dcb5d9603e1594526cbfa3782b491c515313567db1b60cfaafce1360f52e191c72d85d1dc2ea84bcc6f89aba6eab13b6498380a SHA512 d55d36cd0737dedc7d32321c93bbea1ce31d3b50db006f42e25073e5b4d356dc5ebd0ea652fd501be724745d8a9e0771a9d79d61ea9c822525eabbd4498434e9
+EBUILD openssh-9.3_p2.ebuild 13579 BLAKE2B d14f223e710380fef225829f0b08cadb407571143b3d46a7ea2ab9b8c4fb003a6897c1138ce749c24b1b0bed896af83f35dd81d84d8d9bc52b903124d71ef5fe SHA512 47a05c7b8962891ede466c24f2e2bc635fa42317932fd0c6c857dbd80a835d196f7fd08ae3272507cfa16daa49bc2ba667dd4a1b35b36d4f039b9045c8b0353a
+EBUILD openssh-9.4_p1.ebuild 13460 BLAKE2B afabbccdb249e44e3c85503967b3640214d94b2115571f769c60f88dabbefdefb173f7b66d1fd70a9b5f305d65551d6be9aa3b9060eb476851a1878a19b0362a SHA512 0daa0f528d715543c010b8721de201236f5c5ef26c8403e987c7542725ffe977bcb02d9e331235f92a771e12cd15797f605685d733ee7fda4cc807b9180426c4
 MISC metadata.xml 1788 BLAKE2B d04d3030f70f3615522672fa56e684acaa67ddce8d16cce86ba8911fb8fc11ed152be012ecf560427d271868c4841a7422aaa644305947302d3ebab62bdb577d SHA512 bd328e3a33ce04b989149333db5f774f1b52540f12ef83b08b7fcf136ae2a3a9c83bef42c28991d3536249098ca0b9ffd21e583d93599580510d8619e9fd01ca
diff --git a/net-misc/openssh/files/openssh-9.3_p2-zlib-1.3.patch b/net-misc/openssh/files/openssh-9.3_p2-zlib-1.3.patch
new file mode 100644
index 000000000000..f1336bbe0380
--- /dev/null
+++ b/net-misc/openssh/files/openssh-9.3_p2-zlib-1.3.patch
@@ -0,0 +1,21 @@
+https://bugs.gentoo.org/912766
+https://github.com/openssh/openssh-portable/commit/cb4ed12ffc332d1f72d054ed92655b5f1c38f621
+
+From cb4ed12ffc332d1f72d054ed92655b5f1c38f621 Mon Sep 17 00:00:00 2001
+From: Darren Tucker <dtucker@dtucker.net>
+Date: Sat, 19 Aug 2023 07:39:08 +1000
+Subject: [PATCH] Fix zlib version check for 1.3 and future version.
+
+bz#3604.
+--- a/configure.ac
++++ b/configure.ac
+@@ -1464,7 +1464,7 @@ else
+ 	[[
+ 	int a=0, b=0, c=0, d=0, n, v;
+ 	n = sscanf(ZLIB_VERSION, "%d.%d.%d.%d", &a, &b, &c, &d);
+-	if (n != 3 && n != 4)
++	if (n < 1)
+ 		exit(1);
+ 	v = a*1000000 + b*10000 + c*100 + d;
+ 	fprintf(stderr, "found zlib version %s (%d)\n", ZLIB_VERSION, v);
+
diff --git a/net-misc/openssh/openssh-9.3_p1-r1.ebuild b/net-misc/openssh/openssh-9.3_p1-r1.ebuild
index e3184f35c252..2624fa94f0ee 100644
--- a/net-misc/openssh/openssh-9.3_p1-r1.ebuild
+++ b/net-misc/openssh/openssh-9.3_p1-r1.ebuild
@@ -88,6 +88,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-9.3_p1-deny-shmget-shmat-shmdt-in-preauth-privsep-child.patch"
 	"${FILESDIR}/${PN}-9.3_p1-gss-use-HOST_NAME_MAX.patch" #834044
 	"${FILESDIR}/${PN}-9.3_p1-openssl-version-compat-check.patch"
+	"${FILESDIR}/${PN}-9.3_p2-zlib-1.3.patch" #912766
 )
 
 pkg_pretend() {
diff --git a/net-misc/openssh/openssh-9.3_p2.ebuild b/net-misc/openssh/openssh-9.3_p2.ebuild
index 8e57bfe2061c..3013b70ed4bc 100644
--- a/net-misc/openssh/openssh-9.3_p2.ebuild
+++ b/net-misc/openssh/openssh-9.3_p2.ebuild
@@ -88,6 +88,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-9.3_p1-deny-shmget-shmat-shmdt-in-preauth-privsep-child.patch"
 	"${FILESDIR}/${PN}-9.3_p1-gss-use-HOST_NAME_MAX.patch" #834044
 	"${FILESDIR}/${PN}-9.3_p1-openssl-version-compat-check.patch"
+	"${FILESDIR}/${PN}-9.3_p2-zlib-1.3.patch" #912766
 )
 
 pkg_pretend() {
diff --git a/net-misc/openssh/openssh-9.4_p1.ebuild b/net-misc/openssh/openssh-9.4_p1.ebuild
index ec36f3445783..5d1ffb94eba4 100644
--- a/net-misc/openssh/openssh-9.4_p1.ebuild
+++ b/net-misc/openssh/openssh-9.4_p1.ebuild
@@ -86,6 +86,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-9.3_p1-disable-conch-interop-tests.patch"
 	"${FILESDIR}/${PN}-9.3_p1-fix-putty-tests.patch"
 	"${FILESDIR}/${PN}-9.3_p1-deny-shmget-shmat-shmdt-in-preauth-privsep-child.patch"
+	"${FILESDIR}/${PN}-9.3_p2-zlib-1.3.patch" #912766
 )
 
 pkg_pretend() {