| 1 |
commit: d80452b5bce46df84fcfee0e324b1626da4ad7b8 |
| 2 |
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at> |
| 3 |
AuthorDate: Tue Dec 27 17:09:14 2022 +0000 |
| 4 |
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Jan 1 18:16:22 2023 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d80452b5 |
| 7 |
|
| 8 |
net-misc/openssh: remove unused patches |
| 9 |
|
| 10 |
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at> |
| 11 |
Closes: https://github.com/gentoo/gentoo/pull/28857 |
| 12 |
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org> |
| 13 |
|
| 14 |
.../files/openssh-8.9_p1-X509-glue-13.3.1.patch | 126 --------------------- |
| 15 |
.../openssh-8.9_p1-fzero-call-used-regs.patch | 32 ------ |
| 16 |
2 files changed, 158 deletions(-) |
| 17 |
|
| 18 |
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 |
| 19 |
deleted file mode 100644 |
| 20 |
index eab5b5344d6a..000000000000 |
| 21 |
--- a/net-misc/openssh/files/openssh-8.9_p1-X509-glue-13.3.1.patch |
| 22 |
+++ /dev/null |
| 23 |
@@ -1,126 +0,0 @@ |
| 24 |
-diff -ur '--exclude=.*.un~' a/openssh-8.9p1+x509-13.3.1.diff b/openssh-8.9p1+x509-13.3.1.diff |
| 25 |
---- a/openssh-8.9p1+x509-13.3.1.diff 2022-03-05 21:49:32.673126122 -0800 |
| 26 |
-+++ b/openssh-8.9p1+x509-13.3.1.diff 2022-03-05 21:52:52.581776560 -0800 |
| 27 |
-@@ -1002,15 +1002,16 @@ |
| 28 |
- char b[512]; |
| 29 |
- - size_t len = ssh_digest_bytes(SSH_DIGEST_SHA512); |
| 30 |
- - u_char *hash = xmalloc(len); |
| 31 |
-+- double delay; |
| 32 |
- + int digest_alg; |
| 33 |
- + size_t len; |
| 34 |
- + u_char *hash; |
| 35 |
-- double delay; |
| 36 |
-- |
| 37 |
-++ double delay = 0; |
| 38 |
-++ |
| 39 |
- + digest_alg = ssh_digest_maxbytes(); |
| 40 |
- + len = ssh_digest_bytes(digest_alg); |
| 41 |
- + hash = xmalloc(len); |
| 42 |
--+ |
| 43 |
-+ |
| 44 |
- (void)snprintf(b, sizeof b, "%llu%s", |
| 45 |
- (unsigned long long)options.timing_secret, user); |
| 46 |
- - if (ssh_digest_memory(SSH_DIGEST_SHA512, b, strlen(b), hash, len) != 0) |
| 47 |
-@@ -44746,8 +44747,8 @@ |
| 48 |
- gss_create_empty_oid_set(&status, &oidset); |
| 49 |
- gss_add_oid_set_member(&status, ctx->oid, &oidset); |
| 50 |
- |
| 51 |
--- if (gethostname(lname, MAXHOSTNAMELEN)) { |
| 52 |
--+ if (gethostname(lname, MAXHOSTNAMELEN) == -1) { |
| 53 |
-+- if (gethostname(lname, HOST_NAME_MAX)) { |
| 54 |
-++ if (gethostname(lname, HOST_NAME_MAX) == -1) { |
| 55 |
- gss_release_oid_set(&status, &oidset); |
| 56 |
- return (-1); |
| 57 |
- } |
| 58 |
-@@ -52143,7 +52144,7 @@ |
| 59 |
- diff -ruN openssh-8.9p1/m4/openssh.m4 openssh-8.9p1+x509-13.3.1/m4/openssh.m4 |
| 60 |
- --- openssh-8.9p1/m4/openssh.m4 2022-02-23 13:31:11.000000000 +0200 |
| 61 |
- +++ openssh-8.9p1+x509-13.3.1/m4/openssh.m4 1970-01-01 02:00:00.000000000 +0200 |
| 62 |
--@@ -1,200 +0,0 @@ |
| 63 |
-+@@ -1,203 +0,0 @@ |
| 64 |
- -dnl OpenSSH-specific autoconf macros |
| 65 |
- -dnl |
| 66 |
- - |
| 67 |
-@@ -52160,6 +52161,8 @@ |
| 68 |
- - AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ |
| 69 |
- -#include <stdlib.h> |
| 70 |
- -#include <stdio.h> |
| 71 |
-+-/* Trivial function to help test for -fzero-call-used-regs */ |
| 72 |
-+-void f(int n) {} |
| 73 |
- -int main(int argc, char **argv) { |
| 74 |
- - (void)argv; |
| 75 |
- - /* Some math to catch -ftrapv problems in the toolchain */ |
| 76 |
-@@ -52167,6 +52170,7 @@ |
| 77 |
- - float l = i * 2.1; |
| 78 |
- - double m = l / 0.5; |
| 79 |
- - long long int n = argc * 12345LL, o = 12345LL * (long long int)argc; |
| 80 |
-+- f(0); |
| 81 |
- - printf("%d %d %d %f %f %lld %lld\n", i, j, k, l, m, n, o); |
| 82 |
- - /* |
| 83 |
- - * Test fallthrough behaviour. clang 10's -Wimplicit-fallthrough does |
| 84 |
-@@ -52884,12 +52888,11 @@ |
| 85 |
- |
| 86 |
- install-files: |
| 87 |
- $(MKDIR_P) $(DESTDIR)$(bindir) |
| 88 |
--@@ -396,6 +372,8 @@ |
| 89 |
-+@@ -396,6 +372,7 @@ |
| 90 |
- $(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)5 |
| 91 |
- $(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)8 |
| 92 |
- $(MKDIR_P) $(DESTDIR)$(libexecdir) |
| 93 |
- + $(MKDIR_P) $(DESTDIR)$(sshcadir) |
| 94 |
--+ $(MKDIR_P) $(DESTDIR)$(piddir) |
| 95 |
- $(MKDIR_P) -m 0755 $(DESTDIR)$(PRIVSEP_PATH) |
| 96 |
- $(INSTALL) -m 0755 $(STRIP_OPT) ssh$(EXEEXT) $(DESTDIR)$(bindir)/ssh$(EXEEXT) |
| 97 |
- $(INSTALL) -m 0755 $(STRIP_OPT) scp$(EXEEXT) $(DESTDIR)$(bindir)/scp$(EXEEXT) |
| 98 |
-@@ -73836,7 +73839,7 @@ |
| 99 |
- +if test "$sshd_type" = "pkix" ; then |
| 100 |
- + unset_arg='' |
| 101 |
- +else |
| 102 |
--+ unset_arg=none |
| 103 |
-++ unset_arg= |
| 104 |
- +fi |
| 105 |
- + |
| 106 |
- cat > $OBJ/sshd_config.i << _EOF |
| 107 |
-@@ -79691,25 +79694,6 @@ |
| 108 |
- #ifdef __NR_getrandom |
| 109 |
- SC_ALLOW(__NR_getrandom), |
| 110 |
- #endif |
| 111 |
--@@ -267,15 +273,15 @@ |
| 112 |
-- #ifdef __NR_clock_nanosleep_time64 |
| 113 |
-- SC_ALLOW(__NR_clock_nanosleep_time64), |
| 114 |
-- #endif |
| 115 |
---#ifdef __NR_clock_gettime64 |
| 116 |
--- SC_ALLOW(__NR_clock_gettime64), |
| 117 |
---#endif |
| 118 |
-- #ifdef __NR__newselect |
| 119 |
-- SC_ALLOW(__NR__newselect), |
| 120 |
-- #endif |
| 121 |
-- #ifdef __NR_ppoll |
| 122 |
-- SC_ALLOW(__NR_ppoll), |
| 123 |
-- #endif |
| 124 |
--+#ifdef __NR_ppoll_time64 |
| 125 |
--+ SC_ALLOW(__NR_ppoll_time64), |
| 126 |
--+#endif |
| 127 |
-- #ifdef __NR_poll |
| 128 |
-- SC_ALLOW(__NR_poll), |
| 129 |
-- #endif |
| 130 |
- @@ -288,6 +294,9 @@ |
| 131 |
- #ifdef __NR_read |
| 132 |
- SC_ALLOW(__NR_read), |
| 133 |
-@@ -137848,16 +137832,6 @@ |
| 134 |
- +int asnmprintf(char **, size_t, int *, const char *, ...) |
| 135 |
- __attribute__((format(printf, 4, 5))); |
| 136 |
- void msetlocale(void); |
| 137 |
--diff -ruN openssh-8.9p1/version.h openssh-8.9p1+x509-13.3.1/version.h |
| 138 |
----- openssh-8.9p1/version.h 2022-02-23 13:31:11.000000000 +0200 |
| 139 |
--+++ openssh-8.9p1+x509-13.3.1/version.h 2022-03-05 10:07:00.000000000 +0200 |
| 140 |
--@@ -2,5 +2,4 @@ |
| 141 |
-- |
| 142 |
-- #define SSH_VERSION "OpenSSH_8.9" |
| 143 |
-- |
| 144 |
---#define SSH_PORTABLE "p1" |
| 145 |
---#define SSH_RELEASE SSH_VERSION SSH_PORTABLE |
| 146 |
--+#define SSH_RELEASE PACKAGE_STRING ", " SSH_VERSION "p1" |
| 147 |
- diff -ruN openssh-8.9p1/version.m4 openssh-8.9p1+x509-13.3.1/version.m4 |
| 148 |
- --- openssh-8.9p1/version.m4 1970-01-01 02:00:00.000000000 +0200 |
| 149 |
- +++ openssh-8.9p1+x509-13.3.1/version.m4 2022-03-05 10:07:00.000000000 +0200 |
| 150 |
|
| 151 |
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 |
| 152 |
deleted file mode 100644 |
| 153 |
index 0231ce46d7b1..000000000000 |
| 154 |
--- a/net-misc/openssh/files/openssh-8.9_p1-fzero-call-used-regs.patch |
| 155 |
+++ /dev/null |
| 156 |
@@ -1,32 +0,0 @@ |
| 157 |
-From f107467179428a0e3ea9e4aa9738ac12ff02822d Mon Sep 17 00:00:00 2001 |
| 158 |
-From: Colin Watson <cjwatson@××××××.org> |
| 159 |
-Date: Thu, 24 Feb 2022 16:04:18 +0000 |
| 160 |
-Subject: [PATCH] Improve detection of -fzero-call-used-regs=all support |
| 161 |
- |
| 162 |
-GCC doesn't tell us whether this option is supported unless it runs into |
| 163 |
-the situation where it would need to emit corresponding code. |
| 164 |
---- |
| 165 |
- m4/openssh.m4 | 3 +++ |
| 166 |
- 1 file changed, 3 insertions(+) |
| 167 |
- |
| 168 |
-diff --git a/m4/openssh.m4 b/m4/openssh.m4 |
| 169 |
-index 4f9c3792dc1..8c33c701b8b 100644 |
| 170 |
---- a/m4/openssh.m4 |
| 171 |
-+++ b/m4/openssh.m4 |
| 172 |
-@@ -14,6 +14,8 @@ AC_DEFUN([OSSH_CHECK_CFLAG_COMPILE], [{ |
| 173 |
- AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ |
| 174 |
- #include <stdlib.h> |
| 175 |
- #include <stdio.h> |
| 176 |
-+/* Trivial function to help test for -fzero-call-used-regs */ |
| 177 |
-+void f(int n) {} |
| 178 |
- int main(int argc, char **argv) { |
| 179 |
- (void)argv; |
| 180 |
- /* Some math to catch -ftrapv problems in the toolchain */ |
| 181 |
-@@ -21,6 +23,7 @@ int main(int argc, char **argv) { |
| 182 |
- float l = i * 2.1; |
| 183 |
- double m = l / 0.5; |
| 184 |
- long long int n = argc * 12345LL, o = 12345LL * (long long int)argc; |
| 185 |
-+ f(0); |
| 186 |
- printf("%d %d %d %f %f %lld %lld\n", i, j, k, l, m, n, o); |
| 187 |
- /* |
| 188 |
- * Test fallthrough behaviour. clang 10's -Wimplicit-fallthrough does |
Archives