From patchwork Mon Mar 11 15:28:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jack Hill X-Patchwork-Id: 61668 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 159EA27BBEA; Mon, 11 Mar 2024 15:29:58 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 2D25127BBE2 for ; Mon, 11 Mar 2024 15:29:57 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rjhar-0003ze-Of; Mon, 11 Mar 2024 11:29:37 -0400 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 ) id 1rjhak-0003xk-6O for guix-patches@gnu.org; Mon, 11 Mar 2024 11:29:30 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rjhai-0005ES-UK for guix-patches@gnu.org; Mon, 11 Mar 2024 11:29:28 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rjhbG-0001y7-QF for guix-patches@gnu.org; Mon, 11 Mar 2024 11:30:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#69659] [PATCH v2] gnu: openssh: Update to 9.7p1. Resent-From: Jack Hill Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 11 Mar 2024 15:30:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 69659 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 69659@debbugs.gnu.org Received: via spool by 69659-submit@debbugs.gnu.org id=B69659.17101709427346 (code B ref 69659); Mon, 11 Mar 2024 15:30:02 +0000 Received: (at 69659) by debbugs.gnu.org; 11 Mar 2024 15:29:02 +0000 Received: from localhost ([127.0.0.1]:41070 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rjhaH-0001uK-E9 for submit@debbugs.gnu.org; Mon, 11 Mar 2024 11:29:01 -0400 Received: from minsky.hcoop.net ([104.248.1.95]:45682) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rjhaF-0001u5-1p for 69659@debbugs.gnu.org; Mon, 11 Mar 2024 11:28:59 -0400 Received: from [2603:6080:a200:1c76::19a] (helo=mimolette.home.eronel.org) by minsky.hcoop.net with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1rjhZb-0003tY-Sn for 69659@debbugs.gnu.org; Mon, 11 Mar 2024 11:28:19 -0400 From: Jack Hill Date: Mon, 11 Mar 2024 11:28:09 -0400 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: <38cbe2cb-ed6f-a991-3faa-fc2f2140f00f@jackhill.us> References: <38cbe2cb-ed6f-a991-3faa-fc2f2140f00f@jackhill.us> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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 base-commit: 09346fd05f19da3846635e1a0f1c844050d59f26 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 -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@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