Your message dated Fri, 06 Oct 2023 16:56:10 +0000 with message-id <e1qoo7w-007sj0...@fasolo.debian.org> and subject line Bug#1053463: fixed in quilt 0.67+really0.67-4 has caused the Debian Bug report #1053463, regarding quilt: quilt functions corrupt patches if awk is not gawk to be marked as done.
This means that you claim that the problem has been dealt with. If this is not the case it is now your responsibility to reopen the Bug report if necessary, and/or fix the problem forthwith. (NB: If you are a system administrator and have no idea what this message is talking about, this may indicate a serious mail system misconfiguration somewhere. Please contact ow...@bugs.debian.org immediately.) -- 1053463: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1053463 Debian Bug Tracking System Contact ow...@bugs.debian.org with problems
--- Begin Message ---Package: quilt Version: 0.67+really0.67-1 Severity: important Tags: fixed-upstream patch The /usr/share/quilt/scripts/patchfns script contains a gawkism and does not work correctly with either mawk or original-awk. In both cases "quilt refresh" corrupts existing patches, but the symptoms are quite different: - With awk=original-awk the refreshed patch is appended after the original one instead of replacing it, and applying the refreshed patch later fails. - With awk=mawk there is a complaint from mawk: ,---- | awk: line 21: regular expression compile failed (syntax error ^* or ^+) | ^+++[ \t][^ \t] `---- This time there is no duplication of the patch, but the complete patch header is removed, causing information loss. :-( Fortunately the problem had already been reported upstream and fixed in commit ce9c68abb7c ("patchfns: Compatibility fix for BSD awk"), I have attached the patch for your convenience and already tested it successfully with both mawk and original-awk. :-) -- System Information: Debian Release: trixie/sid APT prefers unstable APT policy: (500, 'unstable'), (101, 'experimental') Architecture: amd64 (x86_64)From ce9c68abb7cee0b4fb0d5a7ff7048d0ab3b726f8 Mon Sep 17 00:00:00 2001 From: Jean Delvare <jdelv...@suse.de> Date: Thu, 23 Jun 2022 14:36:58 +0200 Subject: [PATCH 1/1] patchfns: Compatibility fix for BSD awk "+" needs to be quoted to be considered as a literal "+" by BSD awk. Without this fix, patch_header() fails to find the beginning of the changes and treats the whole patch as a header, subsequently causing "quilt refresh" to append the refreshed patch after the original one instead of replacing it. Bug reported and fix suggested by Dominic Evans. Signed-off-by: Jean Delvare <jdelv...@suse.de> Fixes: 1d94980dbdd4 ("Tighten the patch format parsing") --- quilt/scripts/patchfns.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/quilt/scripts/patchfns.in b/quilt/scripts/patchfns.in index 75cee52..c2d5f9d 100644 --- a/quilt/scripts/patchfns.in +++ b/quilt/scripts/patchfns.in @@ -848,7 +848,7 @@ patch_header() MAYBE_CONTEXT=0 } MAYBE_UNIFIED { - if (/^+++[ \t][^ \t]/) + if (/^\+\+\+[ \t][^ \t]/) exit print eaten MAYBE_UNIFIED=0 @@ -881,7 +881,7 @@ patch_body() MAYBE_CONTEXT=0 } MAYBE_UNIFIED { - if (/^+++[ \t][^ \t]/) { + if (/^\+\+\+[ \t][^ \t]/) { print eaten body=1 } -- 2.42.0
--- End Message ---
--- Begin Message ---Source: quilt Source-Version: 0.67+really0.67-4 Done: Dr. Tobias Quathamer <to...@debian.org> We believe that the bug you reported is fixed in the latest version of quilt, which is due to be installed in the Debian FTP archive. A summary of the changes between this version and the previous one is attached. Thank you for reporting the bug, which will now be closed. If you have further comments please address them to 1053...@bugs.debian.org, and the maintainer will reopen the bug report if appropriate. Debian distribution maintenance software pp. Dr. Tobias Quathamer <to...@debian.org> (supplier of updated quilt package) (This message was generated automatically at their request; if you believe that there is a problem with it please contact the archive administrators by mailing ftpmas...@ftp-master.debian.org) -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 Format: 1.8 Date: Fri, 06 Oct 2023 18:26:30 +0200 Source: quilt Architecture: source Version: 0.67+really0.67-4 Distribution: unstable Urgency: medium Maintainer: Martin Quinson <mquin...@debian.org> Changed-By: Dr. Tobias Quathamer <to...@debian.org> Closes: 1053463 Changes: quilt (0.67+really0.67-4) unstable; urgency=medium . * patchfns: Compatibility fix for BSD awk (Closes: #1053463) Checksums-Sha1: 1092a5e3e36caeb19c481e135b0961640cce5384 2069 quilt_0.67+really0.67-4.dsc af5a1a1d681defe6adacacd3eb3a48d965a2b6ec 39556 quilt_0.67+really0.67-4.debian.tar.xz 720c54d9f0c0fade56f2b09ac593eecc7a7a037b 9188 quilt_0.67+really0.67-4_amd64.buildinfo Checksums-Sha256: 03300e943bbf5fdcc085b1813d4d2c813e8456238fcc721a3c87bd45bf9f5807 2069 quilt_0.67+really0.67-4.dsc e249f261438e2b31a402abd1c349e01a74162be87458c79f24e5f2f0c1e9ed3f 39556 quilt_0.67+really0.67-4.debian.tar.xz 22501157b06615d6df1f83de07c9987e3d586a401604b65283b72b35863598c4 9188 quilt_0.67+really0.67-4_amd64.buildinfo Files: 9980f2a07fdf6ffdc08549dc899cebe9 2069 vcs optional quilt_0.67+really0.67-4.dsc 5c5f9ceaf46226c7183e5097ac01e84c 39556 vcs optional quilt_0.67+really0.67-4.debian.tar.xz 7a3d07289551f10d09170bf67a3785d2 9188 vcs optional quilt_0.67+really0.67-4_amd64.buildinfo -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEE0cuPObxd7STF0seMEwLx8Dbr6xkFAmUgOAYACgkQEwLx8Dbr 6xniNxAAkrAOVvKTI2z9jZ8a3mQ4hO9NJklURLHZzYDDh0Nq5Ve9zB2p/VvGlLzF HKqcgfsxg23OK/TVtvTgtnfBALiNBIvXzoc9C1tCOpts4IFPBm00wGagdet8ZsDJ Qqk6TXkKhdlPrUMTOIH5bJCWRUsE5VMiLtBtc+Yan7ZLnE7nYGqQh37yvhIOmqhO gsfoPXK3srcelixobu03/yJDDwM11DbW25bhSfsuaVwxTsXxbofOFiAnS+/k7fSs XO+C8tdYWQXaei5JmvuPsueSwu/4orq2QhWt1kW+QNjs1uIqTIbX54p6943WCxyl UYBayf9ABUO10pzbey/af0IRXnlONIVRnAbx5a8IpBLF0h6lYTxAt8MlgEhN14yO FRlXmsQ4Diwt177owcyUgJUMM13Ykb55Ky8MOnfQTlnOI+YEhZajurdJmCkW7VZn i6Htb2ZKX7bfYZqpZ8qeuCCgz81Uvekd/eIHIVXXBKXXkJw4pV+0/L0kyd9L31vR KgejSK3a7YD9Jz/OIBdDD+1i7YbPe6CuzN4Ee+lcsmSywW8pZc8LaPhW8xlIelnD fPJsWNyEfDUeEAQLlOM6XF+tvGK3wYtZuXti9IM3ANEbYEfq0oakH0jEasi+2MhG BuqjuZtFP/Z//Vi/Tls358q8MOHTX37ok6FiSjwIyRMOZWG9HDk= =3IGG -----END PGP SIGNATURE-----
--- End Message ---
