3.8.
This commit is contained in:
Tim Waugh
parent
4216d4197e
commit
6958cd94fe
1
.gitignore
vendored
1
.gitignore
vendored
@ -6,3 +6,4 @@ diffutils-2.8.1.tar.gz
|
||||
/diffutils-3.5.tar.xz
|
||||
/diffutils-3.6.tar.xz
|
||||
/diffutils-3.7.tar.xz
|
||||
/diffutils-3.8.tar.xz
|
||||
|
||||
@ -1,16 +0,0 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQIzBAABCgAdFiEEFV0/xQDINEhtHupnf9n8ywAL7u4FAlwqylgACgkQf9n8ywAL
|
||||
7u6ujBAAh81vOPv2HhDG/DtnI0zLcP2Twr+beAxrhDkFi7hb9szFiAzx88nxlt7L
|
||||
zmqVh4AF7czMsYsjujHYGmAFxgMFEW5HPbXEbNN2zOFC2lcIOq+5PyGyAN1tPdiG
|
||||
Zcju/TiLXtmpyPt0aYsAnVx4lY2IBtjVhVRBSQnbZcWEXrZisNid0KoAkFFGQyim
|
||||
loSgUN7622L8JDZQ+XrtnvPgEcR/wVcLmyGozLouKc1trkO8Pyhjam0UOQEFq12L
|
||||
eEf5PAV9d3r/DqZQW98YhA5g5XwaAaOdKR7sbc1NDKqbo0qAtRZJ9aBn7TCxiBM/
|
||||
4SQAu3HAgr14r97Df9yQdd/LbfOiMm47txz0OCWI2+QC5NIK9OVkdnjfPU2D6pRY
|
||||
xh+9n8Gict5/BYO6NHNE8Zs50ZxQFEHvh0y/GJNTpJHLUBbvA0jWDfIXq1tlg4Gt
|
||||
DkQz6TmJzltFDgh6TZcmCEWd/8beT81U7u/NZYmCWHUeNx7g6voe1oZeofqcG4EF
|
||||
LXvBkK/go4l8p7qWQ3ifb7ydY4cOisfIQpddYJCpjEt+OAnVAzsfckpQUXiMzdpS
|
||||
G7pqbR3DTIqAp1ZQJlV+UV4lcMxgnktg3gSzmtAct7/pfF5OVoch3EylyOWjs4F5
|
||||
BTtIvn9AcaU0xuO1VogKu9HyZHq0InDV5dCsGgnz8M+9uHEiyf8=
|
||||
=nbm3
|
||||
-----END PGP SIGNATURE-----
|
||||
16
diffutils-3.8.tar.xz.sig
Normal file
16
diffutils-3.8.tar.xz.sig
Normal file
@ -0,0 +1,16 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQIzBAABCgAdFiEEFV0/xQDINEhtHupnf9n8ywAL7u4FAmEHUX8ACgkQf9n8ywAL
|
||||
7u4sHBAAqVMdOZrt6KAkAmtxPbTN93pZydq1TsIfDp1/1BWygy6LbVxyMY7SAB+k
|
||||
WyhskuwlF+DhLwATUgfuqJTfXsEagw+JMlQpPAZAiyaNmOLOEGni7wLvx2qkQWz6
|
||||
3SbYSQUQUig9k6Ccnv0QyFpadKOkueyDJ6m5FWhXW9GbNaYT/dNSGQ4v67JjLvcY
|
||||
e3wZKuRH01HdtNrQghLa/wdt7toCVe6hXA/D91up6zRZ3nDO9c6Zp09b2O/ssyrp
|
||||
r20bQuK1xlXQGwvJAIi7wmyY+OkMxTXXP9g7OsXU/sYaxQBoPMSbfrC2B6vx8dqQ
|
||||
DmEoSWuh9n/2/aF4OzDa3gaYdRdlRZyeM/DioCSUbrhOU1xXOC4Lh0dHmxSZwUQ8
|
||||
PlKphakQOk0wmf8FfAk+45oI/74clT8ixE2SUxmwSrgbCy7Cxn6G3L0fhE0x7k/m
|
||||
PC9ogg6PMsM+ITyhj2xLRvEEB2/M5nKpzZJ5DG3uRzF+JwpXwp444LfDRplC3Cum
|
||||
i159wBY2jpa3ip28xcP0pplwNEKhJM0n+u/KjB2xqx2cgnFqNk9J9VoW0mH+MWAj
|
||||
CSCUIRdjjxxegHbxNsZ7B6Vh0RiAqSD5LPyPNzWGr1WYCM8gKimrtlQnoZG9JoTi
|
||||
zU3LtUW10w2gw3madJzDNAwMNTnmWgZw6Tm8w9etmXWsJjTaD8g=
|
||||
=XQl1
|
||||
-----END PGP SIGNATURE-----
|
||||
@ -1,26 +0,0 @@
|
||||
diff -up diffutils-3.7/gnulib-tests/test-perror2.c.fix-gnulib-tests diffutils-3.7/gnulib-tests/test-perror2.c
|
||||
--- diffutils-3.7/gnulib-tests/test-perror2.c.fix-gnulib-tests 2018-01-07 00:45:53.000000000 +0000
|
||||
+++ diffutils-3.7/gnulib-tests/test-perror2.c 2020-10-08 14:36:15.002040558 +0100
|
||||
@@ -79,9 +79,6 @@ main (void)
|
||||
errno = -5;
|
||||
perror ("");
|
||||
ASSERT (!ferror (stderr));
|
||||
- ASSERT (msg1 == msg2 || msg1 == msg4 || STREQ (msg1, str1));
|
||||
- ASSERT (msg2 == msg4 || STREQ (msg2, str2));
|
||||
- ASSERT (msg3 == msg4 || STREQ (msg3, str3));
|
||||
ASSERT (STREQ (msg4, str4));
|
||||
|
||||
free (str1);
|
||||
diff -up diffutils-3.7/gnulib-tests/test-strerror_r.c.fix-gnulib-tests diffutils-3.7/gnulib-tests/test-strerror_r.c
|
||||
--- diffutils-3.7/gnulib-tests/test-strerror_r.c.fix-gnulib-tests 2018-01-07 00:45:53.000000000 +0000
|
||||
+++ diffutils-3.7/gnulib-tests/test-strerror_r.c 2020-10-08 14:36:15.003040568 +0100
|
||||
@@ -165,9 +165,6 @@ main (void)
|
||||
|
||||
strerror_r (EACCES, buf, sizeof buf);
|
||||
strerror_r (-5, buf, sizeof buf);
|
||||
- ASSERT (msg1 == msg2 || msg1 == msg4 || STREQ (msg1, str1));
|
||||
- ASSERT (msg2 == msg4 || STREQ (msg2, str2));
|
||||
- ASSERT (msg3 == msg4 || STREQ (msg3, str3));
|
||||
ASSERT (STREQ (msg4, str4));
|
||||
|
||||
free (str1);
|
||||
@ -1,7 +1,7 @@
|
||||
diff -up diffutils-3.6/src/diff.c.i18n diffutils-3.6/src/diff.c
|
||||
--- diffutils-3.6/src/diff.c.i18n 2017-05-06 20:02:54.000000000 +0100
|
||||
+++ diffutils-3.6/src/diff.c 2017-05-22 10:52:21.989254674 +0100
|
||||
@@ -76,6 +76,8 @@ static void try_help (char const *, char
|
||||
diff -up diffutils-3.8/src/diff.c.i18n diffutils-3.8/src/diff.c
|
||||
--- diffutils-3.8/src/diff.c.i18n 2021-06-12 06:50:55.000000000 +0100
|
||||
+++ diffutils-3.8/src/diff.c 2021-08-02 09:55:20.671517943 +0100
|
||||
@@ -77,6 +77,8 @@ static void try_help (char const *, char
|
||||
static void check_stdout (void);
|
||||
static void usage (void);
|
||||
|
||||
@ -10,9 +10,9 @@ diff -up diffutils-3.6/src/diff.c.i18n diffutils-3.6/src/diff.c
|
||||
/* If comparing directories, compare their common subdirectories
|
||||
recursively. */
|
||||
static bool recursive;
|
||||
@@ -298,6 +300,13 @@ main (int argc, char **argv)
|
||||
excluded = new_exclude ();
|
||||
@@ -300,6 +302,13 @@ main (int argc, char **argv)
|
||||
presume_output_tty = false;
|
||||
xstdopen ();
|
||||
|
||||
+#ifdef HANDLE_MULTIBYTE
|
||||
+ if (MB_CUR_MAX > 1)
|
||||
@ -24,9 +24,9 @@ diff -up diffutils-3.6/src/diff.c.i18n diffutils-3.6/src/diff.c
|
||||
/* Decode the options. */
|
||||
|
||||
while ((c = getopt_long (argc, argv, shortopts, longopts, NULL)) != -1)
|
||||
diff -up diffutils-3.6/src/diff.h.i18n diffutils-3.6/src/diff.h
|
||||
--- diffutils-3.6/src/diff.h.i18n 2017-01-01 11:22:36.000000000 +0000
|
||||
+++ diffutils-3.6/src/diff.h 2017-05-22 10:51:09.050371844 +0100
|
||||
diff -up diffutils-3.8/src/diff.h.i18n diffutils-3.8/src/diff.h
|
||||
--- diffutils-3.8/src/diff.h.i18n 2021-01-02 01:37:49.000000000 +0000
|
||||
+++ diffutils-3.8/src/diff.h 2021-08-02 09:54:36.922101185 +0100
|
||||
@@ -23,6 +23,17 @@
|
||||
#include <stdio.h>
|
||||
#include <unlocked-io.h>
|
||||
@ -58,9 +58,9 @@ diff -up diffutils-3.6/src/diff.h.i18n diffutils-3.6/src/diff.h
|
||||
extern lin translate_line_number (struct file_data const *, lin);
|
||||
extern struct change *find_change (struct change *);
|
||||
extern struct change *find_reverse_change (struct change *);
|
||||
diff -up diffutils-3.6/src/io.c.i18n diffutils-3.6/src/io.c
|
||||
--- diffutils-3.6/src/io.c.i18n 2017-01-01 11:22:36.000000000 +0000
|
||||
+++ diffutils-3.6/src/io.c 2017-05-22 10:51:09.050371844 +0100
|
||||
diff -up diffutils-3.8/src/io.c.i18n diffutils-3.8/src/io.c
|
||||
--- diffutils-3.8/src/io.c.i18n 2021-01-02 01:37:49.000000000 +0000
|
||||
+++ diffutils-3.8/src/io.c 2021-08-02 09:58:03.672211301 +0100
|
||||
@@ -23,6 +23,7 @@
|
||||
#include <cmpbuf.h>
|
||||
#include <file-type.h>
|
||||
@ -398,19 +398,19 @@ diff -up diffutils-3.6/src/io.c.i18n diffutils-3.6/src/io.c
|
||||
+
|
||||
/* Hash this line until we find a newline. */
|
||||
switch (ig_white_space)
|
||||
{
|
||||
{
|
||||
@@ -397,7 +708,7 @@ find_and_hash_each_line (struct file_dat
|
||||
else if (!diff_length_compare_anyway)
|
||||
continue;
|
||||
else if (!diff_length_compare_anyway)
|
||||
continue;
|
||||
|
||||
- if (! lines_differ (eqline, ip))
|
||||
+ if (! lines_differ (eqline, eqs[i].length + 1, ip, length + 1))
|
||||
break;
|
||||
}
|
||||
- if (! lines_differ (eqline, ip))
|
||||
+ if (! lines_differ (eqline, eqs[i].length + 1, ip, length + 1))
|
||||
break;
|
||||
}
|
||||
|
||||
diff -up diffutils-3.6/src/util.c.i18n diffutils-3.6/src/util.c
|
||||
--- diffutils-3.6/src/util.c.i18n 2017-05-18 18:39:59.000000000 +0100
|
||||
+++ diffutils-3.6/src/util.c 2017-05-22 10:51:09.050371844 +0100
|
||||
diff -up diffutils-3.8/src/util.c.i18n diffutils-3.8/src/util.c
|
||||
--- diffutils-3.8/src/util.c.i18n 2021-01-02 01:37:49.000000000 +0000
|
||||
+++ diffutils-3.8/src/util.c 2021-08-02 09:54:36.922101185 +0100
|
||||
@@ -985,7 +985,8 @@ finish_output (void)
|
||||
Return nonzero if the lines differ. */
|
||||
|
||||
|
||||
@ -1,25 +0,0 @@
|
||||
diff -up diffutils-3.7/lib/c-stack.c.sigstksz diffutils-3.7/lib/c-stack.c
|
||||
--- diffutils-3.7/lib/c-stack.c.sigstksz 2021-04-12 10:58:48.892279388 +0100
|
||||
+++ diffutils-3.7/lib/c-stack.c 2021-04-12 11:04:59.488695551 +0100
|
||||
@@ -52,12 +52,18 @@ typedef struct sigaltstack stack_t;
|
||||
#endif
|
||||
#ifndef SIGSTKSZ
|
||||
# define SIGSTKSZ 16384
|
||||
-#elif HAVE_LIBSIGSEGV && SIGSTKSZ < 16384
|
||||
+#elif HAVE_LIBSIGSEGV
|
||||
/* libsigsegv 2.6 through 2.8 have a bug where some architectures use
|
||||
more than the Linux default of an 8k alternate stack when deciding
|
||||
if a fault was caused by stack overflow. */
|
||||
-# undef SIGSTKSZ
|
||||
-# define SIGSTKSZ 16384
|
||||
+# if defined _SC_SIGSTKSZ && _SC_SIGSTKSZ < 16384
|
||||
+ /* glibc 2.34 defines SIGSTKSZ to sysconf (_SC_SIGSTKSZ) */
|
||||
+# undef SIGSTKSZ
|
||||
+# define SIGSTKSZ 16384
|
||||
+# elif SIGSTKSZ < 16384
|
||||
+# undef SIGSTKSZ
|
||||
+# define SIGSTKSZ 16384
|
||||
+# endif
|
||||
#endif
|
||||
|
||||
#include <stdlib.h>
|
||||
@ -1,13 +1,11 @@
|
||||
Summary: GNU collection of diff utilities
|
||||
Name: diffutils
|
||||
Version: 3.7
|
||||
Release: 10%{?dist}
|
||||
Version: 3.8
|
||||
Release: 1%{?dist}
|
||||
URL: https://www.gnu.org/software/diffutils/diffutils.html
|
||||
Source: https://ftp.gnu.org/gnu/diffutils/diffutils-%{version}.tar.xz
|
||||
Patch1: diffutils-cmp-s-empty.patch
|
||||
Patch2: diffutils-i18n.patch
|
||||
Patch3: diffutils-fix-gnulib-tests.patch
|
||||
Patch4: diffutils-sigstksz.patch
|
||||
License: GPLv3+
|
||||
Provides: bundled(gnulib)
|
||||
BuildRequires: gcc
|
||||
@ -35,12 +33,6 @@ Install diffutils if you need to compare text files.
|
||||
|
||||
%patch2 -p1 -b .i18n
|
||||
|
||||
# Fix from gnulib upstream, commit 175e0bc (bug #1863423).
|
||||
%patch3 -p1 -b .fix-gnulib-tests
|
||||
|
||||
# Handle SIGSTKSZ no longer being a constant (bug #1943016).
|
||||
%patch4 -p1 -b .sigstksz
|
||||
|
||||
# Run autoreconf for aarch64 support (bug #925256).
|
||||
autoreconf
|
||||
|
||||
@ -67,6 +59,9 @@ make check
|
||||
%{_infodir}/diffutils.info*
|
||||
|
||||
%changelog
|
||||
* Mon Aug 2 2021 Tim Waugh <twaugh@redhat.com> - 3.8-1
|
||||
- 3.8.
|
||||
|
||||
* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.7-10
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
||||
|
||||
|
||||
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (diffutils-3.7.tar.xz) = 7b12cf8aea1b9844773748f72272d9c6a38adae9c3c3a8c62048f91fb56c60b76035fa5f51665dceaf2cfbf1d1f4a3efdcc24bf47a5a16ff4350543314b12c9c
|
||||
SHA512 (diffutils-3.8.tar.xz) = 279441270987e70d5ecfaf84b6285a4866929c43ec877e50f154a788858d548a8a316f2fc26ad62f7348c8d289cb29a09d06dfadce1806e3d8b4ea88c8b1aa7c
|
||||
|
||||
Loading…
Reference in New Issue
Block a user