From patchwork Sat Apr 12 14:41:47 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 41609 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 1A94A27BC4B; Sat, 12 Apr 2025 15:43:28 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL, RCVD_IN_VALIDITY_SAFE,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 5292927BC49 for ; Sat, 12 Apr 2025 15:43:26 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u3c4c-0006kU-Pb; Sat, 12 Apr 2025 10:43:10 -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 1u3c4a-0006jx-SG for guix-patches@gnu.org; Sat, 12 Apr 2025 10:43:08 -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 1u3c4W-0000VU-1g for guix-patches@gnu.org; Sat, 12 Apr 2025 10:43:07 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:Subject; bh=5oozq8Je9KsXCtFFz0SJqvdbzgc6njC2LuoxeHKxiEU=; b=UaItDAIEW9LkPlUxrPhNLHF3sMEz0MK8ZGa5eWY2ZOhtKgSgnnQr6OQ3SIsZ9eFrMvD2amhBXDZD8HUxIlKnrDXmP2bcMxkdtk3FVD4otb2dxQU6s7cMchdcRxcfO1Pf2ZkeHBu3PaheTyQGz3IF1Lv+YHruml7xoNBpoJ/RTrq2oSLkvM57+sbJ1OhLAeZ0EpX9AxrX3lh0zpqGGXbChsGOxMDSImh+GsHK7qi7xxwAz8+FX1HiwQ0GhOJEF6re04k4cuwt3Q9ydjTex83EVHvzGCYCMkAMEBEEoSEhZlFKXPZqZg5ib3ljiYGrDgjUb5HYv1bioHoIXE/NdKCA/w==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1u3c4V-00066s-SN for guix-patches@gnu.org; Sat, 12 Apr 2025 10:43:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77765] [PATCH core-updates] gnu: socat: Update to 1.8.0.3 and enable tests. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 12 Apr 2025 14:43:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 77765 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 77765@debbugs.gnu.org Cc: Maxim Cournoyer X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.174446895423199 (code B ref -1); Sat, 12 Apr 2025 14:43:03 +0000 Received: (at submit) by debbugs.gnu.org; 12 Apr 2025 14:42:34 +0000 Received: from localhost ([127.0.0.1]:57579 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u3c3x-00061V-D5 for submit@debbugs.gnu.org; Sat, 12 Apr 2025 10:42:33 -0400 Received: from lists.gnu.org ([2001:470:142::17]:43792) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1u3c3u-00060F-DC for submit@debbugs.gnu.org; Sat, 12 Apr 2025 10:42:28 -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 1u3c3m-0006gQ-Qw for guix-patches@gnu.org; Sat, 12 Apr 2025 10:42:20 -0400 Received: from mail-pf1-x434.google.com ([2607:f8b0:4864:20::434]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u3c3h-0000Qg-Na for guix-patches@gnu.org; Sat, 12 Apr 2025 10:42:16 -0400 Received: by mail-pf1-x434.google.com with SMTP id d2e1a72fcca58-739b3fe7ce8so2731080b3a.0 for ; Sat, 12 Apr 2025 07:42:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1744468931; x=1745073731; darn=gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=5oozq8Je9KsXCtFFz0SJqvdbzgc6njC2LuoxeHKxiEU=; b=WuvchEbwPsEiCaeRCx3RUHhU4xZfr1vbRXEg4od4ZRab90fpWVRjF5AvyJzqhnADLi /pfnj3bUJkhzw6m9bYAQNzbRA02OhH3/gwyP43T8Mi0I/YWLFBBYqZXJ9+4is4tDffu8 q7W4hkMHV8rzz179R1zheua+UvbAl2Uzs8g0YdEJqWeL7IoZmHou4M0jUGzPYTCJ3hLs umPm0LPc+guGpWDKX4CFl/JRsTobM2oUOMLwDJNLX6veP9Xs1wpf/rrdnm36jcUFtgte PKNPlKO7AfPQKMwZX3ebSVIqBxKIeRRSHmbWXEhO2D5DCRRt+EPcBUK7swJPdMgnKROb MFpg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744468931; x=1745073731; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=5oozq8Je9KsXCtFFz0SJqvdbzgc6njC2LuoxeHKxiEU=; b=lrx+Oke6+HLM4S2NUUqE4FrSfVrJXNdpVEXbH3jx8frGqGiaq08/xd0UU851DLs5zb GmdnVRhh/2qd1Jgxx4qZLtOb71PJOS+um0hvy3y3SWfWYXbcMMEA/4QcjQojfXgGmVIT Maj3jXwGpLXyTr2ACb9FgtPgSCYRIdkh0Js/YTJ7I1j6zhMT/UMLiPxFv+Ntogoaikr+ JoOa3LLPtenBE+Gu09rQ149WG1KSaXnlgVsTiIn+bm/pUd25vbJxEBdAxiUl9c8QuvUZ yGMb5jUB3CxoPHCqY/FqIOPdAc1r137ZvEiNtnsapPCI1ISEJHlnjmetkKNWZshcHH0S N4Nw== X-Gm-Message-State: AOJu0YzKN5jOsq5opEC91PVbtNby9DssNBDJJFlRqCn5pHKYNmCjejQI 3Qn1OLR76HGbX5yiCHpPnwN5vljIhsXRc6ofQzTi3KS0RXG4lUcGu78aCg== X-Gm-Gg: ASbGncuCnCLWmOqq2CM20+tzcXXTbKPj38v9Vwuwin9otuYDYRjY7H91nau/KfVmN8J ddfwFRhNoKSHrbUZvJm5N1JYFxdSX01BG1Z82ZyXoGIZu3/QZSNgRWiHatd6FZPb8Uh45Cq8cyu JKlJk+/9VVsjqiO/f9HkWKs345Co87fM6O/yw9nJQpjmtLjjjx6VXFz/KYkcnFPA3frTYhPWvjD oVjLYomcF3RI3SpZkl1QzHZ5B8JYehXnRAAO3bPaUKMy34LjWMLNSjj2mjeUy3Z/gf0Lebbrw7k HPG3FLlyAm0F7hXfzNdGEIq29Hc1pCvrRkaTto5xacUcK0uKqkwXPJGcozz2 X-Google-Smtp-Source: AGHT+IH9ekBsA1cH9SFe+DcVS1yRAte7C99JgPUsevcyLS6KO+bJJ1X7d2tvgwf2h8fYfjStWoEIDQ== X-Received: by 2002:a05:6a21:3a96:b0:1f5:9961:c40 with SMTP id adf61e73a8af0-2017978aa88mr10476813637.8.1744468931290; Sat, 12 Apr 2025 07:42:11 -0700 (PDT) Received: from localhost.localdomain ([2405:6586:be0:0:83c8:d31d:2cec:f542]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-b02a2d39624sm5525539a12.59.2025.04.12.07.42.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 12 Apr 2025 07:42:10 -0700 (PDT) From: Maxim Cournoyer Date: Sat, 12 Apr 2025 23:41:47 +0900 Message-ID: X-Mailer: git-send-email 2.49.0 MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::434; envelope-from=maxim.cournoyer@gmail.com; helo=mail-pf1-x434.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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/networking.scm (socat): Update to 1.8.0.3. [arguments]: Remove #:tests? and add #:test-target, #:make-flags and #:phases. [native-inputs]: New field. Change-Id: Ice251af89ce1757aeb17c70debfcf38515fac1e8 --- gnu/packages/networking.scm | 41 +++++++++++++++++++++++++++++++++---- 1 file changed, 37 insertions(+), 4 deletions(-) base-commit: e839cd1108626a6db6c47915f0efa4ab41c6a01c diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index caff01e1b9..9f8449954f 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -26,7 +26,7 @@ ;;; Copyright © 2018, 2020-2022 Marius Bakke ;;; Copyright © 2018, 2020, 2021, 2022 Oleg Pykhalov ;;; Copyright © 2018 Pierre Neidhardt -;;; Copyright © 2019, 2020, 2021, 2022, 2023, 2024 Maxim Cournoyer +;;; Copyright © 2019-2025 Maxim Cournoyer ;;; Copyright © 2019 Vasile Dumitrascu ;;; Copyright © 2019 Julien Lepiller ;;; Copyright © 2019 Timotej Lazar @@ -1234,7 +1234,7 @@ (define-public pproxy (define-public socat (package (name "socat") - (version "1.7.4.4") + (version "1.8.0.3") (source (origin (method url-fetch) (uri (string-append @@ -1242,9 +1242,42 @@ (define-public socat version ".tar.bz2")) (sha256 (base32 - "1b40ccdvxq5kaghsbwg4q3dq5aw4acw1bpqvs3v3ljp5y392pm7v")))) + "1580dbns45ibs171bx1dz6mkyfj6wichp10yjjkb6nyrc5rh3sq1")))) (build-system gnu-build-system) - (arguments '(#:tests? #f)) ; no test suite + (arguments + (list + #:make-flags + #~(list (string-append "SHELL=" + (search-input-file %build-inputs "bin/sh"))) + #:test-target "test" + #:phases #~(modify-phases %standard-phases + (add-after 'unpack 'patch-commands + (lambda _ + (substitute* "test.sh" + (("/bin/rm") + (which "rm")) + (("/usr/bin/env") + (which "env")) + (("/sbin/ifconfig") + (which "ifconfig"))))) + (add-after 'unpack 'disable-problematic-tests + (lambda _ + ;; Wholly skip tests 418 and 503, which fail + ;; non-deterministically. + (invoke "sed" + "-e" "/NAME=ABSTRACT_USER/{n;s/$TESTS/SKIP/}" + "-e" "/NAME=SYSTEM_SIGINT/{n;s/$TESTS/SKIP/}" + "-i" "test.sh") + (substitute* "Makefile.in" + (("./test.sh") + (string-append + "./test.sh --expect-fail " + (string-join + '("228,467,468" ;requires /etc/services + "478" ;pkill: only one pattern can be provided + "528") ;requires tty + ","))))))))) + (native-inputs (list net-tools procps)) (inputs (list openssl readline)) (home-page "http://www.dest-unreach.org/socat/") (synopsis