Преглед изворни кода

package/openssh: bump to version 9.7p1

Release notes - https://www.openssh.com/txt/release-9.7

Drop upstream patch - 001-better-detection-of-broken-fzero-call-used-regs.patch

Signed-off-by: Akhilesh Nema <nemaakhilesh@gmail.com>
Signed-off-by: Arnout Vandecappelle <arnout@mind.be>
(cherry picked from commit 9496ff57e54c136d6961294aa2c5f8d560673ebf)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Akhilesh Nema пре 1 година
родитељ
комит
11c8ff1499

+ 0 - 57
package/openssh/0001-better-detection-of-broken-fzero-call-used-regs.patch

@@ -1,57 +0,0 @@
-From 1036d77b34a5fa15e56f516b81b9928006848cbd Mon Sep 17 00:00:00 2001
-From: Damien Miller <djm@mindrot.org>
-Date: Fri, 22 Dec 2023 17:56:26 +1100
-Subject: [PATCH] better detection of broken -fzero-call-used-regs
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-gcc 13.2.0 on ppc64le refuses to compile some function, including
-cipher.c:compression_alg_list() with an error:
-
-> sorry, unimplemented: argument ‘used’ is not supportedcw
-> for ‘-fzero-call-used-regs’ on this target
-
-This extends the autoconf will-it-work test with a similarly-
-structured function that seems to catch this.
-
-Spotted/tested by Colin Watson; bz3645
-
-Upstream: https://github.com/openssh/openssh-portable/commit/1036d77b34a5fa15e56f516b81b9928006848cbd.patch
-Signed-off-by: Brandon Maier <brandon.maier@collins.com>
----
- m4/openssh.m4 | 12 +++++++++---
- 1 file changed, 9 insertions(+), 3 deletions(-)
-
-diff --git a/m4/openssh.m4 b/m4/openssh.m4
-index 5d4c56280fc..033df501c3d 100644
---- a/m4/openssh.m4
-+++ b/m4/openssh.m4
-@@ -20,18 +20,24 @@ char *f2(char *s, ...) {
- 	va_end(args);
- 	return strdup(ret);
- }
-+const char *f3(int s) {
-+	return s ? "good" : "gooder";
-+}
- int main(int argc, char **argv) {
--	(void)argv;
- 	char b[256], *cp;
-+	const char *s;
- 	/* Some math to catch -ftrapv problems in the toolchain */
- 	int i = 123 * argc, j = 456 + argc, k = 789 - argc;
- 	float l = i * 2.1;
- 	double m = l / 0.5;
- 	long long int n = argc * 12345LL, o = 12345LL * (long long int)argc;
-+	(void)argv;
- 	f(1);
--	snprintf(b, sizeof b, "%d %d %d %f %f %lld %lld\n", i,j,k,l,m,n,o);
-+	s = f3(f(2));
-+	snprintf(b, sizeof b, "%d %d %d %f %f %lld %lld %s\n", i,j,k,l,m,n,o,s);
- 	if (write(1, b, 0) == -1) exit(0);
--	cp = f2("%d %d %d %f %f %lld %lld\n", i,j,k,l,m,n,o);
-+	cp = f2("%d %d %d %f %f %lld %lld %s\n", i,j,k,l,m,n,o,s);
-+	if (write(1, cp, 0) == -1) exit(0);
- 	free(cp);
- 	/*
- 	 * Test fallthrough behaviour.  clang 10's -Wimplicit-fallthrough does

+ 2 - 2
package/openssh/openssh.hash

@@ -1,4 +1,4 @@
-# From https://www.openssh.com/txt/release-9.4p1
-sha256  910211c07255a8c5ad654391b40ee59800710dd8119dd5362de09385aa7a777c  openssh-9.6p1.tar.gz
+# From https://www.openssh.com/txt/release-9.7
+sha256  490426f766d82a2763fcacd8d83ea3d70798750c7bd2aff2e57dc5660f773ffd  openssh-9.7p1.tar.gz
 # Locally calculated
 sha256  05c30446ba738934b3f1efa965b454c122ca26cc4b268e5ae6843f58ccd1b16d  LICENCE

+ 1 - 1
package/openssh/openssh.mk

@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-OPENSSH_VERSION_MAJOR = 9.6
+OPENSSH_VERSION_MAJOR = 9.7
 OPENSSH_VERSION_MINOR = p1
 OPENSSH_VERSION = $(OPENSSH_VERSION_MAJOR)$(OPENSSH_VERSION_MINOR)
 OPENSSH_CPE_ID_VERSION = $(OPENSSH_VERSION_MAJOR)