From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id eFfeGpuxOWeYRgEAe85BDQ:P1 (envelope-from ) for ; Sun, 17 Nov 2024 09:04:27 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id eFfeGpuxOWeYRgEAe85BDQ (envelope-from ) for ; Sun, 17 Nov 2024 10:04:27 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=jksaHuRi; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=PpTu7zIz; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=gmail.com (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1731834267; h=from:from:sender:sender: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:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=ro8vVzPcfKMxBJoUX5o/ycEe5oZdQ3vPpQXT7YeoRbE=; b=gIwDAGBKyO8UBSo/ZRo7GglQtXodUP4sdIY76LsJn3vSA3OOJ9mX4T1tLesMbDCgZzMezu 6Jv/CtA3l6hKvPLACP2QolMKoucgOPhlLayTk/4ayFljEufOpS4zGuP+MP3bBuGEaKFj3V VCZvbRc0bULfxw9YW4pLOzbmZHDeWxfKGlAqgTb7SFQGX7bWQMFirnUb6+1Aifj6FNa6FF 4QCbgBOmuA3PnErILCo/edPRLFp7Xg5BWRyed4hUWiDZ0v7Lqz/rGyP6fi0xH7Y68rvsVc R1BKGQAJ7LD9sb59xJXXvU43GtfDKU0rhqs7bReYZHGutAQiFUymCtuKcv/bnw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1731834267; a=rsa-sha256; cv=none; b=HgS53nxHkjH+4Or18kriaQEOIEF0n1u4R3MfStEmofRT0FuVzKy8N3SXoyiyDHgcLQep+n Z4pf/45kxVXPzMQfvltoHrSvG7D8AIVc6YkiH//QunaINeyng2kOuTuH/UlobC3y6mGDXF acJPD8DYZbBblNZwW5ItSM5ZtPVLKMa+0Kf8t70r5P1JeAe5KEQ+OsaclQNfEyY1xXod92 ZiND7kbYB3MGAYQf9Is2JUUL4RXxGyN5iDHp+nROv+HCtWGs2CWvKPu8dgRP58hlgTlNi7 ETVzNwbrLYa0gJieHn+5wa1XfQFmvERzUtI+rSqNpH/vOdbt37ePkYQj2qWU0A== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=jksaHuRi; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=PpTu7zIz; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=gmail.com (policy=none) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 04C8955AA for ; Sun, 17 Nov 2024 10:04:26 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tCbCO-0001zH-F6; Sun, 17 Nov 2024 04:04:04 -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 ) id 1tCbCN-0001uY-Bx for guix-patches@gnu.org; Sun, 17 Nov 2024 04:04:03 -0500 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 1tCbCN-0008PN-3H for guix-patches@gnu.org; Sun, 17 Nov 2024 04:04:03 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=ro8vVzPcfKMxBJoUX5o/ycEe5oZdQ3vPpQXT7YeoRbE=; b=jksaHuRiw0TDWXiPrcmzAvkvIyaufF6lnZcaaziRoAQFjwmfwCgGschVfBac6uBlcXBbUvVacMWpxtHqq4xTe7DN4jDg6Qp6n9LU6TF75n5U9TGNbXLMM9/HoEQkGZbmUTKj3wszFVhAGTKQEEej7tji2zCYcp0azVe8mI+rifApkfHclxhl+fi4dVNVjOV298VTejz8pdToe9Ozz2qI0vuaD4Cji9+VZi+QjsUgXjsdWmP0r8gDSdtdIVYfdi73hjzpRwSRzJERWpC41bOPwn29g82s3XN7dN7e6hzsKsGGx6Bl/6gOs2n59NvBdEF6NjWMMnZGhnQ/MvoGq4cx+A==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tCbCM-0006jz-UK for guix-patches@gnu.org; Sun, 17 Nov 2024 04:04:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74391] [PATCH 2/2] gnu: sslh: Use GEXPs. Resent-From: "Artyom V. Poptsov" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 17 Nov 2024 09:04:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74391 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74391@debbugs.gnu.org Cc: "Artyom V. Poptsov" Received: via spool by 74391-submit@debbugs.gnu.org id=B74391.173183422625875 (code B ref 74391); Sun, 17 Nov 2024 09:04:02 +0000 Received: (at 74391) by debbugs.gnu.org; 17 Nov 2024 09:03:46 +0000 Received: from localhost ([127.0.0.1]:55886 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tCbC5-0006jG-S4 for submit@debbugs.gnu.org; Sun, 17 Nov 2024 04:03:46 -0500 Received: from mail-lf1-f44.google.com ([209.85.167.44]:41776) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tCbC3-0006is-Ix for 74391@debbugs.gnu.org; Sun, 17 Nov 2024 04:03:44 -0500 Received: by mail-lf1-f44.google.com with SMTP id 2adb3069b0e04-53b13eae3b3so416518e87.3 for <74391@debbugs.gnu.org>; Sun, 17 Nov 2024 01:03:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1731834157; x=1732438957; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ro8vVzPcfKMxBJoUX5o/ycEe5oZdQ3vPpQXT7YeoRbE=; b=PpTu7zIzupGYy82oRn2hLmfCPUQcLp8yXgz5DVNbFNLIBzyA6+mZmNdppG4LD60Q0b 23JtL1VLc/SGMjYYusvv0FO0/jqQyRR0kcNV8+xHSuliheHUqRdynADTMU/wKsO7y4f1 PInc0nXfaQLe5/LFfpWS6U0/GTK8ZysvXqyHFtS8Fex5mh7XMBL2WulNxHJ92ZcF4cSm OR0g5nSI1CkU+sZLsj59xuU/PomtCcLbxfHCJsHbXAIdyy6RAm74d41+wehij8hGNiZK 9URwWqpHluyOGlx9jINnJyTlsCfs6rAKzR6FU9sPAXUoWlxp7CtPW1hJd/A/p0Xu67YS 3Kxg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1731834157; x=1732438957; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ro8vVzPcfKMxBJoUX5o/ycEe5oZdQ3vPpQXT7YeoRbE=; b=BjGDN1xfHRFoYlFQXdHJMKMU+8rEivCM2zu/2GwDUJGfbsFW0iMqUQwwZdYQuEJM6U 5Jv9nOo3+/su4DiB2vykwQjXpzPW20Gxj49XmsvdmMsATbF8KhR/wo+8Zo+BLD62Y4kb OrTI3MEL5RVc6h5lzv0SLPDogYauS0nIOVs39fh8uNlA0oIMVJGwOm2dUw0IBwtJ+gUC Vi1PpLoyPvTJyMqcbpMatY55ZmhxxhtCqPZH+EJ0w25srZe92Gn5ncmF2AlPBZHsoHHP F2WnpcdpuLiQcjHiATLkn0LOdFjc/YLdSZhUPH2waijO7c19IHtM0EfTyCIOAGVX58ZY dI3A== X-Gm-Message-State: AOJu0YwuonnoJ+lI6yvisjKRbpPrM3A1oXVehsLdTkzstXVVeI988eo3 wGoeI15I62NqwXeG+mGY01mqsTEEkEJOVuHtKnnPG493pYxM7H+y5YaMtXBa X-Google-Smtp-Source: AGHT+IHGwumZX+1TXhbCKCRgzoPYCjSEg5TxjfrY+JKx/h74HAF/2GddReQtjvIwCtCejKhSTpBVlA== X-Received: by 2002:a05:6512:ac6:b0:53d:a209:43b2 with SMTP id 2adb3069b0e04-53dab2a6b4bmr1049412e87.7.1731834157260; Sun, 17 Nov 2024 01:02:37 -0800 (PST) Received: from elephant.. ([95.79.23.50]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-53da64f2a49sm1211177e87.19.2024.11.17.01.02.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 Nov 2024 01:02:35 -0800 (PST) From: "Artyom V. Poptsov" Date: Sun, 17 Nov 2024 12:02:27 +0300 Message-ID: <2924c8c2d1d1ee64f90867729d837724edf98119.1731833680.git.poptsov.artyom@gmail.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: -0.30 X-Spam-Score: -0.30 X-Migadu-Queue-Id: 04C8955AA X-Migadu-Scanner: mx13.migadu.com X-TUID: GTh7v/LivDR4 * gnu/packages/networking.scm (sslh): Use GEXPs. Change-Id: I5b31afdfeb1f1f9b2e5f86290adc405f3a90a367 --- gnu/packages/networking.scm | 61 ++++++++++++++++++------------------- 1 file changed, 29 insertions(+), 32 deletions(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 091ed06d3d..6017654866 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -2740,38 +2740,35 @@ (define-public sslh (inputs (list libev libconfig pcre)) (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'check 'fix-tests - (lambda _ - (substitute* "t" - ;; XXX: Disable a failing test. - (("my \\$DROP_CNX = 1;") - "my $DROP_CNX = 0;") - ;; XXX: "sslh-select" seems to not support this option for some - ;; reason. According to "sslhconf.cfg" this option just overrides the - ;; verbosity configuration so it seems that we can safely drop it. - (("-v 4") - "")) - (substitute* "test.cfg" - ;; The Guix build environment lacks ‘ip4-localhost’. - (("ip4-localhost") "localhost")) - #t)) - ;; Many of these files are mentioned in the man page. Install them. - (add-after 'install 'install-documentation - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (doc (string-append out "/share/doc/sslh"))) - (install-file "README.md" doc) - (for-each - (lambda (file) - (install-file file (string-append doc "/examples"))) - (append (find-files "." "\\.cfg") - (find-files "scripts")))) - #t))) - #:make-flags (list ,(string-append "CC=" (cc-for-target)) - "USELIBCONFIG=1" - (string-append "PREFIX=" (assoc-ref %outputs "out"))) + (list #:phases + #~(modify-phases %standard-phases + (add-before 'check 'fix-tests + (lambda _ + (substitute* "t" + ;; XXX: Disable a failing test. + (("my \\$DROP_CNX = 1;") + "my $DROP_CNX = 0;") + ;; XXX: "sslh-select" seems to not support this option for some + ;; reason. According to "sslhconf.cfg" this option just overrides the + ;; verbosity configuration so it seems that we can safely drop it. + (("-v 4") + "")) + (substitute* "test.cfg" + ;; The Guix build environment lacks ‘ip4-localhost’. + (("ip4-localhost") "localhost")))) + ;; Many of these files are mentioned in the man page. Install them. + (add-after 'install 'install-documentation + (lambda _ + (let* ((doc (string-append #$output "/share/doc/sslh"))) + (install-file "README.md" doc) + (for-each + (lambda (file) + (install-file file (string-append doc "/examples"))) + (append (find-files "." "\\.cfg") + (find-files "scripts"))))))) + #:make-flags #~(list (string-append "CC=" #$(cc-for-target)) + "USELIBCONFIG=1" + (string-append "PREFIX=" #$output)) #:test-target "test")) (home-page "https://www.rutschle.net/tech/sslh/README.html") (synopsis "Applicative network protocol demultiplexer") -- 2.46.0