From db3f3501151c012751012659e149a7f80e4efd54 Mon Sep 17 00:00:00 2001 From: Zach van Rijn Date: Fri, 7 Apr 2023 10:44:57 -0700 Subject: system/diffutils: add patch for 'diff -D' regression. fixes #983, #984. --- .../diff-fix-bug-where-D-does-not-work.patch | 72 ++++++++++++++++++++++ 1 file changed, 72 insertions(+) create mode 100644 system/diffutils/diff-fix-bug-where-D-does-not-work.patch (limited to 'system/diffutils/diff-fix-bug-where-D-does-not-work.patch') diff --git a/system/diffutils/diff-fix-bug-where-D-does-not-work.patch b/system/diffutils/diff-fix-bug-where-D-does-not-work.patch new file mode 100644 index 000000000..fa547efd8 --- /dev/null +++ b/system/diffutils/diff-fix-bug-where-D-does-not-work.patch @@ -0,0 +1,72 @@ +This patch differs from upstream in the following way: + + * It does not add the 'ifdef' regression test. + +Justification: + + * Adding unnecessary dependencies (autotools) is undesirable; + + * Attempting to 'autoreconf -i' (due to touched 'Makefile.am') + does not work in the current environment, failing with: + + configure:7925: error: possibly undefined macro: gl_ANYTHREADLIB_EARLY + ... + configure:13623: error: possibly undefined macro: gl_PTHREADLIB + configure:13708: error: possibly undefined macro: gl_WEAK_SYMBOLS + autoreconf: error: /usr/bin/autoconf failed with exit status: 1 + + * The next diffutils release tarball should be usable. + +From ba08fbbb0ca5da455bf695236c57bc50e7faed50 Mon Sep 17 00:00:00 2001 +From: Paul Eggert +Date: Fri, 10 Feb 2023 15:33:40 -0800 +Subject: diff: fix bug where -D does not work +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Problem reported by Robert Webb (bug#61193). +* NEWS: Mention this. +* src/diff.c (main): Omit stray ‘sizeof’. +* tests/ifdef: New test. +* tests/Makefile.am (TESTS): Add it. +--- + NEWS | 5 +++++ + src/diff.c | 2 +- + tests/Makefile.am | 1 + + tests/ifdef | 37 +++++++++++++++++++++++++++++++++++++ + 4 files changed, 44 insertions(+), 1 deletion(-) + create mode 100755 tests/ifdef + +diff --git a/NEWS b/NEWS +index ad9c6cc..f146730 100644 +--- a/NEWS ++++ b/NEWS +@@ -2,6 +2,11 @@ GNU diffutils NEWS -*- outline -*- + + * Noteworthy changes in release ?.? (????-??-??) [?] + ++** Bug fixes ++ ++ diff -D no longer fails to output #ifndef lines. ++ [bug#61193 introduced in 3.9] ++ + + * Noteworthy changes in release 3.9 (2023-01-15) [stable] + +diff --git a/src/diff.c b/src/diff.c +index dd6f63b..2b4834f 100644 +--- a/src/diff.c ++++ b/src/diff.c +@@ -416,7 +416,7 @@ main (int argc, char **argv) + char *base = b; + int changes = 0; + +- for (i = 0; i < sizeof sizeof C_ifdef_group_formats; i++) ++ for (i = 0; i < sizeof C_ifdef_group_formats; i++) + { + char ch = C_ifdef_group_formats[i]; + switch (ch) +-- +cgit v1.1 + -- cgit v1.2.3-70-g09d2