From b3d7b433f0e43a5e42de08c29db199b462e6dbba Mon Sep 17 00:00:00 2001 From: Tim Waugh Date: Mon, 16 Jan 2023 14:45:50 +0000 Subject: [PATCH] 3.9 (bug #2161117). --- .gitignore | 1 + diffutils-3.8.tar.xz.sig | 16 ------------- diffutils-3.9.tar.xz.sig | 16 +++++++++++++ diffutils-i18n.patch | 50 ++++++++++++++++++++-------------------- diffutils.spec | 7 ++++-- sources | 2 +- 6 files changed, 48 insertions(+), 44 deletions(-) delete mode 100644 diffutils-3.8.tar.xz.sig create mode 100644 diffutils-3.9.tar.xz.sig diff --git a/.gitignore b/.gitignore index 0da4306..f9a2667 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ diffutils-2.8.1.tar.gz /diffutils-3.6.tar.xz /diffutils-3.7.tar.xz /diffutils-3.8.tar.xz +/diffutils-3.9.tar.xz diff --git a/diffutils-3.8.tar.xz.sig b/diffutils-3.8.tar.xz.sig deleted file mode 100644 index a7b6567..0000000 --- a/diffutils-3.8.tar.xz.sig +++ /dev/null @@ -1,16 +0,0 @@ ------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----- diff --git a/diffutils-3.9.tar.xz.sig b/diffutils-3.9.tar.xz.sig new file mode 100644 index 0000000..b3f93fb --- /dev/null +++ b/diffutils-3.9.tar.xz.sig @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEEFV0/xQDINEhtHupnf9n8ywAL7u4FAmPEk3oACgkQf9n8ywAL +7u6wfg//YWpTsc+kHsuteg8gEWJWaOj+NI7XD86OPIkfb+VDHsaLiui1A0Wb6R+K +SGLuUITr2IPXVqaE98PmrcII7Yd1BPsu8qQSaOs6J4c702rbYQhWQUMAyhevg2QT +cvg8ao8GEphzIn5Fod9KQqy91lgEI84fQfNOtphL9de97HEDQTBL5sWoa2rPKWLZ +JQFxEOaGybSQe9SQXJjjThAGyg3QY8oP+07KnpEnH3UxZutPTqCYzNg7oZv7eObU +LDhx+AcXLbbkjFwdeM2ubdwD600bAJdDjmLotDom9ew7AOZUqB+Ml9tzn+fOnXuB +oKMLB8ONMRJ+5rsZPJFRZUgJQZQ6e5AOZMNZwX5vWLBB/68sMVDtuGlaKHwxZWv4 +oqEWXicffa+ot77jc7Cr/rBEFDTaGayBgPJqLsk0wj1UZCKQOAN0DcL7ThH4qH4c +gb0F1asIi/QjA2cGmRauTMj/WfjIBhDMrFC5dgn7uZHvgWM9Bt1jAJXZt0RQ+A16 +PgSgwnQYaQxZu18M7Mhe/JKSmTzTZpBIyI/95MwQK++YjYF1ROy95ViGJP2gkGDg +qt4P5JJ2eyRtdcutVOSDRTUERRdLyIIdnUiIIhPs4aSBoNgktvL5e91/BSVLMPXf +3pnUGIWpZjhHv3Xc7Z3HrFxdXYuXtv2OdUjZBrewA6KZjZFh+JE= +=GjI7 +-----END PGP SIGNATURE----- diff --git a/diffutils-i18n.patch b/diffutils-i18n.patch index 476e7b5..2e64696 100644 --- a/diffutils-i18n.patch +++ b/diffutils-i18n.patch @@ -1,7 +1,7 @@ -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 +diff -up diffutils-3.9/src/diff.c.i18n diffutils-3.9/src/diff.c +--- diffutils-3.9/src/diff.c.i18n 2023-01-02 01:18:33.000000000 +0000 ++++ diffutils-3.9/src/diff.c 2023-01-16 14:40:53.841265893 +0000 +@@ -76,6 +76,8 @@ static _Noreturn void try_help (char con static void check_stdout (void); static void usage (void); @@ -10,7 +10,7 @@ diff -up diffutils-3.8/src/diff.c.i18n diffutils-3.8/src/diff.c /* If comparing directories, compare their common subdirectories recursively. */ static bool recursive; -@@ -300,6 +302,13 @@ main (int argc, char **argv) +@@ -303,6 +305,13 @@ main (int argc, char **argv) presume_output_tty = false; xstdopen (); @@ -24,9 +24,9 @@ diff -up diffutils-3.8/src/diff.c.i18n diffutils-3.8/src/diff.c /* Decode the options. */ while ((c = getopt_long (argc, argv, shortopts, longopts, NULL)) != -1) -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 +diff -up diffutils-3.9/src/diff.h.i18n diffutils-3.9/src/diff.h +--- diffutils-3.9/src/diff.h.i18n 2023-01-02 01:18:33.000000000 +0000 ++++ diffutils-3.9/src/diff.h 2023-01-16 14:41:58.620317020 +0000 @@ -23,6 +23,17 @@ #include #include @@ -45,22 +45,22 @@ diff -up diffutils-3.8/src/diff.h.i18n diffutils-3.8/src/diff.h /* What kind of changes a hunk contains. */ enum changes { -@@ -381,7 +392,11 @@ extern void print_sdiff_script (struct c +@@ -389,7 +400,11 @@ extern void print_sdiff_script (struct c + /* util.c */ extern char const change_letter[4]; extern char const pr_program[]; - extern char *concat (char const *, char const *, char const *); --extern bool lines_differ (char const *, char const *) _GL_ATTRIBUTE_PURE; -+extern bool (*lines_differ) (char const *, size_t, char const *, size_t) _GL_ATTRIBUTE_PURE; -+extern bool lines_differ_singlebyte (char const *, size_t, char const *, size_t) _GL_ATTRIBUTE_PURE; +-extern bool lines_differ (char const *, char const *) ATTRIBUTE_PURE; ++extern bool (*lines_differ) (char const *, size_t, char const *, size_t) ATTRIBUTE_PURE; ++extern bool lines_differ_singlebyte (char const *, size_t, char const *, size_t) ATTRIBUTE_PURE; +#ifdef HANDLE_MULTIBYTE -+extern bool lines_differ_multibyte (char const *, size_t, char const *, size_t) _GL_ATTRIBUTE_PURE; ++extern bool lines_differ_multibyte (char const *, size_t, char const *, size_t) ATTRIBUTE_PURE; +#endif 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.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 +diff -up diffutils-3.9/src/io.c.i18n diffutils-3.9/src/io.c +--- diffutils-3.9/src/io.c.i18n 2023-01-02 01:18:33.000000000 +0000 ++++ diffutils-3.9/src/io.c 2023-01-16 14:40:53.841265893 +0000 @@ -23,6 +23,7 @@ #include #include @@ -69,7 +69,7 @@ diff -up diffutils-3.8/src/io.c.i18n diffutils-3.8/src/io.c /* Rotate an unsigned value to the left. */ #define ROL(v, n) ((v) << (n) | (v) >> (sizeof (v) * CHAR_BIT - (n))) -@@ -215,6 +216,28 @@ slurp (struct file_data *current) +@@ -214,6 +215,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.8/src/io.c.i18n diffutils-3.8/src/io.c static void find_and_hash_each_line (struct file_data *current) -@@ -241,12 +264,300 @@ find_and_hash_each_line (struct file_dat +@@ -240,12 +263,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.8/src/io.c.i18n diffutils-3.8/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 +@@ -396,7 +707,7 @@ find_and_hash_each_line (struct file_dat else if (!diff_length_compare_anyway) continue; @@ -408,10 +408,10 @@ diff -up diffutils-3.8/src/io.c.i18n diffutils-3.8/src/io.c break; } -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) +diff -up diffutils-3.9/src/util.c.i18n diffutils-3.9/src/util.c +--- diffutils-3.9/src/util.c.i18n 2023-01-02 01:18:33.000000000 +0000 ++++ diffutils-3.9/src/util.c 2023-01-16 14:40:53.842265909 +0000 +@@ -1084,7 +1084,8 @@ finish_output (void) Return nonzero if the lines differ. */ bool @@ -421,7 +421,7 @@ diff -up diffutils-3.8/src/util.c.i18n diffutils-3.8/src/util.c { register char const *t1 = s1; register char const *t2 = s2; -@@ -1141,6 +1142,354 @@ lines_differ (char const *s1, char const +@@ -1240,6 +1241,354 @@ lines_differ (char const *s1, char const return true; } diff --git a/diffutils.spec b/diffutils.spec index 937b048..3b02829 100644 --- a/diffutils.spec +++ b/diffutils.spec @@ -1,7 +1,7 @@ Summary: GNU collection of diff utilities Name: diffutils -Version: 3.8 -Release: 3%{?dist} +Version: 3.9 +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 @@ -59,6 +59,9 @@ make check %{_infodir}/diffutils.info* %changelog +* Mon Jan 16 2023 Tim Waugh - 3.9-1 +- 3.9 (bug #2161117). + * Thu Jul 21 2022 Fedora Release Engineering - 3.8-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild diff --git a/sources b/sources index f708696..9e1a05f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (diffutils-3.8.tar.xz) = 279441270987e70d5ecfaf84b6285a4866929c43ec877e50f154a788858d548a8a316f2fc26ad62f7348c8d289cb29a09d06dfadce1806e3d8b4ea88c8b1aa7c +SHA512 (diffutils-3.9.tar.xz) = d43280cb1cb2615a8867d971467eb9a3fa037fe9a411028068036f733dab42b10d42767093cea4de71e62b2659a3ec73bd7d1a8f251befd49587e32802682d0f