gentoo auto-resync : 07:07:2024 - 12:24:46

4 files changed, 34 insertions, 2 deletions

diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest
index f6dc442215e6..2b4ad0baf7ac 100644
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -5,10 +5,12 @@ AUX openssh-9.6_p1-CVE-2024-6387.patch 508 BLAKE2B 592b671107692b2be1e181e0be60b
 AUX openssh-9.6_p1-chaff-logic.patch 696 BLAKE2B c4823f78e5cc381fb65e14512917965c0118490e5b430a28f0322fff013b7b0f40f8a0b664e748a3c1317776f22ed1411655c2fa52532c444741e8f600b582a7 SHA512 6a839546c618f00c297ac9b5b2ae46bd13ac495e5a093a3aa4d0cda81152db94706c4e9ce6b132a038e4febd05b7c19693c98ac91cc142073a06d9960efe29e4
 AUX openssh-9.6_p1-fix-xmss-c99.patch 696 BLAKE2B db9ad0e9340ee241d28310b438e90a909bea551fe136f2e6855f00067e63f3558a773005359454b14315dd46ac508397ad8f081b4aaae9f7ccf0bbc30b263d85 SHA512 1e7c2b7aec655ba312a9c0edb9db5f79323aace53f5531d69d60672e1f5bb329543558d8abea5e7a21cea1c438c5ae228f6e2a0fc39a78524b6f7f005b8011e3
 AUX openssh-9.7_p1-config-tweaks.patch 1032 BLAKE2B 52f20d412722b00a452b92c8b45a8884b3e8d76c05be45431de3c7a0401dcbbf4587b65703e28a389ee05066af73cb6c1845626342b059fac463dc2ea38d0535 SHA512 bfc39aa573dd3934bae2a496a8a730f99dd7d6217c4d6e146ca4c401151f5e803f704719f29213548c67db015ba9f4cae749dd7ee5bc3b8cee0395892abae01f
+AUX openssh-9.8_p1-musl-connect.patch 478 BLAKE2B da4043516412f5cc443c06c1f1bbd090a29408d774959e7f8cc84cc5fdacbfa927b4f89c53c9320334e7c715b6e9f24a8abff1d44adc5f0bc45b9c0432729cc8 SHA512 1953656561e952659fd38d8be96421945040c4cfb5e144bfccb77dd755adf72b6e1ca7751139bd6b20d1bafacab70c606b9e274aa7e091e437b6f399dc9e2352
 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
 AUX sshd.service.1 298 BLAKE2B 7a4f2e2656096b09a8b435d393ea9b0a7bd10a2a9f0e9d9cf49b9ae9600cccfb19a64e09f4cf718e8054fc997f21656f609eb3af15ee2e3576531a88b5709842 SHA512 efc936ca412999e3b1acabe6cf4e87c033fe468cede1c3c499499e252cf7cdeca0841e5e1862ebe316ff3f4bf758fba674f08d081b403713e154b6bbc37da365
+AUX sshd.service.2 282 BLAKE2B df9efc9bf73c0824bd0e290bf8e5ad442003461013fa30c18beddfa5760f257274aaaf045f845ee8700b780c8b792b02bb9e7d458d77fee48dbfb6da55b34563 SHA512 24c04f0608b478b3aa600a0bdfeb31b196bd9524fdd9c78bcbef5f603a797e17ffbf2ce503af707800b67d789b24fbe1ce15e87df58003752156709d497fca3b
 AUX sshd.socket 136 BLAKE2B 22e218c831fc384a3151ef97c391253738fa9002e20cf4628c6fe3d52d4b0ac3b957da58f816950669d0a6f8f2786251c6dfc31bbb863f837a3f52631341dc2e SHA512 4d31d373b7bdae917dc0cf05418c71d4743e98e354aefcf055f88f55c9c644a5a0e0e605dbb8372c1b98d17c0ea1c8c0fee27d38ab8dbe23c7e420a6a78c6d42
 AUX sshd_at.service.1 163 BLAKE2B b5c77d69e3860d365ba96a5b2fe14514bda9425e170fc7f324dcaf95fb02756ef9c5c2658904e812232f40fac9a3c2f4abf61b9129038bde66bb7d3a992d2606 SHA512 fbfe0aed3a5e99f15dc68838975cc49a206d697fb3549d8b31db25617dc7b7b8dd2397d865d89f305d5da391cd56a69277c2215c4335fccb4dd6a9b95ba34e2f
 DIST openssh-9.6p1.tar.gz 1857862 BLAKE2B dd7f6747fe89f7b386be4faaf7fc43398a9bf439e45608ae61c2126cf8743c64ef7b5af45c75e9007b0bda525f8809261ca0f2fc47ce60177ba769a5324719dd SHA512 0ebf81e39914c3a90d7777a001ec7376a94b37e6024baf3e972c58f0982b7ddef942315f5e01d56c00ff95603b4a20ee561ab918ecc55511df007ac138160509
@@ -20,5 +22,5 @@ DIST openssh-9.8p1.tar.gz.asc 833 BLAKE2B 5291e8c03ab9a75acb44285cd7fc010f4a3355
 EBUILD openssh-9.6_p1-r3.ebuild 13807 BLAKE2B 61ce712b91455496975c2f5daec0d50fc32dd677aee7612f7734c9a690724c2ae9d968b50a56216e765dc1aac289491e16a1e80856c3cfc745e0ab869d409ff2 SHA512 66cfc7769271649448389e2b25987ee1702d0a9bce45699e746374cd923065e7ff6d8b6df0616a3af80381e7963500512acee66995a6a5088b5bc49266ec2010
 EBUILD openssh-9.6_p1-r5.ebuild 13949 BLAKE2B f87a0bca07c8d17c5842f1edd3a26ac9af2a2fd462c63afbb5337198d477152100b2af7f6816875db82046b107132e201f98676b60d2afd72600ce4e8d5f7693 SHA512 fbf4d6ddbfc11debfbf8b4279b48f3d7c3c70e2b9ab705988a6a136aeb829e84b444b18eec05d11e21bb02e1273d9918c46084cc640aeba079b41cabcb200f3c
 EBUILD openssh-9.7_p1-r6.ebuild 14123 BLAKE2B ca52b359044de9227eb24866bf11a43ae7bad28ab36fd5d5ded17fea9bb53a8a31e0ef879c09012c51c7382f0a947536ca565e4a76975089c210218526c34b13 SHA512 60ec7e6f4497901eea582ca92058a6c2cb7bed1e99af0175fc20457b5c3d4ebe7b1adc6167d49b1ca428eef7ce3b5d0ba6d2ea26b371bca284dcef839bdfa3ef
-EBUILD openssh-9.8_p1-r1.ebuild 15237 BLAKE2B 230b850fd20d87215ee6841feef794a042369f57ca443fb2285475b3cfb75533a41d1e59cf23f3555250bed700cd3e69728e58a87f8215e534d88502620efff2 SHA512 2e045b708129a5e491e25868f6339afe41641b73b85e02450bc5bedf2cd30c8700de072baa49d5ab7a4fc11f3511078a904986c0a927f8872d9eba5a23a41938
+EBUILD openssh-9.8_p1-r2.ebuild 15284 BLAKE2B 26db07f62b9a6997d34398bc684ae034d53f8aeb9b3851870cde66ae4f09a464b7f76cfc2ebe0a68fecce64bbf6817eb543aa519e544a3781a1ce2c46b94baec SHA512 397c641df559470747f246212ec33590b3005fe9956d279a93ee1fdcdbae4a2bb5c8cfc3e5b66585703edd43b0ad826bc2741ef62c75e0c6c6d88aa2852ec46e
 MISC metadata.xml 1788 BLAKE2B d04d3030f70f3615522672fa56e684acaa67ddce8d16cce86ba8911fb8fc11ed152be012ecf560427d271868c4841a7422aaa644305947302d3ebab62bdb577d SHA512 bd328e3a33ce04b989149333db5f774f1b52540f12ef83b08b7fcf136ae2a3a9c83bef42c28991d3536249098ca0b9ffd21e583d93599580510d8619e9fd01ca
diff --git a/net-misc/openssh/files/openssh-9.8_p1-musl-connect.patch b/net-misc/openssh/files/openssh-9.8_p1-musl-connect.patch
new file mode 100644
index 000000000000..c0546e747a1f
--- /dev/null
+++ b/net-misc/openssh/files/openssh-9.8_p1-musl-connect.patch
@@ -0,0 +1,14 @@
+https://bugzilla.mindrot.org/show_bug.cgi?id=3707
+https://bugs.gentoo.org/935353
+--- a/openbsd-compat/port-linux.c
++++ b/openbsd-compat/port-linux.c
+@@ -366,7 +366,7 @@ ssh_systemd_notify(const char *fmt, ...)
+ 		error_f("socket \"%s\": %s", path, strerror(errno));
+ 		goto out;
+ 	}
+-	if (connect(fd, &addr, sizeof(addr)) != 0) {
++	if (connect(fd, (struct sockaddr *)&addr, sizeof(addr)) != 0) {
+ 		error_f("socket \"%s\" connect: %s", path, strerror(errno));
+ 		goto out;
+ 	}
+
diff --git a/net-misc/openssh/files/sshd.service.2 b/net-misc/openssh/files/sshd.service.2
new file mode 100644
index 000000000000..d935ea763f0d
--- /dev/null
+++ b/net-misc/openssh/files/sshd.service.2
@@ -0,0 +1,15 @@
+[Unit]
+Description=OpenSSH server daemon
+After=network.target auditd.service
+
+[Service]
+Type=notify-reload
+ExecStartPre=/usr/bin/ssh-keygen -A
+ExecStart=/usr/sbin/sshd -D -e
+KillMode=process
+OOMPolicy=continue
+Restart=on-failure
+RestartSec=42s
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-misc/openssh/openssh-9.8_p1-r1.ebuild b/net-misc/openssh/openssh-9.8_p1-r2.ebuild
index 6633e212c19c..8c6f3c5cb671 100644
--- a/net-misc/openssh/openssh-9.8_p1-r1.ebuild
+++ b/net-misc/openssh/openssh-9.8_p1-r2.ebuild
@@ -79,6 +79,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-9.4_p1-Allow-MAP_NORESERVE-in-sandbox-seccomp-filter-maps.patch"
 	"${FILESDIR}/${PN}-9.6_p1-fix-xmss-c99.patch"
 	"${FILESDIR}/${PN}-9.7_p1-config-tweaks.patch"
+	"${FILESDIR}/${PN}-9.8_p1-musl-connect.patch"
 )
 
 pkg_pretend() {
@@ -318,7 +319,7 @@ src_install() {
 	rmdir "${ED}"/var/empty || die
 
 	systemd_dounit "${FILESDIR}"/sshd.socket
-	systemd_newunit "${FILESDIR}"/sshd.service.1 sshd.service
+	systemd_newunit "${FILESDIR}"/sshd.service.2 sshd.service
 	systemd_newunit "${FILESDIR}"/sshd_at.service.1 'sshd@.service'
 
 	# Install dropins with explicit mode, bug 906638, 915840