From unknown Tue Jun 17 20:10:56 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#63150 <63150@debbugs.gnu.org> To: bug#63150 <63150@debbugs.gnu.org> Subject: Status: quilt tests fail Reply-To: bug#63150 <63150@debbugs.gnu.org> Date: Wed, 18 Jun 2025 03:10:56 +0000 retitle 63150 quilt tests fail reassign 63150 guix submitter 63150 Jack Hill severity 63150 normal tag 63150 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Fri Apr 28 11:00:45 2023 Received: (at submit) by debbugs.gnu.org; 28 Apr 2023 15:00:45 +0000 Received: from localhost ([127.0.0.1]:34222 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1psPaW-0006O5-Rq for submit@debbugs.gnu.org; Fri, 28 Apr 2023 11:00:45 -0400 Received: from lists.gnu.org ([209.51.188.17]:52104) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1psPaU-0006Nw-KO for submit@debbugs.gnu.org; Fri, 28 Apr 2023 11:00:43 -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 1psPaU-0004rG-Bq for bug-guix@gnu.org; Fri, 28 Apr 2023 11:00:42 -0400 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 ) id 1psPaS-0000cp-LI for bug-guix@gnu.org; Fri, 28 Apr 2023 11:00:42 -0400 Received: from marsh.hcoop.net ([45.55.52.66]) by minsky.hcoop.net with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1psPaR-0004ZB-7s for bug-guix@gnu.org; Fri, 28 Apr 2023 11:00:39 -0400 Date: Fri, 28 Apr 2023 11:00:39 -0400 (EDT) From: Jack Hill X-X-Sender: jackhill@marsh.hcoop.net To: bug-guix@gnu.org Subject: quilt tests fail Message-ID: User-Agent: Alpine 2.21 (DEB 202 2017-01-01) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="925712948-129912897-1682694039=:331" Received-SPF: pass client-ip=104.248.1.95; envelope-from=jackhill@jackhill.us; 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: -1.4 (-) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.4 (--) This message is in MIME format. The first part should be readable text, while the remaining parts are likely unreadable without MIME-aware tools. --925712948-129912897-1682694039=:331 Content-Type: text/plain; format=flowed; charset=UTF-8 Content-Transfer-Encoding: 8BIT Hi Guix, The check phase or quilt (below) currently fails (guix commit aecc6e70587f8412cbbb9b2c13141de4f534518e). Maybe something with newer grep from core-updates? I'm not sure yet (which is why there is no patch 😁). ``` starting phase `check' [add-filename-check.test] 6 commands (6 passed, 0 failed) [altered-series.test] 12 commands (12 passed, 0 failed) [annotate.test] 31 commands (31 passed, 0 failed) [applied.test] 15 commands (15 passed, 0 failed) [auto-refresh.test] 14 commands (14 passed, 0 failed) [backup-files.test] 119 commands (119 passed, 0 failed) [colon-in-patch-name.test] 23 commands (23 passed, 0 failed) [comments.test] 11 commands (11 passed, 0 failed) [conflicts.test] 39 commands (39 passed, 0 failed) [create-delete.test] [4] $ mkdir patches -- ok [6] $ echo delete > delete -- ok [7] $ quilt new test.diff -- ok [10] $ quilt add create -- ok [13] $ echo create > create -- ok [14] $ quilt refresh -- ok [17] $ quilt add delete -- ok [20] $ rm -f delete -- ok [21] $ quilt refresh -- ok [23] $ quilt header -r -- ok [31] $ quilt patches -v create -- ok [33] $ quilt patches delete -- ok [36] $ quilt pop -q -- ok [40] $ quilt patches create -- ok [42] $ quilt patches -v delete -- ok [44] $ quilt patches -- /dev/null dev/null null --- -- failed grep: warning: stray \ before / != ~ grep: warning: stray \ before / != ~ grep: warning: stray \ before / != ~ [46] $ echo create > create -- ok [47] $ rm -f delete -- ok [48] $ patch -p1 --dry-run < patches/test.diff -- ok 19 commands (18 passed, 1 failed) make: *** [Makefile:411: test/.create-delete.ok] Error 1 ``` Best, Jack --925712948-129912897-1682694039=:331-- From debbugs-submit-bounces@debbugs.gnu.org Sat Apr 29 04:23:24 2023 Received: (at 63150) by debbugs.gnu.org; 29 Apr 2023 08:23:24 +0000 Received: from localhost ([127.0.0.1]:35188 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1psfrX-0000OE-P5 for submit@debbugs.gnu.org; Sat, 29 Apr 2023 04:23:24 -0400 Received: from jpoiret.xyz ([206.189.101.64]:33196) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1psfrS-0000O3-Gf for 63150@debbugs.gnu.org; Sat, 29 Apr 2023 04:23:22 -0400 Received: from authenticated-user (jpoiret.xyz [206.189.101.64]) by jpoiret.xyz (Postfix) with ESMTPA id 85D97184F1E; Sat, 29 Apr 2023 08:23:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jpoiret.xyz; s=dkim; t=1682756596; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=GxX4+wB/1nT02AlFU76tUY32BRK9FvtP4XrlYwbIYCE=; b=iJMFo6SPY0CmkTZVyRqzYW3vji0WaJ0Pl2xUw/sjjoJQ9GJfsbXZg9BXuDGzBwHDuIAtHE sfsdq/w8uKXFaFgCmGm2X7/2VrrMPzyzamFpxp4UxldVx67wPhvgUXarHM5CYqxc8uNNdr a0rTBEbDhGG5+DPF7WmFnJC3Y9MRGFbU/tmlAaFj5hAOCvu1nWimLd1x+rwZ0Jve+YVlM0 /SZLfyHOf7Ii9s+DgTPQr/RLcx8lOR5oYYazhx46Bo4QeQv3U6CcU5Eijzgq6LzI2V0F9J nljaThT+33JDJ92pKwb9PGDObvHjk5mhg4+tBSD2KLNKRUbzRflqTzSTyz4x7Q== From: Josselin Poiret To: Jack Hill , 63150@debbugs.gnu.org Subject: Re: bug#63150: quilt tests fail In-Reply-To: References: Date: Sat, 29 Apr 2023 10:23:11 +0200 Message-ID: <87leibdrm8.fsf@jpoiret.xyz> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spamd-Bar: -- Authentication-Results: jpoiret.xyz; auth=pass smtp.auth=jpoiret@jpoiret.xyz smtp.mailfrom=dev@jpoiret.xyz X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 63150 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.0 (/) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Hi Jack, Jack Hill writes: > The check phase or quilt (below) currently fails (guix commit=20 > aecc6e70587f8412cbbb9b2c13141de4f534518e). Maybe something with newer gre= p=20 > from core-updates? I'm not sure yet (which is why there is no patch =F0= =9F=98=81). > [...] > [44] $ quilt patches -- /dev/null dev/null null --- -- failed > grep: warning: stray \ before / !=3D ~ Yes, apparently grep 3.8 now warns when characters that don't need to be escaped are, since it is UB according to POSIX. Maybe quilt has resolved the issue upstream and needs to be updated? Best, =2D-=20 Josselin Poiret --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQHEBAEBCgAuFiEEOSSM2EHGPMM23K8vUF5AuRYXGooFAmRM0+8QHGRldkBqcG9p cmV0Lnh5egAKCRBQXkC5FhcairCQDACgKerGrIp6eynbWtjfwJfrQRgl9S9oK6ZI VCygJVxpoewYuyTmjbMk6kX+IQSTv3keWaKFCBhHzs9EJHMgKKBHofECs6kalr5i BwIFbcTlgagAzkZX6w/vWItwnynTYRtgzJeUtX9yF9WyKuG5Qc/GaN8X48ezN+V6 E+PG9xMvoEcMw7/4s5knygblMW8R/HMyDTdQ/7DyXY6D3TfxQfj8YRzhDWTM2KhN cIebSAE9fOPwm/4YvhsVDo4GjqaLC4TZb8mqDWSQUc5NQIb0O2X+n3LVbHHOomfs MvKFtB3qz4jwtFBbh57E5a8V2xshLefGvF/9ViHU4GoFZ3tITj5QK4EAEdWyTglb mNl8MggDb5nS0dFaGuar4MZELEH0ODXiaZpclgsZwxKfvq6cH262TOjltt5tqis5 guMoI2DA+xLkqlBCrT0OCROw61Zk9rVWZHI12CRzzEvzdONUh2LA4BfXhzfRYli4 Wj/6jnhwnS0RzRAgXSjANemUwHtz05E= =JLoJ -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Sun Apr 30 06:28:26 2023 Received: (at 63150) by debbugs.gnu.org; 30 Apr 2023 10:28:26 +0000 Received: from localhost ([127.0.0.1]:37289 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pt4I6-00082D-5m for submit@debbugs.gnu.org; Sun, 30 Apr 2023 06:28:26 -0400 Received: from mx1.polytechnique.org ([129.104.30.34]:43095) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pt4I4-000824-9G for 63150@debbugs.gnu.org; Sun, 30 Apr 2023 06:28:24 -0400 Received: from ubik (unknown [106.47.199.105]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ssl.polytechnique.org (Postfix) with ESMTPSA id 5984C5646D8 for <63150@debbugs.gnu.org>; Sun, 30 Apr 2023 12:28:20 +0200 (CEST) From: Maze To: 63150@debbugs.gnu.org Date: Sun, 30 Apr 2023 18:28:12 +0800 Message-ID: <875y9dekar.fsf@pkbd.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-AV-Checked: ClamAV using ClamSMTP at svoboda.polytechnique.org (Sun Apr 30 12:28:22 2023 +0200 (CEST)) X-Spam-Flag: No, tests=bogofilter, spamicity=0.029699, queueID=8D0005646D5 X-Spam-Score: 3.5 (+++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Guix distributes quilt version 0.66, there is a version 0.67 that quilt released as a tarball in 2022 but this version still has the bug in its test suite as it relates to the latest grep. I just tried, at the time of writing the HEAD (as cloned) of the git repo of quilt successfully goes through the check target of its Makefile. Content analysis details: (3.5 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 3.6 RCVD_IN_SBL_CSS RBL: Received via a relay in Spamhaus SBL-CSS [106.47.199.105 listed in zen.spamhaus.org] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [129.104.30.34 listed in wl.mailspike.net] -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at https://www.dnswl.org/, medium trust [129.104.30.34 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.2 HEADER_FROM_DIFFERENT_DOMAINS From and EnvelopeFrom 2nd level mail domains are different 0.0 RCVD_IN_MSPIKE_WL Mailspike good senders 1.8 MISSING_SUBJECT Missing Subject: header 0.2 NO_SUBJECT Extra score for no subject X-Debbugs-Envelope-To: 63150 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 2.5 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Guix distributes quilt version 0.66, there is a version 0.67 that quilt released as a tarball in 2022 but this version still has the bug in its test suite as it relates to the latest grep. I just tried, at the time of writing the HEAD (as cloned) of the git repo of quilt successfully goes through the check target of its Makefile. Content analysis details: (2.5 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [129.104.30.34 listed in wl.mailspike.net] 3.6 RCVD_IN_SBL_CSS RBL: Received via a relay in Spamhaus SBL-CSS [106.47.199.105 listed in zen.spamhaus.org] -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at https://www.dnswl.org/, medium trust [129.104.30.34 listed in list.dnswl.org] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record 0.2 HEADER_FROM_DIFFERENT_DOMAINS From and EnvelopeFrom 2nd level mail domains are different 0.0 RCVD_IN_MSPIKE_WL Mailspike good senders 1.8 MISSING_SUBJECT Missing Subject: header 0.2 NO_SUBJECT Extra score for no subject -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager Guix distributes quilt version 0.66, there is a version 0.67 that quilt released as a tarball in 2022 but this version still has the bug in its test suite as it relates to the latest grep. I just tried, at the time of writing the HEAD (as cloned) of the git repo of quilt successfully goes through the check target of its Makefile. I got it through: git clone https://git.savannah.nongnu.org/git/quilt.git And I completed the make check with their commit: c1ce964f3e9312100a60f03c1e1fdd601e1911f2 I have a dire need for quilt to build in guix because I use netcat-openbsd a lot. For practical reasons, it would be much better (for me) if a fix could hit the master branch quickly. Buf if not... well, I suppose this can be worked around with a special quilt and a special netcat-openbsd package. From debbugs-submit-bounces@debbugs.gnu.org Sun Apr 30 08:34:36 2023 Received: (at 63150) by debbugs.gnu.org; 30 Apr 2023 12:34:36 +0000 Received: from localhost ([127.0.0.1]:37431 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pt6GB-0005vj-GI for submit@debbugs.gnu.org; Sun, 30 Apr 2023 08:34:36 -0400 Received: from jpoiret.xyz ([206.189.101.64]:60646) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pt6G7-0005vS-Aj for 63150@debbugs.gnu.org; Sun, 30 Apr 2023 08:34:34 -0400 Received: from authenticated-user (jpoiret.xyz [206.189.101.64]) by jpoiret.xyz (Postfix) with ESMTPA id 17148184D70; Sun, 30 Apr 2023 12:34:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jpoiret.xyz; s=dkim; t=1682858069; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=+vlh7lC5wN/mXfPDy02hnNSatEUUR9tCthqUhj5Yow4=; b=WNaZdDHoSoQ4zIx/9qqGZXac95BbVD0+8ZlQgVSajTakyptFYbWCg7daU8UY6jvBNc5m59 VJHzMZR59bvdgJ/jnSh2MdjKgShX1ascdFPul0tr+6hVrtnT/L7pIAQKC5SNN11kXhTtmS Hb47aExDvNHuWB3VYSGIveNhecmE2fIj/MvDv41E/A6AEkTKY4Xs3vMok3sehnj+ImXd1l RDtdm8dEY6ZSgDI9qepEiZp9qGtwByPFD0KyAUipus1RRLFZ+7/vZ4vNDrsxd3QVN4EfLT fnHyYrP1//DYMddbEciX4T9GXfXtZQp9KFpNTwv78AI/Nbfdue2t7py3X3bicw== From: Josselin Poiret To: Maze , 63150@debbugs.gnu.org Subject: [PATCH 1/2] gnu: quilt: Fix build because of grep warnings. Date: Sun, 30 Apr 2023 14:34:27 +0200 Message-Id: In-Reply-To: <875y9dekar.fsf@pkbd.org> References: <875y9dekar.fsf@pkbd.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spamd-Bar: ++++ Authentication-Results: jpoiret.xyz; auth=pass smtp.auth=jpoiret@jpoiret.xyz smtp.mailfrom=dev@jpoiret.xyz X-Spam-Level: **** X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 63150 Cc: Josselin Poiret X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Josselin Poiret * gnu/packages/patches/quilt-avoid-grep-warnings.patch: New patch. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/patchutils.scm (quilt): Use it. --- Hi everyone, This should fix the build and also update quilt. Best, gnu/local.mk | 1 + .../patches/quilt-avoid-grep-warnings.patch | 142 ++++++++++++++++++ gnu/packages/patchutils.scm | 3 +- 3 files changed, 145 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/quilt-avoid-grep-warnings.patch diff --git a/gnu/local.mk b/gnu/local.mk index 1a84e5b499..06e5f5aa7f 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1825,6 +1825,7 @@ dist_patch_DATA = \ %D%/packages/patches/qtwayland-gcc-11.patch \ %D%/packages/patches/qtwayland-dont-recreate-callbacks.patch \ %D%/packages/patches/qtwayland-cleanup-callbacks.patch \ + %D%/packages/patches/quilt-avoid-grep-warnings.patch \ %D%/packages/patches/ragel-char-signedness.patch \ %D%/packages/patches/randomjungle-disable-static-build.patch \ %D%/packages/patches/range-v3-build-with-gcc10.patch \ diff --git a/gnu/packages/patches/quilt-avoid-grep-warnings.patch b/gnu/packages/patches/quilt-avoid-grep-warnings.patch new file mode 100644 index 0000000000..b91dc98695 --- /dev/null +++ b/gnu/packages/patches/quilt-avoid-grep-warnings.patch @@ -0,0 +1,142 @@ +From f73f8d7f71de2878d3f92881a5fcb8eafd78cb5f Mon Sep 17 00:00:00 2001 +From: Jean Delvare +Date: Fri, 9 Sep 2022 10:10:37 +0200 +Subject: Avoid warnings with grep 3.8 + +GNU grep version 3.8 became more strict about needless quoting in +patterns. We have one occurrence of that in quilt, where "/" +characters are being quoted by default. There are cases where they +indeed need to be quoted (typically when used in a sed s/// command) +but most of the time they do not, and this results in the following +warning: + +grep: warning: stray \ before / + +So rename quote_bre() to quote_sed_re(), and introduce +quote_grep_re() which does not quote "/". + +Signed-off-by: Jean Delvare +--- + quilt/diff.in | 2 +- + quilt/patches.in | 2 +- + quilt/scripts/patchfns.in | 20 +++++++++++++------- + quilt/upgrade.in | 4 ++-- + 4 files changed, 17 insertions(+), 11 deletions(-) + +diff --git a/quilt/diff.in b/quilt/diff.in +index e90dc33..07788ff 100644 +--- a/quilt/diff.in ++++ b/quilt/diff.in +@@ -255,7 +255,7 @@ then + # Add all files in the snapshot into the file list (they may all + # have changed). + files=( $(find $QUILT_PC/$snap_subdir -type f \ +- | sed -e "s/^$(quote_bre $QUILT_PC/$snap_subdir/)//" \ ++ | sed -e "s/^$(quote_sed_re $QUILT_PC/$snap_subdir/)//" \ + | sort) ) + printf "%s\n" "${files[@]}" >&4 + unset files +diff --git a/quilt/patches.in b/quilt/patches.in +index bb17a46..eac45a9 100644 +--- a/quilt/patches.in ++++ b/quilt/patches.in +@@ -60,7 +60,7 @@ scan_unapplied() + # Quote each file name only once + for file in "${opt_files[@]}" + do +- files_bre[${#files_bre[@]}]=$(quote_bre "$file") ++ files_bre[${#files_bre[@]}]=$(quote_grep_re "$file") + done + + # "Or" all files in a single pattern +diff --git a/quilt/scripts/patchfns.in b/quilt/scripts/patchfns.in +index c2d5f9d..1bd7233 100644 +--- a/quilt/scripts/patchfns.in ++++ b/quilt/scripts/patchfns.in +@@ -78,8 +78,14 @@ array_join() + done + } + +-# Quote a string for use in a basic regular expression. +-quote_bre() ++# Quote a string for use in a regular expression for a grep pattern. ++quote_grep_re() ++{ ++ echo "$1" | sed -e 's:\([][^$.*\\]\):\\\1:g' ++} ++ ++# Quote a string for use in a regular expression for a sed s/// command. ++quote_sed_re() + { + echo "$1" | sed -e 's:\([][^$/.*\\]\):\\\1:g' + } +@@ -215,7 +221,7 @@ patch_in_series() + + if [ -e "$SERIES" ] + then +- grep -q "^$(quote_bre $patch)\([ \t]\|$\)" "$SERIES" ++ grep -q "^$(quote_grep_re $patch)\([ \t]\|$\)" "$SERIES" + else + return 1 + fi +@@ -365,7 +371,7 @@ is_applied() + { + local patch=$1 + [ -e $DB ] || return 1 +- grep -q "^$(quote_bre $patch)\$" $DB ++ grep -q "^$(quote_grep_re $patch)\$" $DB + } + + applied_patches() +@@ -465,7 +471,7 @@ remove_from_db() + local tmpfile + if tmpfile=$(gen_tempfile) + then +- grep -v "^$(quote_bre $patch)\$" $DB > $tmpfile ++ grep -v "^$(quote_grep_re $patch)\$" $DB > $tmpfile + cat $tmpfile > $DB + rm -f $tmpfile + [ -s $DB ] || rm -f $DB +@@ -520,7 +526,7 @@ find_patch() + fi + + local patch=${1#$SUBDIR_DOWN$QUILT_PATCHES/} +- local bre=$(quote_bre "$patch") ++ local bre=$(quote_sed_re "$patch") + set -- $(sed -e "/^$bre\(\|\.patch\|\.diff\?\)\(\|\.gz\|\.bz2\|\.xz\|\.lzma\|\.lz\)\([ "$'\t'"]\|$\)/!d" \ + -e 's/[ '$'\t''].*//' "$SERIES") + if [ $# -eq 1 ] +@@ -631,7 +637,7 @@ files_in_patch() + then + find "$path" -type f \ + -a ! -path "$(quote_glob "$path")/.timestamp" | +- sed -e "s/$(quote_bre "$path")\///" ++ sed -e "s/$(quote_sed_re "$path")\///" + fi + } + +diff --git a/quilt/upgrade.in b/quilt/upgrade.in +index dbf7d05..866aa33 100644 +--- a/quilt/upgrade.in ++++ b/quilt/upgrade.in +@@ -74,7 +74,7 @@ printf $"Converting meta-data to version %s\n" "$DB_VERSION" + + for patch in $(applied_patches) + do +- proper_name="$(grep "^$(quote_bre $patch)"'\(\|\.patch\|\.diff?\)\(\|\.gz\|\.bz2\)\([ \t]\|$\)' $SERIES)" ++ proper_name="$(grep "^$(quote_grep_re $patch)"'\(\|\.patch\|\.diff?\)\(\|\.gz\|\.bz2\)\([ \t]\|$\)' $SERIES)" + proper_name=${proper_name#$QUILT_PATCHES/} + proper_name=${proper_name%% *} + if [ -z "$proper_name" ] +@@ -84,7 +84,7 @@ do + fi + + if [ "$patch" != "$proper_name" -a -d $QUILT_PC/$patch ] \ +- && grep -q "^$(quote_bre $patch)\$" \ ++ && grep -q "^$(quote_grep_re $patch)\$" \ + $QUILT_PC/applied-patches + then + mv $QUILT_PC/$patch $QUILT_PC/$proper_name \ +-- +cgit v1.1 + diff --git a/gnu/packages/patchutils.scm b/gnu/packages/patchutils.scm index 0d88a2d943..465e605010 100644 --- a/gnu/packages/patchutils.scm +++ b/gnu/packages/patchutils.scm @@ -117,7 +117,8 @@ (define-public quilt (uri (string-append "mirror://savannah/quilt/" "quilt-" version ".tar.gz")) (sha256 - (base32 "01vfvk4pqigahx82fhaaffg921ivd3k7rylz1yfvy4zbdyd32jri")))) + (base32 "01vfvk4pqigahx82fhaaffg921ivd3k7rylz1yfvy4zbdyd32jri")) + (patches (search-patches "quilt-avoid-grep-warnings.patch")))) (build-system gnu-build-system) (native-inputs `(("gettext" ,gettext-minimal))) base-commit: 4884ee6dd4b1694a4a502dd8058d6c61fa0c0199 -- 2.39.2 From debbugs-submit-bounces@debbugs.gnu.org Sun Apr 30 08:34:47 2023 Received: (at 63150) by debbugs.gnu.org; 30 Apr 2023 12:34:47 +0000 Received: from localhost ([127.0.0.1]:37433 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pt6GN-0005w3-B0 for submit@debbugs.gnu.org; Sun, 30 Apr 2023 08:34:47 -0400 Received: from jpoiret.xyz ([206.189.101.64]:60726) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pt6G7-0005vU-Sk for 63150@debbugs.gnu.org; Sun, 30 Apr 2023 08:34:35 -0400 Received: from authenticated-user (jpoiret.xyz [206.189.101.64]) by jpoiret.xyz (Postfix) with ESMTPA id F3219185317; Sun, 30 Apr 2023 12:34:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jpoiret.xyz; s=dkim; t=1682858071; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ExZghJxmt2HB1wJt+SHnXd5NSv5OfTWdh2XSTXe/GLE=; b=ol6SflBPgOe6NbYOJkSgHASGgRNynso/MNWC88OiP/gNqmFiUcsLfwuuMc5EtbGfNczPZ5 sMIvUceH2pOMbBnCE8zP3ot6vqcTwaL6y5s2xAgJVMIc5WWhyAOprFSQjilCQxaektz1yJ 2qNuTCGivmxOsytaKn4K4m+xTCyGz2VF9qYLjW2Nz0NSE3ZQ+G0cvVN22InEUiZ8QUJRkl b5wLIwOWr6VacMseJP7ugBB9REpMynJsXubCkYYrYi1QTgGazI41hqVXbJTAABTwwjy/7y bEclQd/+pM7LSircgmYcJM0Yb5u4zR2PQ6b1TtH+2Znyt4ZJZxUIs95PAwxZxQ== From: Josselin Poiret To: Maze , 63150@debbugs.gnu.org Subject: [PATCH 2/2] gnu: quilt: Update to 0.67. Date: Sun, 30 Apr 2023 14:34:28 +0200 Message-Id: <090c2c3ff15eb0bd476fd6d8c1a443b68dbe8b5f.1682858043.git.dev@jpoiret.xyz> In-Reply-To: <875y9dekar.fsf@pkbd.org> References: <875y9dekar.fsf@pkbd.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spamd-Bar: ++++ Authentication-Results: jpoiret.xyz; auth=pass smtp.auth=jpoiret@jpoiret.xyz smtp.mailfrom=dev@jpoiret.xyz X-Spam-Level: **** X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 63150 Cc: Josselin Poiret X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Josselin Poiret * gnu/packages/patchutils.scm (quilt): Update to 0.67. --- gnu/packages/patchutils.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/patchutils.scm b/gnu/packages/patchutils.scm index 465e605010..88c2cbc907 100644 --- a/gnu/packages/patchutils.scm +++ b/gnu/packages/patchutils.scm @@ -110,14 +110,14 @@ (define-public patchutils (define-public quilt (package (name "quilt") - (version "0.66") + (version "0.67") (source (origin (method url-fetch) (uri (string-append "mirror://savannah/quilt/" "quilt-" version ".tar.gz")) (sha256 - (base32 "01vfvk4pqigahx82fhaaffg921ivd3k7rylz1yfvy4zbdyd32jri")) + (base32 "1hiw05aqysbnnl15zg2n5cr11k0z7rz85fvq8qv6qap7hw4vxqrv")) (patches (search-patches "quilt-avoid-grep-warnings.patch")))) (build-system gnu-build-system) (native-inputs -- 2.39.2 From debbugs-submit-bounces@debbugs.gnu.org Sun Apr 30 08:35:05 2023 Received: (at control) by debbugs.gnu.org; 30 Apr 2023 12:35:06 +0000 Received: from localhost ([127.0.0.1]:37439 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pt6Gf-0005xE-Nb for submit@debbugs.gnu.org; Sun, 30 Apr 2023 08:35:05 -0400 Received: from jpoiret.xyz ([206.189.101.64]:60822) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pt6Ge-0005x1-6b for control@debbugs.gnu.org; Sun, 30 Apr 2023 08:35:04 -0400 Received: from authenticated-user (jpoiret.xyz [206.189.101.64]) by jpoiret.xyz (Postfix) with ESMTPA id 995BC184D70 for ; Sun, 30 Apr 2023 12:35:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jpoiret.xyz; s=dkim; t=1682858103; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type; bh=xjtmaYAYjh9ZyxNN10jdTU9xBZCl3I6FkQ+XAQoxxDQ=; b=ih39VwQEBB/uw7f8LiSqVBPHrzCbGTSb7VnU2Lv1aFbNeEeoGoHw72H0viQugXWJU+Qqzm zvaO68zxLBktlQ54qrKZBSkh2YkTZJB9TteEnzzyJPQdHOvw6zQ4yxi1oB34Q9lr61huGP 6mM4efqxlpQXdCkfO4Ge6kgSQImZK/uKmRhknH9YdbO4yM16CK6xYT0W5OOrsIlFDJ0oLL m6Sp4HaXJHWvFgJ4omObX03FBM4LLACTSGrlHl6gSDt0J4/QEDgULVz2PCqpjF5sygJ+3B 6WmGJ32pYaRG6sqTbZqng7aPwOw3jmhw/GN+pKRHVHQvHbtICABJwrUysO294g== From: Josselin Poiret To: control@debbugs.gnu.org Subject: Date: Sun, 30 Apr 2023 14:35:00 +0200 Message-ID: <878re9eeff.fsf@jpoiret.xyz> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spamd-Bar: + Authentication-Results: jpoiret.xyz; auth=pass smtp.auth=jpoiret@jpoiret.xyz smtp.mailfrom=dev@jpoiret.xyz X-Spam-Level: * X-Spam-Score: 4.0 (++++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: tags 63150 + patch thankyou -- Josselin Poiret Content analysis details: (4.0 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 T_PDS_OTHER_BAD_TLD Untrustworthy TLDs [URI: jpoiret.xyz (xyz)] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record 2.0 FROM_SUSPICIOUS_NTLD_FP From abused NTLD 0.0 FROM_SUSPICIOUS_NTLD From abused NTLD 2.0 BLANK_SUBJECT Subject is present but empty X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.0 (+) --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable tags 63150 + patch thankyou =2D-=20 Josselin Poiret --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQHEBAEBCgAuFiEEOSSM2EHGPMM23K8vUF5AuRYXGooFAmROYHQQHGRldkBqcG9p cmV0Lnh5egAKCRBQXkC5FhcaiuIuC/9goFG4PWeugUaHepIo3qQ/YmiIJrq6PTc4 RhI7KB+JeAVqZYSaN+US3rYJ7TKWxiDxgCm8APYodqm2FHzDX1GFK2rIhwHLJnu3 5Cv81nMjjk/loa72Oiy8oCNVF9kvScGAyfowujTTo9Jc13DMK+b7NUddNMrHsbPf OoIaH9DTVKsGh1pTFzJg76he+4A2p/yWpHrrrVf/7LqVyOL1frKig731nfXsrlwh 45mhwzXOolizu7EibIRY6wPlq9mVa9dYUWH1/CxMOUZNrU+qOXDBSRs6pHb1skMz cZq9OBv0Kw7HfSanIUJSlf34yhxDVDbc9ua63iA4UhVw8+LeKX/V8j3M7M38WcAY +TD/vSzrZvSFsIiyOpeVvw5v40c0QqndoIOKg3Jqw6A97N7iGVLyoZVshCN7iVB7 5OOXFRRAcUDfnK2THG1VQV1DCvLiKH2Q10GXOOYHhZfFcISiscCZ54ZBfictEZRI GhjGHxzC9fWDgfU1c2Y+yvMkGxMisXo= =CTce -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Sat May 20 15:22:24 2023 Received: (at 63150-done) by debbugs.gnu.org; 20 May 2023 19:22:24 +0000 Received: from localhost ([127.0.0.1]:59381 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q0S9o-0002fG-Cm for submit@debbugs.gnu.org; Sat, 20 May 2023 15:22:24 -0400 Received: from mail-wm1-f41.google.com ([209.85.128.41]:48351) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q0S9k-0002f2-FK for 63150-done@debbugs.gnu.org; Sat, 20 May 2023 15:22:22 -0400 Received: by mail-wm1-f41.google.com with SMTP id 5b1f17b1804b1-3f5fc210ac5so2870655e9.0 for <63150-done@debbugs.gnu.org>; Sat, 20 May 2023 12:22:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1684610534; x=1687202534; h=in-reply-to:content-disposition:mime-version:references :mail-followup-to:message-id:subject:cc:to:from:date:sender:from:to :cc:subject:date:message-id:reply-to; bh=e3WIt/zhEGp206ZwBOY/+6rI/Oxa7hIJxnUvr5d3QTk=; b=UuMXDvb2cq88j7lw/5rMKpLPVHfDUtp627W9v2uNg0lv5R9FyA86wpwidqXHoYjzAF N5SgYXcsV5nwWfkKOAsSuwyaSef4gpvNzP6Y+qDRFBkbkWDBSpJlwUoOc4QYQduNsGgz ESRcikImHDw2e37Rl6W07+oDV04VB6Xm3hptZx65ub8ZM7bIXSkfI9JTL9rTmnHWC8i6 5Qw9xuBIidiS35sweZdWZ2Wu9m8JwdgBXjE+YqWCPgjTNH6s/UA4r+nOFEfJCi4pd2dg LV4tfiUdOqibIHvJoycaYlFaeuQZnITjjgSbSX1/KleNFdOttGIj1eEnvVR9ksiijwX9 G/TQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684610534; x=1687202534; h=in-reply-to:content-disposition:mime-version:references :mail-followup-to:message-id:subject:cc:to:from:date:sender :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=e3WIt/zhEGp206ZwBOY/+6rI/Oxa7hIJxnUvr5d3QTk=; b=cgldS1CNrfNzg4jopve66AgcG7pKzX9Y1ap02EY6JPYFLHAmPqbgNEy81/cplqmRVt mQS4fAf/DXpKY4yv3uoDAGq6OwnH+Q6MuXaivaTQZnc82hTU9q4ZSAxsthYcgTlPfzk0 FxS6zLCkQXYnbheJISbHzYP+ZLXBowcWRgZLxPS+JWWNPzormK2/86ji29JzRklE57lb 7jLECWrkW/sfRyAmjvS+B3jzWGk1cRiVFKSpOhO0tnhw/n/+CD2tEFOnoEluRtKHCSA+ CE68Jh1WirFSIA5pzI0v3yOlRAhstH5xUyyGkwMDx5T2ky7jM0L4WA3LskUR4EcG/B87 i9Eg== X-Gm-Message-State: AC+VfDwDikRDBWVhVEQUSPPw8M4qHbGAIFwUJkWyQZNHxw4GwaF/cBvx Ew5sVebPx+QmVhXojqecUxS4OoGSmHg= X-Google-Smtp-Source: ACHHUZ7RHj9e1p/gs81T5KsICXN+Z/raIKsjVaVk9OrRwfaSuNUukc4nO0HpJairdmZbyJUdGEscVA== X-Received: by 2002:adf:ce8e:0:b0:306:2f8e:d259 with SMTP id r14-20020adfce8e000000b003062f8ed259mr3710609wrn.57.1684610534243; Sat, 20 May 2023 12:22:14 -0700 (PDT) Received: from localhost ([37.46.46.3]) by smtp.gmail.com with ESMTPSA id u7-20020a7bc047000000b003f3157988f8sm3084082wmc.26.2023.05.20.12.22.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 20 May 2023 12:22:13 -0700 (PDT) Date: Sat, 20 May 2023 22:22:29 +0300 From: Efraim Flashner To: Josselin Poiret Subject: Re: bug#63150: [PATCH 1/2] gnu: quilt: Fix build because of grep warnings. Message-ID: Mail-Followup-To: Efraim Flashner , Josselin Poiret , Maze , 63150-done@debbugs.gnu.org References: <875y9dekar.fsf@pkbd.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="k4mcwz/ZpIIaFyt+" Content-Disposition: inline In-Reply-To: X-PGP-Key-ID: 0x41AAE7DCCA3D8351 X-PGP-Key: https://flashner.co.il/~efraim/efraim_flashner.asc X-PGP-Fingerprint: A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 X-Spam-Score: 0.3 (/) X-Debbugs-Envelope-To: 63150-done Cc: Maze , 63150-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) --k4mcwz/ZpIIaFyt+ Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sun, Apr 30, 2023 at 02:34:27PM +0200, Josselin Poiret via Bug reports f= or GNU Guix wrote: > From: Josselin Poiret >=20 > * gnu/packages/patches/quilt-avoid-grep-warnings.patch: New patch. > * gnu/local.mk (dist_patch_DATA): Register it. > * gnu/packages/patchutils.scm (quilt): Use it. > --- > Hi everyone, >=20 > This should fix the build and also update quilt. It seems I applied basically the same patch and didn't see this patch. Sorry! --=20 Efraim Flashner =D7=A8=D7=A0=D7=A9=D7=9C=D7=A4 = =D7=9D=D7=99=D7=A8=D7=A4=D7=90 GPG key =3D A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted --k4mcwz/ZpIIaFyt+ Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEoov0DD5VE3JmLRT3Qarn3Mo9g1EFAmRpHfEACgkQQarn3Mo9 g1GmUhAAudGmBN814dSjSlwjOjcZCbG4RCcpdTCVAZjy1tdt4fUmwWivDluLjUT0 tzsTT9gZ6pZgqXI06Hjn762N4dC3o8t/4FoewHIgPpMCg3eAC0m7kAFhQ6VsqqVn 8hAyLIXGfskPNusQaVuvvkjwz9d7o4fooVry1U3Y0/Imz5gEteLA77rq0jYRjHtQ hI2p3xVYmkJrT4zApl7FAU/WFsvon52hG1uWn0zic24NHFBDof+XtuLhXKykJmJi 0GCkp2Fk1cc0LhkYnVkejbUeWdlL8/W9ZVcb3V/C3TU7b7QMRuYy7LsKMe3SU4Eq OUwB5ng9PY6GUdcxBUidfVcFRnEa3fuH6aElVcFPAp37G7fLC3T6L+UB2/ovGK3z Y3chnqFAZcmTr53smeMTdLrlkPL8ibSrydN/jyWq/QrRwRrLBLEAXiicawic42oG WKzJBzlMogRFjYmaeZiuW2w0WxFp7j+fQlAqNAgpWPVhIHLZ75loFWcLut7Hhqwc sX0O9NA5V/Wuj0oG+3qlL4AvOmiBQkhvtKXCBH2eal5NZaXi3dZlHLy4OOIRDzio UD4NaMLpdynOhCJV/uWM+uKFJh/3lhKTdoFd9gdVyFL7OVR3Z5gdMZwxMESqFCCW UN+/yCQAY1zsNjWk0J49IU3AKP6Fzl0EfOCF1CjJG1dZgbtMar8= =e9gV -----END PGP SIGNATURE----- --k4mcwz/ZpIIaFyt+-- From unknown Tue Jun 17 20:10:56 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Sun, 18 Jun 2023 11:24:07 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator