GNU bug report logs -
#69659
gnu: openssh: Update to 9.7p1.
Previous Next
Reported by: Jack Hill <jackhill <at> jackhill.us>
Date: Fri, 8 Mar 2024 22:53:02 UTC
Severity: normal
Tags: patch
Done: Ludovic Courtès <ludo <at> gnu.org>
Bug is archived. No further changes may be made.
To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 69659 in the body.
You can then email your comments to 69659 AT debbugs.gnu.org in the normal way.
Toggle the display of automated, internal messages from the tracker.
Report forwarded
to
guix-patches <at> gnu.org
:
bug#69659
; Package
guix-patches
.
(Fri, 08 Mar 2024 22:53:02 GMT)
Full text and
rfc822 format available.
Acknowledgement sent
to
Jack Hill <jackhill <at> jackhill.us>
:
New bug report received and forwarded. Copy sent to
guix-patches <at> gnu.org
.
(Fri, 08 Mar 2024 22:53:02 GMT)
Full text and
rfc822 format available.
Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):
Hi Guix,
The portable openssh project has called for testing in advance of the
imminent 9.7p1 release [0]. I've tested an updated Guix package locally,
but wanted to submit the patch to the tracker as well to benefit from
broader testing on QA. Obviously, the patch is not yet ready to be
committed.
Let me know if this wasn't an appropriate thing do do.
Best,
Jack
[0] https://lists.mindrot.org/pipermail/openssh-unix-dev/2024-March/041181.html
Jack Hill (1):
WIP: gnu: Update openssh to 9.7p1 pre-release.
gnu/packages/ssh.scm | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
base-commit: 09346fd05f19da3846635e1a0f1c844050d59f26
--
2.41.0
Information forwarded
to
guix-patches <at> gnu.org
:
bug#69659
; Package
guix-patches
.
(Sat, 09 Mar 2024 00:02:01 GMT)
Full text and
rfc822 format available.
Message #8 received at 69659 <at> debbugs.gnu.org (full text, mbox):
* gnu/packages/ssh.scm (openssh): Update to pre-release for 9.7p1.
Change-Id: Ia13c32869afa6c964770243ecacf5a3ce473e5e2
---
gnu/packages/ssh.scm | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm
index d53d8d59e7..cabe3237a4 100644
--- a/gnu/packages/ssh.scm
+++ b/gnu/packages/ssh.scm
@@ -198,18 +198,20 @@ (define-public libssh2
(define-public openssh
(package
(name "openssh")
- (version "9.6p1")
+ (version "9.7p1")
(source
(origin
(method url-fetch)
- (uri (string-append "mirror://openbsd/OpenSSH/portable/"
- "openssh-" version ".tar.gz"))
+ ;; (uri (string-append "mirror://openbsd/OpenSSH/portable/"
+ ;; "openssh-" version ".tar.gz"))
+ (uri "http://www.mindrot.org/openssh_snap/openssh-SNAP-20240309.tar.gz")
(patches (search-patches "openssh-trust-guix-store-directory.patch"
;; Can be removed with next openssh update
;; https://issues.guix.gnu.org/67948#2
- "openssh-gcc-13-ppc64le-fzero-call-used-regs.patch"))
+ ;"openssh-gcc-13-ppc64le-fzero-call-used-regs.patch"
+ ))
(sha256
- (base32 "0z3pgam8b4z05lvdb78iv06p204qwl7b94a3cnnwba2mfb0120li"))))
+ (base32 "0fifdqagic75nb01p56pn5b3yjxrwcxvgx04jvr9zj6mmg5zwff0"))))
(build-system gnu-build-system)
(arguments
(list
base-commit: 09346fd05f19da3846635e1a0f1c844050d59f26
--
2.41.0
Information forwarded
to
guix-patches <at> gnu.org
:
bug#69659
; Package
guix-patches
.
(Mon, 11 Mar 2024 15:25:01 GMT)
Full text and
rfc822 format available.
Message #11 received at 69659 <at> debbugs.gnu.org (full text, mbox):
retitle gnu: openssh: Update to 9.7p1.
thanks
Hi Guix,
The pre-release testing [0] didn't turn up any obvious problems, and 9.7p1
has now been released [1], so here's the patch to update to that version
that I believe should be ready for inclusing in Guix. My reading of the
release notes indicates that this is a bugfix/feature relase without
security fixes.
Best,
Jack
[0] https://issues.guix.gnu.org/69659#0
[1] https://www.openssh.com/txt/release-9.7
Jack Hill (1):
gnu: openssh: Update to 9.7p1.
gnu/local.mk | 1 -
...-gcc-13-ppc64le-fzero-call-used-regs.patch | 61 -------------------
gnu/packages/ssh.scm | 9 +--
3 files changed, 3 insertions(+), 68 deletions(-)
delete mode 100644 gnu/packages/patches/openssh-gcc-13-ppc64le-fzero-call-used-regs.patch
base-commit: 09346fd05f19da3846635e1a0f1c844050d59f26
--
2.41.0
Changed bug title to 'gnu: openssh: Update to 9.7p1.' from '[PATCH 0/1] Work In Progress: openssh 9.7p1'
Request was from
Jack Hill <jackhill <at> jackhill.us>
to
control <at> debbugs.gnu.org
.
(Mon, 11 Mar 2024 15:28:02 GMT)
Full text and
rfc822 format available.
Information forwarded
to
guix-patches <at> gnu.org
:
bug#69659
; Package
guix-patches
.
(Mon, 11 Mar 2024 15:30:02 GMT)
Full text and
rfc822 format available.
Message #16 received at 69659 <at> debbugs.gnu.org (full text, mbox):
* gnu/packages/ssh.scm (openssh): Update to 9.7p1
[source]: Remove openssh-gcc-13-ppc64le-fzero-call-used-regs.patch'.
* gnu/packages/patches/openssh-gcc-13-ppc64le-fzero-call-used-regs.patch:
Delete file.
* gnu/packages/local.mk (dist_patch_DATA): Remove it.
Change-Id: Ia13c32869afa6c964770243ecacf5a3ce473e5e2
---
gnu/local.mk | 1 -
...-gcc-13-ppc64le-fzero-call-used-regs.patch | 61 -------------------
gnu/packages/ssh.scm | 9 +--
3 files changed, 3 insertions(+), 68 deletions(-)
delete mode 100644 gnu/packages/patches/openssh-gcc-13-ppc64le-fzero-call-used-regs.patch
diff --git a/gnu/local.mk b/gnu/local.mk
index 16241ee441..3673523e40 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1762,7 +1762,6 @@ dist_patch_DATA = \
%D%/packages/patches/openjdk-15-xcursor-no-dynamic.patch \
%D%/packages/patches/openjdk-21-fix-rpath.patch \
%D%/packages/patches/openmpi-mtl-priorities.patch \
- %D%/packages/patches/openssh-gcc-13-ppc64le-fzero-call-used-regs.patch \
%D%/packages/patches/openssh-trust-guix-store-directory.patch \
%D%/packages/patches/openresolv-restartcmd-guix.patch \
%D%/packages/patches/openrgb-unbundle-hueplusplus.patch \
diff --git a/gnu/packages/patches/openssh-gcc-13-ppc64le-fzero-call-used-regs.patch b/gnu/packages/patches/openssh-gcc-13-ppc64le-fzero-call-used-regs.patch
deleted file mode 100644
index 1af9868b9a..0000000000
--- a/gnu/packages/patches/openssh-gcc-13-ppc64le-fzero-call-used-regs.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From 1036d77b34a5fa15e56f516b81b9928006848cbd Mon Sep 17 00:00:00 2001
-From: Damien Miller <djm <at> 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
----
-
-Taken from upsteam, and for Guix by jackhill <at> jackhill.us
-Thanks Marcel van der Boom for noticing: https://issues.guix.gnu.org/67948#2
-
-m4/openssh.m4 | 12 +++++++++---
- 1 file changed, 9 insertions(+), 3 deletions(-)
-
-diff --git a/m4/openssh.m4 b/m4/openssh.m4
-index 5d4c56280..033df501c 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.41.0
-
diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm
index d53d8d59e7..ff39aea9ba 100644
--- a/gnu/packages/ssh.scm
+++ b/gnu/packages/ssh.scm
@@ -198,18 +198,15 @@ (define-public libssh2
(define-public openssh
(package
(name "openssh")
- (version "9.6p1")
+ (version "9.7p1")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://openbsd/OpenSSH/portable/"
"openssh-" version ".tar.gz"))
- (patches (search-patches "openssh-trust-guix-store-directory.patch"
- ;; Can be removed with next openssh update
- ;; https://issues.guix.gnu.org/67948#2
- "openssh-gcc-13-ppc64le-fzero-call-used-regs.patch"))
+ (patches (search-patches "openssh-trust-guix-store-directory.patch"))
(sha256
- (base32 "0z3pgam8b4z05lvdb78iv06p204qwl7b94a3cnnwba2mfb0120li"))))
+ (base32 "1z9zfw7ndibxwprazlkv1isrh1yplczdin5cziijfanqcvvjc129"))))
(build-system gnu-build-system)
(arguments
(list
base-commit: 09346fd05f19da3846635e1a0f1c844050d59f26
--
2.41.0
Reply sent
to
Ludovic Courtès <ludo <at> gnu.org>
:
You have taken responsibility.
(Fri, 05 Apr 2024 16:22:04 GMT)
Full text and
rfc822 format available.
Notification sent
to
Jack Hill <jackhill <at> jackhill.us>
:
bug acknowledged by developer.
(Fri, 05 Apr 2024 16:22:04 GMT)
Full text and
rfc822 format available.
Message #21 received at 69659-done <at> debbugs.gnu.org (full text, mbox):
Hi Jack,
Jack Hill <jackhill <at> jackhill.us> skribis:
> The pre-release testing [0] didn't turn up any obvious problems, and
> 9.7p1 has now been released [1], so here's the patch to update to that
> version that I believe should be ready for inclusing in Guix. My
> reading of the release notes indicates that this is a bugfix/feature
> relase without security fixes.
>
> Best,
> Jack
>
> [0] https://issues.guix.gnu.org/69659#0
> [1] https://www.openssh.com/txt/release-9.7
>
> Jack Hill (1):
> gnu: openssh: Update to 9.7p1.
Finally applied. Thanks for the patch and for your careful checks!
Ludo’.
bug archived.
Request was from
Debbugs Internal Request <help-debbugs <at> gnu.org>
to
internal_control <at> debbugs.gnu.org
.
(Sat, 04 May 2024 11:24:12 GMT)
Full text and
rfc822 format available.
This bug report was last modified 12 days ago.
Previous Next
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997,2003 nCipher Corporation Ltd,
1994-97 Ian Jackson.