From: "Conrad Kostecki" <conikost@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/openssh/files/
Date: Sun, 1 Jan 2023 18:16:35 +0000 (UTC) [thread overview]
Message-ID: <1672596982.d80452b5bce46df84fcfee0e324b1626da4ad7b8.conikost@gentoo> (raw)
commit: d80452b5bce46df84fcfee0e324b1626da4ad7b8
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Tue Dec 27 17:09:14 2022 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sun Jan 1 18:16:22 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d80452b5
net-misc/openssh: remove unused patches
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/28857
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
.../files/openssh-8.9_p1-X509-glue-13.3.1.patch | 126 ---------------------
.../openssh-8.9_p1-fzero-call-used-regs.patch | 32 ------
2 files changed, 158 deletions(-)
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 <stdlib.h>
- -#include <stdio.h>
-+-/* 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 <cjwatson@debian.org>
-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 <stdlib.h>
- #include <stdio.h>
-+/* 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
next reply other threads:[~2023-01-01 18:16 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-01 18:16 Conrad Kostecki [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-07-07 8:44 [gentoo-commits] repo/gentoo:master commit in: net-misc/openssh/files/ Sam James
2023-12-31 2:38 Conrad Kostecki
2023-05-07 10:11 David Seifert
2023-04-01 19:13 Conrad Kostecki
2023-03-23 6:02 Sam James
2023-01-14 19:17 Sam James
2022-10-30 9:28 Sam James
2022-02-26 3:02 Sam James
2022-02-16 14:59 Mike Gilbert
2021-12-24 13:29 Conrad Kostecki
2021-07-25 21:32 Conrad Kostecki
2021-05-03 11:28 Mikle Kolyada
2021-04-26 20:23 Mike Gilbert
2021-04-25 12:59 Conrad Kostecki
2021-03-04 22:39 Patrick McLean
2021-02-20 22:43 Conrad Kostecki
2020-09-01 19:21 Mike Gilbert
2020-06-20 7:47 Michał Górny
2020-05-12 1:41 Patrick McLean
2020-04-17 18:01 Patrick McLean
2019-11-17 18:40 Patrick McLean
2019-04-19 16:58 Patrick McLean
2019-03-11 4:48 Aaron Bauman
2018-10-31 8:06 Lars Wendler
2018-10-26 18:35 Patrick McLean
2018-10-26 18:30 Patrick McLean
2018-10-23 23:27 Patrick McLean
2018-03-13 13:20 Lars Wendler
2017-12-28 15:58 Lars Wendler
2017-01-09 21:09 Lars Wendler
2016-09-09 17:20 Patrick McLean
2016-09-09 6:43 Patrick McLean
2016-09-08 18:49 Patrick McLean
2016-09-08 0:28 Patrick McLean
2016-09-07 18:54 Patrick McLean
2016-09-07 4:54 Patrick McLean
2016-09-07 2:43 Patrick McLean
2016-09-07 1:12 Patrick McLean
2016-08-06 8:59 Mike Frysinger
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1672596982.d80452b5bce46df84fcfee0e324b1626da4ad7b8.conikost@gentoo \
--to=conikost@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox