From patchwork Sun Apr 13 17:39:42 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Morgan Smith X-Patchwork-Id: 41639 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 C61B527BC4B; Sun, 13 Apr 2025 18:41:36 +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_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 26C5927BC49 for ; Sun, 13 Apr 2025 18:41:34 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u41KM-0002pH-J4; Sun, 13 Apr 2025 13:41:06 -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 1u41KI-0002ob-Uw for guix-patches@gnu.org; Sun, 13 Apr 2025 13:41:05 -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 1u41KI-00036D-Bx for guix-patches@gnu.org; Sun, 13 Apr 2025 13:41:02 -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:References:In-Reply-To:Date:From:To:Subject; bh=iir808J1EBWyiTFGDA1b9nfqELn0pekmeZ4iVU1scf8=; b=a/3uZwt+2wYITdRhjXmL/fqEaOxRUHX8d3CngRy6K0823mS2NLBuc2Q03cKME6bSYlXUfgzfVDN6vQR2f1RoQ8ZR8Zddr23+zhqAFLWRZEPjF32E3kVTMPKWag3anpgYeNSq6v85i9bBo12GEf9rBEZT6o5xK+IBdRRc3iOnYayXY468EoLTmjbly2Ag9HuiGvSv7+eQuNBPZNiUon2Sa5q/tQ+ZKjR7rtDzglZs5wDNbaYkuNqsGhBe/yr/V3515CjZaM6+QRL72+qLeZsrLasb2QHWBwOE1Z1v2yYYb9eqw1eeDJ6/Sc3ewZPmD+B0v8VeXOSn6ITE8A7Ad8UKyA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1u41KI-0000aO-6U for guix-patches@gnu.org; Sun, 13 Apr 2025 13:41:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#76594] [PATCH v3 2/4] gnu: quilt: Update to 0.68. Resent-From: Morgan Smith Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 13 Apr 2025 17:41:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 76594 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 76594@debbugs.gnu.org Cc: Morgan Smith , liliana.prikler@gmail.com, maxim.cournoyer@gmail.com Received: via spool by 76594-submit@debbugs.gnu.org id=B76594.17445660172160 (code B ref 76594); Sun, 13 Apr 2025 17:41:02 +0000 Received: (at 76594) by debbugs.gnu.org; 13 Apr 2025 17:40:17 +0000 Received: from localhost ([127.0.0.1]:43716 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u41JY-0000Yl-SN for submit@debbugs.gnu.org; Sun, 13 Apr 2025 13:40:17 -0400 Received: from mail-mw2nam12olkn2033.outbound.protection.outlook.com ([40.92.23.33]:22465 helo=NAM12-MW2-obe.outbound.protection.outlook.com) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1u41JR-0000SH-VY for 76594@debbugs.gnu.org; Sun, 13 Apr 2025 13:40:11 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=eaXPgD2AhX09i3/tUT6QIJzFmfRhKM3qaDUT1+yHgNtAS1X40gUnXPcHQtILiGEMw4dhViGH0UOhE97e1vpswCWl7mHQjAXHVjFveRn/96LoMuHkodryUr4BJEirPXJNmpQqzymWf3QgIRAR7S58TomfFa4GAlVcLjjlrcN/GHTrAHaUKfAtaELTpO9HptYc/giXXDRgZUQixmS166Pm3vxs+ZCZPpNddnmtVGA9++5LdyEsj0qkt8z5cEjjRSqa1TaMY9wusm7f2xdj+jDbjUOW4xN3WgRIFL/StdcjUxRgiPxcVt8xs2FrmVEPSixRbOncIeaOTJG+qsnDAcvOEw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=iir808J1EBWyiTFGDA1b9nfqELn0pekmeZ4iVU1scf8=; b=gNVMcyMTHN8VhVwLQkWdlgXyCcLUsqZvEpPkdrX3sMbPOzmM67rEbSWuZb50dXFTw2I+Sbeg5oC9uJGEmUVzUXrNHMmbcHwoD15jcKi9vY3pqmE9FAjvd8vmaGp8Zs1CYdZ6lndr55JhL3UxBuB1iQB9pJroztFayhYQKMNRePOYhkrbdaFeVJBqdkBbrBLZJcWS3DvDdlLhrdt8viKqjjXQgW9wsRTItAR2f0JaoUyz8UN2LQWoXtLYj52g4c+lyF1l2LvQSF366cIwa9cBzOSQgtxPQy7qOHBPEWQXHI990H0Az+fTmwzd7Y/+Qu0vQyuzdx25KMHkqDoatjWMlw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=iir808J1EBWyiTFGDA1b9nfqELn0pekmeZ4iVU1scf8=; b=P3ZWcfGc3Ru8cuaiF0J8Yz5pRebRD0tEILUaLHpq2o6Zr80LvI/vwMk4qXw1JKj+27FmbeoVqSn1A7r97KZUA/xzVtJ1vTm4tDjvSer3bjNoqzpW+IpLtIuTmKV4SC6Zq6nOMTUq2+q2y82Nb78arF9tzXL66EsxuW4aw8me8vtn+dltsKw/+fOnaMzFHlr91j7vPKOuAJKlTSBmPHUr4Zy0HfKXqut+qjFy6X5BCd+XBu77b2J+5+JlwrhFpwdJs3HMSwXypUTC8+/mbZR+aihvI4qAKiTNwK7Hoy4KYbnK2gbf1z+lhsrN1gZvSIJg+C2cPTKE1xco0C3A/lqVBA== Received: from CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM (2603:10b6:610:1c4::17) by PH8PR84MB3137.NAMPRD84.PROD.OUTLOOK.COM (2603:10b6:510:1c0::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8632.28; Sun, 13 Apr 2025 17:40:05 +0000 Received: from CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM ([fe80::5c77:7a58:48ed:9aef]) by CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM ([fe80::5c77:7a58:48ed:9aef%5]) with mapi id 15.20.8632.030; Sun, 13 Apr 2025 17:40:05 +0000 From: Morgan Smith Date: Sun, 13 Apr 2025 13:39:42 -0400 Message-ID: X-Mailer: git-send-email 2.49.0 In-Reply-To: <0648f3d588246ffeda82901201099620a1c32bd0.1744565984.git.Morgan.J.Smith@outlook.com> References: <0648f3d588246ffeda82901201099620a1c32bd0.1744565984.git.Morgan.J.Smith@outlook.com> X-ClientProxiedBy: YQBP288CA0042.CANP288.PROD.OUTLOOK.COM (2603:10b6:c01:9d::25) To CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM (2603:10b6:610:1c4::17) X-Microsoft-Original-Message-ID: MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH3PR84MB3424:EE_|PH8PR84MB3137:EE_ X-MS-Office365-Filtering-Correlation-Id: b7eac096-deac-4145-96de-08dd7ab239e4 X-Microsoft-Antispam: BCL:0; ARA:14566002|461199028|8060799006|19110799003|5072599009|15080799006|7092599003|10035399004|3412199025|440099028|12071999003|21061999003|41001999003|1710799026; X-Microsoft-Antispam-Message-Info: op5/7FyaR/SmNz8SCwH+JI4UN42E8Ma28dR+lGJOkbXgJomsOrO1Ed1d5/76e6UHu5rrlVcFWCbWU9jF42y3gkkUnDG848cD+jwqR24pTMnfQmktLVqr7yZJWczxqKVWSfRMNOiVIcn1r4I1MoWjQJQfT//S+uN1ikhhOa+2qetYGLkVzSddLZ95eFt9oDAB8uN/k4YGd/lDjZuMe8oDWWue7f5ZbTKNdHJaHQ0xE/zzCyspU3kCfT7iQWoNiVrGX40xKhuTNdM4OxnC9po7/45LLmiuhsb7s5opRzgHYjQwnG07vBlVMBRzhwlWHro0Ghco4Ry/z+IYWVZ2jKrNSxT7VqNNzMGZqP22EqEn17NeFrJ/epZyX8D4rIK+6yMakddrOmGrw+C/P4QIVuNU0o/6uV5y5k2fSRMlqjEUKpsQkzw+0Eg5DRP5QBKjJ6daBQTqFAdiK8PYdZWI5QvpOVm2DYmMDfZXVh3DEBdxrrRH9EDj4hbDY7f1No0LvJFZk5W3oyQq3LH+Fgoxk44xUx1IVtIzHgqvCdCs3B6ADmjIf8F/Ur5WYUe+Htaow8fncKWNBpu+hIqdRZhW7oCghwpdbFfGavgogjOByHFe0u9RD/fOjby4M4xUBGjvCIXGTGJ3hUBwECIo8XFI9IAhTn4kzzWYVJVlGiIJU3Iks4zg5LczP8sJIswyBJOULcrK//PDhLHqD4QJB4ChNtTZWY0cqPgjmr6ESZHlprKrdMfxSdkcW41B8DFqpzTowcDoE4/VhchD7cDlBhHxDoDUuC+zkea6aAEO43g+AG0sK7XCcX2/4BZBgGUngqMMG6TIaVXUceh7qjl6kwmByb8ZDqk4WiqVbe6U0aTM5wbhCmkw36AA0BzvFEZqxPkS3iakDtgfljZcFsUIVjUq1ggPhOLuikBQaFMfpMDEpzb1bkYzg+jbqFHXeQCcStBQzYypj7a0DeN5V1XP5o18vvRMUA2p31ir8cSHJkdRgmDEyIAVqSFhP0jiTerjR9PxOoQh+UAh8NULHrUsG0BjeuAD4wUyt9WX+6adwC9E5QUtskujEYMUyPAC9E637S/JsRsAPwiQeZCR0tD2+nFV2YDlemW5E602UT+24ahv0GKCOLoGtGl7Fo8cpSMbnByjyBWo6YGQ+/z9AftWhX9sGC4LGPb8Z6TeUGpiprhj8QxenDNn2AjDeZlUoY5oegrJ47+AUEKf41G+KX3Z3RPZfPZIZd7caOI4DFYRo7MaqX66et3sb2o/EGr1YNt0L9LwlgxCHeFUtOoy2VDe4cgm04RZT56xpS8fjbdCvjl0Vpa+Bno= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: PnDsN/h4Paejyf8jl5AGoVM8YNKJUdn9TXIuxTpOZlYsYL7Mziwhi7RiPxTEc6GkgZfuEdrLZy2zwgoeH0w9Yazol+NZKP/IBLh4OSbUKpDbExjeKSCBrySGJE8OxcO4vwjPyepf8ldEAYFawEcY+Oq/Me4AE/DH97cmcjH+ulFNSM2aDtiyDvaaxc5VtKM04bB5ShwIcFKLUvi9oEhgo9jAMvPD00Pvn3nlWWDrxPjhcD8aphXLvwfwJSwgz+z4qbOLPH8Y93CU9vUJRdEXmkur5/x9eAkr//vdixYpKBTbDrXbZEulRDSAcd0dwfbJ+eXndV7vtsp5kA2ycL6dsTp2xefBRK2Dt1Xb80/iQFuhqZfX8SgO62FZXyejZD6gFt43PZeNs3nol6lrhGV1yOEW5JNrgyem1SnulEveIKUJeT1OQnBKdSHOtpNt9rB/+YWxhRBKDURLONxUynVmk0i1lcCuMRIrhru0Im+5XqDjZmTMfF7P6Sqhzmek347V5ek5/1WnylMeqRs5ivmfAnpUTr9TDWoNL3X4cey19hk8ApAVbhdQdOVaktL7QCb5X5RBbqK6NWwJ4C43iRpcriPEA+GpawggyiFxB/EAm6M79kC760OGImi1l3Q6Fo0UrUIBtFKRvcrtYXr3eW5tSA9/5AfdyqlAnlAw8ReLnNEctdGCCvB8hWt6sYC38jK1EYYEfWVDnWV/hlB1NO9VCUF4VXsiO0j+Sf/wA9G2vnGWFX6rpHcTaWpRFMGNRdFNo5RBOF/OGj2kPYY0+96BuidLt2fgb80MMRzbDU0lopFLaWB0JtGIkRiuN9kWFrO3tzCbn2efEYQpMHgQMN/+BP17Z3Mbo9/7dR5Zm/BqSVD9BTkgwd1epvWKwa1zRCi1So9x1+5q6thZYH9PBXUShpDGVTHCTAOKtLy7Y6aP6bZi/GlIyUdMzctmFqOtx/rFSjJiD1QG+XUjUepIjjsV0Wp3akg+p4DvGBkMZ0BLh4DGLbKLNuABJFYYwzUWyezCp0xlirTY4YAcO+hQpzzhidSpA7vAs7ZgPhG/rYH45aKf+hpzrFKU3WtZgTZHL++8YTt7cGUyhrFCPbnXzBFUJGkphSWs7vaI8HxqtkvB0C90fEah8L9eOOa9/VnUse0fGW+qRLuSdwKty739/NYthjnEaO2ukzTY9Z4qAitsiiuFA2TF2LjxI8xLTU/r2gq+CQ1vgKh8J3KT2F6La6nWV+FGy/XXCIgahpHUdP25OY69S85qoM/Z+p4OM+Tigonl X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: b7eac096-deac-4145-96de-08dd7ab239e4 X-MS-Exchange-CrossTenant-AuthSource: CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Apr 2025 17:40:05.7245 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH8PR84MB3137 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/patchutils.scm (quilt): Update to 0.68. Enable parallel tests as upstream fixed it. * /gnu/packages/patches/quilt-grep-compat.patch: Delete file. * gnu/local.mk: Remove quilt-grep-compat.patch. Change-Id: I5da532c07c83d00363799a1cc7f48e0fe63864fe --- gnu/local.mk | 1 - gnu/packages/patches/quilt-grep-compat.patch | 145 ------------------- gnu/packages/patchutils.scm | 6 +- 3 files changed, 2 insertions(+), 150 deletions(-) delete mode 100644 gnu/packages/patches/quilt-grep-compat.patch diff --git a/gnu/local.mk b/gnu/local.mk index c0b9a76cd2..9d8b17f94a 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2164,7 +2164,6 @@ dist_patch_DATA = \ %D%/packages/patches/qtscript-disable-tests.patch \ %D%/packages/patches/quagga-reproducible-build.patch \ %D%/packages/patches/quickswitch-fix-dmenu-check.patch \ - %D%/packages/patches/quilt-grep-compat.patch \ %D%/packages/patches/qmk-firmware-fix-hacker-dvorak.patch \ %D%/packages/patches/qtwayland-dont-recreate-callbacks.patch \ %D%/packages/patches/qtwayland-cleanup-callbacks.patch \ diff --git a/gnu/packages/patches/quilt-grep-compat.patch b/gnu/packages/patches/quilt-grep-compat.patch deleted file mode 100644 index 25fef506d1..0000000000 --- a/gnu/packages/patches/quilt-grep-compat.patch +++ /dev/null @@ -1,145 +0,0 @@ -From upstream -https://git.savannah.nongnu.org/cgit/quilt.git/patch/?id=f73f8d7f71de2878d3f92881a5fcb8eafd78cb5f - -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 b929ed9a5a..ea784c5acd 100644 --- a/gnu/packages/patchutils.scm +++ b/gnu/packages/patchutils.scm @@ -169,15 +169,14 @@ (define-public patchutils (define-public quilt (package (name "quilt") - (version "0.67") + (version "0.68") (source (origin (method url-fetch) (uri (string-append "mirror://savannah/quilt/" "quilt-" version ".tar.gz")) (sha256 - (base32 "1hiw05aqysbnnl15zg2n5cr11k0z7rz85fvq8qv6qap7hw4vxqrv")) - (patches (search-patches "quilt-grep-compat.patch")))) + (base32 "09l4nf6qb8y8l62z8ypdg5mraz0lvqxg1j1p6xdyh1n10gg0k37y")))) (build-system gnu-build-system) (native-inputs (list gettext-minimal)) @@ -188,7 +187,6 @@ (define-public quilt guile-3.0)) (arguments (list - #:parallel-tests? #f #:phases #~(modify-phases %standard-phases (delete 'check)