From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id CA1FE1581EE for ; Fri, 21 Mar 2025 21:04:39 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id B7BF1343329 for ; Fri, 21 Mar 2025 21:04:39 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 0707F1104AC; Fri, 21 Mar 2025 21:04:36 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id EAF711104AC for ; Fri, 21 Mar 2025 21:04:35 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 94B6E34323F for ; Fri, 21 Mar 2025 21:04:35 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2F2E420FB for ; Fri, 21 Mar 2025 21:04:34 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1742591039.f5d0db4f4aecc36c9963dae13cde91cafe96b25d.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-devel/patch/, sys-devel/patch/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-devel/patch/files/patch-2.7.6_p20250206-no-backup-if-mismatch-regression.patch sys-devel/patch/files/patch-2.7.6_p20250206-traditional-diff-lines.patch sys-devel/patch/patch-2.7.6_p20250206-r1.ebuild X-VCS-Directories: sys-devel/patch/files/ sys-devel/patch/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: f5d0db4f4aecc36c9963dae13cde91cafe96b25d X-VCS-Branch: master Date: Fri, 21 Mar 2025 21:04:34 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: d4c7cf65-f5d8-4539-aab2-841cc2c1902f X-Archives-Hash: 8eb8e66f6a0a65e49ce5101c2d77d32e commit: f5d0db4f4aecc36c9963dae13cde91cafe96b25d Author: Sam James gentoo org> AuthorDate: Fri Mar 21 21:03:07 2025 +0000 Commit: Sam James gentoo org> CommitDate: Fri Mar 21 21:03:59 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5d0db4f sys-devel/patch: drop test patches modifying Makefile.am The workaround in 7b8499943ab93e837b92eceaf8b85e5646327b7f doesn't seem enough for Prefix as reported in #gentoo-prefix. While autotools.eclass needs investigating (still), there's not much value in leaving these tests here for now. Signed-off-by: Sam James gentoo.org> ...20250206-no-backup-if-mismatch-regression.patch | 80 ---------------------- ...ch-2.7.6_p20250206-traditional-diff-lines.patch | 78 --------------------- sys-devel/patch/patch-2.7.6_p20250206-r1.ebuild | 10 --- 3 files changed, 168 deletions(-) diff --git a/sys-devel/patch/files/patch-2.7.6_p20250206-no-backup-if-mismatch-regression.patch b/sys-devel/patch/files/patch-2.7.6_p20250206-no-backup-if-mismatch-regression.patch index f4d162694ab4..0891b855d998 100644 --- a/sys-devel/patch/files/patch-2.7.6_p20250206-no-backup-if-mismatch-regression.patch +++ b/sys-devel/patch/files/patch-2.7.6_p20250206-no-backup-if-mismatch-regression.patch @@ -13,10 +13,7 @@ https://bugs.gentoo.org/show_bug.cgi?id=949834 * tests/Makefile.am (TESTS): Add it. --- src/patch.c | 6 ++++- - tests/Makefile.am | 1 + - tests/no-backup | 56 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 62 insertions(+), 1 deletion(-) - create mode 100644 tests/no-backup diff --git a/src/patch.c b/src/patch.c index 6c460f7..e4d0524 100644 @@ -52,80 +49,3 @@ index 6c460f7..e4d0524 100644 break; case CHAR_MAX + 7: posixly_correct = true; -diff --git a/tests/Makefile.am b/tests/Makefile.am -index 43ddf66..acb449a 100644 ---- a/tests/Makefile.am -+++ b/tests/Makefile.am -@@ -50,6 +50,7 @@ TESTS = \ - mixed-patch-types \ - munged-context-format \ - need-filename \ -+ no-backup \ - no-mode-change-git-diff \ - no-newline-triggers-assert \ - preserve-c-function-names \ -diff --git a/tests/no-backup b/tests/no-backup -new file mode 100644 -index 0000000..57b73fa ---- /dev/null -+++ b/tests/no-backup -@@ -0,0 +1,56 @@ -+# Copyright 2025 Free Software Foundation, Inc. -+# -+# Copying and distribution of this file, with or without modification, -+# in any medium, are permitted without royalty provided the copyright -+# notice and this notice are preserved. -+ -+# Test the --no-backup-if-mismatch option -+ -+. $srcdir/test-lib.sh -+ -+require cat -+use_local_patch -+use_tmpdir -+ -+# ============================================================== -+ -+cat >my_file <<'EOF' -+/* ... */ -+void baz(); -+ -+ -+void baz() { -+ /* ... */ -+} -+ -+int main() { -+ int foo; -+ int bar; -+ -+ /* ... */ -+ baz(); -+} -+EOF -+ -+cat >my_file.patch <<'EOF' -+--- my_file 2025-02-16 11:22:12.881765792 +0000 -++++ my_file_new 2025-02-16 11:22:12.881796732 +0000 -+@@ -2,7 +2,7 @@ -+ void baz(); -+ -+ void baz() { -+- /* ... */ -++ // ... -+ } -+ -+ int main() { -+EOF -+ -+unset POSIXLY_CORRECT -+ -+check 'patch -N --no-backup-if-mismatch -Date: Wed, 26 Feb 2025 16:44:48 -0800 -Subject: [PATCH 2/2] Regression in commit abe92e8010ab affecting MariaDB tests - -I have disovered a regression in commit abe92e8010ab ("Prefer idx_t, -ptrdiff_t to lin") while I was running MariaDB tests. The regression is -related to a diff file [1], where the patch fails to apply it with -following error: - - patch: **** '---' expected at line 2 of patch - -To illustrate the issue, I have attached a git patch containing a -testcase with simplified reproducer. - -[1] https://github.com/MariaDB/server/blob/mariadb-10.6.21/mysql-test/suite/innodb/r/innodb-wl5522%2Cstrict_crc32.rdiff file ---- - tests/Makefile.am | 1 + - tests/regression-abe92e8010ab | 33 +++++++++++++++++++++++++++++++++ - 2 files changed, 34 insertions(+) - create mode 100644 tests/regression-abe92e8010ab - -diff --git a/tests/Makefile.am b/tests/Makefile.am -index acb449a..8f1a248 100644 ---- a/tests/Makefile.am -+++ b/tests/Makefile.am -@@ -57,6 +57,7 @@ TESTS = \ - preserve-mode-and-timestamp \ - quoted-filenames \ - read-only-files \ -+ regression-abe92e8010ab \ - reject-format \ - remember-backup-files \ - remember-reject-files \ -diff --git a/tests/regression-abe92e8010ab b/tests/regression-abe92e8010ab -new file mode 100644 -index 0000000..0e11e34 ---- /dev/null -+++ b/tests/regression-abe92e8010ab -@@ -0,0 +1,33 @@ -+. $srcdir/test-lib.sh -+ -+require cat -+use_local_patch -+use_tmpdir -+ -+cat > f < f.diff < 3 -+EOF -+ -+check 'patch f < f.diff' <