Date: Sunday, February 12, 2023 @ 21:36:59 Author: seblu Revision: 468693
upgpkg: diffutils 3.9-1 Added: diffutils/trunk/01-fix-colors-test.patch diffutils/trunk/02-fix-bug-where-D-does-not-work.patch Modified: diffutils/trunk/PKGBUILD ----------------------------------------+ 01-fix-colors-test.patch | 30 ++++++++++++++++++++++++++++++ 02-fix-bug-where-D-does-not-work.patch | 18 ++++++++++++++++++ PKGBUILD | 12 ++++++++---- 3 files changed, 56 insertions(+), 4 deletions(-) Added: 01-fix-colors-test.patch =================================================================== --- 01-fix-colors-test.patch (rev 0) +++ 01-fix-colors-test.patch 2023-02-12 21:36:59 UTC (rev 468693) @@ -0,0 +1,30 @@ +From 89f3daeaaf021a77177daec8666bcd80ec476833 Mon Sep 17 00:00:00 2001 +From: Jim Meyering <[email protected]> +Date: Mon, 16 Jan 2023 15:48:10 -0800 +Subject: tests: accommodate newer GNU make's SIGPIPE-ignore +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +* tests/colors: Allow an exit code of not just 141 (SIGPIPE), +but also "error": 2. +Reported by Tomasz Kłoczko in http://bugs.gnu.org/59905. +--- + tests/colors | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/tests/colors b/tests/colors +index a14e555..6ef729f 100755 +--- a/tests/colors ++++ b/tests/colors +@@ -128,6 +128,9 @@ printf '%1000000s-a' > a + printf '%1000000s-b' > b + head -c 10 < fifo > /dev/null & + diff --color=always ---presume-output-tty a b > fifo +-test $? = 141 || fail=1 ++ ++# Depending on version of GNU make (4.3.92-4.4 set SIGPIPE to "ignore"), ++# either of these is acceptable. ++case $? in 2|141) ;; *) fail=1 ;; esac + + Exit $fail Added: 02-fix-bug-where-D-does-not-work.patch =================================================================== --- 02-fix-bug-where-D-does-not-work.patch (rev 0) +++ 02-fix-bug-where-D-does-not-work.patch 2023-02-12 21:36:59 UTC (rev 468693) @@ -0,0 +1,18 @@ +From ba08fbbb0ca5da455bf695236c57bc50e7faed50 Mon Sep 17 00:00:00 2001 +From: Paul Eggert <[email protected]> +Date: Fri, 10 Feb 2023 15:33:40 -0800 +Subject: diff: fix bug where -D does not work + +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) Modified: PKGBUILD =================================================================== --- PKGBUILD 2023-02-12 21:36:20 UTC (rev 468692) +++ PKGBUILD 2023-02-12 21:36:59 UTC (rev 468693) @@ -3,7 +3,7 @@ # Contributor: Andreas Radke <[email protected]> pkgname=diffutils -pkgver=3.8 +pkgver=3.9 pkgrel=1 pkgdesc='Utility programs used for creating patch files' arch=('x86_64') @@ -11,9 +11,13 @@ license=('GPL3') depends=('glibc' 'bash') validpgpkeys=('155D3FC500C834486D1EEA677FD9FCCB000BEEEE') # Jim Meyering -source=("https://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz"{,.sig}) -sha256sums=('a6bdd7d1b31266d11c4f4de6c1b748d4607ab0231af5188fc2533d0ae2438fec' - 'SKIP') +source=("https://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz"{,.sig} + '01-fix-colors-test.patch' + '02-fix-bug-where-D-does-not-work.patch') +sha256sums=('d80d3be90a201868de83d78dad3413ad88160cc53bcc36eb9eaf7c20dbf023f1' + 'SKIP' + 'bc0b6db1f90808551e376b98a5f5e235b7a33d0f09a780a2d6be476f64678ef7' + 'a96a96267b65b5a17b0acad2064f9edede3f54462146850f9f0b5ea8ef0e7bf4') prepare() { cd $pkgname-$pkgver
