Skip to content

Commit

Permalink
update 0019-openssh-9.8p1 buildroot patch to remove already integrated
Browse files Browse the repository at this point in the history
fzero call patch.
  • Loading branch information
jens-maus committed Jul 15, 2024
1 parent 88411de commit 87b148f
Show file tree
Hide file tree
Showing 3 changed files with 67 additions and 0 deletions.
35 changes: 35 additions & 0 deletions buildroot-patches/0019-openssh-9.8p1.patch
Original file line number Diff line number Diff line change
@@ -1,3 +1,38 @@
--- buildroot/package/openssh/0001-Improve-detection-of-fzero-call-used-regs-used.patch.orig
+++ buildroot/package/openssh/0001-Improve-detection-of-fzero-call-used-regs-used.patch
@@ -1,32 +0,0 @@
-From f9193f03db0029fc9c31fbdb5c66a2737446bd8f Mon Sep 17 00:00:00 2001
-From: Darren Tucker <[email protected]>
-Date: Mon, 25 Mar 2024 09:28:02 +1100
-Subject: [PATCH] Improve detection of -fzero-call-used-regs=used.
-
-Should better detect problems with gcc 13 on m68k. bz#3673 from Colin
-Watson via bz#3673 and https://gcc.gnu.org/bugzilla/show_bug.cgi?id=110934
-
-Signed-off-by: Darren Tucker <[email protected]>
-Upstream: https://github.com/openssh/openssh-portable/commit/f9193f03db0029fc9c31fbdb5c66a2737446bd8f
----
- m4/openssh.m4 | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/m4/openssh.m4 b/m4/openssh.m4
-index 033df501c3d8..176a8d1c9282 100644
---- a/m4/openssh.m4
-+++ b/m4/openssh.m4
-@@ -20,7 +20,10 @@ char *f2(char *s, ...) {
- va_end(args);
- return strdup(ret);
- }
-+int i;
-+double d;
- const char *f3(int s) {
-+ i = (int)d;
- return s ? "good" : "gooder";
- }
- int main(int argc, char **argv) {
---
-2.43.0
-
--- buildroot/package/openssh/openssh.hash.orig
+++ buildroot/package/openssh/openssh.hash
@@ -1,4 +1,4 @@
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
From f9193f03db0029fc9c31fbdb5c66a2737446bd8f Mon Sep 17 00:00:00 2001
From: Darren Tucker <[email protected]>
Date: Mon, 25 Mar 2024 09:28:02 +1100
Subject: [PATCH] Improve detection of -fzero-call-used-regs=used.

Should better detect problems with gcc 13 on m68k. bz#3673 from Colin
Watson via bz#3673 and https://gcc.gnu.org/bugzilla/show_bug.cgi?id=110934

Signed-off-by: Darren Tucker <[email protected]>
Upstream: https://github.com/openssh/openssh-portable/commit/f9193f03db0029fc9c31fbdb5c66a2737446bd8f
---
m4/openssh.m4 | 3 +++
1 file changed, 3 insertions(+)

diff --git a/m4/openssh.m4 b/m4/openssh.m4
index 033df501c3d8..176a8d1c9282 100644
--- a/m4/openssh.m4
+++ b/m4/openssh.m4
@@ -20,7 +20,10 @@ char *f2(char *s, ...) {
va_end(args);
return strdup(ret);
}
+int i;
+double d;
const char *f3(int s) {
+ i = (int)d;
return s ? "good" : "gooder";
}
int main(int argc, char **argv) {
--
2.43.0

0 comments on commit 87b148f

Please sign in to comment.