gentoo auto-resync : 09:03:2025 - 01:48:35

4 files changed, 0 insertions, 53 deletions

diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest
index a36383f99545..91376da72a0f 100644
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -7,8 +7,6 @@ AUX 9.9_p1/0006-upstream-fix-ML-KEM768x25519-KEX-on-big-endian-syste.patch 3308
 AUX 9.9_p1/0007-upstream-explicitly-include-endian.h.patch 1238 BLAKE2B 72ad94fac5b753494de022fa6f6452f5b5bc1dccd6b6fc170335867867910ee51bfdb4a600716f1da97e06bc09e60335bfd98cebf0970273d662552736ec9636 SHA512 4f24e2b5a425622c244ba469f89165d474b35d4bdfd82ffa3bde335de2581c789e36a3f05d3476bdcd179fff5e8ff47a1f789c0cd00631be7191512989fb09ce
 AUX 9.9_p1/0008-htole64-etc-for-systems-without-endian.h.patch 2186 BLAKE2B 12a0f652e3cfd7d739efdfdd40588a949eb2e107977f0fdce9fced131164e73dc6d859cb14dae73c1dcd9aa0841e109f43da513525a7b11305256eade378ebf7 SHA512 393b2240400294fa7d1bb83bc9714fdca087c94465ea1258637d6d7bc1ea4aea252472302d526e1212af3277fdf3b6e02d0aa87d02114d8877feed1c9c7427ba
 AUX openssh-9.4_p1-Allow-MAP_NORESERVE-in-sandbox-seccomp-filter-maps.patch 1647 BLAKE2B 9d55e9060e6eae041176bef27acc58d6026c8fb68c65c71c11c1acbe4e6840a63fba3dbc113a8981da66901717c1f3b4f2211a2cb322d3d4e5eba8c86f4e269c SHA512 d8fc604795d8bb4228ccbfe5714d5503bb1e0d63818d2fac65d533530d01fe4ce4fac0743b8b415f646322fec859b699fa7365beba8a42bd880d737b7c6bd7df
-AUX openssh-9.6_p1-CVE-2024-6387.patch 508 BLAKE2B 592b671107692b2be1e181e0be60b693485b430355f77dd0da49ad63a26824efac82ac09d58d0ca6085b3af3204410a5433409dc880de91212870d3a520efb75 SHA512 86083f30781df293666442ab597a8c16f6e84581be4ea4371c32aeeac7efb985b78dcb8c9ae749b6747d196c7c90cd99cd946fea0cf990f06446a71ff9465858
-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-inetd.patch 895 BLAKE2B 4e64abf32c0dd8ff9ad742bc2c230b9330b5994ecbc3f3c559f929e73992ea69d3085954cfa571c9a2ee33921d2eeeba5e7031808a87583003ca914e4927bbda SHA512 7a6f7c035ea0284deca7d5de30580d621b2ae3d6a51386a553f6adf7f6209b000a1da588f0c5b865c1d5e82f79f3d84d3409532d42e367702e99b321b08bf3fe
@@ -18,7 +16,6 @@ AUX ssh-agent.initd 246 BLAKE2B cb3ccce0436a12bfa91c65e55162ef8c96f336a5a51234ef
 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
diff --git a/net-misc/openssh/files/openssh-9.6_p1-CVE-2024-6387.patch b/net-misc/openssh/files/openssh-9.6_p1-CVE-2024-6387.patch
deleted file mode 100644
index 7b7fb70380d9..000000000000
--- a/net-misc/openssh/files/openssh-9.6_p1-CVE-2024-6387.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-https://bugs.gentoo.org/935271
-Backport proposed by upstream at https://marc.info/?l=oss-security&m=171982317624594&w=2.
---- a/log.c
-+++ b/log.c
-@@ -451,12 +451,14 @@ void
- sshsigdie(const char *file, const char *func, int line, int showfunc,
-     LogLevel level, const char *suffix, const char *fmt, ...)
- {
-+#ifdef SYSLOG_R_SAFE_IN_SIGHAND
- 	va_list args;
- 
- 	va_start(args, fmt);
- 	sshlogv(file, func, line, showfunc, SYSLOG_LEVEL_FATAL,
- 	    suffix, fmt, args);
- 	va_end(args);
-+#endif
- 	_exit(1);
- }
- 
diff --git a/net-misc/openssh/files/openssh-9.6_p1-chaff-logic.patch b/net-misc/openssh/files/openssh-9.6_p1-chaff-logic.patch
deleted file mode 100644
index 90544d1a457e..000000000000
--- a/net-misc/openssh/files/openssh-9.6_p1-chaff-logic.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-"Minor logic error in ObscureKeystrokeTiming"
-https://marc.info/?l=oss-security&m=171982317624594&w=2
---- a/clientloop.c
-+++ b/clientloop.c
-@@ -608,8 +608,9 @@ obfuscate_keystroke_timing(struct ssh *ssh, struct timespec *timeout,
- 		if (timespeccmp(&now, &chaff_until, >=)) {
- 			/* Stop if there have been no keystrokes for a while */
- 			stop_reason = "chaff time expired";
--		} else if (timespeccmp(&now, &next_interval, >=)) {
--			/* Otherwise if we were due to send, then send chaff */
-+		} else if (timespeccmp(&now, &next_interval, >=) &&
-+		    !ssh_packet_have_data_to_write(ssh)) {
-+			/* If due to send but have no data, then send chaff */
- 			if (send_chaff(ssh))
- 				nchaff++;
- 		}
diff --git a/net-misc/openssh/files/sshd.service.1 b/net-misc/openssh/files/sshd.service.1
deleted file mode 100644
index a541164cd7f2..000000000000
--- a/net-misc/openssh/files/sshd.service.1
+++ /dev/null
@@ -1,15 +0,0 @@
-[Unit]
-Description=OpenSSH server daemon
-After=network.target auditd.service
-
-[Service]
-ExecStartPre=/usr/bin/ssh-keygen -A
-ExecStart=/usr/sbin/sshd -D -e
-ExecReload=/bin/kill -HUP $MAINPID
-KillMode=process
-OOMPolicy=continue
-Restart=on-failure
-RestartSec=42s
-
-[Install]
-WantedBy=multi-user.target