All of lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH 1/1] package/openssh: bump to version 9.7p1
@ 2024-03-24  0:17 Akhilesh Nema
  2024-03-24 15:10 ` Arnout Vandecappelle via buildroot
                   ` (2 more replies)
  0 siblings, 3 replies; 4+ messages in thread
From: Akhilesh Nema @ 2024-03-24  0:17 UTC (permalink / raw)
  To: buildroot; +Cc: Akhilesh Nema

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

Drop upstream patch - 001-better-detection-of-broken-fzero-call-used-regs.patch (https://github.com/openssh/openssh-portable/commit/1036d77b34a5fa15e56f516b81b9928006848cbd.patch)

Signed-off-by: Akhilesh Nema <nemaakhilesh@gmail.com>
---

sha256 was captured from the release notes with the following command.

curl -s https://www.openssh.com/txt/release-9.7 | grep "SHA256 (openssh-9.7p1.tar.gz) = " | awk -F" = " '{print $2}'  | base64 --decode | xxd -ps -c 64

test-pkg results
$ cat openssh.config
BR2_PACKAGE_OPENSSH=y
BR2_PACKAGE_OPENSSH_CLIENT=y
BR2_PACKAGE_OPENSSH_SERVER=y
BR2_PACKAGE_OPENSSH_KEY_UTILS=y
BR2_PACKAGE_OPENSSH_SANDBOX=y

./utils/test-pkg -k -c openssh.config -p openssh
	bootlin-armv5-uclibc [1/6]: OK
	 bootlin-armv7-glibc [2/6]: OK
   bootlin-armv7m-uclibc [3/6]: SKIPPED
	 bootlin-x86-64-musl [4/6]: OK
	  br-arm-full-static [5/6]: OK
		 arm-aarch64 [6/6]: OK

$ utils/docker-run make check-package
398613 lines processed
0 warnings generated

./support/testing/run-tests -d dl/ -o testsuite tests.package.test_openssh.TestOpenSshGlibc
16:04:44 TestOpenSshGlibc                         Starting
16:04:45 TestOpenSshGlibc                         Building
16:06:40 TestOpenSshGlibc                         Building done
16:06:56 TestOpenSshGlibc                         Cleaning up
.
----------------------------------------------------------------------
Ran 1 test in 132.916s

OK

./support/testing/run-tests -k -d dl/ -o testsuite tests.package.test_openssh.TestOpenSshuClibc
16:44:35 TestOpenSshuClibc                        Starting
16:44:36 TestOpenSshuClibc                        Building
16:46:20 TestOpenSshuClibc                        Building done
16:46:34 TestOpenSshuClibc                        Cleaning up
.
----------------------------------------------------------------------
Ran 1 test in 118.367s

OK

Signed-off-by: Akhilesh Nema <nemaakhilesh@gmail.com>
---
 ...ction-of-broken-fzero-call-used-regs.patch | 57 -------------------
 package/openssh/openssh.hash                  |  4 +-
 package/openssh/openssh.mk                    |  2 +-
 3 files changed, 3 insertions(+), 60 deletions(-)
 delete mode 100644 package/openssh/0001-better-detection-of-broken-fzero-call-used-regs.patch

diff --git a/package/openssh/0001-better-detection-of-broken-fzero-call-used-regs.patch b/package/openssh/0001-better-detection-of-broken-fzero-call-used-regs.patch
deleted file mode 100644
index 5c056033a9..0000000000
--- a/package/openssh/0001-better-detection-of-broken-fzero-call-used-regs.patch
+++ /dev/null
@@ -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
diff --git a/package/openssh/openssh.hash b/package/openssh/openssh.hash
index 618b13133d..58297aa694 100644
--- a/package/openssh/openssh.hash
+++ b/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
diff --git a/package/openssh/openssh.mk b/package/openssh/openssh.mk
index ef530cc850..ce55253120 100644
--- a/package/openssh/openssh.mk
+++ b/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)
-- 
2.25.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-03-25  8:56 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-03-24  0:17 [Buildroot] [PATCH 1/1] package/openssh: bump to version 9.7p1 Akhilesh Nema
2024-03-24 15:10 ` Arnout Vandecappelle via buildroot
2024-03-25  8:26 ` Peter Korsgaard
2024-03-25  8:56 ` Peter Korsgaard

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.