GNU logs - #68212, boring messages

Message sent to marcel@HIDDEN, john.kehayias@HIDDEN, efraim@HIDDEN, guix-patches@HIDDEN:

Subject: [bug#68212] [PATCH] gnu: openssh: fix build one ppc64le.
Resent-From: Jack Hill <jackhill@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: marcel@HIDDEN, john.kehayias@HIDDEN, efraim@HIDDEN, guix-patches@HIDDEN
Resent-Date: Tue, 02 Jan 2024 16:54:01 +0000
Resent-Message-ID: <handler.68212.B.170421443710388 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
To: 68212 <at> debbugs.gnu.org
Cc: Marcel van der Boom <marcel@HIDDEN>, John Kehayias <john.kehayias@HIDDEN>, Efraim Flashner <efraim@HIDDEN>
From: Jack Hill <jackhill@HIDDEN>
Date: Tue,  2 Jan 2024 11:53:28 -0500
Message-ID: <0d64ed54ae7b8a0984e10b1be2f98257fe95377f.1704214408.git.jackhill@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Received-SPF: pass client-ip=104.248.1.95; envelope-from=jackhill@HIDDEN;
 helo=minsky.hcoop.net
X-Spam_score_int: -18
X-Spam_score: -1.9
X-Spam_bar: -
X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_NONE=0.001,
 SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no
X-Spam_action: no action
X-Spam-Score: 0.9 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -0.1 (/)

* gnu/packages/ssh.scm (openssh)[source]:
Use 'openssh-gcc-13-ppc64le-fzero-call-used-regs.patch'.
* gnu/packages/patches/openssh-gcc-13-ppc64le-fzero-call-used-regs.patch:
New file.
* gnu/local.mk (dist_patch_DATA): Add it.

Reported by Marcel van der Boom <marcel@HIDDEN>.

Change-Id: I41b1350b2cdd1487a8fd69b13b64f63c0dc166c9
---
 gnu/local.mk                                  |  1 +
 ...-gcc-13-ppc64le-fzero-call-used-regs.patch | 61 +++++++++++++++++++
 gnu/packages/ssh.scm                          |  5 +-
 3 files changed, 66 insertions(+), 1 deletion(-)
 create 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 4b2393bfdd..b52134e34e 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1735,6 +1735,7 @@ 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
new file mode 100644
index 0000000000..1af9868b9a
--- /dev/null
+++ b/gnu/packages/patches/openssh-gcc-13-ppc64le-fzero-call-used-regs.patch
@@ -0,0 +1,61 @@
+From 1036d77b34a5fa15e56f516b81b9928006848cbd Mon Sep 17 00:00:00 2001
+From: Damien Miller <djm@HIDDEN>
+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@HIDDEN
+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 0b364bbe90..e33a18f408 100644
--- a/gnu/packages/ssh.scm
+++ b/gnu/packages/ssh.scm
@@ -204,7 +204,10 @@ (define-public openssh
       (method url-fetch)
       (uri (string-append "mirror://openbsd/OpenSSH/portable/"
                           "openssh-" version ".tar.gz"))
-      (patches (search-patches "openssh-trust-guix-store-directory.patch"))
+      (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"))
       (sha256
        (base32 "0z3pgam8b4z05lvdb78iv06p204qwl7b94a3cnnwba2mfb0120li"))))
    (build-system gnu-build-system)

base-commit: 8f03c69b428923dc4d51cda23b10aa7fa7d89f05
-- 
2.41.0

Message sent:

Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-Mailer: MIME-tools 5.505 (Entity 5.505)
Content-Type: text/plain; charset=utf-8
X-Loop: help-debbugs@HIDDEN
From: help-debbugs@HIDDEN (GNU bug Tracking System)
To: Jack Hill <jackhill@HIDDEN>
Subject: bug#68212: Acknowledgement ([PATCH] gnu: openssh: fix build one
 ppc64le.)
Message-ID: <handler.68212.B.170421443710388.ack <at> debbugs.gnu.org>
References: <0d64ed54ae7b8a0984e10b1be2f98257fe95377f.1704214408.git.jackhill@HIDDEN>
X-Gnu-PR-Message: ack 68212
X-Gnu-PR-Package: guix-patches
X-Gnu-PR-Keywords: patch
Reply-To: 68212 <at> debbugs.gnu.org
Date: Tue, 02 Jan 2024 16:54:01 +0000

Thank you for filing a new bug report with debbugs.gnu.org.

This is an automatically generated reply to let you know your message
has been received.

Your message is being forwarded to the package maintainers and other
interested parties for their attention; they will reply in due course.

As you requested using X-Debbugs-CC, your message was also forwarded to
  Marcel van der Boom <marcel@HIDDEN>, John Kehayias <john.kehayia=
s@HIDDEN>, Efraim Flashner <efraim@HIDDEN>
(after having been given a bug report number, if it did not have one).

Your message has been sent to the package maintainer(s):
 guix-patches@HIDDEN

If you wish to submit further information on this problem, please
send it to 68212 <at> debbugs.gnu.org.

Please do not send mail to help-debbugs@HIDDEN unless you wish
to report a problem with the Bug-tracking system.

--=20
68212: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D68212
GNU Bug Tracking System
Contact help-debbugs@HIDDEN with problems

Message sent to marcel@HIDDEN, john.kehayias@HIDDEN, efraim@HIDDEN, guix-patches@HIDDEN:

Subject: [bug#68212] [PATCH v2] gnu: openssh: fix build on ppc64le.
References: <0d64ed54ae7b8a0984e10b1be2f98257fe95377f.1704214408.git.jackhill@HIDDEN>
In-Reply-To: <0d64ed54ae7b8a0984e10b1be2f98257fe95377f.1704214408.git.jackhill@HIDDEN>
Resent-From: Jack Hill <jackhill@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: marcel@HIDDEN, john.kehayias@HIDDEN, efraim@HIDDEN, guix-patches@HIDDEN
Resent-Date: Tue, 02 Jan 2024 16:56:01 +0000
Resent-Message-ID: <handler.68212.B68212.170421452410557 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
To: 68212 <at> debbugs.gnu.org
Cc: Marcel van der Boom <marcel@HIDDEN>, John Kehayias <john.kehayias@HIDDEN>, Efraim Flashner <efraim@HIDDEN>
From: Jack Hill <jackhill@HIDDEN>
Date: Tue,  2 Jan 2024 11:54:46 -0500
Message-ID: <0b1513509acb7ae7215cc50e9222494ba9cb3075.1704214486.git.jackhill@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Precedence: list
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>

* gnu/packages/ssh.scm (openssh)[source]:
Use 'openssh-gcc-13-ppc64le-fzero-call-used-regs.patch'.
* gnu/packages/patches/openssh-gcc-13-ppc64le-fzero-call-used-regs.patch:
New file.
* gnu/local.mk (dist_patch_DATA): Add it.

Reported by Marcel van der Boom <marcel@HIDDEN>.

Change-Id: I41b1350b2cdd1487a8fd69b13b64f63c0dc166c9
---

v2: fix typo in commit message

 gnu/local.mk                                  |  1 +
 ...-gcc-13-ppc64le-fzero-call-used-regs.patch | 61 +++++++++++++++++++
 gnu/packages/ssh.scm                          |  5 +-
 3 files changed, 66 insertions(+), 1 deletion(-)
 create 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 4b2393bfdd..b52134e34e 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1735,6 +1735,7 @@ 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
new file mode 100644
index 0000000000..1af9868b9a
--- /dev/null
+++ b/gnu/packages/patches/openssh-gcc-13-ppc64le-fzero-call-used-regs.patch
@@ -0,0 +1,61 @@
+From 1036d77b34a5fa15e56f516b81b9928006848cbd Mon Sep 17 00:00:00 2001
+From: Damien Miller <djm@HIDDEN>
+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@HIDDEN
+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 0b364bbe90..e33a18f408 100644
--- a/gnu/packages/ssh.scm
+++ b/gnu/packages/ssh.scm
@@ -204,7 +204,10 @@ (define-public openssh
       (method url-fetch)
       (uri (string-append "mirror://openbsd/OpenSSH/portable/"
                           "openssh-" version ".tar.gz"))
-      (patches (search-patches "openssh-trust-guix-store-directory.patch"))
+      (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"))
       (sha256
        (base32 "0z3pgam8b4z05lvdb78iv06p204qwl7b94a3cnnwba2mfb0120li"))))
    (build-system gnu-build-system)

base-commit: 8f03c69b428923dc4d51cda23b10aa7fa7d89f05
-- 
2.41.0

Message received at control <at> debbugs.gnu.org:

Received: (at control) by debbugs.gnu.org; 2 Jan 2024 16:56:20 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Tue Jan 02 11:56:19 2024
Received: from localhost ([127.0.0.1]:51131 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1rKi3v-0002ln-Lc
	for submit <at> debbugs.gnu.org; Tue, 02 Jan 2024 11:56:19 -0500
Received: from minsky.hcoop.net ([104.248.1.95]:37456)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <jackhill@HIDDEN>) id 1rKi3t-0002lY-3O
 for control <at> debbugs.gnu.org; Tue, 02 Jan 2024 11:56:17 -0500
Received: from 071-069-176-211.res.spectrum.com ([71.69.176.211]
 helo=[172.31.7.167])
 by minsky.hcoop.net with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.92) (envelope-from <jackhill@HIDDEN>)
 id 1rKi3l-0002Uc-Bn
 for control <at> debbugs.gnu.org; Tue, 02 Jan 2024 11:56:09 -0500
Date: Tue, 2 Jan 2024 11:56:08 -0500 (EST)
From: Jack Hill <jackhill@HIDDEN>
To: control <at> debbugs.gnu.org
Subject: typo fix 
Message-ID: <f3aed768-0e7b-3d32-80cb-e2ed0f3e8a04@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; format=flowed; charset=US-ASCII
X-Spam-Score: -0.0 (/)
X-Debbugs-Envelope-To: control
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

retitle 68212 [PATCH] gnu: openssh: fix build on ppc64le.

Message sent:

MIME-Version: 1.0
X-Mailer: MIME-tools 5.505 (Entity 5.505)
X-Loop: help-debbugs@HIDDEN
From: help-debbugs@HIDDEN (GNU bug Tracking System)
To: Jack Hill <jackhill@HIDDEN>
Subject: bug#68212: closed ([PATCH] gnu: openssh: fix build on ppc64le.)
CC: tracker <at> debbugs.gnu.org
Message-ID: <handler.68212.D68212.17055112854833.ackdone <at> debbugs.gnu.org>
References: <f9de675e-4fc4-c48f-9ae1-7a4c0288daca@HIDDEN>
 <0d64ed54ae7b8a0984e10b1be2f98257fe95377f.1704214408.git.jackhill@HIDDEN>
X-Gnu-PR-Message: closed 68212
X-Gnu-PR-Package: guix-patches
X-Gnu-PR-Keywords: patch
Date: Wed, 17 Jan 2024 17:09:02 +0000
Content-Type: multipart/mixed; boundary="----------=_1705511342-4922-0"

This is a multi-part message in MIME format...

------------=_1705511342-4922-0
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain; charset=utf-8

Your message dated Wed, 17 Jan 2024 12:07:54 -0500 (EST)
with message-id <f9de675e-4fc4-c48f-9ae1-7a4c0288daca@HIDDEN>
and subject line Re: [bug#68212] [PATCH v2] gnu: openssh: fix build on ppc6=
4le.
has caused the debbugs.gnu.org bug report #68212,
regarding [PATCH] gnu: openssh: fix build on ppc64le.
to be marked as done.

(If you believe you have received this mail in error, please contact
help-debbugs@HIDDEN)


--=20
68212: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D68212
GNU Bug Tracking System
Contact help-debbugs@HIDDEN with problems

------------=_1705511342-4922-0
Content-Type: message/rfc822
Content-Disposition: inline
Content-Transfer-Encoding: 7bit

Received: (at submit) by debbugs.gnu.org; 2 Jan 2024 16:53:57 +0000
Received: from localhost ([127.0.0.1]:51115 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1rKi1c-0002hQ-E9
	for submit <at> debbugs.gnu.org; Tue, 02 Jan 2024 11:53:57 -0500
Received: from lists.gnu.org ([2001:470:142::17]:38636)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <jackhill@HIDDEN>) id 1rKi1Y-0002h7-Dh
 for submit <at> debbugs.gnu.org; Tue, 02 Jan 2024 11:53:56 -0500
Received: from eggs.gnu.org ([2001:470:142:3::10])
 by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <jackhill@HIDDEN>)
 id 1rKi1P-0000Vt-RB
 for guix-patches@HIDDEN; Tue, 02 Jan 2024 11:53:43 -0500
Received: from minsky.hcoop.net ([104.248.1.95])
 by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <jackhill@HIDDEN>)
 id 1rKi1N-00029h-S1
 for guix-patches@HIDDEN; Tue, 02 Jan 2024 11:53:43 -0500
Received: from lib-its13.lib.duke.edu ([152.3.118.151]
 helo=localhost.localdomain)
 by minsky.hcoop.net with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.92) (envelope-from <jackhill@HIDDEN>)
 id 1rKi1M-0002K3-CY
 for guix-patches@HIDDEN; Tue, 02 Jan 2024 11:53:40 -0500
From: Jack Hill <jackhill@HIDDEN>
To: guix-patches@HIDDEN
Subject: [PATCH] gnu: openssh: fix build one ppc64le.
Date: Tue,  2 Jan 2024 11:53:28 -0500
Message-ID: <0d64ed54ae7b8a0984e10b1be2f98257fe95377f.1704214408.git.jackhill@HIDDEN>
X-Mailer: git-send-email 2.41.0
MIME-Version: 1.0
X-Debbugs-Cc: Marcel van der Boom <marcel@HIDDEN>,
 John Kehayias <john.kehayias@HIDDEN>,
 Efraim Flashner <efraim@HIDDEN>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Received-SPF: pass client-ip=104.248.1.95; envelope-from=jackhill@HIDDEN;
 helo=minsky.hcoop.net
X-Spam_score_int: -18
X-Spam_score: -1.9
X-Spam_bar: -
X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_NONE=0.001,
 SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no
X-Spam_action: no action
X-Spam-Score: 0.9 (/)
X-Debbugs-Envelope-To: submit
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -0.1 (/)

* gnu/packages/ssh.scm (openssh)[source]:
Use 'openssh-gcc-13-ppc64le-fzero-call-used-regs.patch'.
* gnu/packages/patches/openssh-gcc-13-ppc64le-fzero-call-used-regs.patch:
New file.
* gnu/local.mk (dist_patch_DATA): Add it.

Reported by Marcel van der Boom <marcel@HIDDEN>.

Change-Id: I41b1350b2cdd1487a8fd69b13b64f63c0dc166c9
---
 gnu/local.mk                                  |  1 +
 ...-gcc-13-ppc64le-fzero-call-used-regs.patch | 61 +++++++++++++++++++
 gnu/packages/ssh.scm                          |  5 +-
 3 files changed, 66 insertions(+), 1 deletion(-)
 create 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 4b2393bfdd..b52134e34e 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1735,6 +1735,7 @@ 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
new file mode 100644
index 0000000000..1af9868b9a
--- /dev/null
+++ b/gnu/packages/patches/openssh-gcc-13-ppc64le-fzero-call-used-regs.patch
@@ -0,0 +1,61 @@
+From 1036d77b34a5fa15e56f516b81b9928006848cbd Mon Sep 17 00:00:00 2001
+From: Damien Miller <djm@HIDDEN>
+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@HIDDEN
+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 0b364bbe90..e33a18f408 100644
--- a/gnu/packages/ssh.scm
+++ b/gnu/packages/ssh.scm
@@ -204,7 +204,10 @@ (define-public openssh
       (method url-fetch)
       (uri (string-append "mirror://openbsd/OpenSSH/portable/"
                           "openssh-" version ".tar.gz"))
-      (patches (search-patches "openssh-trust-guix-store-directory.patch"))
+      (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"))
       (sha256
        (base32 "0z3pgam8b4z05lvdb78iv06p204qwl7b94a3cnnwba2mfb0120li"))))
    (build-system gnu-build-system)

base-commit: 8f03c69b428923dc4d51cda23b10aa7fa7d89f05
-- 
2.41.0




------------=_1705511342-4922-0
Content-Type: message/rfc822
Content-Disposition: inline
Content-Transfer-Encoding: 7bit

Received: (at 68212-done) by debbugs.gnu.org; 17 Jan 2024 17:08:05 +0000
Received: from localhost ([127.0.0.1]:53190 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1rQ9OW-0001Ft-UP
	for submit <at> debbugs.gnu.org; Wed, 17 Jan 2024 12:08:05 -0500
Received: from minsky.hcoop.net ([104.248.1.95]:35168)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <jackhill@HIDDEN>) id 1rQ9OV-0001Ew-E8
 for 68212-done <at> debbugs.gnu.org; Wed, 17 Jan 2024 12:08:03 -0500
Received: from 071-069-176-211.res.spectrum.com ([71.69.176.211]
 helo=mimolette.local)
 by minsky.hcoop.net with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.92) (envelope-from <jackhill@HIDDEN>)
 id 1rQ9ON-000318-Ft; Wed, 17 Jan 2024 12:07:55 -0500
Date: Wed, 17 Jan 2024 12:07:54 -0500 (EST)
From: Jack Hill <jackhill@HIDDEN>
To: 68212-done <at> debbugs.gnu.org
Subject: Re: [bug#68212] [PATCH v2] gnu: openssh: fix build on ppc64le.
In-Reply-To: <0b1513509acb7ae7215cc50e9222494ba9cb3075.1704214486.git.jackhill@HIDDEN>
Message-ID: <f9de675e-4fc4-c48f-9ae1-7a4c0288daca@HIDDEN>
References: <0d64ed54ae7b8a0984e10b1be2f98257fe95377f.1704214408.git.jackhill@HIDDEN>
 <0b1513509acb7ae7215cc50e9222494ba9cb3075.1704214486.git.jackhill@HIDDEN>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="8323328-10513996-1705511275=:2096"
X-Spam-Score: -0.0 (/)
X-Debbugs-Envelope-To: 68212-done
Cc: John Kehayias <john.kehayias@HIDDEN>,
 =?ISO-8859-15?Q?Ludovic_Court=E8s?= <ludo@HIDDEN>,
 Marcel van der Boom <marcel@HIDDEN>,
 Efraim Flashner <efraim@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

  This message is in MIME format.  The first part should be readable text,
  while the remaining parts are likely unreadable without MIME-aware tools.

--8323328-10513996-1705511275=:2096
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Transfer-Encoding: 8BIT

This was applied to master by Ludo’ in 
ef270f9d73203c1b19c6163ce4d4257a52bfb605

Thanks and closing!

Best,
Jack
--8323328-10513996-1705511275=:2096--


------------=_1705511342-4922-0--

Message sent:

MIME-Version: 1.0
X-Mailer: MIME-tools 5.505 (Entity 5.505)
X-Loop: help-debbugs@HIDDEN
From: help-debbugs@HIDDEN (GNU bug Tracking System)
To: Jack Hill <jackhill@HIDDEN>
Subject: bug#68212: closed (Re: [bug#68212] [PATCH v2] gnu: openssh: fix
 build on ppc64le.)
Message-ID: <handler.68212.D68212.17055112854833.notifdone <at> debbugs.gnu.org>
References: <f9de675e-4fc4-c48f-9ae1-7a4c0288daca@HIDDEN>
 <0d64ed54ae7b8a0984e10b1be2f98257fe95377f.1704214408.git.jackhill@HIDDEN>
X-Gnu-PR-Message: they-closed 68212
X-Gnu-PR-Package: guix-patches
X-Gnu-PR-Keywords: patch
Reply-To: 68212 <at> debbugs.gnu.org
Date: Wed, 17 Jan 2024 17:09:02 +0000
Content-Type: multipart/mixed; boundary="----------=_1705511342-4922-1"

This is a multi-part message in MIME format...

------------=_1705511342-4922-1
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain; charset="utf-8"

Your bug report

#68212: [PATCH] gnu: openssh: fix build on ppc64le.

which was filed against the guix-patches package, has been closed.

The explanation is attached below, along with your original report.
If you require more details, please reply to 68212 <at> debbugs.gnu.org.

--=20
68212: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D68212
GNU Bug Tracking System
Contact help-debbugs@HIDDEN with problems

------------=_1705511342-4922-1
Content-Type: message/rfc822
Content-Disposition: inline
Content-Transfer-Encoding: 7bit

Received: (at 68212-done) by debbugs.gnu.org; 17 Jan 2024 17:08:05 +0000
Received: from localhost ([127.0.0.1]:53190 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1rQ9OW-0001Ft-UP
	for submit <at> debbugs.gnu.org; Wed, 17 Jan 2024 12:08:05 -0500
Received: from minsky.hcoop.net ([104.248.1.95]:35168)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <jackhill@HIDDEN>) id 1rQ9OV-0001Ew-E8
 for 68212-done <at> debbugs.gnu.org; Wed, 17 Jan 2024 12:08:03 -0500
Received: from 071-069-176-211.res.spectrum.com ([71.69.176.211]
 helo=mimolette.local)
 by minsky.hcoop.net with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.92) (envelope-from <jackhill@HIDDEN>)
 id 1rQ9ON-000318-Ft; Wed, 17 Jan 2024 12:07:55 -0500
Date: Wed, 17 Jan 2024 12:07:54 -0500 (EST)
From: Jack Hill <jackhill@HIDDEN>
To: 68212-done <at> debbugs.gnu.org
Subject: Re: [bug#68212] [PATCH v2] gnu: openssh: fix build on ppc64le.
In-Reply-To: <0b1513509acb7ae7215cc50e9222494ba9cb3075.1704214486.git.jackhill@HIDDEN>
Message-ID: <f9de675e-4fc4-c48f-9ae1-7a4c0288daca@HIDDEN>
References: <0d64ed54ae7b8a0984e10b1be2f98257fe95377f.1704214408.git.jackhill@HIDDEN>
 <0b1513509acb7ae7215cc50e9222494ba9cb3075.1704214486.git.jackhill@HIDDEN>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="8323328-10513996-1705511275=:2096"
X-Spam-Score: -0.0 (/)
X-Debbugs-Envelope-To: 68212-done
Cc: John Kehayias <john.kehayias@HIDDEN>,
 =?ISO-8859-15?Q?Ludovic_Court=E8s?= <ludo@HIDDEN>,
 Marcel van der Boom <marcel@HIDDEN>,
 Efraim Flashner <efraim@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

  This message is in MIME format.  The first part should be readable text,
  while the remaining parts are likely unreadable without MIME-aware tools.

--8323328-10513996-1705511275=:2096
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Transfer-Encoding: 8BIT

This was applied to master by Ludo’ in 
ef270f9d73203c1b19c6163ce4d4257a52bfb605

Thanks and closing!

Best,
Jack
--8323328-10513996-1705511275=:2096--


------------=_1705511342-4922-1
Content-Type: message/rfc822
Content-Disposition: inline
Content-Transfer-Encoding: 7bit

Received: (at submit) by debbugs.gnu.org; 2 Jan 2024 16:53:57 +0000
Received: from localhost ([127.0.0.1]:51115 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1rKi1c-0002hQ-E9
	for submit <at> debbugs.gnu.org; Tue, 02 Jan 2024 11:53:57 -0500
Received: from lists.gnu.org ([2001:470:142::17]:38636)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <jackhill@HIDDEN>) id 1rKi1Y-0002h7-Dh
 for submit <at> debbugs.gnu.org; Tue, 02 Jan 2024 11:53:56 -0500
Received: from eggs.gnu.org ([2001:470:142:3::10])
 by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <jackhill@HIDDEN>)
 id 1rKi1P-0000Vt-RB
 for guix-patches@HIDDEN; Tue, 02 Jan 2024 11:53:43 -0500
Received: from minsky.hcoop.net ([104.248.1.95])
 by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <jackhill@HIDDEN>)
 id 1rKi1N-00029h-S1
 for guix-patches@HIDDEN; Tue, 02 Jan 2024 11:53:43 -0500
Received: from lib-its13.lib.duke.edu ([152.3.118.151]
 helo=localhost.localdomain)
 by minsky.hcoop.net with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.92) (envelope-from <jackhill@HIDDEN>)
 id 1rKi1M-0002K3-CY
 for guix-patches@HIDDEN; Tue, 02 Jan 2024 11:53:40 -0500
From: Jack Hill <jackhill@HIDDEN>
To: guix-patches@HIDDEN
Subject: [PATCH] gnu: openssh: fix build one ppc64le.
Date: Tue,  2 Jan 2024 11:53:28 -0500
Message-ID: <0d64ed54ae7b8a0984e10b1be2f98257fe95377f.1704214408.git.jackhill@HIDDEN>
X-Mailer: git-send-email 2.41.0
MIME-Version: 1.0
X-Debbugs-Cc: Marcel van der Boom <marcel@HIDDEN>,
 John Kehayias <john.kehayias@HIDDEN>,
 Efraim Flashner <efraim@HIDDEN>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Received-SPF: pass client-ip=104.248.1.95; envelope-from=jackhill@HIDDEN;
 helo=minsky.hcoop.net
X-Spam_score_int: -18
X-Spam_score: -1.9
X-Spam_bar: -
X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_NONE=0.001,
 SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no
X-Spam_action: no action
X-Spam-Score: 0.9 (/)
X-Debbugs-Envelope-To: submit
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -0.1 (/)

* gnu/packages/ssh.scm (openssh)[source]:
Use 'openssh-gcc-13-ppc64le-fzero-call-used-regs.patch'.
* gnu/packages/patches/openssh-gcc-13-ppc64le-fzero-call-used-regs.patch:
New file.
* gnu/local.mk (dist_patch_DATA): Add it.

Reported by Marcel van der Boom <marcel@HIDDEN>.

Change-Id: I41b1350b2cdd1487a8fd69b13b64f63c0dc166c9
---
 gnu/local.mk                                  |  1 +
 ...-gcc-13-ppc64le-fzero-call-used-regs.patch | 61 +++++++++++++++++++
 gnu/packages/ssh.scm                          |  5 +-
 3 files changed, 66 insertions(+), 1 deletion(-)
 create 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 4b2393bfdd..b52134e34e 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1735,6 +1735,7 @@ 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
new file mode 100644
index 0000000000..1af9868b9a
--- /dev/null
+++ b/gnu/packages/patches/openssh-gcc-13-ppc64le-fzero-call-used-regs.patch
@@ -0,0 +1,61 @@
+From 1036d77b34a5fa15e56f516b81b9928006848cbd Mon Sep 17 00:00:00 2001
+From: Damien Miller <djm@HIDDEN>
+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@HIDDEN
+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 0b364bbe90..e33a18f408 100644
--- a/gnu/packages/ssh.scm
+++ b/gnu/packages/ssh.scm
@@ -204,7 +204,10 @@ (define-public openssh
       (method url-fetch)
       (uri (string-append "mirror://openbsd/OpenSSH/portable/"
                           "openssh-" version ".tar.gz"))
-      (patches (search-patches "openssh-trust-guix-store-directory.patch"))
+      (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"))
       (sha256
        (base32 "0z3pgam8b4z05lvdb78iv06p204qwl7b94a3cnnwba2mfb0120li"))))
    (build-system gnu-build-system)

base-commit: 8f03c69b428923dc4d51cda23b10aa7fa7d89f05
-- 
2.41.0




------------=_1705511342-4922-1--

Message sent to guix-patches@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: [bug#68212] [PATCH v2] gnu: openssh: fix build on ppc64le.
Resent-From: Marcel van der Boom <marcel@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Thu, 18 Jan 2024 09:23:01 +0000
Resent-Message-ID: <handler.68212.B68212.17055697434121 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 68212
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: Jack Hill <jackhill@HIDDEN>
Cc: John Kehayias <john.kehayias@HIDDEN>, 68212 <at> debbugs.gnu.org, Ludovic =?UTF-8?Q?Court=C3=A8s?= <ludo@HIDDEN>, Efraim Flashner <efraim@HIDDEN>
Received: via spool by 68212-submit <at> debbugs.gnu.org id=B68212.17055697434121
          (code B ref 68212); Thu, 18 Jan 2024 09:23:01 +0000
Received: (at 68212) by debbugs.gnu.org; 18 Jan 2024 09:22:23 +0000
Received: from localhost ([127.0.0.1]:54344 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1rQObO-00014P-Nb
	for submit <at> debbugs.gnu.org; Thu, 18 Jan 2024 04:22:23 -0500
Received: from read.hsdev.com ([2001:19f0:5001:2902:5400:1ff:feeb:c9ab]:35752)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <marcel@HIDDEN>) id 1rQObM-00014A-AD
 for 68212 <at> debbugs.gnu.org; Thu, 18 Jan 2024 04:22:21 -0500
Received: from hsdev.com (router2.hsdev.com [213.125.12.138])
 by read.hsdev.com (Postfix) with ESMTPA id 0005220DB3;
 Thu, 18 Jan 2024 10:22:10 +0100 (CET)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=van-der-boom.nl;
 s=202103; t=1705569732;
 h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
 to:to:cc:cc:mime-version:mime-version:content-type:content-type:
 content-transfer-encoding:content-transfer-encoding:
 in-reply-to:in-reply-to:references:references:openpgp:openpgp;
 bh=OgNOwYcxfl3R0bJrvA5rYHz3+s0aehyabimS+p+oJpI=;
 b=r0ltWBZqIp23uK3L0IBs16cSitiTXQTRkvWrW3JsmOaJo07CMyQz5umu4HwoMLBYps62n4
 0SXGIQs2aVPXYVlii3yziQoMAXbtdicdIJuOQj8Zeh58Jj50IWxaCzIP9OkY/dEOl1A3lY
 Bd1g2TOWG/mmjWO+80iYD6Tn6199XAY=
Received: from changeme.hsdev.com (localhost [127.0.0.1])
 by hsdev.com (Postfix) with ESMTP id 70AF836BE700;
 Thu, 18 Jan 2024 10:22:10 +0100 (CET)
From: Marcel van der Boom <marcel@HIDDEN>
In-Reply-To: <f9de675e-4fc4-c48f-9ae1-7a4c0288daca@HIDDEN> (Jack Hill's
 message of "Wed, 17 Jan 2024 12:07:54 -0500 (EST)")
References: <0d64ed54ae7b8a0984e10b1be2f98257fe95377f.1704214408.git.jackhill@HIDDEN>
 <0b1513509acb7ae7215cc50e9222494ba9cb3075.1704214486.git.jackhill@HIDDEN>
 <f9de675e-4fc4-c48f-9ae1-7a4c0288daca@HIDDEN>
User-Agent: mu4e 1.11.26; emacs 30.0.50
OpenPGP: id=235E5C8CF5E8DFFB;
 url="https://keys.openpgp.org/vks/v1/by-fingerprint/77DDA1B68D04792A8F85D855235E5C8CF5E8DFFB";
 preference=signencrypt
Date: Thu, 18 Jan 2024 10:22:10 +0100
Message-ID: <874jfb9et9.fsf@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Transfer-Encoding: quoted-printable
X-Spam-Score: -0.00
X-Spam-Score: -0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)


This still fails for me, and apparently also on the build farm:

https://ci.guix.gnu.org/build/3266550/details

if I am reading it properly that build is after the described=20
patch. The log has the same error as I have locally when building=20
openssh

Interestingly, since the openssh release I have this in my=20
manifest which *succeeds* in building openssh:


(define-public openssh-next
  (let ((xcommit "1036d77b34a5fa15e56f516b81b9928006848cbd"))
    (package
     (inherit openssh)
     (name "openssh-next")
     (version "9.6p1-1")
     (native-inputs
      (list autoconf
            automake
            pkg-config))
     (source
      (origin
       (method git-fetch)
       (uri (git-reference
             (url=20
             "https://github.com/openssh/openssh-portable.git")
             (commit xcommit)))
       (file-name (git-file-name name version))
       (patches (search-patches=20
       "openssh-trust-guix-store-directory.patch"))
       (sha256
        (base32=20
        "1sary1ig972l4zjvpzncf9whfp5ab8snff2fw9sy5a8pda5n2a7w")))))))

This just refers to the commit that holds the patch, so in theory=20
it should be the same as the applied patch, no?

Am I overlooking something?



[Jack Hill]:
> This was applied to master by Ludo=E2=80=99 in=20
> ef270f9d73203c1b19c6163ce4d4257a52bfb605

> Thanks and closing!

> Best,
> Jack

--
Marcel van der Boom =E2=86=92 marcel@HIDDEN

Message received at fakecontrol@fakecontrolmessage:

Received: (at fakecontrol) by fakecontrolmessage;
To: internal_control <at> debbugs.gnu.org
From: Debbugs Internal Request <help-debbugs@HIDDEN>
Subject: Internal Control
Message-Id: Did not alter fixed versions and reopened.
Date: Mon, 29 Jan 2024 07:53:02 +0000
User-Agent: Fakemail v42.6.9

# This is a fake control message.
#
# The action:
# Did not alter fixed versions and reopened.
thanks
# This fakemail brought to you by your local debbugs
# administrator

Message received at control <at> debbugs.gnu.org:

Received: (at control) by debbugs.gnu.org; 29 Jan 2024 18:00:45 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Mon Jan 29 13:00:45 2024
Received: from localhost ([127.0.0.1]:33404 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1rUVw4-0006CE-2n
	for submit <at> debbugs.gnu.org; Mon, 29 Jan 2024 13:00:44 -0500
Received: from read.hsdev.com ([2001:19f0:5001:2902:5400:1ff:feeb:c9ab]:57898)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <marcel@HIDDEN>) id 1rULA3-0000ga-Fz
 for control <at> debbugs.gnu.org; Mon, 29 Jan 2024 01:30:28 -0500
Received: from hsdev.com (router2.hsdev.com [213.125.12.138])
 by read.hsdev.com (Postfix) with ESMTPA id E1CD920FF9
 for <control <at> debbugs.gnu.org>; Mon, 29 Jan 2024 07:30:12 +0100 (CET)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hsdev.com; s=201906;
 t=1706509812;
 h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
 to:to:cc; bh=sJKVtcTbJsUg80JRM+M3+saHH2kP1GAdEQ53p7w4zvE=;
 b=eXNTrYInw2ECwSDBc/FbHFTNQ1IzQ5SIwxcRkHTb9Wp8y0XV2nva12ZKxjy+7iBLyxocQH
 QKQmdMMN21F71e/cWZKBxjooGcY5qt2B/+THw4NWrsedEnuL8cXdYyfbSkx+7XZiA2UDBk
 WKj1A5pIf8u2ND2zlwM7oiTisl/PJL8=
Received: from changeme.hsdev.com (localhost [127.0.0.1])
 by hsdev.com (Postfix) with ESMTP id 746A036BE758
 for <control <at> debbugs.gnu.org>; Mon, 29 Jan 2024 07:30:12 +0100 (CET)
Date: Mon, 29 Jan 2024 07:30:12 +0100
Message-Id: <87frygfy8b.fsf@HIDDEN>
To: control <at> debbugs.gnu.org
From: Marcel van der Boom <marcel@HIDDEN>
Subject: control message for bug #68212
X-Spam-Score: -0.87
X-Spam-Score: -0.0 (/)
X-Debbugs-Envelope-To: control
X-Mailman-Approved-At: Mon, 29 Jan 2024 13:00:43 -0500
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

reopen 68212
tags 68212 - fixed patch
quit

Last modified: Mon, 29 Jan 2024 18:15:01 UTC

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997 nCipher Corporation Ltd, 1994-97 Ian Jackson.