[gentoo-commits] repo/gentoo:master commit in: net-misc/openssh-contrib/files/

[Conrad Kostecki]

commit: e72afe2da1a4936ca807afe37799f8442e569c7c
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Thu Apr 18 18:14:24 2024 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Thu Apr 18 19:31:48 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e72afe2d

net-misc/openssh-contrib: remove unused patch

Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Signed-off-by: Conrad Kostecki  gentoo.org>

 .../openssh-contrib/files/openssh-8.6_p1-hpn-version.patch  | 13 -
 1 file changed, 13 deletions(-)

diff --git a/net-misc/openssh-contrib/files/openssh-8.6_p1-hpn-version.patch 
b/net-misc/openssh-contrib/files/openssh-8.6_p1-hpn-version.patch
deleted file mode 100644
index 6dc290d6737b..
--- a/net-misc/openssh-contrib/files/openssh-8.6_p1-hpn-version.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/kex.c b/kex.c
-index 34808b5c..88d7ccac 100644
 a/kex.c
-+++ b/kex.c
-@@ -1205,7 +1205,7 @@ kex_exchange_identification(struct ssh *ssh, int 
timeout_ms,
-   if (version_addendum != NULL && *version_addendum == '\0')
-   version_addendum = NULL;
-   if ((r = sshbuf_putf(our_version, "SSH-%d.%d-%.100s%s%s\r\n",
--  PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION,
-+  PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE,
-   version_addendum == NULL ? "" : " ",
-   version_addendum == NULL ? "" : version_addendum)) != 0) {
-   oerrno = errno;

[gentoo-commits] repo/gentoo:master commit in: net-misc/openssh-contrib/

[Patrick McLean]

commit: 4e55535c1e0c49190c257e359a8e3c0c94f18fa4
Author: Patrick McLean  gentoo  org>
AuthorDate: Mon Mar 25 21:29:19 2024 +
Commit: Patrick McLean  gentoo  org>
CommitDate: Mon Mar 25 21:29:46 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e55535c

net-misc/openssh-contrib: Revbump, sync with openssh, remove old

Signed-off-by: Patrick McLean  gentoo.org>

 net-misc/openssh-contrib/Manifest  |   6 -
 .../openssh-contrib/openssh-contrib-9.5_p1.ebuild  | 505 -
 ..._p1.ebuild => openssh-contrib-9.7_p1-r1.ebuild} | 129 --
 3 files changed, 80 insertions(+), 560 deletions(-)

diff --git a/net-misc/openssh-contrib/Manifest 
b/net-misc/openssh-contrib/Manifest
index 3ae3fc930cdf..42cd209f7e0e 100644
--- a/net-misc/openssh-contrib/Manifest
+++ b/net-misc/openssh-contrib/Manifest
@@ -1,11 +1,5 @@
 DIST openssh-8_5_P1-hpn-DynWinNoneSwitch-15.2.diff 51428 BLAKE2B 
370b88a7da7f148bf5a4d445f05cf593b486e9df53bba027e2e179726f534b68cf9d94edd6e53024e0b6ff5f20e568727bc9d26c94d0d415603602a80d3ad241
 SHA512 
2d8d887901164b33b2799ff3ec72e86a39ae4a1696e52bcee0872dbae7772fcc534351e6e7f87126ee71b164c74e9091350f14b782f4b242a09f09b4f50d047a
 DIST openssh-8_5_P1-hpn-PeakTput-15.2.diff 2429 BLAKE2B 
849bf3c313719ab7a25c75e82d5dc5ac98365a038b2a66fe58d01eae5b20c258b94b5830e799d6909e75c69753cda05a910f3bdab9606fb7d5efa68e05f1
 SHA512 
c4a56fab55fabd1d902d45f235b603708d43f969920e45c9a57e557dccfa9cade2ec61f26d1ace938f6f73e79f17b12f119b5aea9166cbda8e3435b910500914
-DIST openssh-9.3_p2-hpn-15.2-glue.patch.xz 4728 BLAKE2B 
9e3c04a289d0a94b03b871027f4f8476e3981602f5a2d9ac8a8602e08d01248a72c48126ff53a174c8dc95f6bd8608ba75bbc74f5eb427e4ecbe7c7794c7c200
 SHA512 
bb42d001f89b8eb3a5af813d4c526548e13467deeb2811384b473e61c86e6e766aabb9652867953c0f979533ea7045c424298f11df4faf05e43fb8b1f439
-DIST openssh-9.5_p1-X509-glue-14.3.patch.xz 788 BLAKE2B 
641c9936639a7629f6ae82d56f48b9dd39e58087024fe04259e2be5aef3b484a3f8ba6c91e603dd4f80d03c92490ee85cbaccff1e40e4f7ee1064c4a1ac9f191
 SHA512 
8f9255e3f8a682d7c82125a6064cdd8a80616e4b699a4c101515f15af7185a6b0b98efa246e0ed97a278f377ea616daf2dd98d0dc479c24d1ac3a76c12cd97ec
-DIST openssh-9.5_p1-hpn-15.2-X509-14.3-glue.patch.xz 5132 BLAKE2B 
82a30622e67fab233591f6b30c634f2f8383eda77de163b6139ca9892c0485d8f174901e5e6788f6c911e0859e563ac6a9022e99099507f76a59908770474e78
 SHA512 
697b2ce1b2b0aa1bcf95b76b3bc79de7d8793a3c2975bc3bfb23a64fd3a9133df9fd0831848f9388b21f7f1fd597824b221d45b9380ee26beb60040596386d61
-DIST openssh-9.5p1+x509-14.3.diff.gz 1224337 BLAKE2B 
f695711eeab6b40a8660ac897961068738cb5941c799243888d5a90f56cf4b308803dd88d3d97d7932a72b82ebc269e20c7d142076fb3b03def1245491da0497
 SHA512 
a7798e2a40a81df882911c485fa240584713135df59c6dab720597b6ef60ecfac85ebd595983d7c5ce8625b758eeb777fe1462845976a2674cad339dadc0719a
-DIST openssh-9.5p1.tar.gz 1843001 BLAKE2B 
55dbb0a2792b0046c943a19ca090e6e378e77856e94823a1bbbafaa0da94357403765c4c028aebf6543049a0f9bbe0019629be3f92cdadfac1be56def796
 SHA512 
e183fdf7477fd986215b889eea4a945d71385e35305746ccb164e757ecc28166f429c70890a237d8ef4cdcae5132935ba2ecb3b2a658eb73a6afcf6f42277b9c
-DIST openssh-9.5p1.tar.gz.asc 833 BLAKE2B 
abec3d14d9a880008db202be00ed446ccc0a98ce77c16a9e6d6492feac07c8f3284f9cd24f6ee1d904a55f9f23d5cce8a716916975c179a38ef6bde1d36e0acf
 SHA512 
2b6de653420ba02eb99c7e6fba09af3bacfe9c701f3dfc3c94f41a3539c0414954fc5c64cce63c488c5ccd5d4ddb42d3f2184ff7f323342c885c47bf7d426ca1
 DIST openssh-9.6_p1-X509-glue-14.4.2.patch.xz 1516 BLAKE2B 
49f1d100e1b84f051aee599547562bab17b313d097b9b16b7c3ad94fb76e31b04fc101b1824f011507033e9c5744ee0207cb751865576f92501bc442076afe8b
 SHA512 
a09bd2ed9b9d0edfa691c2f99699261c17c9441e188ba870c1f2ceff28817af979a29a7b5c1bbfe9fbeb343241cc00b232099791cc30d665700fcbebdae07139
 DIST openssh-9.6_p1-hpn-15.2-X509-14.4.2-glue.patch.xz 5472 BLAKE2B 
a92ca0746cd48b1580e0a73dcae5d6e141988d3239d09a2f07de376833d14ca2434185b5fdb444fb6821da9ff75ce0c63c86404299e977d3c86050d3a116fc47
 SHA512 
2690f158bf1f5d1512f80c9c8d86006339a461a0bf229e41c62b75d28a9b45cb5392680fbb633415c27c3abfaa1906c170cd1d18679a2be81a1367361fd98afa
 DIST openssh-9.6_p1-hpn-15.2-glue.patch.xz 5028 BLAKE2B 
74970dc9f244eea2e35270c9abe67bdf0f05a3ddb33ffe6ce54056ade3fbec2abe9cb60e92ea889b01be7429dfd754f2986b175cdb014aab721421e1a4952c87
 SHA512 
1edafed18b1fd5d64844a3d121aacbf38dcde2b90adc9b4533f3192f1335365736e9cfd82f7c847980c9b1c1b72ee39470b38d6758b3a8f5ed59796d5005492b

diff --git a/net-misc/openssh-contrib/openssh-contrib-9.5_p1.ebuild 
b/net-misc/openssh-contrib/openssh-contrib-9.5_p1.ebuild
deleted file mode 100644
index ea41cbbeb21c..
--- a/net-misc/openssh-contrib/openssh-contrib-9.5_p1.ebuild
+++ /dev/null
@@ -1,505 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit user-info flag-o-matic autotools pam systemd toolchain-funcs verify-sig
-
-# Make it more portable between straight releases
-# 

[gentoo-commits] repo/gentoo:master commit in: net-misc/openssh-contrib/files/, net-misc/openssh-contrib/

[Patrick McLean]

commit: 78b678bf06efe43d591f3766b4e59ffb1400a864
Author: Patrick McLean  gentoo  org>
AuthorDate: Thu Mar 21 22:36:43 2024 +
Commit: Patrick McLean  gentoo  org>
CommitDate: Thu Mar 21 22:36:43 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78b678bf

net-misc/openssh-contrib: add 9.7_p1

Signed-off-by: Patrick McLean  gentoo.org>

 net-misc/openssh-contrib/Manifest  |   5 +
 ..._NORESERVE-in-sandbox-seccomp-filter-maps.patch |  44 ++
 .../openssh-contrib/openssh-contrib-9.7_p1.ebuild  | 499 +
 3 files changed, 548 insertions(+)

diff --git a/net-misc/openssh-contrib/Manifest 
b/net-misc/openssh-contrib/Manifest
index d100d8f8abdc..3ae3fc930cdf 100644
--- a/net-misc/openssh-contrib/Manifest
+++ b/net-misc/openssh-contrib/Manifest
@@ -12,3 +12,8 @@ DIST openssh-9.6_p1-hpn-15.2-glue.patch.xz 5028 BLAKE2B 
74970dc9f244eea2e35270c9
 DIST openssh-9.6p1+x509-14.4.2.diff.gz 1243845 BLAKE2B 
19ed0e174d06f4722b0f244e2c41098422fec88372d77e7c64bed2c00f4d4842b8f517d3f49958febd7a640f0582497fcaf64774fd0a04fbdc8c06b7f0ce5311
 SHA512 
247a088bbe7fe2bced0ec6e7f3d1fc34c3b81ce43ade9312a769c4495c7adf60d8a9ad2afb25e52fdea2f60888330de05375fbe24cd5b86a2f173e160ddb7bb8
 DIST openssh-9.6p1.tar.gz 1857862 BLAKE2B 
dd7f6747fe89f7b386be4faaf7fc43398a9bf439e45608ae61c2126cf8743c64ef7b5af45c75e9007b0bda525f8809261ca0f2fc47ce60177ba769a5324719dd
 SHA512 
0ebf81e39914c3a90da001ec7376a94b37e6024baf3e972c58f0982b7ddef942315f5e01d56c00ff95603b4a20ee561ab918ecc55511df007ac138160509
 DIST openssh-9.6p1.tar.gz.asc 833 BLAKE2B 
9363d02f85457aa90069020827306a2f49d8406e32f5ee1d231844648dd2ffa02fa9b7325b8677a11e46a0ba0d9ffc86d9c989435d691a02f5354a956c49f9f9
 SHA512 
aec5a5bd6ce480a8e5b5879dc55f8186aec90fe61f085aa92ad7d07f324574aa781be09c83b7443a32848d091fd44fb12c1842d49cee77afc351e550ffcc096d
+DIST openssh-9.7_p1-X509-glue-15.0.patch.xz 1532 BLAKE2B 
ff2c5ca97607da84345342bec31435304780503d4f066bf181407c85981d8e73b622ca1107b303d0cf7bc61a262f6e8f38d5372a60d8389b8caf671cfa55b94b
 SHA512 
48ec8e54e6e670ee2d2783fb38befd4101869cc7fc1a4e7b72058034a716170da62cae7e94a48acb575a1cec2604d5c02da629fbe482b7dbc5e28cf4d7ef7c01
+DIST openssh-9.7_p1-hpn-15.2-X509-15.0-glue.patch.xz 5472 BLAKE2B 
6ebbc66354d3af3c204f0c2f11d8b3d4e5c842b38b82263d21659cebcceaaa6502c04bb5e06c4200b9aef9d267b61e33f94001efe30f8e57760d43df5292
 SHA512 
e90ceda65ccfc80c4dec580b6e64f3bd889443d6e7d627dc4fca4900776621d33f3da0856998a63560f195b1ed98e47c4401e40d6840518ee1ccb8ea150f21fe
+DIST openssh-9.7p1+x509-15.0.diff.gz 1239003 BLAKE2B 
98f6a6d531a9afb70d6f34dcd6609115e017d4b1738a0683dbabf66aba02382cf727db4fb07fd2a62534aa87318982e9d1c41991fdbf7cc3e6593d376ad08208
 SHA512 
c141bddd73fb78a8f0c92bbed6900bab6617768fc124c10ec4ea70491e1b545bbd962fa35ee5efd134a9851a1b807a5b8bae8e46585cf87a60e0311b49de3226
+DIST openssh-9.7p1.tar.gz 1848766 BLAKE2B 
520859fcbdf678808fc8515b64585ab9a90a8055fa869df6fbba3083cb7f73ddb81ed9ea981e131520736a8aed838f85ae68ca63406a410df61039913c5cb48b
 SHA512 
0cafc17d22851605a4a5495a1d82c2b3fbbe6643760aad226dbf2a25b5f49d4375c3172833706ea3cb6c05d5d02a40feb9a7e790eae5c4570dd344a43e94ca55
+DIST openssh-9.7p1.tar.gz.asc 833 BLAKE2B 
a95e952be48bd55a07d0a95a49dc06c326816c67b8b5d40bd3f64c28aa43122253817b8a088e7a3b8a190375ea39f9fc3400b22d035561f9643c1d32b5caef27
 SHA512 
e028978e4266de9ad513626b13d70249e4166923fc15f38751178e2b3522ff6ebb9a7ca7dc32d1bb42d42fb92adf9903dba1b734bec083010ed7323aadad8baf

diff --git 
a/net-misc/openssh-contrib/files/openssh-9.4_p1-Allow-MAP_NORESERVE-in-sandbox-seccomp-filter-maps.patch
 
b/net-misc/openssh-contrib/files/openssh-9.4_p1-Allow-MAP_NORESERVE-in-sandbox-seccomp-filter-maps.patch
new file mode 100644
index ..379a3981d7ea
--- /dev/null
+++ 
b/net-misc/openssh-contrib/files/openssh-9.4_p1-Allow-MAP_NORESERVE-in-sandbox-seccomp-filter-maps.patch
@@ -0,0 +1,44 @@
+From 45b491ce13fcf7dbc0b3bd6df986c9cf59190721 Mon Sep 17 00:00:00 2001
+From: Jordan R Abrahams-Whitehead 
+Date: Tue, 12 Dec 2023 22:54:02 +
+Subject: [PATCH] Allow MAP_NORESERVE in sandbox seccomp filter maps
+
+While debugging Scudo on ChromeOS, we found that the no reserve mode
+immediately crashed `sshd`. We tracked it down to the
+sandbox-seccomp-filter.
+
+Being able to mmap with MAP_NORESERVE is useful (if not necessary) for
+some overcommitting allocators.
+
+During mmap calls, the flag MAP_NORESERVE is used by some allocators
+such as LLVM's Scudo for layout optimisation. This causes the sandbox
+seccomp filter for the client subprocess to die with some Scudo
+configurations.
+
+Upstream patch submission:
+https://lists.mindrot.org/pipermail/openssh-unix-dev/2023-December/041095.html
+---
+ sandbox-seccomp-filter.c | 6 --
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/sandbox-seccomp-filter.c b/sandbox-seccomp-filter.c
+index 23b40b643..a49c5ca99 100644
+--- a/sandbox-seccomp-filter.c
 b/sandbox-seccomp-filter.c
+@@ -190,9 +190,11 @@
+ 
+ #if 

[gentoo-commits] repo/gentoo:master commit in: net-misc/openssh-contrib/files/

[David Seifert]

commit: 0104890e0756d76bcc03443bc0f35b9833c735bd
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Sat Feb 17 14:35:25 2024 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Feb 17 14:35:25 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0104890e

net-misc/openssh-contrib: remove unused patches

Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Signed-off-by: David Seifert  gentoo.org>

 .../files/openssh-8.5_p1-hpn-15.2-sctp-glue.patch  | 18 ---
 .../openssh-8.9_p1-gss-use-HOST_NAME_MAX.patch | 13 -
 ...enssh-9.3_p1-openssl-version-compat-check.patch | 58 --
 .../files/openssh-9.3_p2-zlib-1.3.patch| 21 
 4 files changed, 110 deletions(-)

diff --git 
a/net-misc/openssh-contrib/files/openssh-8.5_p1-hpn-15.2-sctp-glue.patch 
b/net-misc/openssh-contrib/files/openssh-8.5_p1-hpn-15.2-sctp-glue.patch
deleted file mode 100644
index 7199227589c6..
--- a/net-misc/openssh-contrib/files/openssh-8.5_p1-hpn-15.2-sctp-glue.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -u a/openssh-8_5_P1-hpn-DynWinNoneSwitch-15.2.diff 
b/openssh-8_5_P1-hpn-DynWinNoneSwitch-15.2.diff
 a/openssh-8_5_P1-hpn-DynWinNoneSwitch-15.2.diff2021-03-16 
10:06:45.020527770 -0700
-+++ b/openssh-8_5_P1-hpn-DynWinNoneSwitch-15.2.diff2021-03-16 
10:07:01.294423665 -0700
-@@ -1414,14 +1414,3 @@
-  # Example of overriding settings on a per-user basis
-  #Match User anoncvs
-  #X11Forwarding no
--diff --git a/version.h b/version.h
--index 6b4fa372..332fb486 100644
- a/version.h
--+++ b/version.h
--@@ -3,4 +3,5 @@
-- #define SSH_VERSION  "OpenSSH_8.5"
-- 
-- #define SSH_PORTABLE "p1"
---#define SSH_RELEASE  SSH_VERSION SSH_PORTABLE
--+#define SSH_HPN "-hpn15v2"
--+#define SSH_RELEASE  SSH_VERSION SSH_PORTABLE SSH_HPN

diff --git 
a/net-misc/openssh-contrib/files/openssh-8.9_p1-gss-use-HOST_NAME_MAX.patch 
b/net-misc/openssh-contrib/files/openssh-8.9_p1-gss-use-HOST_NAME_MAX.patch
deleted file mode 100644
index 9e08b2a553c2..
--- a/net-misc/openssh-contrib/files/openssh-8.9_p1-gss-use-HOST_NAME_MAX.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/gss-serv.c b/gss-serv.c
-index b5d4bb2d..00e3d118 100644
 a/gss-serv.c
-+++ b/gss-serv.c
-@@ -105,7 +105,7 @@ ssh_gssapi_acquire_cred(Gssctxt *ctx)
-   gss_create_empty_oid_set(, );
-   gss_add_oid_set_member(, ctx->oid, );
- 
--  if (gethostname(lname, MAXHOSTNAMELEN)) {
-+  if (gethostname(lname, HOST_NAME_MAX)) {
-   gss_release_oid_set(, );
-   return (-1);
-   }

diff --git 
a/net-misc/openssh-contrib/files/openssh-9.3_p1-openssl-version-compat-check.patch
 
b/net-misc/openssh-contrib/files/openssh-9.3_p1-openssl-version-compat-check.patch
deleted file mode 100644
index b571ae253fff..
--- 
a/net-misc/openssh-contrib/files/openssh-9.3_p1-openssl-version-compat-check.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-https://bugzilla.mindrot.org/show_bug.cgi?id=3548
 a/openbsd-compat/openssl-compat.c
-+++ b/openbsd-compat/openssl-compat.c
-@@ -48,19 +48,25 @@ ssh_compatible_openssl(long headerver, long libver)
-   if (headerver == libver)
-   return 1;
- 
--  /* for versions < 1.0.0, major,minor,fix,status must match */
--  if (headerver < 0x100f) {
--  mask = 0xf00fL; /* major,minor,fix,status */
--  return (headerver & mask) == (libver & mask);
-+  /*
-+   * For versions < 3.0.0, major,minor,status must match and library
-+   * fix version must be equal to or newer than the header.
-+   */
-+  if (headerver < 0x300f) {
-+  mask = 0xffffL; /* major,minor,status */
-+  hfix = (headerver & 0x000ff000) >> 12;
-+  lfix = (libver & 0x000ff000) >> 12;
-+  if ( (headerver & mask) == (libver & mask) && lfix >= hfix)
-+  return 1;
-   }
- 
-   /*
--   * For versions >= 1.0.0, major,minor,status must match and library
--   * fix version must be equal to or newer than the header.
-+   * For versions >= 3.0.0, major must match and minor,status must be
-+   * equal to or greater than the header.
-*/
--  mask = 0xfff0L; /* major,minor,status */
--  hfix = (headerver & 0x000ff000) >> 12;
--  lfix = (libver & 0x000ff000) >> 12;
-+  mask = 0xf00fL; /* major, status */
-+  hfix = (headerver & 0x0ff0L) >> 12;
-+  lfix = (libver & 0x0ff0L) >> 12;
-   if ( (headerver & mask) == (libver & mask) && lfix >= hfix)
-   return 1;
-   return 0;
 a/openbsd-compat/regress/opensslvertest.c
-+++ b/openbsd-compat/regress/opensslvertest.c
-@@ -31,7 +31,7 @@ struct version_test {
-   { 0x0090802fL, 0x0090804fL, 1}, /* newer library fix version: ok */
-   { 0x0090802fL, 0x0090801fL, 1}, /* older library fix version: ok */
- 

[gentoo-commits] repo/gentoo:master commit in: net-misc/openssh-contrib/files/, net-misc/openssh-contrib/

[Patrick McLean]

commit: 1dced2a968c2d6c0011604dce4366129ffe4b816
Author: Patrick McLean  gentoo  org>
AuthorDate: Wed Feb  7 00:20:53 2024 +
Commit: Patrick McLean  gentoo  org>
CommitDate: Wed Feb  7 00:21:31 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1dced2a9

net-misc/openssh-contrib: add 9.6_p1

Signed-off-by: Patrick McLean  gentoo.org>

 net-misc/openssh-contrib/Manifest  |   6 +
 .../files/openssh-9.6_p1-hpn-version.patch |  13 +
 .../openssh-contrib/openssh-contrib-9.6_p1.ebuild  | 504 +
 3 files changed, 523 insertions(+)

diff --git a/net-misc/openssh-contrib/Manifest 
b/net-misc/openssh-contrib/Manifest
index 4474bb040ac6..18e3a686869b 100644
--- a/net-misc/openssh-contrib/Manifest
+++ b/net-misc/openssh-contrib/Manifest
@@ -23,3 +23,9 @@ DIST openssh-9.5_p1-hpn-15.2-X509-14.3-glue.patch.xz 5132 
BLAKE2B 82a30622e67fab
 DIST openssh-9.5p1+x509-14.3.diff.gz 1224337 BLAKE2B 
f695711eeab6b40a8660ac897961068738cb5941c799243888d5a90f56cf4b308803dd88d3d97d7932a72b82ebc269e20c7d142076fb3b03def1245491da0497
 SHA512 
a7798e2a40a81df882911c485fa240584713135df59c6dab720597b6ef60ecfac85ebd595983d7c5ce8625b758eeb777fe1462845976a2674cad339dadc0719a
 DIST openssh-9.5p1.tar.gz 1843001 BLAKE2B 
55dbb0a2792b0046c943a19ca090e6e378e77856e94823a1bbbafaa0da94357403765c4c028aebf6543049a0f9bbe0019629be3f92cdadfac1be56def796
 SHA512 
e183fdf7477fd986215b889eea4a945d71385e35305746ccb164e757ecc28166f429c70890a237d8ef4cdcae5132935ba2ecb3b2a658eb73a6afcf6f42277b9c
 DIST openssh-9.5p1.tar.gz.asc 833 BLAKE2B 
abec3d14d9a880008db202be00ed446ccc0a98ce77c16a9e6d6492feac07c8f3284f9cd24f6ee1d904a55f9f23d5cce8a716916975c179a38ef6bde1d36e0acf
 SHA512 
2b6de653420ba02eb99c7e6fba09af3bacfe9c701f3dfc3c94f41a3539c0414954fc5c64cce63c488c5ccd5d4ddb42d3f2184ff7f323342c885c47bf7d426ca1
+DIST openssh-9.6_p1-X509-glue-14.4.2.patch.xz 1516 BLAKE2B 
49f1d100e1b84f051aee599547562bab17b313d097b9b16b7c3ad94fb76e31b04fc101b1824f011507033e9c5744ee0207cb751865576f92501bc442076afe8b
 SHA512 
a09bd2ed9b9d0edfa691c2f99699261c17c9441e188ba870c1f2ceff28817af979a29a7b5c1bbfe9fbeb343241cc00b232099791cc30d665700fcbebdae07139
+DIST openssh-9.6_p1-hpn-15.2-X509-14.4.2-glue.patch.xz 5472 BLAKE2B 
a92ca0746cd48b1580e0a73dcae5d6e141988d3239d09a2f07de376833d14ca2434185b5fdb444fb6821da9ff75ce0c63c86404299e977d3c86050d3a116fc47
 SHA512 
2690f158bf1f5d1512f80c9c8d86006339a461a0bf229e41c62b75d28a9b45cb5392680fbb633415c27c3abfaa1906c170cd1d18679a2be81a1367361fd98afa
+DIST openssh-9.6_p1-hpn-15.2-glue.patch.xz 5028 BLAKE2B 
74970dc9f244eea2e35270c9abe67bdf0f05a3ddb33ffe6ce54056ade3fbec2abe9cb60e92ea889b01be7429dfd754f2986b175cdb014aab721421e1a4952c87
 SHA512 
1edafed18b1fd5d64844a3d121aacbf38dcde2b90adc9b4533f3192f1335365736e9cfd82f7c847980c9b1c1b72ee39470b38d6758b3a8f5ed59796d5005492b
+DIST openssh-9.6p1+x509-14.4.2.diff.gz 1243845 BLAKE2B 
19ed0e174d06f4722b0f244e2c41098422fec88372d77e7c64bed2c00f4d4842b8f517d3f49958febd7a640f0582497fcaf64774fd0a04fbdc8c06b7f0ce5311
 SHA512 
247a088bbe7fe2bced0ec6e7f3d1fc34c3b81ce43ade9312a769c4495c7adf60d8a9ad2afb25e52fdea2f60888330de05375fbe24cd5b86a2f173e160ddb7bb8
+DIST openssh-9.6p1.tar.gz 1857862 BLAKE2B 
dd7f6747fe89f7b386be4faaf7fc43398a9bf439e45608ae61c2126cf8743c64ef7b5af45c75e9007b0bda525f8809261ca0f2fc47ce60177ba769a5324719dd
 SHA512 
0ebf81e39914c3a90da001ec7376a94b37e6024baf3e972c58f0982b7ddef942315f5e01d56c00ff95603b4a20ee561ab918ecc55511df007ac138160509
+DIST openssh-9.6p1.tar.gz.asc 833 BLAKE2B 
9363d02f85457aa90069020827306a2f49d8406e32f5ee1d231844648dd2ffa02fa9b7325b8677a11e46a0ba0d9ffc86d9c989435d691a02f5354a956c49f9f9
 SHA512 
aec5a5bd6ce480a8e5b5879dc55f8186aec90fe61f085aa92ad7d07f324574aa781be09c83b7443a32848d091fd44fb12c1842d49cee77afc351e550ffcc096d

diff --git a/net-misc/openssh-contrib/files/openssh-9.6_p1-hpn-version.patch 
b/net-misc/openssh-contrib/files/openssh-9.6_p1-hpn-version.patch
new file mode 100644
index ..95a69815b822
--- /dev/null
+++ b/net-misc/openssh-contrib/files/openssh-9.6_p1-hpn-version.patch
@@ -0,0 +1,13 @@
+diff --git a/kex.c b/kex.c
+index 34808b5c..88d7ccac 100644
+--- a/kex.c
 b/kex.c
+@@ -1205,7 +1205,7 @@ kex_exchange_identification(struct ssh *ssh, int 
timeout_ms,
+   if (version_addendum != NULL && *version_addendum == '\0')
+   version_addendum = NULL;
+   if ((r = sshbuf_putf(our_version, "SSH-%d.%d-%s%s%s\r\n",
+-  PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION,
++  PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE,
+   version_addendum == NULL ? "" : " ",
+   version_addendum == NULL ? "" : version_addendum)) != 0) {
+   oerrno = errno;

diff --git a/net-misc/openssh-contrib/openssh-contrib-9.6_p1.ebuild 
b/net-misc/openssh-contrib/openssh-contrib-9.6_p1.ebuild
new file mode 100644
index ..4f323c2a427c
--- /dev/null
+++ b/net-misc/openssh-contrib/openssh-contrib-9.6_p1.ebuild
@@ -0,0 +1,504 @@
+# 

[gentoo-commits] repo/gentoo:master commit in: net-misc/openssh-contrib/

[Patrick McLean]

commit: 35dcf6991efbdb3b23eb97f0580c9d942a173da5
Author: Patrick McLean  gentoo  org>
AuthorDate: Wed Feb  7 00:21:23 2024 +
Commit: Patrick McLean  gentoo  org>
CommitDate: Wed Feb  7 00:21:31 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35dcf699

net-misc/openssh-contrib: drop 9.3_p1, 9.3_p2, 9.4_p1-r1

Signed-off-by: Patrick McLean  gentoo.org>

 net-misc/openssh-contrib/Manifest  |  17 -
 .../openssh-contrib/openssh-contrib-9.3_p1.ebuild  | 532 -
 .../openssh-contrib/openssh-contrib-9.3_p2.ebuild  | 507 
 .../openssh-contrib-9.4_p1-r1.ebuild   | 506 
 4 files changed, 1562 deletions(-)

diff --git a/net-misc/openssh-contrib/Manifest 
b/net-misc/openssh-contrib/Manifest
index 18e3a686869b..d100d8f8abdc 100644
--- a/net-misc/openssh-contrib/Manifest
+++ b/net-misc/openssh-contrib/Manifest
@@ -1,23 +1,6 @@
-DIST openssh-8_5_P1-hpn-AES-CTR-15.2.diff 30096 BLAKE2B 
f0c020dd2403806c79d4c37a019996d275655b04997301e247f5c4dd7fad35d12b3b7c25afb1b078d915ef2a4ae02f736f0aec9ba2a8c56a405d7ca303bcadf7
 SHA512 
4c2dbf99a9b5953fdb955f700272bbaeaa025f108a8860d2190197962b849f8385327af82c4d6a3a130a7fba35a74a8ec9437d642867601acb29817c49632a8f
 DIST openssh-8_5_P1-hpn-DynWinNoneSwitch-15.2.diff 51428 BLAKE2B 
370b88a7da7f148bf5a4d445f05cf593b486e9df53bba027e2e179726f534b68cf9d94edd6e53024e0b6ff5f20e568727bc9d26c94d0d415603602a80d3ad241
 SHA512 
2d8d887901164b33b2799ff3ec72e86a39ae4a1696e52bcee0872dbae7772fcc534351e6e7f87126ee71b164c74e9091350f14b782f4b242a09f09b4f50d047a
 DIST openssh-8_5_P1-hpn-PeakTput-15.2.diff 2429 BLAKE2B 
849bf3c313719ab7a25c75e82d5dc5ac98365a038b2a66fe58d01eae5b20c258b94b5830e799d6909e75c69753cda05a910f3bdab9606fb7d5efa68e05f1
 SHA512 
c4a56fab55fabd1d902d45f235b603708d43f969920e45c9a57e557dccfa9cade2ec61f26d1ace938f6f73e79f17b12f119b5aea9166cbda8e3435b910500914
-DIST openssh-9.3_p1-X509-glue-14.1.1.patch.xz 936 BLAKE2B 
f1716ff7801a27aa2aad06f1cca2ca6988eef65fb0ddcbde483e5c9205506ca40b658f5c8c40b2625afb38ff9b56e40831eadcf751c8ee1c11f69ec559f3c147
 SHA512 
dace01bcf22b625cd00e18ce019b0be31b6f47f714845f3ebb98ebee41b4db0a769fa09cab63ea17536a7106ec90f2b15f87696ae49fa6f6e31bad94ae09719d
-DIST openssh-9.3_p1-hpn-15.2-X509-14.1.1-glue.patch.xz 6224 BLAKE2B 
47c7054648e8d795b0d9e563d8313242c917df8a3620a60cff2d77f9ae8482cec861244e0f1433f711922f0704b775b7183284960a3baa48a27b99979ad7ffa3
 SHA512 
728cf2586bcc9480afe71b5106e2286b925857a9e04dce79f744b36cbe3ec2844ac5b4a6bd4b64117f32ad1b04c0943b9d6f935eee826202871588ed9a167387
-DIST openssh-9.3_p1-hpn-15.2-glue.patch.xz 5044 BLAKE2B 
73205bd8f702612df7cb6f29e8b353df854428974dc20d5938033157da64418317f326ab8118893dc47173cd871dc7654a3e3ed601289744560becc98729cd3f
 SHA512 
343b77109158b9af5d8d57f4ac7968bce8277fa3b4dcaa19b76593620fbddbfa832bd76c0da52e12179fe5f391f9fef67e7af51b138ab8cc69a8a6471b6a3909
-DIST openssh-9.3_p2-X509-glue-14.1.1.patch.xz 116132 BLAKE2B 
7e2b5aa4569a27943cb701dccbca8224e64130a4bce46ce8ba7978a93d3a410fe46957694475fafd51177dbbefa28fc613d9bf69aa436541b03e83dc9b9497ba
 SHA512 
df67a40f27c8af029c3d84e44bd74115e16bfe98efc039bd1f5661c22c5ab1213c2970a80c017775e828f6c5b4e2e815eff28c745888b0dba1ef6c259943ba20
-DIST openssh-9.3_p2-hpn-15.2-X509-14.1.1-glue.patch.xz 5056 BLAKE2B 
aea1d9dd10abb5dd85d304fb4a415c5fb8b237dd82d8f39c092622d85b51751336f18bff5feb80e9a165e171b92f471272210d926327a649961eb640cb8b
 SHA512 
6d384ad9b3bebc4b90550e089b6c3c8d2959880a2510bea5bd7d723dd831815929dbf67a882105f22b3dd2eef6ed82dea89343175499a57d8e0f6b56ec6abfd6
 DIST openssh-9.3_p2-hpn-15.2-glue.patch.xz 4728 BLAKE2B 
9e3c04a289d0a94b03b871027f4f8476e3981602f5a2d9ac8a8602e08d01248a72c48126ff53a174c8dc95f6bd8608ba75bbc74f5eb427e4ecbe7c7794c7c200
 SHA512 
bb42d001f89b8eb3a5af813d4c526548e13467deeb2811384b473e61c86e6e766aabb9652867953c0f979533ea7045c424298f11df4faf05e43fb8b1f439
-DIST openssh-9.3p1+x509-14.1.1.diff.gz 1221335 BLAKE2B 
9203fbb6955fe44ebd7ed031245a90b8df7e149a6ad3205097ffd5d2d7655a0e6b8cd2e20d7f7216fbc6d3e8bd0a1453f3fc028f04e96c0f244ad0772a0e30ab
 SHA512 
8a1036d680d25f99e1a24ea77a2c303e807c0f5c5323043684da9fcc9ff603f80384688935a654cc97216f84f85f00f590dc35d2ee2b1f0fb169f8b427559b2d
-DIST openssh-9.3p1-sctp-1.2.patch.xz 6836 BLAKE2B 
d12394ecaa7eca6e0b3590cea83b71537edc3230bc5f7b2992a06a67c77247cc4156be0ba151038a5baee1c3f105f76f1917cc5aad08d1aadadfd6e56858781b
 SHA512 
ba5af014e5b825bf4a57368416a15c6e56afd355780e4c5eab44a396c3f4276ac4d813c5c15b83f3b8edf4763855221743796c038433b292fda9417f0b274a71
-DIST openssh-9.3p1.tar.gz 1856839 BLAKE2B 
45578edf98bba3d23c7cefe60d8a7d3079e7c6676459f7422ace7a2461ab96943fbcadb478633a80f40bc098f2435722850b563714adb78b14922be53cb5753d
 SHA512 
087ff6fe5f6caab4c6c3001d906399e02beffad7277280f11187420c2939fd4befdcb14643862a657ce4cad2f115b82a0a1a2c99df6ee54dcd76b53647637c19
-DIST openssh-9.3p1.tar.gz.asc 833 BLAKE2B 

[gentoo-commits] repo/gentoo:master commit in: net-misc/openssh-contrib/

[Patrick McLean]

commit: 6b990a1a411e82ed1c6b818f71a4f104324fade2
Author: Patrick McLean  gentoo  org>
AuthorDate: Thu Oct  5 22:16:45 2023 +
Commit: Patrick McLean  gentoo  org>
CommitDate: Thu Oct  5 22:16:45 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b990a1a

net-misc/openssh-contrib: add 9.5_p1

Signed-off-by: Patrick McLean  gentoo.org>

 net-misc/openssh-contrib/Manifest  |   5 +
 .../openssh-contrib/openssh-contrib-9.5_p1.ebuild  | 505 +
 2 files changed, 510 insertions(+)

diff --git a/net-misc/openssh-contrib/Manifest 
b/net-misc/openssh-contrib/Manifest
index 8a69297b58be..4474bb040ac6 100644
--- a/net-misc/openssh-contrib/Manifest
+++ b/net-misc/openssh-contrib/Manifest
@@ -18,3 +18,8 @@ DIST openssh-9.4_p1-hpn-15.2-X509-14.2-glue.patch.xz 5144 
BLAKE2B 324dff4027
 DIST openssh-9.4p1+x509-14.2.1.diff.gz 1221969 BLAKE2B 
67b06648aafd849fdcb4c54c4a841c46b6a97d53d7ebdefe6110aba7a0877833ebb2a8d22a1e51a748051f889ba08cc1501ea0e9e221fef2f5c0e8caad170983
 SHA512 
d90dc7bde008ab793d9f85f1b4b0687f1d084fdf2fc6cfd229748424ddcc4664f558be44fee73d72e88bc99e03a5dd1ec57138a82f77b82e0f65d14bd3ef545a
 DIST openssh-9.4p1.tar.gz 1845094 BLAKE2B 
d13d758129cce947d3f12edb6e88406aad10de6887b19ffa3ebd8e382b742a05f2a692a8824aec99939f6c7e13fbccc3bb14e5ee112f9a9255d4882eb87dcf53
 SHA512 
0aaedeced7dbc70419c7245eb0e9db4ef570e0e7739b890ebae04d56da5fe8d147e8e150f3c943f60730976569e3ac6cc8da62ec7e2a78e2ef47d295ca0b1d25
 DIST openssh-9.4p1.tar.gz.asc 833 BLAKE2B 
95eedd9356766e5d0ea1261da3dc4c7869f054b418c626fb35815a0aa655b1ddbf54436b437d98c4344b05c9196c8fa1f592eac07b3ccf08bd3e980f8b6955af
 SHA512 
983b4ebaa3b98e70831ce686cb503270926c065163a2510eef0c5102ef50b6e665b889ee15ea8c0bd7c4bbddb19270f036e1d554a8212ef2c292f9c682c8631a
+DIST openssh-9.5_p1-X509-glue-14.3.patch.xz 788 BLAKE2B 
641c9936639a7629f6ae82d56f48b9dd39e58087024fe04259e2be5aef3b484a3f8ba6c91e603dd4f80d03c92490ee85cbaccff1e40e4f7ee1064c4a1ac9f191
 SHA512 
8f9255e3f8a682d7c82125a6064cdd8a80616e4b699a4c101515f15af7185a6b0b98efa246e0ed97a278f377ea616daf2dd98d0dc479c24d1ac3a76c12cd97ec
+DIST openssh-9.5_p1-hpn-15.2-X509-14.3-glue.patch.xz 5132 BLAKE2B 
82a30622e67fab233591f6b30c634f2f8383eda77de163b6139ca9892c0485d8f174901e5e6788f6c911e0859e563ac6a9022e99099507f76a59908770474e78
 SHA512 
697b2ce1b2b0aa1bcf95b76b3bc79de7d8793a3c2975bc3bfb23a64fd3a9133df9fd0831848f9388b21f7f1fd597824b221d45b9380ee26beb60040596386d61
+DIST openssh-9.5p1+x509-14.3.diff.gz 1224337 BLAKE2B 
f695711eeab6b40a8660ac897961068738cb5941c799243888d5a90f56cf4b308803dd88d3d97d7932a72b82ebc269e20c7d142076fb3b03def1245491da0497
 SHA512 
a7798e2a40a81df882911c485fa240584713135df59c6dab720597b6ef60ecfac85ebd595983d7c5ce8625b758eeb777fe1462845976a2674cad339dadc0719a
+DIST openssh-9.5p1.tar.gz 1843001 BLAKE2B 
55dbb0a2792b0046c943a19ca090e6e378e77856e94823a1bbbafaa0da94357403765c4c028aebf6543049a0f9bbe0019629be3f92cdadfac1be56def796
 SHA512 
e183fdf7477fd986215b889eea4a945d71385e35305746ccb164e757ecc28166f429c70890a237d8ef4cdcae5132935ba2ecb3b2a658eb73a6afcf6f42277b9c
+DIST openssh-9.5p1.tar.gz.asc 833 BLAKE2B 
abec3d14d9a880008db202be00ed446ccc0a98ce77c16a9e6d6492feac07c8f3284f9cd24f6ee1d904a55f9f23d5cce8a716916975c179a38ef6bde1d36e0acf
 SHA512 
2b6de653420ba02eb99c7e6fba09af3bacfe9c701f3dfc3c94f41a3539c0414954fc5c64cce63c488c5ccd5d4ddb42d3f2184ff7f323342c885c47bf7d426ca1

diff --git a/net-misc/openssh-contrib/openssh-contrib-9.5_p1.ebuild 
b/net-misc/openssh-contrib/openssh-contrib-9.5_p1.ebuild
new file mode 100644
index ..0c2cbcad0001
--- /dev/null
+++ b/net-misc/openssh-contrib/openssh-contrib-9.5_p1.ebuild
@@ -0,0 +1,505 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit user-info flag-o-matic autotools pam systemd toolchain-funcs verify-sig
+
+# Make it more portable between straight releases
+# and _p? releases.
+MY_P=${P/-contrib/}
+PARCH=${MY_P/_}
+
+# PV to USE for HPN patches
+#HPN_PV="${PV^^}"
+HPN_PV="8.5_P1"
+
+HPN_VER="15.2"
+HPN_PATCHES=(
+   openssh-${HPN_PV/./_}-hpn-DynWinNoneSwitch-${HPN_VER}.diff
+   openssh-${HPN_PV/./_}-hpn-PeakTput-${HPN_VER}.diff
+)
+HPN_GLUE_PATCH="openssh-9.3_p2-hpn-${HPN_VER}-glue.patch"
+HPN_PATCH_DIR="HPN-SSH%%20${HPN_VER/./v}%%20${HPN_PV/_P/p}"
+
+X509_VER="14.3"
+X509_PATCH="${PARCH}+x509-${X509_VER}.diff.gz"
+X509_PATCH="${X509_PATCH/p2/p1}"
+X509_GLUE_PATCH="openssh-${PV}-X509-glue-${X509_VER}.patch"
+#X509_HPN_GLUE_PATCH="${MY_P}-hpn-${HPN_VER}-X509-${X509_VER}-glue.patch"
+X509_HPN_GLUE_PATCH="${MY_P}-hpn-${HPN_VER}-X509-${X509_VER%.1}-glue.patch"
+
+DESCRIPTION="Port of OpenBSD's free SSH release with HPN/X509 patches"
+HOMEPAGE="https://www.openssh.com/;
+SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz
+   ${HPN_VER:+hpn? (
+   $(printf 
"mirror://sourceforge/project/hpnssh/Patches/${HPN_PATCH_DIR}/%s\n" 
"${HPN_PATCHES[@]}")
+   

[gentoo-commits] repo/gentoo:master commit in: net-misc/openssh-contrib/, net-misc/openssh-contrib/files/

[Patrick McLean]

commit: 4d8d554dc36be80ca3807e35667af8611446b54f
Author: Patrick McLean  gentoo  org>
AuthorDate: Mon Aug 21 18:49:05 2023 +
Commit: Patrick McLean  gentoo  org>
CommitDate: Mon Aug 21 18:51:16 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d8d554d

net-misc/openssh-contrib: Revbump, X509 14.2.1, zlib patch (bug #912767)

Bug: https://bugs.gentoo.org/912767
Signed-off-by: Patrick McLean  gentoo.org>

 net-misc/openssh-contrib/Manifest   |  4 ++--
 .../files/openssh-9.3_p2-zlib-1.3.patch | 21 +
 ...4_p1.ebuild => openssh-contrib-9.4_p1-r1.ebuild} |  6 --
 3 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/net-misc/openssh-contrib/Manifest 
b/net-misc/openssh-contrib/Manifest
index e41061964198..8a69297b58be 100644
--- a/net-misc/openssh-contrib/Manifest
+++ b/net-misc/openssh-contrib/Manifest
@@ -13,8 +13,8 @@ DIST openssh-9.3p1.tar.gz 1856839 BLAKE2B 
45578edf98bba3d23c7cefe60d8a7d3079e7c6
 DIST openssh-9.3p1.tar.gz.asc 833 BLAKE2B 
e6533d64b117a400b76b90f71fa856d352dea57d91e4e89fa375429403ac0734cc0a2f075bc58c6bb4f40a8f9776735aa36bdb0bbf3880a2115cea787633e48b
 SHA512 
6222378eb24a445c6c1db255392b405f5369b1af0e92f558d4ba05b0d83ab0d084cb8f4b91d7ae8636f333d970638a6635e2bc7af885135dd34992d87f2ef1f4
 DIST openssh-9.3p2.tar.gz 1835850 BLAKE2B 
38f8d4ada263112b318fafccabf0a33a004d8290a867434004eb3d37127c9bdabe6e0225fca9d6d68fb54338fec81dcc9313ca7c91d3a033311db44174dc9f6f
 SHA512 
15b8c57aa120186f1d1c3c2b8dc6ffd26733e12f755a6b0a4255d9ec1815a61506275ff5723b4ac029e44bc2ad22852ac36e1101f292348fbfa79aa1a4cd3f35
 DIST openssh-9.3p2.tar.gz.asc 833 BLAKE2B 
cfba3867d7f97cb2c904bd3ae111bd63e8a050464b66e3f3f22390839a153d57ef5819182f8ad99a6b520f27881143552dc64fccfc33dcc0483ffe1ef33a5a47
 SHA512 
759e512a36a3a62264803b517298a65c83e1daebd9867e28ea1ca4999c38539368815ccda86540a4f5d45fa79c539d8242995ba55f2918baf2a7404c105e337a
-DIST openssh-9.4_p1-X509-glue-14.2.patch.xz 784 BLAKE2B 
b559cc7132a85baf8984088769be7f84c86ca2c5d91eba0412882615f86d0f405b3790c6dfb35111cab7150780b8b3ce2120e30a1f1d078f6308dfca47470ef6
 SHA512 
8faaba8444fd795a64d3ecb91ffea9e754d2688039dc8b5d8d085a91671860884c0fa1bd568d1ed62f2cd1f328564f2fb3e467e4288aa6e5a37024bcfa70522e
+DIST openssh-9.4_p1-X509-glue-14.2.1.patch.xz 904 BLAKE2B 
64dd3f145858d7d6b6625fa565a882f7ab43faf78233a2a78b7b13fc1d417ae67c675bebc09dd1343b3504af0c2c47a1fda6ac77a11238e1d2dabcdd394253e9
 SHA512 
542263bae6135c0493a16c63526da6b98cc425e01f2a1e332156bca4d3d7c7e91cfe1cd86f32c5f67097275eeb543b356faacad665c2a36c22843e2e00d19e10
 DIST openssh-9.4_p1-hpn-15.2-X509-14.2-glue.patch.xz 5144 BLAKE2B 
324dff4027825b8400225cf322a6882caca30aa567a1bea405142ff9f9ed143b837ef8082011342ae6d22033c22e34499f930d0b9ca1e3c241cac7c15e99
 SHA512 
e63b2187d3f210ce897b6696b02a364f4f212c1290f7b9bbcceeb1532427254c54366b7da059ce3cf99e595457e69d8edff4fcb7c18021c7530dea1df4bb
-DIST openssh-9.4p1+x509-14.2.diff.gz 1219074 BLAKE2B 
ea31ef87a5a450c1e8785f4eeb27f2bfb7a2ac187e10c35dc814cdad139645e52a577b238dc8bcb9c2cb001ee6ab29d88fb056b4ff772b3660c5cf9fa4fc2380
 SHA512 
53cc58618f57e6011f0ae2484b56ef7fc971f39aaf248a0e0a4361e28d0e170a7d4e3b97efe7c5f2848d845cfe970b8511e876d2b9bcb1cecbf01bedd972
+DIST openssh-9.4p1+x509-14.2.1.diff.gz 1221969 BLAKE2B 
67b06648aafd849fdcb4c54c4a841c46b6a97d53d7ebdefe6110aba7a0877833ebb2a8d22a1e51a748051f889ba08cc1501ea0e9e221fef2f5c0e8caad170983
 SHA512 
d90dc7bde008ab793d9f85f1b4b0687f1d084fdf2fc6cfd229748424ddcc4664f558be44fee73d72e88bc99e03a5dd1ec57138a82f77b82e0f65d14bd3ef545a
 DIST openssh-9.4p1.tar.gz 1845094 BLAKE2B 
d13d758129cce947d3f12edb6e88406aad10de6887b19ffa3ebd8e382b742a05f2a692a8824aec99939f6c7e13fbccc3bb14e5ee112f9a9255d4882eb87dcf53
 SHA512 
0aaedeced7dbc70419c7245eb0e9db4ef570e0e7739b890ebae04d56da5fe8d147e8e150f3c943f60730976569e3ac6cc8da62ec7e2a78e2ef47d295ca0b1d25
 DIST openssh-9.4p1.tar.gz.asc 833 BLAKE2B 
95eedd9356766e5d0ea1261da3dc4c7869f054b418c626fb35815a0aa655b1ddbf54436b437d98c4344b05c9196c8fa1f592eac07b3ccf08bd3e980f8b6955af
 SHA512 
983b4ebaa3b98e70831ce686cb503270926c065163a2510eef0c5102ef50b6e665b889ee15ea8c0bd7c4bbddb19270f036e1d554a8212ef2c292f9c682c8631a

diff --git a/net-misc/openssh-contrib/files/openssh-9.3_p2-zlib-1.3.patch 
b/net-misc/openssh-contrib/files/openssh-9.3_p2-zlib-1.3.patch
new file mode 100644
index ..f1336bbe0380
--- /dev/null
+++ b/net-misc/openssh-contrib/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 
+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", 

[gentoo-commits] repo/gentoo:master commit in: net-misc/openssh-contrib/

[Patrick McLean]

commit: 41785a11e327124c8dee9ea3693bb119a2b9fc9b
Author: Patrick McLean  gentoo  org>
AuthorDate: Mon Aug 21 18:50:49 2023 +
Commit: Patrick McLean  gentoo  org>
CommitDate: Mon Aug 21 18:51:16 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41785a11

net-misc/openssh-contrib: Add patch for zlib-1.3 (bug #912767)

Closes: https://bugs.gentoo.org/912767
Signed-off-by: Patrick McLean  gentoo.org>

 net-misc/openssh-contrib/openssh-contrib-9.3_p1.ebuild | 1 +
 net-misc/openssh-contrib/openssh-contrib-9.3_p2.ebuild | 1 +
 2 files changed, 2 insertions(+)

diff --git a/net-misc/openssh-contrib/openssh-contrib-9.3_p1.ebuild 
b/net-misc/openssh-contrib/openssh-contrib-9.3_p1.ebuild
index 26c886d2d198..460d83ab5935 100644
--- a/net-misc/openssh-contrib/openssh-contrib-9.3_p1.ebuild
+++ b/net-misc/openssh-contrib/openssh-contrib-9.3_p1.ebuild
@@ -125,6 +125,7 @@ PATCHES=(
"${FILESDIR}/openssh-8.9_p1-allow-ppoll_time64.patch" #834019
"${FILESDIR}/openssh-8.9_p1-gss-use-HOST_NAME_MAX.patch" #834044
"${FILESDIR}/openssh-9.3_p1-openssl-version-compat-check.patch"
+   "${FILESDIR}/openssh-9.3_p2-zlib-1.3.patch" #912767
 )
 
 pkg_pretend() {

diff --git a/net-misc/openssh-contrib/openssh-contrib-9.3_p2.ebuild 
b/net-misc/openssh-contrib/openssh-contrib-9.3_p2.ebuild
index af6ba3f3e4ed..fce00a82a653 100644
--- a/net-misc/openssh-contrib/openssh-contrib-9.3_p2.ebuild
+++ b/net-misc/openssh-contrib/openssh-contrib-9.3_p2.ebuild
@@ -120,6 +120,7 @@ PATCHES=(
"${FILESDIR}/openssh-8.9_p1-allow-ppoll_time64.patch" #834019
"${FILESDIR}/openssh-8.9_p1-gss-use-HOST_NAME_MAX.patch" #834044
"${FILESDIR}/openssh-9.3_p1-openssl-version-compat-check.patch"
+   "${FILESDIR}/openssh-9.3_p2-zlib-1.3.patch" #912767
 )
 
 pkg_pretend() {

[gentoo-commits] repo/gentoo:master commit in: net-misc/openssh-contrib/

[Patrick McLean]

commit: 509df9d6d6582a4927cfe0c7ec08972a43b79e64
Author: Patrick McLean  gentoo  org>
AuthorDate: Mon Aug 14 18:55:19 2023 +
Commit: Patrick McLean  gentoo  org>
CommitDate: Mon Aug 14 18:55:19 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=509df9d6

net-misc/openssh-contrib: add 9.4_p1

Signed-off-by: Patrick McLean  gentoo.org>

 net-misc/openssh-contrib/Manifest  |   5 +
 .../openssh-contrib/openssh-contrib-9.4_p1.ebuild  | 504 +
 2 files changed, 509 insertions(+)

diff --git a/net-misc/openssh-contrib/Manifest 
b/net-misc/openssh-contrib/Manifest
index ff4094389d70..e41061964198 100644
--- a/net-misc/openssh-contrib/Manifest
+++ b/net-misc/openssh-contrib/Manifest
@@ -13,3 +13,8 @@ DIST openssh-9.3p1.tar.gz 1856839 BLAKE2B 
45578edf98bba3d23c7cefe60d8a7d3079e7c6
 DIST openssh-9.3p1.tar.gz.asc 833 BLAKE2B 
e6533d64b117a400b76b90f71fa856d352dea57d91e4e89fa375429403ac0734cc0a2f075bc58c6bb4f40a8f9776735aa36bdb0bbf3880a2115cea787633e48b
 SHA512 
6222378eb24a445c6c1db255392b405f5369b1af0e92f558d4ba05b0d83ab0d084cb8f4b91d7ae8636f333d970638a6635e2bc7af885135dd34992d87f2ef1f4
 DIST openssh-9.3p2.tar.gz 1835850 BLAKE2B 
38f8d4ada263112b318fafccabf0a33a004d8290a867434004eb3d37127c9bdabe6e0225fca9d6d68fb54338fec81dcc9313ca7c91d3a033311db44174dc9f6f
 SHA512 
15b8c57aa120186f1d1c3c2b8dc6ffd26733e12f755a6b0a4255d9ec1815a61506275ff5723b4ac029e44bc2ad22852ac36e1101f292348fbfa79aa1a4cd3f35
 DIST openssh-9.3p2.tar.gz.asc 833 BLAKE2B 
cfba3867d7f97cb2c904bd3ae111bd63e8a050464b66e3f3f22390839a153d57ef5819182f8ad99a6b520f27881143552dc64fccfc33dcc0483ffe1ef33a5a47
 SHA512 
759e512a36a3a62264803b517298a65c83e1daebd9867e28ea1ca4999c38539368815ccda86540a4f5d45fa79c539d8242995ba55f2918baf2a7404c105e337a
+DIST openssh-9.4_p1-X509-glue-14.2.patch.xz 784 BLAKE2B 
b559cc7132a85baf8984088769be7f84c86ca2c5d91eba0412882615f86d0f405b3790c6dfb35111cab7150780b8b3ce2120e30a1f1d078f6308dfca47470ef6
 SHA512 
8faaba8444fd795a64d3ecb91ffea9e754d2688039dc8b5d8d085a91671860884c0fa1bd568d1ed62f2cd1f328564f2fb3e467e4288aa6e5a37024bcfa70522e
+DIST openssh-9.4_p1-hpn-15.2-X509-14.2-glue.patch.xz 5144 BLAKE2B 
324dff4027825b8400225cf322a6882caca30aa567a1bea405142ff9f9ed143b837ef8082011342ae6d22033c22e34499f930d0b9ca1e3c241cac7c15e99
 SHA512 
e63b2187d3f210ce897b6696b02a364f4f212c1290f7b9bbcceeb1532427254c54366b7da059ce3cf99e595457e69d8edff4fcb7c18021c7530dea1df4bb
+DIST openssh-9.4p1+x509-14.2.diff.gz 1219074 BLAKE2B 
ea31ef87a5a450c1e8785f4eeb27f2bfb7a2ac187e10c35dc814cdad139645e52a577b238dc8bcb9c2cb001ee6ab29d88fb056b4ff772b3660c5cf9fa4fc2380
 SHA512 
53cc58618f57e6011f0ae2484b56ef7fc971f39aaf248a0e0a4361e28d0e170a7d4e3b97efe7c5f2848d845cfe970b8511e876d2b9bcb1cecbf01bedd972
+DIST openssh-9.4p1.tar.gz 1845094 BLAKE2B 
d13d758129cce947d3f12edb6e88406aad10de6887b19ffa3ebd8e382b742a05f2a692a8824aec99939f6c7e13fbccc3bb14e5ee112f9a9255d4882eb87dcf53
 SHA512 
0aaedeced7dbc70419c7245eb0e9db4ef570e0e7739b890ebae04d56da5fe8d147e8e150f3c943f60730976569e3ac6cc8da62ec7e2a78e2ef47d295ca0b1d25
+DIST openssh-9.4p1.tar.gz.asc 833 BLAKE2B 
95eedd9356766e5d0ea1261da3dc4c7869f054b418c626fb35815a0aa655b1ddbf54436b437d98c4344b05c9196c8fa1f592eac07b3ccf08bd3e980f8b6955af
 SHA512 
983b4ebaa3b98e70831ce686cb503270926c065163a2510eef0c5102ef50b6e665b889ee15ea8c0bd7c4bbddb19270f036e1d554a8212ef2c292f9c682c8631a

diff --git a/net-misc/openssh-contrib/openssh-contrib-9.4_p1.ebuild 
b/net-misc/openssh-contrib/openssh-contrib-9.4_p1.ebuild
new file mode 100644
index ..402849e5c957
--- /dev/null
+++ b/net-misc/openssh-contrib/openssh-contrib-9.4_p1.ebuild
@@ -0,0 +1,504 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit user-info flag-o-matic autotools pam systemd toolchain-funcs verify-sig
+
+# Make it more portable between straight releases
+# and _p? releases.
+MY_P=${P/-contrib/}
+PARCH=${MY_P/_}
+
+# PV to USE for HPN patches
+#HPN_PV="${PV^^}"
+HPN_PV="8.5_P1"
+
+HPN_VER="15.2"
+HPN_PATCHES=(
+   openssh-${HPN_PV/./_}-hpn-DynWinNoneSwitch-${HPN_VER}.diff
+   openssh-${HPN_PV/./_}-hpn-PeakTput-${HPN_VER}.diff
+)
+HPN_GLUE_PATCH="openssh-9.3_p2-hpn-${HPN_VER}-glue.patch"
+HPN_PATCH_DIR="HPN-SSH%%20${HPN_VER/./v}%%20${HPN_PV/_P/p}"
+
+X509_VER="14.2"
+X509_PATCH="${PARCH}+x509-${X509_VER}.diff.gz"
+X509_PATCH="${X509_PATCH/p2/p1}"
+X509_GLUE_PATCH="openssh-${PV}-X509-glue-${X509_VER}.patch"
+X509_HPN_GLUE_PATCH="${MY_P}-hpn-${HPN_VER}-X509-${X509_VER}-glue.patch"
+
+DESCRIPTION="Port of OpenBSD's free SSH release with HPN/X509 patches"
+HOMEPAGE="https://www.openssh.com/;
+SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz
+   ${HPN_VER:+hpn? (
+   $(printf 
"mirror://sourceforge/project/hpnssh/Patches/${HPN_PATCH_DIR}/%s\n" 
"${HPN_PATCHES[@]}")
+   
https://dev.gentoo.org/~chutzpah/dist/openssh/${HPN_GLUE_PATCH}.xz
+   )}
+   

[gentoo-commits] repo/gentoo:master commit in: net-misc/openssh-contrib/

[Patrick McLean]

commit: 485789457e7dc78a60bc5a6a771f996cc500062d
Author: Patrick McLean  gentoo  org>
AuthorDate: Mon Jul 24 22:39:35 2023 +
Commit: Patrick McLean  gentoo  org>
CommitDate: Mon Jul 24 22:39:47 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48578945

net-misc/openssh-contrib: unkeyword 9.3_p1 for ~amd64

Signed-off-by: Patrick McLean  gentoo.org>

 net-misc/openssh-contrib/openssh-contrib-9.3_p1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/openssh-contrib/openssh-contrib-9.3_p1.ebuild 
b/net-misc/openssh-contrib/openssh-contrib-9.3_p1.ebuild
index 9a91a490d05f..26c886d2d198 100644
--- a/net-misc/openssh-contrib/openssh-contrib-9.3_p1.ebuild
+++ b/net-misc/openssh-contrib/openssh-contrib-9.3_p1.ebuild
@@ -51,7 +51,7 @@ S="${WORKDIR}/${PARCH}"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="~amd64"
+#KEYWORDS="~amd64"
 # Probably want to drop ssl defaulting to on in a future version.
 IUSE="abi_mips_n32 audit debug hpn kerberos ldns libedit livecd pam +pie sctp 
security-key selinux +ssl static test X X509 xmss"
 

[gentoo-commits] repo/gentoo:master commit in: net-misc/openssh-contrib/

[Patrick McLean]

commit: 71b6527ea4d7d180f63e3f7aa4567206bef9d3a4
Author: Patrick McLean  gentoo  org>
AuthorDate: Mon Jul 24 22:15:10 2023 +
Commit: Patrick McLean  gentoo  org>
CommitDate: Mon Jul 24 22:15:51 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71b6527e

net-misc/openssh-contrib: add 9.3_p2

Signed-off-by: Patrick McLean  gentoo.org>

 net-misc/openssh-contrib/Manifest  |   5 +
 .../openssh-contrib/openssh-contrib-9.3_p2.ebuild  | 506 +
 2 files changed, 511 insertions(+)

diff --git a/net-misc/openssh-contrib/Manifest 
b/net-misc/openssh-contrib/Manifest
index 680eb4cd062e..ff4094389d70 100644
--- a/net-misc/openssh-contrib/Manifest
+++ b/net-misc/openssh-contrib/Manifest
@@ -4,7 +4,12 @@ DIST openssh-8_5_P1-hpn-PeakTput-15.2.diff 2429 BLAKE2B 
849bf3c313719ab7a25c75e8
 DIST openssh-9.3_p1-X509-glue-14.1.1.patch.xz 936 BLAKE2B 
f1716ff7801a27aa2aad06f1cca2ca6988eef65fb0ddcbde483e5c9205506ca40b658f5c8c40b2625afb38ff9b56e40831eadcf751c8ee1c11f69ec559f3c147
 SHA512 
dace01bcf22b625cd00e18ce019b0be31b6f47f714845f3ebb98ebee41b4db0a769fa09cab63ea17536a7106ec90f2b15f87696ae49fa6f6e31bad94ae09719d
 DIST openssh-9.3_p1-hpn-15.2-X509-14.1.1-glue.patch.xz 6224 BLAKE2B 
47c7054648e8d795b0d9e563d8313242c917df8a3620a60cff2d77f9ae8482cec861244e0f1433f711922f0704b775b7183284960a3baa48a27b99979ad7ffa3
 SHA512 
728cf2586bcc9480afe71b5106e2286b925857a9e04dce79f744b36cbe3ec2844ac5b4a6bd4b64117f32ad1b04c0943b9d6f935eee826202871588ed9a167387
 DIST openssh-9.3_p1-hpn-15.2-glue.patch.xz 5044 BLAKE2B 
73205bd8f702612df7cb6f29e8b353df854428974dc20d5938033157da64418317f326ab8118893dc47173cd871dc7654a3e3ed601289744560becc98729cd3f
 SHA512 
343b77109158b9af5d8d57f4ac7968bce8277fa3b4dcaa19b76593620fbddbfa832bd76c0da52e12179fe5f391f9fef67e7af51b138ab8cc69a8a6471b6a3909
+DIST openssh-9.3_p2-X509-glue-14.1.1.patch.xz 116132 BLAKE2B 
7e2b5aa4569a27943cb701dccbca8224e64130a4bce46ce8ba7978a93d3a410fe46957694475fafd51177dbbefa28fc613d9bf69aa436541b03e83dc9b9497ba
 SHA512 
df67a40f27c8af029c3d84e44bd74115e16bfe98efc039bd1f5661c22c5ab1213c2970a80c017775e828f6c5b4e2e815eff28c745888b0dba1ef6c259943ba20
+DIST openssh-9.3_p2-hpn-15.2-X509-14.1.1-glue.patch.xz 5056 BLAKE2B 
aea1d9dd10abb5dd85d304fb4a415c5fb8b237dd82d8f39c092622d85b51751336f18bff5feb80e9a165e171b92f471272210d926327a649961eb640cb8b
 SHA512 
6d384ad9b3bebc4b90550e089b6c3c8d2959880a2510bea5bd7d723dd831815929dbf67a882105f22b3dd2eef6ed82dea89343175499a57d8e0f6b56ec6abfd6
+DIST openssh-9.3_p2-hpn-15.2-glue.patch.xz 4728 BLAKE2B 
9e3c04a289d0a94b03b871027f4f8476e3981602f5a2d9ac8a8602e08d01248a72c48126ff53a174c8dc95f6bd8608ba75bbc74f5eb427e4ecbe7c7794c7c200
 SHA512 
bb42d001f89b8eb3a5af813d4c526548e13467deeb2811384b473e61c86e6e766aabb9652867953c0f979533ea7045c424298f11df4faf05e43fb8b1f439
 DIST openssh-9.3p1+x509-14.1.1.diff.gz 1221335 BLAKE2B 
9203fbb6955fe44ebd7ed031245a90b8df7e149a6ad3205097ffd5d2d7655a0e6b8cd2e20d7f7216fbc6d3e8bd0a1453f3fc028f04e96c0f244ad0772a0e30ab
 SHA512 
8a1036d680d25f99e1a24ea77a2c303e807c0f5c5323043684da9fcc9ff603f80384688935a654cc97216f84f85f00f590dc35d2ee2b1f0fb169f8b427559b2d
 DIST openssh-9.3p1-sctp-1.2.patch.xz 6836 BLAKE2B 
d12394ecaa7eca6e0b3590cea83b71537edc3230bc5f7b2992a06a67c77247cc4156be0ba151038a5baee1c3f105f76f1917cc5aad08d1aadadfd6e56858781b
 SHA512 
ba5af014e5b825bf4a57368416a15c6e56afd355780e4c5eab44a396c3f4276ac4d813c5c15b83f3b8edf4763855221743796c038433b292fda9417f0b274a71
 DIST openssh-9.3p1.tar.gz 1856839 BLAKE2B 
45578edf98bba3d23c7cefe60d8a7d3079e7c6676459f7422ace7a2461ab96943fbcadb478633a80f40bc098f2435722850b563714adb78b14922be53cb5753d
 SHA512 
087ff6fe5f6caab4c6c3001d906399e02beffad7277280f11187420c2939fd4befdcb14643862a657ce4cad2f115b82a0a1a2c99df6ee54dcd76b53647637c19
 DIST openssh-9.3p1.tar.gz.asc 833 BLAKE2B 
e6533d64b117a400b76b90f71fa856d352dea57d91e4e89fa375429403ac0734cc0a2f075bc58c6bb4f40a8f9776735aa36bdb0bbf3880a2115cea787633e48b
 SHA512 
6222378eb24a445c6c1db255392b405f5369b1af0e92f558d4ba05b0d83ab0d084cb8f4b91d7ae8636f333d970638a6635e2bc7af885135dd34992d87f2ef1f4
+DIST openssh-9.3p2.tar.gz 1835850 BLAKE2B 
38f8d4ada263112b318fafccabf0a33a004d8290a867434004eb3d37127c9bdabe6e0225fca9d6d68fb54338fec81dcc9313ca7c91d3a033311db44174dc9f6f
 SHA512 
15b8c57aa120186f1d1c3c2b8dc6ffd26733e12f755a6b0a4255d9ec1815a61506275ff5723b4ac029e44bc2ad22852ac36e1101f292348fbfa79aa1a4cd3f35
+DIST openssh-9.3p2.tar.gz.asc 833 BLAKE2B 
cfba3867d7f97cb2c904bd3ae111bd63e8a050464b66e3f3f22390839a153d57ef5819182f8ad99a6b520f27881143552dc64fccfc33dcc0483ffe1ef33a5a47
 SHA512 
759e512a36a3a62264803b517298a65c83e1daebd9867e28ea1ca4999c38539368815ccda86540a4f5d45fa79c539d8242995ba55f2918baf2a7404c105e337a

diff --git a/net-misc/openssh-contrib/openssh-contrib-9.3_p2.ebuild 
b/net-misc/openssh-contrib/openssh-contrib-9.3_p2.ebuild
new file mode 100644
index ..af6ba3f3e4ed
--- /dev/null
+++ b/net-misc/openssh-contrib/openssh-contrib-9.3_p2.ebuild
@@ -0,0 +1,506 

[gentoo-commits] repo/gentoo:master commit in: net-misc/openssh-contrib/

[Sam James]

commit: acde9b9d754c567a61650e840b626bf32557251c
Author: Sam James  gentoo  org>
AuthorDate: Mon Jun 26 15:13:47 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jun 26 15:13:47 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=acde9b9d

net-misc/openssh-contrib: drop libc_Cygwin cruft

Support is already gone.

Closes: https://bugs.gentoo.org/909191
Signed-off-by: Sam James  gentoo.org>

 net-misc/openssh-contrib/openssh-contrib-9.3_p1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/openssh-contrib/openssh-contrib-9.3_p1.ebuild 
b/net-misc/openssh-contrib/openssh-contrib-9.3_p1.ebuild
index 8fa1eabcaa5c..9a91a490d05f 100644
--- a/net-misc/openssh-contrib/openssh-contrib-9.3_p1.ebuild
+++ b/net-misc/openssh-contrib/openssh-contrib-9.3_p1.ebuild
@@ -320,6 +320,7 @@ src_configure() {
--datadir="${EPREFIX}"/usr/share/openssh
--with-privsep-path="${EPREFIX}"/var/empty
--with-privsep-user=sshd
+   --with-hardening
$(use_with audit audit linux)
$(use_with kerberos kerberos5 "${EPREFIX}"/usr)
# We apply the sctp patch conditionally, so can't pass 
--without-sctp
@@ -333,7 +334,6 @@ src_configure() {
$(usex X509 '' "$(use_with security-key security-key-builtin)")
$(use_with ssl openssl)
$(use_with ssl ssl-engine)
-   $(use_with !elibc_Cygwin hardening) #659210
)
 
if use elibc_musl; then

[gentoo-commits] repo/gentoo:master commit in: net-misc/openssh-contrib/

[Sam James]

commit: d7341c7a0438bde8a99f6a02cc0daf85590a9e78
Author: Sam James  gentoo  org>
AuthorDate: Tue May  9 21:26:24 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu May 11 20:03:47 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7341c7a

net-misc/openssh-contrib: tweak config file names

Signed-off-by: Sam James  gentoo.org>

 net-misc/openssh-contrib/openssh-contrib-9.3_p1.ebuild | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/net-misc/openssh-contrib/openssh-contrib-9.3_p1.ebuild 
b/net-misc/openssh-contrib/openssh-contrib-9.3_p1.ebuild
index bdcd1d5ad012..8fa1eabcaa5c 100644
--- a/net-misc/openssh-contrib/openssh-contrib-9.3_p1.ebuild
+++ b/net-misc/openssh-contrib/openssh-contrib-9.3_p1.ebuild
@@ -385,7 +385,7 @@ tweak_ssh_configs() {
Include "${EPREFIX}/etc/ssh/sshd_config.d/*.conf"
EOF
 
-   cat <<-EOF >> "${ED}"/etc/ssh/ssh_config.d/90gentoo.conf || die
+   cat <<-EOF >> "${ED}"/etc/ssh/ssh_config.d/999gentoo.conf || die
# Send locale environment variables (bug #367017)
SendEnv ${locale_vars[*]}
 
@@ -393,7 +393,7 @@ tweak_ssh_configs() {
SendEnv COLORTERM
EOF
 
-   cat <<-EOF >> "${ED}"/etc/ssh/ssh_config.d/91gentoo-security.conf || die
+   cat <<-EOF >> "${ED}"/etc/ssh/ssh_config.d/999gentoo-security.conf 
|| die
RevokedHostKeys "${EPREFIX}/etc/ssh/ssh_revoked_hosts"
EOF
 
@@ -402,7 +402,7 @@ tweak_ssh_configs() {
ssh-rsa 
B3NzaC1yc2EBIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ==
EOF
 
-   cat <<-EOF >> "${ED}"/etc/ssh/sshd_config.d/90gentoo.conf || die
+   cat <<-EOF >> "${ED}"/etc/ssh/sshd_config.d/999gentoo.conf || die
# Allow client to pass locale environment variables (bug #367017)
AcceptEnv ${locale_vars[*]}
 
@@ -411,7 +411,7 @@ tweak_ssh_configs() {
EOF
 
if use pam ; then
-   cat <<-EOF >> "${ED}"/etc/ssh/sshd_config.d/90gentoo-pam.conf 
|| die
+   cat <<-EOF >> 
"${ED}"/etc/ssh/sshd_config.d/999gentoo-pam.conf || die
UsePAM yes
# This interferes with PAM.
PasswordAuthentication no
@@ -422,7 +422,7 @@ tweak_ssh_configs() {
fi
 
if use livecd ; then
-   cat <<-EOF >> 
"${ED}"/etc/ssh/sshd_config.d/90gentoo-livecd.conf || die
+   cat <<-EOF >> 
"${ED}"/etc/ssh/sshd_config.d/999gentoo-livecd.conf || die
# Allow root login with password on livecds.
PermitRootLogin Yes
EOF

[gentoo-commits] repo/gentoo:master commit in: net-misc/openssh-contrib/

[Sam James]

commit: 988aa8b2fcff709be8f4deb43d7f8e8667506600
Author: Sam James  gentoo  org>
AuthorDate: Mon May  8 17:06:39 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu May 11 20:03:44 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=988aa8b2

net-misc/openssh-contrib: use /etc/ssh/ssh_config.d and /etc/ssh/sshd_config.d 
for config dropinsa

Debian patches this into their config already and we found ourselves wanting
it when looking at handling the github.com SSH key change/rotation.

/etc/ssh/ssh_config.d and /etc/ssh/sshd_config.d both become directories
where users can add their own configuration files, but we also install the 
Gentoo
snippets formerly in ssh_config and sshd_config in there instead.

Signed-off-by: Sam James  gentoo.org>

 .../openssh-contrib/openssh-contrib-9.3_p1.ebuild  | 51 --
 1 file changed, 29 insertions(+), 22 deletions(-)

diff --git a/net-misc/openssh-contrib/openssh-contrib-9.3_p1.ebuild 
b/net-misc/openssh-contrib/openssh-contrib-9.3_p1.ebuild
index f20217c819ff..18255acf5f45 100644
--- a/net-misc/openssh-contrib/openssh-contrib-9.3_p1.ebuild
+++ b/net-misc/openssh-contrib/openssh-contrib-9.3_p1.ebuild
@@ -377,39 +377,46 @@ tweak_ssh_configs() {
LANGUAGE LC_ADDRESS LC_IDENTIFICATION LC_MEASUREMENT LC_NAME 
LC_PAPER LC_TELEPHONE
)
 
-   # First the server config.
-   cat <<-EOF >> "${ED}"/etc/ssh/sshd_config
-
-   # Allow client to pass locale environment variables. #367017
-   AcceptEnv ${locale_vars[*]}
-
-   # Allow client to pass COLORTERM to match TERM. #658540
-   AcceptEnv COLORTERM
+   dodir /etc/ssh/ssh_config.d /etc/ssh/sshd_config.d
+   cat <<-EOF >> "${ED}"/etc/ssh/ssh_config || die
+   Include "${EPREFIX}/etc/ssh/ssh_config.d/*.conf"
+   EOF
+   cat <<-EOF >> "${ED}"/etc/ssh/sshd_config || die
+   Include "${EPREFIX}/etc/ssh/sshd_config.d/*.conf"
EOF
 
-   # Then the client config.
-   cat <<-EOF >> "${ED}"/etc/ssh/ssh_config
-
-   # Send locale environment variables. #367017
+   cat <<-EOF >> "${ED}"/etc/ssh/ssh_config.d/90gentoo.conf || die
+   # Send locale environment variables (bug #367017)
SendEnv ${locale_vars[*]}
 
-   # Send COLORTERM to match TERM. #658540
+   # Send COLORTERM to match TERM (bug #658540)
SendEnv COLORTERM
EOF
 
+   cat <<-EOF >> "${ED}"/etc/ssh/sshd_config.d/90gentoo.conf || die
+   # Allow client to pass locale environment variables (bug #367017)
+   AcceptEnv ${locale_vars[*]}
+
+   # Allow client to pass COLORTERM to match TERM (bug #658540)
+   AcceptEnv COLORTERM
+   EOF
+
if use pam ; then
-   sed -i \
-   -e "/^#UsePAM /s:.*:UsePAM yes:" \
-   -e "/^#PasswordAuthentication 
/s:.*:PasswordAuthentication no:" \
-   -e "/^#PrintMotd /s:.*:PrintMotd no:" \
-   -e "/^#PrintLastLog /s:.*:PrintLastLog no:" \
-   "${ED}"/etc/ssh/sshd_config || die
+   cat <<-EOF >> "${ED}"/etc/ssh/sshd_config.d/90gentoo-pam.conf 
|| die
+   UsePAM yes
+   # This interferes with PAM.
+   PasswordAuthentication no
+   # PAM can do its own handling of MOTD.
+   PrintMotd no
+   PrintLastLog no
+   EOF
fi
 
if use livecd ; then
-   sed -i \
-   -e '/^#PermitRootLogin/c# Allow root login with 
password on livecds.\nPermitRootLogin Yes' \
-   "${ED}"/etc/ssh/sshd_config || die
+   cat <<-EOF >> 
"${ED}"/etc/ssh/sshd_config.d/90gentoo-livecd.conf || die
+   # Allow root login with password on livecds.
+   PermitRootLogin Yes
+   EOF
fi
 }
 

[gentoo-commits] repo/gentoo:master commit in: net-misc/openssh-contrib/

[Sam James]

commit: a3392cb674cc568575d1dfe3c35c3fc907cb2a8f
Author: Sam James  gentoo  org>
AuthorDate: Mon May  8 17:07:09 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu May 11 20:03:46 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3392cb6

net-misc/openssh-contrib: revoke github.com's compromised RSA host key

See https://github.blog/2023-03-23-we-updated-our-rsa-ssh-host-key/.

It's necessary for the old github.com key to be explicitly removed (or revoked)
rather than just selecting a new key, i.e. it's possible for users to be 
silently
affected but not see the error because github.com may not serve them an RSA key.

Revoke the old github.com key as part of the ebuild to help users out.

Closes: https://github.com/gentoo/gentoo/pull/30327
Closes: https://github.com/gentoo/gentoo/pull/30897
Signed-off-by: Sam James  gentoo.org>

 net-misc/openssh-contrib/openssh-contrib-9.3_p1.ebuild | 9 +
 1 file changed, 9 insertions(+)

diff --git a/net-misc/openssh-contrib/openssh-contrib-9.3_p1.ebuild 
b/net-misc/openssh-contrib/openssh-contrib-9.3_p1.ebuild
index 18255acf5f45..bdcd1d5ad012 100644
--- a/net-misc/openssh-contrib/openssh-contrib-9.3_p1.ebuild
+++ b/net-misc/openssh-contrib/openssh-contrib-9.3_p1.ebuild
@@ -393,6 +393,15 @@ tweak_ssh_configs() {
SendEnv COLORTERM
EOF
 
+   cat <<-EOF >> "${ED}"/etc/ssh/ssh_config.d/91gentoo-security.conf || die
+   RevokedHostKeys "${EPREFIX}/etc/ssh/ssh_revoked_hosts"
+   EOF
+
+   cat <<-EOF >> "${ED}"/etc/ssh/ssh_revoked_hosts || die
+   # https://github.blog/2023-03-23-we-updated-our-rsa-ssh-host-key/
+   ssh-rsa 
B3NzaC1yc2EBIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ==
+   EOF
+
cat <<-EOF >> "${ED}"/etc/ssh/sshd_config.d/90gentoo.conf || die
# Allow client to pass locale environment variables (bug #367017)
AcceptEnv ${locale_vars[*]}