From f23332592b552e3a6a72808d0cd6c4d599daeec6 Mon Sep 17 00:00:00 2001 From: Tim Waugh Date: May 22 2017 10:01:05 +0000 Subject: 3.6 (bug #1453019). --- diff --git a/.gitignore b/.gitignore index 52ad54b..12ed2dd 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ diffutils-2.8.1.tar.gz /diffutils-3.2.tar.xz /diffutils-3.3.tar.xz /diffutils-3.5.tar.xz +/diffutils-3.6.tar.xz diff --git a/diffutils-3.5-gcc7.patch b/diffutils-3.5-gcc7.patch deleted file mode 100644 index 70cda3a..0000000 --- a/diffutils-3.5-gcc7.patch +++ /dev/null @@ -1,222 +0,0 @@ -diff -up diffutils-3.5/lib/intprops.h.than diffutils-3.5/lib/intprops.h ---- diffutils-3.5/lib/intprops.h.than 2017-02-21 09:08:39.470417367 -0500 -+++ diffutils-3.5/lib/intprops.h 2017-02-21 09:46:57.090996508 -0500 -@@ -1,6 +1,6 @@ - /* intprops.h -- properties of integer types - -- Copyright (C) 2001-2016 Free Software Foundation, Inc. -+ Copyright (C) 2001-2017 Free Software Foundation, Inc. - - This program is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published -@@ -47,12 +47,16 @@ - - /* Minimum and maximum values for integer types and expressions. */ - -+/* The width in bits of the integer type or expression T. -+ Padding bits are not supported; this is checked at compile-time below. */ -+#define TYPE_WIDTH(t) (sizeof (t) * CHAR_BIT) -+ - /* The maximum and minimum values for the integer type T. */ - #define TYPE_MINIMUM(t) ((t) ~ TYPE_MAXIMUM (t)) - #define TYPE_MAXIMUM(t) \ - ((t) (! TYPE_SIGNED (t) \ - ? (t) -1 \ -- : ((((t) 1 << (sizeof (t) * CHAR_BIT - 2)) - 1) * 2 + 1))) -+ : ((((t) 1 << (TYPE_WIDTH (t) - 2)) - 1) * 2 + 1))) - - /* The maximum and minimum values for the type of the expression E, - after integer promotion. E should not have side effects. */ -@@ -65,7 +69,13 @@ - ? _GL_SIGNED_INT_MAXIMUM (e) \ - : _GL_INT_NEGATE_CONVERT (e, 1)) - #define _GL_SIGNED_INT_MAXIMUM(e) \ -- (((_GL_INT_CONVERT (e, 1) << (sizeof ((e) + 0) * CHAR_BIT - 2)) - 1) * 2 + 1) -+ (((_GL_INT_CONVERT (e, 1) << (TYPE_WIDTH ((e) + 0) - 2)) - 1) * 2 + 1) -+ -+/* Work around OpenVMS incompatibility with C99. */ -+#if !defined LLONG_MAX && defined __INT64_MAX -+# define LLONG_MAX __INT64_MAX -+# define LLONG_MIN __INT64_MIN -+#endif - - /* This include file assumes that signed types are two's complement without - padding bits; the above macros have undefined behavior otherwise. -@@ -84,10 +94,15 @@ verify (TYPE_MAXIMUM (long int) == LONG_ - verify (TYPE_MINIMUM (long long int) == LLONG_MIN); - verify (TYPE_MAXIMUM (long long int) == LLONG_MAX); - #endif -+/* Similarly, sanity-check one ISO/IEC TS 18661-1:2014 macro if defined. */ -+#ifdef UINT_WIDTH -+verify (TYPE_WIDTH (unsigned int) == UINT_WIDTH); -+#endif - - /* Does the __typeof__ keyword work? This could be done by - 'configure', but for now it's easier to do it by hand. */ --#if (2 <= __GNUC__ || defined __IBM__TYPEOF__ \ -+#if (2 <= __GNUC__ \ -+ || (1210 <= __IBMC__ && defined __IBM__TYPEOF__) \ - || (0x5110 <= __SUNPRO_C && !__STDC__)) - # define _GL_HAVE___TYPEOF__ 1 - #else -@@ -116,8 +131,7 @@ verify (TYPE_MAXIMUM (long long int) == - signed, this macro may overestimate the true bound by one byte when - applied to unsigned types of size 2, 4, 16, ... bytes. */ - #define INT_STRLEN_BOUND(t) \ -- (INT_BITS_STRLEN_BOUND (sizeof (t) * CHAR_BIT \ -- - _GL_SIGNED_TYPE_OR_EXPR (t)) \ -+ (INT_BITS_STRLEN_BOUND (TYPE_WIDTH (t) - _GL_SIGNED_TYPE_OR_EXPR (t)) \ - + _GL_SIGNED_TYPE_OR_EXPR (t)) - - /* Bound on buffer size needed to represent an integer type or expression T, -@@ -222,20 +236,23 @@ verify (TYPE_MAXIMUM (long long int) == - ? (a) < (min) >> (b) \ - : (max) >> (b) < (a)) - --/* True if __builtin_add_overflow (A, B, P) works when P is null. */ --#define _GL_HAS_BUILTIN_OVERFLOW_WITH_NULL (7 <= __GNUC__) -+/* True if __builtin_add_overflow (A, B, P) works when P is non-null. */ -+#define _GL_HAS_BUILTIN_OVERFLOW (5 <= __GNUC__) -+ -+/* True if __builtin_add_overflow_p (A, B, C) works. */ -+#define _GL_HAS_BUILTIN_OVERFLOW_P (7 <= __GNUC__) - - /* The _GL*_OVERFLOW macros have the same restrictions as the - *_RANGE_OVERFLOW macros, except that they do not assume that operands - (e.g., A and B) have the same type as MIN and MAX. Instead, they assume - that the result (e.g., A + B) has that type. */ --#if _GL_HAS_BUILTIN_OVERFLOW_WITH_NULL --# define _GL_ADD_OVERFLOW(a, b, min, max) -- __builtin_add_overflow (a, b, (__typeof__ ((a) + (b)) *) 0) --# define _GL_SUBTRACT_OVERFLOW(a, b, min, max) -- __builtin_sub_overflow (a, b, (__typeof__ ((a) - (b)) *) 0) --# define _GL_MULTIPLY_OVERFLOW(a, b, min, max) -- __builtin_mul_overflow (a, b, (__typeof__ ((a) * (b)) *) 0) -+#if _GL_HAS_BUILTIN_OVERFLOW_P -+# define _GL_ADD_OVERFLOW(a, b, min, max) \ -+ __builtin_add_overflow_p (a, b, (__typeof__ ((a) + (b))) 0) -+# define _GL_SUBTRACT_OVERFLOW(a, b, min, max) \ -+ __builtin_sub_overflow_p (a, b, (__typeof__ ((a) - (b))) 0) -+# define _GL_MULTIPLY_OVERFLOW(a, b, min, max) \ -+ __builtin_mul_overflow_p (a, b, (__typeof__ ((a) * (b))) 0) - #else - # define _GL_ADD_OVERFLOW(a, b, min, max) \ - ((min) < 0 ? INT_ADD_RANGE_OVERFLOW (a, b, min, max) \ -@@ -315,7 +332,7 @@ verify (TYPE_MAXIMUM (long long int) == - _GL_BINARY_OP_OVERFLOW (a, b, _GL_ADD_OVERFLOW) - #define INT_SUBTRACT_OVERFLOW(a, b) \ - _GL_BINARY_OP_OVERFLOW (a, b, _GL_SUBTRACT_OVERFLOW) --#if _GL_HAS_BUILTIN_OVERFLOW_WITH_NULL -+#if _GL_HAS_BUILTIN_OVERFLOW_P - # define INT_NEGATE_OVERFLOW(a) INT_SUBTRACT_OVERFLOW (0, a) - #else - # define INT_NEGATE_OVERFLOW(a) \ -@@ -349,10 +366,6 @@ verify (TYPE_MAXIMUM (long long int) == - #define INT_MULTIPLY_WRAPV(a, b, r) \ - _GL_INT_OP_WRAPV (a, b, r, *, __builtin_mul_overflow, INT_MULTIPLY_OVERFLOW) - --#ifndef __has_builtin --# define __has_builtin(x) 0 --#endif -- - /* Nonzero if this compiler has GCC bug 68193 or Clang bug 25390. See: - https://gcc.gnu.org/bugzilla/show_bug.cgi?id=68193 - https://llvm.org/bugs/show_bug.cgi?id=25390 -@@ -369,7 +382,7 @@ verify (TYPE_MAXIMUM (long long int) == - the operation. BUILTIN is the builtin operation, and OVERFLOW the - overflow predicate. Return 1 if the result overflows. See above - for restrictions. */ --#if 5 <= __GNUC__ || __has_builtin (__builtin_add_overflow) -+#if _GL_HAS_BUILTIN_OVERFLOW - # define _GL_INT_OP_WRAPV(a, b, r, op, builtin, overflow) builtin (a, b, r) - #elif 201112 <= __STDC_VERSION__ && !_GL__GENERIC_BOGUS - # define _GL_INT_OP_WRAPV(a, b, r, op, builtin, overflow) \ -@@ -412,7 +425,7 @@ verify (TYPE_MAXIMUM (long long int) == - # else - # define _GL_INT_OP_WRAPV_LONGISH(a, b, r, op, overflow) \ - _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned long int, \ -- long int, LONG_MIN, LONG_MAX)) -+ long int, LONG_MIN, LONG_MAX) - # endif - #endif - -diff -up diffutils-3.5/lib/xalloc-oversized.h.than diffutils-3.5/lib/xalloc-oversized.h ---- diffutils-3.5/lib/xalloc-oversized.h.than 2017-02-21 09:45:13.729168233 -0500 -+++ diffutils-3.5/lib/xalloc-oversized.h 2017-02-21 09:45:18.309249247 -0500 -@@ -1,6 +1,6 @@ - /* xalloc-oversized.h -- memory allocation size checking - -- Copyright (C) 1990-2000, 2003-2004, 2006-2016 Free Software Foundation, Inc. -+ Copyright (C) 1990-2000, 2003-2004, 2006-2017 Free Software Foundation, Inc. - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by -@@ -19,48 +19,37 @@ - #define XALLOC_OVERSIZED_H_ - - #include -+#include - --/* Default for (non-Clang) compilers that lack __has_builtin. */ --#ifndef __has_builtin --# define __has_builtin(x) 0 --#endif -- --/* True if N * S would overflow in a size calculation. -+/* True if N * S would overflow in a size_t calculation, -+ or would generate a value larger than PTRDIFF_MAX. - This expands to a constant expression if N and S are both constants. - By gnulib convention, SIZE_MAX represents overflow in size -- calculations, so the conservative dividend to use here is -- SIZE_MAX - 1, since SIZE_MAX might represent an overflowed value. -- However, malloc (SIZE_MAX) fails on all known hosts where -- sizeof (ptrdiff_t) <= sizeof (size_t), so do not bother to test for -- exactly-SIZE_MAX allocations on such hosts; this avoids a test and -- branch when S is known to be 1. */ -+ calculations, so the conservative size_t-based dividend to use here -+ is SIZE_MAX - 1. */ - #define __xalloc_oversized(n, s) \ -- ((size_t) (sizeof (ptrdiff_t) <= sizeof (size_t) ? -1 : -2) / (s) < (n)) -+ ((size_t) (PTRDIFF_MAX < SIZE_MAX ? PTRDIFF_MAX : SIZE_MAX - 1) / (s) < (n)) - -+#if PTRDIFF_MAX < SIZE_MAX -+typedef ptrdiff_t __xalloc_count_type; -+#else -+typedef size_t __xalloc_count_type; -+#endif - --/* Return 1 if an array of N objects, each of size S, cannot exist due -- to size arithmetic overflow. S must be positive and N must be -- nonnegative. This is a macro, not a function, so that it -- works correctly even when SIZE_MAX < N. */ -+/* Return 1 if an array of N objects, each of size S, cannot exist -+ reliably due to size or ptrdiff_t arithmetic overflow. S must be -+ positive and N must be nonnegative. This is a macro, not a -+ function, so that it works correctly even when SIZE_MAX < N. */ - --/* GCC 7 __builtin_mul_overflow should easily compute this. See: -- https://gcc.gnu.org/bugzilla/show_bug.cgi?id=68120 */ - #if 7 <= __GNUC__ --# define xalloc_oversized(n, s) __builtin_mul_overflow (n, s, (size_t *) NULL) -- --/* GCC 5 and Clang __builtin_mul_overflow needs a temporary, and -- should be used only for non-constant operands, so that -- xalloc_oversized is a constant expression if both arguments are. -- Do not use this if pedantic, since pedantic GCC issues a diagnostic -- for ({ ... }). */ --#elif ((5 <= __GNUC__ \ -- || (__has_builtin (__builtin_mul_overflow) \ -- && __has_builtin (__builtin_constant_p))) \ -- && !__STRICT_ANSI__) -+# define xalloc_oversized(n, s) \ -+ __builtin_mul_overflow_p (n, s, (__xalloc_count_type) 1) -+#elif 5 <= __GNUC__ && !__STRICT_ANSI__ - # define xalloc_oversized(n, s) \ - (__builtin_constant_p (n) && __builtin_constant_p (s) \ - ? __xalloc_oversized (n, s) \ -- : ({ size_t __xalloc_size; __builtin_mul_overflow (n, s, &__xalloc_size); })) -+ : ({ __xalloc_count_type __xalloc_count; \ -+ __builtin_mul_overflow (n, s, &__xalloc_count); })) - - /* Other compilers use integer division; this may be slower but is - more portable. */ diff --git a/diffutils-3.5.tar.xz.sig b/diffutils-3.5.tar.xz.sig deleted file mode 100644 index 63266bf..0000000 --- a/diffutils-3.5.tar.xz.sig +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIcBAABCgAGBQJXuT2mAAoJEH/Z/MsAC+7uECsP/0wVZOh74XKI0Y4XPxqhgKou -L/uFMgqpq2P9Uwr8jnJCr3xsKWCHYSYXOjmzbQ21wkqDWynT+NbLRcH4HLvO6vU3 -EWtoBor7UG0weTDanNfRBFjVLWsHsDWJj7VGMja9OAkXjpqo0f+iYHHIbJ+oKlIY -gzNqUdjGg8RpsvNapz4XuTsoUNDrTtVOy/k9xHUZCw/h1cZBVpaAU8MEE3MReab6 -pOn660BlVqT50vMd09FKRuTLktJ2LBFZ6x+xdPBJm5LFdUFqClbiNaNv+idhlvfB -GC8qjBr4WhuCtGpJKLFADTOZ8UOxcmx2sNz0ypiQrLT1UkTUtY3B0ADnzWuMEcwx -eaPNzdJhPExY64i7MA2vc2MxlRb7omj8kI+n0rBpiFKLMI3x3ZWf6Papg/acYbJg -0NHQkqdc82gH3vsp5DX/wNn+3TNwks9ziVt7Jervk7uQqWaDLrah3waBN3q5UWsk -HLAlkhb94Ahi+cNMk1oiNKqT+en3AhZ/7O6imKzTM8bTk27Ek7q3ThLfBeUKcp2O -j1aaPbaDGEL9pZZDCeuZCSdRZDGMY+spGNYRC4pmYCL9C2LsH5jtX5ob9gQsPHt3 -XFsi5l83i5N3amwzb2OdSTEwM0xgPX8TmcN435409gvz/VVmeSmx5jhHb9m8SLSk -SrDXEuf5yKX8J8HXVMgt -=e0eV ------END PGP SIGNATURE----- diff --git a/diffutils-3.6.tar.xz.sig b/diffutils-3.6.tar.xz.sig new file mode 100644 index 0000000..578cfbb --- /dev/null +++ b/diffutils-3.6.tar.xz.sig @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIcBAABCgAGBQJZIfmkAAoJEH/Z/MsAC+7uqLUP/0tj7JXPEO6WN2y76ssw23r5 +mrGy3rF8qiy1F8QoM4VymTRMFAdKFjq4oPd0iW5HicYnD8Mb8Vt0v6+TGXa4ysOz +0gkr3qdnRLcRLVEXs2jnTSRyVPUnOPrECQkOgJPseTQI28TbccxCNC8LBwLAsb4H +EKATndnfUPFxy1gntrRIc4O7e6IyjUYfikrzGgPLil4GFTQZMiJ5FJuFkCBoW6+C +hNAWVOLuT/3mCm3AIzLSK7SbUMa2xa6hQ29d7VAtEP/dH3HRDzFEmsw9CVdo8iDE +DVc1vetlUfs+2WoXSuDee7enTBhXJLyV2P1TxxpRU1nX24sLeqWPz8L548BguRnO +yArz5AhZ3ep9nSaSfd+7iKmzxQK4+eO2a5a1OguDzHNDjV1tvqr61A9o7wBWljJU +Wb/aEGkyn3pqQCbA+Ia3SJoXLbIC8i9ASJ1/XaADRplMuq6BOz7ivgNBkP2Opxvh +lISoLbwrR+FJHyJusx2KIHbJsoei6IWj57EaR993ZylTLNnWk5oBAU5X3h4cIVec +mTMxJ0j1lojXEtQBskQ3q8Q8ZXwLWBhDYz2smBQasnvaibNJmsx/WYNTFo5v8jIE +YyvjkQ2SYULnmC/Evzz+nX1EW7hXFLilXeU73mcHlUKl59qwEZ9QCMd4I3i795Wh +udOMJR+url+hCgi3Wifv +=IN0s +-----END PGP SIGNATURE----- diff --git a/diffutils-cmp-s-empty.patch b/diffutils-cmp-s-empty.patch index bc1c6b4..7fc3a18 100644 --- a/diffutils-cmp-s-empty.patch +++ b/diffutils-cmp-s-empty.patch @@ -1,7 +1,7 @@ -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) +diff -up diffutils-3.6/src/cmp.c.cmp-s-empty diffutils-3.6/src/cmp.c +--- diffutils-3.6/src/cmp.c.cmp-s-empty 2017-05-18 18:39:59.000000000 +0100 ++++ diffutils-3.6/src/cmp.c 2017-05-22 10:53:28.477147864 +0100 +@@ -330,12 +330,15 @@ main (int argc, char **argv) /* If only a return code is needed, and if both input descriptors are associated with plain files, diff --git a/diffutils-i18n.patch b/diffutils-i18n.patch index be365e4..6d2b341 100644 --- a/diffutils-i18n.patch +++ b/diffutils-i18n.patch @@ -1,7 +1,7 @@ -diff -up diffutils-3.3/src/diff.c.i18n diffutils-3.3/src/diff.c ---- diffutils-3.3/src/diff.c.i18n 2013-02-02 04:39:05.000000000 +0000 -+++ diffutils-3.3/src/diff.c 2013-10-23 11:25:18.729708853 +0100 -@@ -74,6 +74,8 @@ static void try_help (char const *, char +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 static void check_stdout (void); static void usage (void); @@ -10,9 +10,9 @@ diff -up diffutils-3.3/src/diff.c.i18n diffutils-3.3/src/diff.c /* If comparing directories, compare their common subdirectories recursively. */ static bool recursive; -@@ -285,6 +287,13 @@ main (int argc, char **argv) - re_set_syntax (RE_SYNTAX_GREP | RE_NO_POSIX_BACKTRACKING); +@@ -298,6 +300,13 @@ main (int argc, char **argv) excluded = new_exclude (); + presume_output_tty = false; +#ifdef HANDLE_MULTIBYTE + if (MB_CUR_MAX > 1) @@ -24,9 +24,9 @@ diff -up diffutils-3.3/src/diff.c.i18n diffutils-3.3/src/diff.c /* Decode the options. */ while ((c = getopt_long (argc, argv, shortopts, longopts, NULL)) != -1) -diff -up diffutils-3.3/src/diff.h.i18n diffutils-3.3/src/diff.h ---- diffutils-3.3/src/diff.h.i18n 2013-02-02 04:39:05.000000000 +0000 -+++ diffutils-3.3/src/diff.h 2013-10-23 11:25:18.729708853 +0100 +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 @@ -23,6 +23,17 @@ #include #include @@ -45,7 +45,7 @@ diff -up diffutils-3.3/src/diff.h.i18n diffutils-3.3/src/diff.h /* What kind of changes a hunk contains. */ enum changes { -@@ -365,7 +376,11 @@ extern void print_sdiff_script (struct c +@@ -381,7 +392,11 @@ extern void print_sdiff_script (struct c extern char const change_letter[4]; extern char const pr_program[]; extern char *concat (char const *, char const *, char const *); @@ -58,9 +58,9 @@ diff -up diffutils-3.3/src/diff.h.i18n diffutils-3.3/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.3/src/io.c.i18n diffutils-3.3/src/io.c ---- diffutils-3.3/src/io.c.i18n 2013-02-02 04:39:05.000000000 +0000 -+++ diffutils-3.3/src/io.c 2013-10-23 12:03:09.155348827 +0100 +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 @@ -23,6 +23,7 @@ #include #include @@ -69,7 +69,7 @@ diff -up diffutils-3.3/src/io.c.i18n diffutils-3.3/src/io.c /* Rotate an unsigned value to the left. */ #define ROL(v, n) ((v) << (n) | (v) >> (sizeof (v) * CHAR_BIT - (n))) -@@ -208,6 +209,28 @@ slurp (struct file_data *current) +@@ -215,6 +216,28 @@ slurp (struct file_data *current) /* Split the file into lines, simultaneously computing the equivalence class for each line. */ @@ -98,7 +98,7 @@ diff -up diffutils-3.3/src/io.c.i18n diffutils-3.3/src/io.c static void find_and_hash_each_line (struct file_data *current) -@@ -234,12 +257,300 @@ find_and_hash_each_line (struct file_dat +@@ -241,12 +264,300 @@ find_and_hash_each_line (struct file_dat bool same_length_diff_contents_compare_anyway = diff_length_compare_anyway | ig_case; @@ -399,7 +399,7 @@ diff -up diffutils-3.3/src/io.c.i18n diffutils-3.3/src/io.c /* Hash this line until we find a newline. */ switch (ig_white_space) { -@@ -390,7 +701,7 @@ find_and_hash_each_line (struct file_dat +@@ -397,7 +708,7 @@ find_and_hash_each_line (struct file_dat else if (!diff_length_compare_anyway) continue; @@ -408,10 +408,10 @@ diff -up diffutils-3.3/src/io.c.i18n diffutils-3.3/src/io.c break; } -diff -up diffutils-3.3/src/util.c.i18n diffutils-3.3/src/util.c ---- diffutils-3.3/src/util.c.i18n 2013-02-02 04:39:05.000000000 +0000 -+++ diffutils-3.3/src/util.c 2013-10-23 11:25:18.730708857 +0100 -@@ -408,7 +408,8 @@ finish_output (void) +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 +@@ -985,7 +985,8 @@ finish_output (void) Return nonzero if the lines differ. */ bool @@ -421,7 +421,7 @@ diff -up diffutils-3.3/src/util.c.i18n diffutils-3.3/src/util.c { register char const *t1 = s1; register char const *t2 = s2; -@@ -564,6 +565,354 @@ lines_differ (char const *s1, char const +@@ -1141,6 +1142,354 @@ lines_differ (char const *s1, char const return true; } diff --git a/diffutils.spec b/diffutils.spec index b33ca45..4ca26fd 100644 --- a/diffutils.spec +++ b/diffutils.spec @@ -1,13 +1,12 @@ Summary: A GNU collection of diff utilities Name: diffutils -Version: 3.5 -Release: 3%{?dist} +Version: 3.6 +Release: 1%{?dist} Group: Applications/Text URL: http://www.gnu.org/software/diffutils/diffutils.html Source: ftp://ftp.gnu.org/gnu/diffutils/diffutils-%{version}.tar.xz Patch1: diffutils-cmp-s-empty.patch Patch2: diffutils-i18n.patch -Patch3: diffutils-3.5-gcc7.patch License: GPLv3+ Requires(post): info Requires(preun): info @@ -36,8 +35,6 @@ Install diffutils if you need to compare text files. %patch2 -p1 -b .i18n -%patch3 -p1 -b .gcc7 - # Run autoreconf for aarch64 support (bug #925256). autoreconf @@ -78,6 +75,9 @@ rm -rf $RPM_BUILD_ROOT %{_infodir}/diffutils.info*gz %changelog +* Mon May 22 2017 Tim Waugh - 3.6-1 +- 3.6 (bug #1453019). + * Tue Feb 21 2017 Than Ngo - 3.5-3 - backport to fix FTBFs with GCC 7 diff --git a/sources b/sources index 6457cdd..c8b39f4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -569354697ff1cfc9a9de3781361015fa diffutils-3.5.tar.xz +SHA512 (diffutils-3.6.tar.xz) = 3c159ff1cb7c901b0a57518483566b5740ca3c45aeb8d3004089f052975481db52994cc18592c502c68b0d2a1e22f1f7830f0d8dd9a9ed86de96e28cce9f70c1