* update diffutils to 3.10-1.1
This commit is contained in:
parent
5076d40a6a
commit
e72c7af195
@ -1,30 +0,0 @@
|
||||
From 89f3daeaaf021a77177daec8666bcd80ec476833 Mon Sep 17 00:00:00 2001
|
||||
From: Jim Meyering <meyering@fb.com>
|
||||
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
|
@ -1,18 +0,0 @@
|
||||
From ba08fbbb0ca5da455bf695236c57bc50e7faed50 Mon Sep 17 00:00:00 2001
|
||||
From: Paul Eggert <eggert@cs.ucla.edu>
|
||||
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)
|
@ -5,7 +5,7 @@
|
||||
|
||||
pkgname=diffutils
|
||||
pkgver=3.10
|
||||
pkgrel=1
|
||||
pkgrel=1.1
|
||||
pkgdesc='Utility programs used for creating patch files'
|
||||
arch=(x86_64 powerpc64le powerpc64 powerpc riscv64)
|
||||
url='https://www.gnu.org/software/diffutils'
|
||||
|
Loading…
x
Reference in New Issue
Block a user