From 5b7c114c09d07eecd00e6f7fb829563aae3597b9 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 1 Jan 2023 20:22:33 +0000 Subject: gentoo auto-resync : 01:01:2023 - 20:22:32 --- net-misc/openssh/Manifest | 2 - .../files/openssh-8.9_p1-X509-glue-13.3.1.patch | 126 --------------------- .../openssh-8.9_p1-fzero-call-used-regs.patch | 32 ------ 3 files changed, 160 deletions(-) delete mode 100644 net-misc/openssh/files/openssh-8.9_p1-X509-glue-13.3.1.patch delete mode 100644 net-misc/openssh/files/openssh-8.9_p1-fzero-call-used-regs.patch (limited to 'net-misc/openssh') diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest index bb28f27dfda1..50caae534b1e 100644 --- a/net-misc/openssh/Manifest +++ b/net-misc/openssh/Manifest @@ -6,9 +6,7 @@ AUX openssh-8.0_p1-fix-putty-tests.patch 1760 BLAKE2B a1127e8f2275c1e23c956b5041 AUX openssh-8.5_p1-hpn-15.2-sctp-glue.patch 727 BLAKE2B fafb6bc3ec680327abf01a7a2f673d4be601094d518d74f5afd0c596c1d60ddfc6f31add6b5533f85bc09cf2122b9e3f7243d5d26a2d6923c88c2f6a811ea2b8 SHA512 eda1c1613e94a7b10df9cc08c87ed8a39edb3f8a160600a74780877772bbd76cc9842d5d5d68ed6a9554e1e310675a1e461d894144d514b8e482d4a1affbc9bd AUX openssh-8.6_p1-hpn-version.patch 556 BLAKE2B 26ef960db46c82ee62e6a6f1be15c2897855caa6cbd05db87d3e606ce42d03fb6e88916f0c6644f67dc008ca802617d0f63e5e8e35d1a6c6076188ba19009186 SHA512 c13d14dc496863bd6bbbf08940322a60e74fa1cc2171f81132dfd874b9371ee0edd77f75ffd606f874fa2de498b174be91da5c641029abff2d2a8503c2f0fc02 AUX openssh-8.7_p1-GSSAPI-dns.patch 11576 BLAKE2B 84aa0128ddeccf67e14c20f9d2acb61226c5091a3e3106285c79db4a297dbd781eddf7a6d4cb3b1a5a5dcbbcd158d32dbca5986b6fbf15f62cd3928cf125b083 SHA512 794b06c6ee6acd1bcd861753970cfc4d04f42499d48ff4119746dbcab8643f75761fddb9f52f49fe01e356740eb3882671ac3ae209e0e45745d195a219ffe5dd -AUX openssh-8.9_p1-X509-glue-13.3.1.patch 4141 BLAKE2B aa875e0de69cdb4935b6053415833b1a0d5858f7f63084e5106dd491060a7a56c208a43a97e663289b3b832cef2d208325e573d161792d35ca4bd6a45fa8f1fa SHA512 90342932f8d191640285afc3ba82456b463640b7f30ba8193f5db023e5fcd4969fb7e57ed3637b0ea6088f4a985b85d563a17b4f0e71a1827cd3ee045e2d392a AUX openssh-8.9_p1-allow-ppoll_time64.patch 396 BLAKE2B b5bb202f79699d9037f12155044328f89ee0573efa43da7cdf8511555e706b6bf66cae069ac95cca900779c6ce293eedec48450f786fd033375e9be17bfb2872 SHA512 9b88024e6a898fc85205fbc038274a3271f787276962150965ab8f599fa355ee73cb48e7e12e3f090034293f9dca94a1ce41dfce2aaeb140693545ff3bc391f0 -AUX openssh-8.9_p1-fzero-call-used-regs.patch 1182 BLAKE2B 45dda480614fd3de6aa6752d3c2f5bb34e8ef1d5576fe75878e349ca56ef451f981dc8e22ce8dd232d6a870cb3c221d8e07bccc45e3f38e43008d48941fafbe4 SHA512 0fb1ae4c4e5d44fa7d6ad301c0c36d4291611a3a34150d2a89499cd486a61b6ce0774be7387e2cd3385aa4b2be9d9b6e9dda7d3783fe1bbf7bfb36067aa973c6 AUX openssh-8.9_p1-gss-use-HOST_NAME_MAX.patch 419 BLAKE2B c5ef82ed92da96213c84d954541dc3d99040f95a3ce6d81ea585360200128154daaa7717a553a91e693ee11044f11b4a2c3f9f0137c4b92cb1aee01514ec7763 SHA512 cdc0894728e01b132346bf1358b2193d5349f281a086a784a4bbdf1a6ad736632cf4c4fbb900c4ebb6b31a13313ed8660dae95968f4e906d40b2aa0b7a7c2303 AUX openssh-8.9_p1-hpn-15.2-X509-glue.patch 15810 BLAKE2B 5ef56bee2ce09033d86c5f99a0956d5e3f268dcf18cc4bb32c75de9e81c3873efe643c39d155188cca4812e677223d66621b061897308ed66bbbc1793343519e SHA512 a1903c6ab7842a14d1324e6ea3b1a25cc161e564092ed4679b333a081f1659712a519335fb2cfbdd344bded47a00d538bb5b5a9bfd2e82a321a8347cfeb5bb16 AUX openssh-8.9_p1-hpn-15.2-glue.patch 8473 BLAKE2B a4616e498db7400702b3c0ba8c6eb6d58b198b1104215b91c0938bb68bf15850f63e3f32e4b99af04ae78ef60818127e17cab68dc3e3bbfe696545057ef3ec63 SHA512 ceff7521accb464c916b5aa695c80de5760272da319f537dc93bb6b6e39de1d408ba4a5335b4071091afb360c5cf44d91429109f84f1e669a175beb3cfcecd26 diff --git a/net-misc/openssh/files/openssh-8.9_p1-X509-glue-13.3.1.patch b/net-misc/openssh/files/openssh-8.9_p1-X509-glue-13.3.1.patch deleted file mode 100644 index eab5b5344d6a..000000000000 --- a/net-misc/openssh/files/openssh-8.9_p1-X509-glue-13.3.1.patch +++ /dev/null @@ -1,126 +0,0 @@ -diff -ur '--exclude=.*.un~' a/openssh-8.9p1+x509-13.3.1.diff b/openssh-8.9p1+x509-13.3.1.diff ---- a/openssh-8.9p1+x509-13.3.1.diff 2022-03-05 21:49:32.673126122 -0800 -+++ b/openssh-8.9p1+x509-13.3.1.diff 2022-03-05 21:52:52.581776560 -0800 -@@ -1002,15 +1002,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) -@@ -44746,8 +44747,8 @@ - gss_create_empty_oid_set(&status, &oidset); - gss_add_oid_set_member(&status, ctx->oid, &oidset); - --- if (gethostname(lname, MAXHOSTNAMELEN)) { --+ if (gethostname(lname, MAXHOSTNAMELEN) == -1) { -+- if (gethostname(lname, HOST_NAME_MAX)) { -++ if (gethostname(lname, HOST_NAME_MAX) == -1) { - gss_release_oid_set(&status, &oidset); - return (-1); - } -@@ -52143,7 +52144,7 @@ - diff -ruN openssh-8.9p1/m4/openssh.m4 openssh-8.9p1+x509-13.3.1/m4/openssh.m4 - --- openssh-8.9p1/m4/openssh.m4 2022-02-23 13:31:11.000000000 +0200 - +++ openssh-8.9p1+x509-13.3.1/m4/openssh.m4 1970-01-01 02:00:00.000000000 +0200 --@@ -1,200 +0,0 @@ -+@@ -1,203 +0,0 @@ - -dnl OpenSSH-specific autoconf macros - -dnl - - -@@ -52160,6 +52161,8 @@ - - AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ - -#include - -#include -+-/* Trivial function to help test for -fzero-call-used-regs */ -+-void f(int n) {} - -int main(int argc, char **argv) { - - (void)argv; - - /* Some math to catch -ftrapv problems in the toolchain */ -@@ -52167,6 +52170,7 @@ - - float l = i * 2.1; - - double m = l / 0.5; - - long long int n = argc * 12345LL, o = 12345LL * (long long int)argc; -+- f(0); - - printf("%d %d %d %f %f %lld %lld\n", i, j, k, l, m, n, o); - - /* - - * Test fallthrough behaviour. clang 10's -Wimplicit-fallthrough does -@@ -52884,12 +52888,11 @@ - - install-files: - $(MKDIR_P) $(DESTDIR)$(bindir) --@@ -396,6 +372,8 @@ -+@@ -396,6 +372,7 @@ - $(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)5 - $(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)8 - $(MKDIR_P) $(DESTDIR)$(libexecdir) - + $(MKDIR_P) $(DESTDIR)$(sshcadir) --+ $(MKDIR_P) $(DESTDIR)$(piddir) - $(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) -@@ -73836,7 +73839,7 @@ - +if test "$sshd_type" = "pkix" ; then - + unset_arg='' - +else --+ unset_arg=none -++ unset_arg= - +fi - + - cat > $OBJ/sshd_config.i << _EOF -@@ -79691,25 +79694,6 @@ - #ifdef __NR_getrandom - SC_ALLOW(__NR_getrandom), - #endif --@@ -267,15 +273,15 @@ -- #ifdef __NR_clock_nanosleep_time64 -- SC_ALLOW(__NR_clock_nanosleep_time64), -- #endif ---#ifdef __NR_clock_gettime64 --- SC_ALLOW(__NR_clock_gettime64), ---#endif -- #ifdef __NR__newselect -- SC_ALLOW(__NR__newselect), -- #endif -- #ifdef __NR_ppoll -- SC_ALLOW(__NR_ppoll), -- #endif --+#ifdef __NR_ppoll_time64 --+ SC_ALLOW(__NR_ppoll_time64), --+#endif -- #ifdef __NR_poll -- SC_ALLOW(__NR_poll), -- #endif - @@ -288,6 +294,9 @@ - #ifdef __NR_read - SC_ALLOW(__NR_read), -@@ -137848,16 +137832,6 @@ - +int asnmprintf(char **, size_t, int *, const char *, ...) - __attribute__((format(printf, 4, 5))); - void msetlocale(void); --diff -ruN openssh-8.9p1/version.h openssh-8.9p1+x509-13.3.1/version.h ----- openssh-8.9p1/version.h 2022-02-23 13:31:11.000000000 +0200 --+++ openssh-8.9p1+x509-13.3.1/version.h 2022-03-05 10:07:00.000000000 +0200 --@@ -2,5 +2,4 @@ -- -- #define SSH_VERSION "OpenSSH_8.9" -- ---#define SSH_PORTABLE "p1" ---#define SSH_RELEASE SSH_VERSION SSH_PORTABLE --+#define SSH_RELEASE PACKAGE_STRING ", " SSH_VERSION "p1" - diff -ruN openssh-8.9p1/version.m4 openssh-8.9p1+x509-13.3.1/version.m4 - --- openssh-8.9p1/version.m4 1970-01-01 02:00:00.000000000 +0200 - +++ openssh-8.9p1+x509-13.3.1/version.m4 2022-03-05 10:07:00.000000000 +0200 diff --git a/net-misc/openssh/files/openssh-8.9_p1-fzero-call-used-regs.patch b/net-misc/openssh/files/openssh-8.9_p1-fzero-call-used-regs.patch deleted file mode 100644 index 0231ce46d7b1..000000000000 --- a/net-misc/openssh/files/openssh-8.9_p1-fzero-call-used-regs.patch +++ /dev/null @@ -1,32 +0,0 @@ -From f107467179428a0e3ea9e4aa9738ac12ff02822d Mon Sep 17 00:00:00 2001 -From: Colin Watson -Date: Thu, 24 Feb 2022 16:04:18 +0000 -Subject: [PATCH] Improve detection of -fzero-call-used-regs=all support - -GCC doesn't tell us whether this option is supported unless it runs into -the situation where it would need to emit corresponding code. ---- - m4/openssh.m4 | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/m4/openssh.m4 b/m4/openssh.m4 -index 4f9c3792dc1..8c33c701b8b 100644 ---- a/m4/openssh.m4 -+++ b/m4/openssh.m4 -@@ -14,6 +14,8 @@ AC_DEFUN([OSSH_CHECK_CFLAG_COMPILE], [{ - AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ - #include - #include -+/* Trivial function to help test for -fzero-call-used-regs */ -+void f(int n) {} - int main(int argc, char **argv) { - (void)argv; - /* Some math to catch -ftrapv problems in the toolchain */ -@@ -21,6 +23,7 @@ int main(int argc, char **argv) { - float l = i * 2.1; - double m = l / 0.5; - long long int n = argc * 12345LL, o = 12345LL * (long long int)argc; -+ f(0); - printf("%d %d %d %f %f %lld %lld\n", i, j, k, l, m, n, o); - /* - * Test fallthrough behaviour. clang 10's -Wimplicit-fallthrough does -- cgit v1.2.3