diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2021-10-30 19:43:03 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2021-10-30 19:43:03 +0100 |
| commit | 162945d2a91899b637bbb9e163b406350de12906 (patch) | |
| tree | 49cc2cc66f724a7c6f033f93aaba4ae3be1f2259 /net-misc/openssh | |
| parent | f660c6de84558324d784218831d8f0782ee41e2e (diff) | |
gentoo resync : 30.10.2021
Diffstat (limited to 'net-misc/openssh')
| -rw-r--r-- | net-misc/openssh/Manifest | 4 | ||||
| -rw-r--r-- | net-misc/openssh/files/openssh-8.8_p1-X509-glue-13.2.3.patch | 30 | ||||
| -rw-r--r-- | net-misc/openssh/openssh-8.8_p1-r2.ebuild (renamed from net-misc/openssh/openssh-8.8_p1-r1.ebuild) | 0 |
3 files changed, 27 insertions, 7 deletions
diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest index f49d84212a98..8c3fa6c4119b 100644 --- a/net-misc/openssh/Manifest +++ b/net-misc/openssh/Manifest @@ -18,7 +18,7 @@ AUX openssh-8.7_p1-GSSAPI-dns.patch 11576 BLAKE2B 84aa0128ddeccf67e14c20f9d2acb6 AUX openssh-8.7_p1-X509-glue-13.2.1.patch 1679 BLAKE2B 2f79c3bc5b3fd93cce0aea23cd16b98fd8031b2ebed21a5360ec84e43ec02565e464fa47db99421f8b94994073823e4dfe590bd5374bf803c8065f1a8c065d6b SHA512 05796a8c6e01456d4e6ad0cc66490b7a9479f8f36854532b392b49c20d3a62e77e13f067b77460b2b3098a6ada3944f821220aa663d6a766cb9d9e1f9bcc6b9d AUX openssh-8.7_p1-hpn-15.2-X509-glue.patch 16283 BLAKE2B 7181c63f43398bda89f663c6de4a688e302d382519b0030ece980777d110ec56077dc6e5ca357f67c8a7a932f2df850ddc4ff7db1ea91c59d136767857c8b24e SHA512 525b68bcd9c891ab6be104d30cf4b9cc9214c257bc41a7e9c306dcfe3fb12109f7422118d9fad58698fe9a6d501b27309e675c857d00c04c46acff27eec60154 AUX openssh-8.7_p1-hpn-15.2-glue.patch 7354 BLAKE2B 1b5afc662d39db3ab137b2a389b3a5cebf55e0c6741c12ade4977d8d5d8cb4f4cf2d8e8978150808c6570cba7b8080ace971d20913df9a740c1e03adc7134726 SHA512 ea57ea2c6138a275bce8cb7d62ea8771bf51db4d8dca4ea33f46539b33ab5a17c7c1749fa7b10c90e167846fd087f4084dcf5604017ad5c2821c2c74793ca9c2 -AUX openssh-8.8_p1-X509-glue-13.2.3.patch 1723 BLAKE2B 791b1a043ca7b18cc0b4b0d292ee466363853ca13d55be951a23f7442f9a49fd2c84e8225e97d37e5bfa1e2ca5f6fa2ff7e3b9d5a3fe9f29d2f0120e13f7d401 SHA512 baf166bd32823186093d42993df6a412f733255d0d0c0c7484dc98e4e9a671a77b9826d9eaee094b415871561cba71cb795d73e8fea556f3ea7e3cb9a548062e +AUX openssh-8.8_p1-X509-glue-13.2.3.patch 2238 BLAKE2B a97643157ecf7b808ae9ee76e00cc58c4515bf5a1e2ff863124dd8b8941f390a90e2b52aa7444898782fc062ccef47983e127efaea7acf225d260479da88f12f SHA512 205c499d03f3bc2c767d406021f5f413eeae06ef5593aa11b24ccce75ebe9e90aacce4f53b120f6330326151c8f11ca43e10fe969f7ed832ef3a604f451f129f AUX sshd-r1.confd 774 BLAKE2B df3f3f28cb4d35b49851399b52408c42e242ae3168ff3fc79add211903567da370cfe86a267932ca9cf13c3afbc38a8f1b53e753a31670ee61bf8ba8747832f8 SHA512 3a69752592126024319a95f1c1747af508fd639c86eca472106c5d6c23d5eeaa441ca74740d4b1aafaa0db759d38879e3c1cee742b08d6166ebc58cddac1e2fe AUX sshd-r1.initd 2675 BLAKE2B 47e87cec2d15b90aae362ce0c8e8ba08dada9ebc244e28be1fe67d24deb00675d3d9b8fef40def8a9224a3e2d15ab717574a3d837e099133c1cf013079588b55 SHA512 257d6437162b76c4a3a648ecc5d4739ca7eaa60b192fde91422c6c05d0de6adfa9635adc24d57dc3da6beb92b1b354ffe8fddad3db453efb610195d5509a4e27 AUX sshd-r2.initd 3197 BLAKE2B b992cc2353f23c0f343bd914e6745d0e2b82364450f2baedc5c96b00e181ad7decef609ca41c1dbc57d53894492e98975a00329207a4696a278978ece66f7acb SHA512 bdd908a604f1ae460cb225c0753325381e638d68eeaea4a30e789192ee7d08d690ddf6ae0db5cc8bfbacf35151cfce975b97ccb6e81d22b2d01555f117342d34 @@ -44,5 +44,5 @@ DIST openssh-8_5_P1-hpn-PeakTput-15.2.diff 2429 BLAKE2B 849bf3c313719ab7a25c75e8 EBUILD openssh-8.5_p1-r2.ebuild 17581 BLAKE2B a971d17ec56d3a6217174c14cec3b273ce0a2d1835cf1ea7e7ef32f8769bd69b7fddc77ec59158744fe8d1463464d33813e4c361cfeafc3935afd4260df136f3 SHA512 07bee99c1b3c40d3b82a640960494b2f92ae1f47f7af3acb04507f5a5e3db35aaaea5d530d59723256b9952cedb8836a0157dd9f7101b2f94aafdcc7c1765944 EBUILD openssh-8.6_p1-r2.ebuild 17655 BLAKE2B 51c2e441eebfab62ebb34eb83ab11ca024ff50a8a3444db82014e554c7d89de10757a45b0f81f4d704977cc7c75a55bae46dbd32bb88132950b72c8cb583073e SHA512 5014bbcde62554e03814906c13521a2db2dcb8df1107d1b2825a9296c85fa76a68c70f07317e57145b46f28b0d5a772aaa03b9e3f6b42db2b3fc0f3be416e527 EBUILD openssh-8.7_p1-r2.ebuild 17549 BLAKE2B 00b3970d5724d32f81935906c8d63be1bae00a2dc5e753c039cba60ed0f1fba13c6de4a34202c34581ddb4ffe04e9a63f1268880ba2528b8f184db50276a3dd8 SHA512 ef26ff570235d2f0557ac98471f8d9eb9645d925e45d426f89981d8ace599257e5e479d920280a7bdb35ef74918fb629f6a3e5bbb6a26a265cbc667687875bdb -EBUILD openssh-8.8_p1-r1.ebuild 17558 BLAKE2B 78f4c6fbdc8d7bceaca1840bc69142a104dd6bfc4a2f271b8800f9b54860d1771737af98c332d7458812a70cdfba7aa4641978553c98528e6b64f1fa8474a6b1 SHA512 4e8d407fc5399b85406620f00a39f61b59f05c0fd2beedde0b038a73242f121de7bd520a071b35c38ed73c61a562e9e08a07988630c830d8683bc198d4687295 +EBUILD openssh-8.8_p1-r2.ebuild 17558 BLAKE2B 78f4c6fbdc8d7bceaca1840bc69142a104dd6bfc4a2f271b8800f9b54860d1771737af98c332d7458812a70cdfba7aa4641978553c98528e6b64f1fa8474a6b1 SHA512 4e8d407fc5399b85406620f00a39f61b59f05c0fd2beedde0b038a73242f121de7bd520a071b35c38ed73c61a562e9e08a07988630c830d8683bc198d4687295 MISC metadata.xml 2102 BLAKE2B 4b1464bbe657cd70e0787f1030354bf5cd87d43f4e19fbaf3686ffdf4c001449511d93d2549a29b4f11faa7901476d85ea7e2555b31f94a97bf73b7912230439 SHA512 ee3fd9db64eced5ef136dec87e5fe965381d2b83247af6e65c9f205adc8758b7bf90a3e45c0fe15dfe82e9aa0f6f25411b58183b8a56ef0ad51026cacbcd89a1 diff --git a/net-misc/openssh/files/openssh-8.8_p1-X509-glue-13.2.3.patch b/net-misc/openssh/files/openssh-8.8_p1-X509-glue-13.2.3.patch index 74f8a842e6b2..b6827623cd66 100644 --- a/net-misc/openssh/files/openssh-8.8_p1-X509-glue-13.2.3.patch +++ b/net-misc/openssh/files/openssh-8.8_p1-X509-glue-13.2.3.patch @@ -1,7 +1,27 @@ diff -ur '--exclude=.*.un~' a/openssh-8.8p1+x509-13.2.3.diff b/openssh-8.8p1+x509-13.2.3.diff ---- a/openssh-8.8p1+x509-13.2.3.diff 2021-10-25 10:23:20.264186260 -0700 -+++ b/openssh-8.8p1+x509-13.2.3.diff 2021-10-25 10:24:35.924443287 -0700 -@@ -51859,12 +51859,11 @@ +--- a/openssh-8.8p1+x509-13.2.3.diff 2021-10-29 14:59:17.070546984 -0700 ++++ b/openssh-8.8p1+x509-13.2.3.diff 2021-10-29 14:59:55.086664489 -0700 +@@ -954,15 +954,16 @@ + char b[512]; + - size_t len = ssh_digest_bytes(SSH_DIGEST_SHA512); + - u_char *hash = xmalloc(len); ++- double delay; + + int digest_alg; + + size_t len; + + u_char *hash; +- double delay; +- +++ double delay = 0; +++ + + digest_alg = ssh_digest_maxbytes(); + + len = ssh_digest_bytes(digest_alg); + + hash = xmalloc(len); +-+ ++ + (void)snprintf(b, sizeof b, "%llu%s", + (unsigned long long)options.timing_secret, user); + - if (ssh_digest_memory(SSH_DIGEST_SHA512, b, strlen(b), hash, len) != 0) +@@ -51859,12 +51860,11 @@ install-files: $(MKDIR_P) $(DESTDIR)$(bindir) @@ -15,7 +35,7 @@ diff -ur '--exclude=.*.un~' a/openssh-8.8p1+x509-13.2.3.diff b/openssh-8.8p1+x50 $(MKDIR_P) -m 0755 $(DESTDIR)$(PRIVSEP_PATH) $(INSTALL) -m 0755 $(STRIP_OPT) ssh$(EXEEXT) $(DESTDIR)$(bindir)/ssh$(EXEEXT) $(INSTALL) -m 0755 $(STRIP_OPT) scp$(EXEEXT) $(DESTDIR)$(bindir)/scp$(EXEEXT) -@@ -71985,7 +71984,7 @@ +@@ -71985,7 +71985,7 @@ +if test "$sshd_type" = "pkix" ; then + unset_arg='' +else @@ -24,7 +44,7 @@ diff -ur '--exclude=.*.un~' a/openssh-8.8p1+x509-13.2.3.diff b/openssh-8.8p1+x50 +fi + cat > $OBJ/sshd_config.i << _EOF -@@ -132360,16 +132359,6 @@ +@@ -132360,16 +132360,6 @@ +int asnmprintf(char **, size_t, int *, const char *, ...) __attribute__((format(printf, 4, 5))); void msetlocale(void); diff --git a/net-misc/openssh/openssh-8.8_p1-r1.ebuild b/net-misc/openssh/openssh-8.8_p1-r2.ebuild index b41b2579d815..b41b2579d815 100644 --- a/net-misc/openssh/openssh-8.8_p1-r1.ebuild +++ b/net-misc/openssh/openssh-8.8_p1-r2.ebuild |