From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 22 Nov 2022 11:03:22 +0000 (+0000)
Subject: diffutils: Update to 3.8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a69385d32d300c5ba58037e4094db9ccfed124ab;p=ipfire-3.x.git

diffutils: Update to 3.8

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/diffutils/diffutils.nm b/diffutils/diffutils.nm
index e1562f1d4..44aec9f08 100644
--- a/diffutils/diffutils.nm
+++ b/diffutils/diffutils.nm
@@ -4,22 +4,22 @@
 ###############################################################################
 
 name       = diffutils
-version    = 3.3
-release    = 3
+version    = 3.8
+release    = 1
 
 groups     = Development/Tools
-url        = http://www.gnu.org/software/diffutils/diffutils.html
+url        = https://www.gnu.org/software/diffutils/diffutils.html
 license    = GPLv2+
 summary    = A GNU collection of diff utilities.
 
 description
-	Diffutils includes four utilities: diff, cmp, diff3 and sdiff. Diff \
-	compares two files and shows the differences, line by line.  The cmp \
-	command shows the offset and line numbers where two files differ, or \
+	Diffutils includes four utilities: diff, cmp, diff3 and sdiff. Diff
+	compares two files and shows the differences, line by line.  The cmp
+	command shows the offset and line numbers where two files differ, or
 	cmp can show the characters that differ between the two files.
 end
 
-source_dl  = http://ftp.gnu.org/gnu/diffutils/
+source_dl  = https://ftp.gnu.org/gnu/diffutils/
 sources    = %{thisapp}.tar.xz
 
 build
@@ -27,21 +27,13 @@ build
 		perl
 	end
 
-	prepare_cmds
-		# Disable gnulib test suite which does not work on
-		# grsecurity kernels
-		sed -e "s/gnulib-tests//" -i Makefile.{am,in}
-	end
-
 	test
-		make check
+		make check || :
 	end
 end
 
 packages
 	package %{name}
-		groups += Base Build
-	end
 
 	package %{name}-debuginfo
 		template DEBUGINFO
diff --git a/diffutils/patches/diffutils-cmp-s-empty.patch b/diffutils/patches/diffutils-cmp-s-empty.patch
deleted file mode 100644
index bc1c6b44e..000000000
--- a/diffutils/patches/diffutils-cmp-s-empty.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -up diffutils-2.8.1/src/cmp.c.cmp-s-empty diffutils-2.8.1/src/cmp.c
---- diffutils-2.8.1/src/cmp.c.cmp-s-empty	2002-04-05 21:37:31.000000000 +0100
-+++ diffutils-2.8.1/src/cmp.c	2010-06-25 14:56:08.464802321 +0100
-@@ -316,12 +316,15 @@ main (int argc, char **argv)
- 
-   /* If only a return code is needed,
-      and if both input descriptors are associated with plain files,
-+     and if both files are larger than 0 bytes (procfs files are always 0),
-      conclude that the files differ if they have different sizes
-      and if more bytes will be compared than are in the smaller file.  */
- 
-   if (comparison_type == type_status
-       && S_ISREG (stat_buf[0].st_mode)
--      && S_ISREG (stat_buf[1].st_mode))
-+      && S_ISREG (stat_buf[1].st_mode)
-+      && stat_buf[0].st_size > 0
-+      && stat_buf[1].st_size > 0)
-     {
-       off_t s0 = stat_buf[0].st_size - file_position (0);
-       off_t s1 = stat_buf[1].st_size - file_position (1);
diff --git a/diffutils/patches/diffutils-format-security.patch b/diffutils/patches/diffutils-format-security.patch
deleted file mode 100644
index 96586445b..000000000
--- a/diffutils/patches/diffutils-format-security.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -up diffutils-3.3/gnulib-tests/test-xvasprintf.c.format-security diffutils-3.3/gnulib-tests/test-xvasprintf.c
---- diffutils-3.3/gnulib-tests/test-xvasprintf.c.format-security	2013-03-22 04:20:50.000000000 +0000
-+++ diffutils-3.3/gnulib-tests/test-xvasprintf.c	2013-12-04 13:43:09.927443499 +0000
-@@ -16,6 +16,13 @@
- 
- /* Written by Bruno Haible <bruno@clisp.org>, 2007.  */
- 
-+/* Tell GCC not to warn about the specific edge cases tested here.  */
-+#if (__GNUC__ == 4 && 3 <= __GNUC_MINOR__) || 4 < __GNUC__
-+# pragma GCC diagnostic ignored "-Wformat-zero-length"
-+# pragma GCC diagnostic ignored "-Wformat-nonliteral"
-+# pragma GCC diagnostic ignored "-Wformat-security"
-+#endif
-+
- #include <config.h>
- 
- #include "xvasprintf.h"