.diffutils.metadata

@@ -1 +1 @@
-ad4e0a05ee2e7f5529db6cb84474f45e086e609b SOURCES/diffutils-3.7.tar.xz
+1287a553868b808ebfff3790a5cdc6fdf7cb2886 SOURCES/diffutils-3.6.tar.xz

.gitignore

@@ -1 +1 @@
-SOURCES/diffutils-3.7.tar.xz
+SOURCES/diffutils-3.6.tar.xz

SOURCES/diffutils-3.6-covscan.patch

@@ -0,0 +1,74 @@
+diff -up diffutils-3.6/lib/quotearg.c.covscan diffutils-3.6/lib/quotearg.c
+--- diffutils-3.6/lib/quotearg.c.covscan	2017-05-20 02:14:05.000000000 +0200
++++ diffutils-3.6/lib/quotearg.c	2018-08-13 14:20:54.934196535 +0200
+@@ -886,8 +886,9 @@ quotearg_n_options (int n, char const *a
+   if (nslots <= n)
+     {
+       bool preallocated = (sv == &slotvec0);
+-
+-      if (MIN (INT_MAX, MIN (PTRDIFF_MAX, SIZE_MAX) / sizeof *sv) <= n)
++      int nmax = MIN (INT_MAX, MIN (PTRDIFF_MAX, SIZE_MAX) / sizeof *sv) - 1;
++      
++      if (nmax < n)
+         xalloc_die ();
+ 
+       slotvec = sv = xrealloc (preallocated ? NULL : sv, (n + 1) * sizeof *sv);
+diff -up diffutils-3.6/src/diff.h.covscan diffutils-3.6/src/diff.h
+--- diffutils-3.6/src/diff.h.covscan	2018-08-13 14:20:54.931196520 +0200
++++ diffutils-3.6/src/diff.h	2018-08-13 14:20:54.935196541 +0200
+@@ -392,7 +392,7 @@ 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 *);
+-extern bool (*lines_differ) (char const *, size_t, char const *, size_t) _GL_ATTRIBUTE_PURE;
++extern bool (*lines_differ) (char const *, size_t, char const *, size_t);
+ extern bool lines_differ_singlebyte (char const *, size_t, char const *, size_t) _GL_ATTRIBUTE_PURE;
+ #ifdef HANDLE_MULTIBYTE
+ extern bool lines_differ_multibyte (char const *, size_t, char const *, size_t) _GL_ATTRIBUTE_PURE;
+diff -up diffutils-3.6/src/ifdef.c.covscan diffutils-3.6/src/ifdef.c
+--- diffutils-3.6/src/ifdef.c.covscan	2017-05-18 19:39:59.000000000 +0200
++++ diffutils-3.6/src/ifdef.c	2018-08-13 14:20:54.935196541 +0200
+@@ -362,20 +362,14 @@ do_printf_spec (FILE *out, char const *s
+ 	    printint print_value = value;
+ 	    size_t spec_prefix_len = f - spec - 2;
+ 	    size_t pI_len = sizeof pI - 1;
+-#if 0
+-	    char format[spec_prefix_len + pI_len + 2];
+-#else
+ 	    char *format = xmalloc (spec_prefix_len + pI_len + 2);
+-#endif
+ 	    char *p = format + spec_prefix_len + pI_len;
+ 	    memcpy (format, spec, spec_prefix_len);
+ 	    memcpy (format + spec_prefix_len, pI, pI_len);
+ 	    *p++ = c;
+ 	    *p = '\0';
+ 	    fprintf (out, format, print_value);
+-#if ! HAVE_C_VARARRAYS
+ 	    free (format);
+-#endif
+ 	  }
+       }
+       break;
+diff -up diffutils-3.6/src/sdiff.c.covscan diffutils-3.6/src/sdiff.c
+--- diffutils-3.6/src/sdiff.c.covscan	2018-08-13 14:41:13.969450849 +0200
++++ diffutils-3.6/src/sdiff.c	2018-08-13 14:44:07.877344103 +0200
+@@ -230,8 +230,10 @@ cleanup (int signo __attribute__((unused
+   if (0 < diffpid)
+     kill (diffpid, SIGPIPE);
+ #endif
+-  if (tmpname)
++  if (tmpname) {
+     unlink (tmpname);
++    free (tmpname);
++  }
+ }
+ 
+ static void exiterr (void) __attribute__((noreturn));
+@@ -685,6 +687,7 @@ main (int argc, char *argv[])
+ 	if (tmpname)
+ 	  {
+ 	    unlink (tmpname);
++	    free (tmpname);
+ 	    tmpname = 0;
+ 	  }
+ 

SOURCES/diffutils-3.6-shows_incorrect_data.patch

@@ -0,0 +1,45 @@
+commit ffd63aedad3c0eb08ebb27103e5f242f8732dc0c
+Author: Paul Eggert <eggert@cs.ucla.edu>
+Date:   Tue Jul 24 10:18:28 2018 -0700
+
+    cmp: fix bug in -b diagnostic
+    
+    Problem reported by mancha (Bug#32249).
+    * src/cmp.c (count_newlines): Restore old value of sentinel.
+    * tests/cmp: Test for the bug.
+
+diff --git a/src/cmp.c b/src/cmp.c
+index 04638e3..2811392 100644
+--- a/src/cmp.c
++++ b/src/cmp.c
+@@ -639,9 +639,11 @@ count_newlines (char *buf, size_t bufsize)
+   size_t count = 0;
+   char *p;
+   char *lim = buf + bufsize;
++  char ch = *lim;
+   *lim = '\n';
+   for (p = buf; (p = rawmemchr (p, '\n')) != lim; p++)
+     count++;
++  *lim = ch;
+   return count;
+ }
+ 
+diff --git a/tests/cmp b/tests/cmp
+index 160c1ea..ca0fe5e 100755
+--- a/tests/cmp
++++ b/tests/cmp
+@@ -208,4 +208,14 @@ done >out1
+ 
+ compare exp1 out1 || fail=1
+ 
++printf 'bad\n' >bad
++printf 'bug\n' >bug
++echo LC_ALL=C cmp -b bad bug
++LC_ALL=C cmp -b bad bug
++test $? -eq 1 || fail=1
++case `LC_ALL=C cmp -b bad bug` in
++  'bad bug differ: byte 2, line 1 is '*' a '*' u') ;;
++  *) echo 'expected cmp -b to report a and u'; fail=1;;
++esac
++
+ Exit $fail

SOURCES/diffutils-3.7-coverity.patch

@@ -1,315 +0,0 @@
-diff -up diffutils-3.7/lib/careadlinkat.c.me diffutils-3.7/lib/careadlinkat.c
---- diffutils-3.7/lib/careadlinkat.c.me	2021-03-23 23:19:06.957542021 +0100
-+++ diffutils-3.7/lib/careadlinkat.c	2021-03-23 23:22:29.309145314 +0100
-@@ -1,6 +1,6 @@
- /* Read symbolic links into a buffer without size limitation, relative to fd.
- 
--   Copyright (C) 2001, 2003-2004, 2007, 2009-2018 Free Software Foundation,
-+   Copyright (C) 2001, 2003-2004, 2007, 2009-2021 Free Software Foundation,
-    Inc.
- 
-    This program is free software: you can redistribute it and/or modify
-@@ -38,75 +38,64 @@
- 
- #include "allocator.h"
- 
--/* Assuming the current directory is FD, get the symbolic link value
--   of FILENAME as a null-terminated string and put it into a buffer.
--   If FD is AT_FDCWD, FILENAME is interpreted relative to the current
--   working directory, as in openat.
--
--   If the link is small enough to fit into BUFFER put it there.
--   BUFFER's size is BUFFER_SIZE, and BUFFER can be null
--   if BUFFER_SIZE is zero.
--
--   If the link is not small, put it into a dynamically allocated
--   buffer managed by ALLOC.  It is the caller's responsibility to free
--   the returned value if it is nonnull and is not BUFFER.  A null
--   ALLOC stands for the standard allocator.
--
--   The PREADLINKAT function specifies how to read links.  It operates
--   like POSIX readlinkat()
--   <http://pubs.opengroup.org/onlinepubs/9699919799/functions/readlink.html>
--   but can assume that its first argument is the same as FD.
-+enum { STACK_BUF_SIZE = 1024 };
- 
--   If successful, return the buffer address; otherwise return NULL and
--   set errno.  */
-+/* Act like careadlinkat (see below), with an additional argument
-+   STACK_BUF that can be used as temporary storage.
- 
--char *
--careadlinkat (int fd, char const *filename,
-+   If GCC_LINT is defined, do not inline this function with GCC 10.1
-+   and later, to avoid creating a pointer to the stack that GCC
-+   -Wreturn-local-addr incorrectly complains about.  See:
-+   https://gcc.gnu.org/bugzilla/show_bug.cgi?id=93644
-+   Although the noinline attribute can hurt performance a bit, no better way
-+   to pacify GCC is known; even an explicit #pragma does not pacify GCC.
-+   When the GCC bug is fixed this workaround should be limited to the
-+   broken GCC versions.  */
-+#if __GNUC_PREREQ (10, 1)
-+# if defined GCC_LINT || defined lint
-+__attribute__ ((__noinline__))
-+# elif __OPTIMIZE__ && !__NO_INLINE__
-+#  define GCC_BOGUS_WRETURN_LOCAL_ADDR
-+# endif
-+#endif
-+static char *
-+readlink_stk (int fd, char const *filename,
-               char *buffer, size_t buffer_size,
-               struct allocator const *alloc,
--              ssize_t (*preadlinkat) (int, char const *, char *, size_t))
-+              ssize_t (*preadlinkat) (int, char const *, char *, size_t),
-+              char stack_buf[STACK_BUF_SIZE])
- {
-   char *buf;
-   size_t buf_size;
-   size_t buf_size_max =
-     SSIZE_MAX < SIZE_MAX ? (size_t) SSIZE_MAX + 1 : SIZE_MAX;
--  char stack_buf[1024];
- 
-   if (! alloc)
-     alloc = &stdlib_allocator;
- 
--  if (! buffer_size)
-+  if (!buffer)
-     {
--      /* Allocate the initial buffer on the stack.  This way, in the
--         common case of a symlink of small size, we get away with a
--         single small malloc() instead of a big malloc() followed by a
--         shrinking realloc().  */
-       buffer = stack_buf;
--      buffer_size = sizeof stack_buf;
-+      buffer_size = STACK_BUF_SIZE;
-     }
- 
-   buf = buffer;
-   buf_size = buffer_size;
- 
--  do
-+  while (buf)
-     {
-       /* Attempt to read the link into the current buffer.  */
-       ssize_t link_length = preadlinkat (fd, filename, buf, buf_size);
-       size_t link_size;
-       if (link_length < 0)
-         {
--          /* On AIX 5L v5.3 and HP-UX 11i v2 04/09, readlink returns -1
--             with errno == ERANGE if the buffer is too small.  */
--          int readlinkat_errno = errno;
--          if (readlinkat_errno != ERANGE)
-+          if (buf != buffer)
-             {
--              if (buf != buffer)
--                {
--                  alloc->free (buf);
--                  errno = readlinkat_errno;
--                }
--              return NULL;
-+              int readlinkat_errno = errno;
-+              alloc->free (buf);
-+              errno = readlinkat_errno;
-             }
-+          return NULL;
-         }
- 
-       link_size = link_length;
-@@ -117,19 +106,19 @@ careadlinkat (int fd, char const *filena
- 
-           if (buf == stack_buf)
-             {
--              char *b = (char *) alloc->allocate (link_size);
-+              char *b = alloc->allocate (link_size);
-               buf_size = link_size;
-               if (! b)
-                 break;
--              memcpy (b, buf, link_size);
--              buf = b;
-+              return memcpy (b, buf, link_size);
-             }
--          else if (link_size < buf_size && buf != buffer && alloc->reallocate)
-+
-+          if (link_size < buf_size && buf != buffer && alloc->reallocate)
-             {
-               /* Shrink BUF before returning it.  */
--              char *b = (char *) alloc->reallocate (buf, link_size);
-+              char *b = alloc->reallocate (buf, link_size);
-               if (b)
--                buf = b;
-+                return b;
-             }
- 
-           return buf;
-@@ -138,8 +127,8 @@ careadlinkat (int fd, char const *filena
-       if (buf != buffer)
-         alloc->free (buf);
- 
--      if (buf_size <= buf_size_max / 2)
--        buf_size *= 2;
-+      if (buf_size < buf_size_max / 2)
-+        buf_size = 2 * buf_size + 1;
-       else if (buf_size < buf_size_max)
-         buf_size = buf_size_max;
-       else if (buf_size_max < SIZE_MAX)
-@@ -149,12 +138,53 @@ careadlinkat (int fd, char const *filena
-         }
-       else
-         break;
--      buf = (char *) alloc->allocate (buf_size);
-+      buf = alloc->allocate (buf_size);
-     }
--  while (buf);
- 
-   if (alloc->die)
-     alloc->die (buf_size);
-   errno = ENOMEM;
-   return NULL;
- }
-+
-+
-+/* Assuming the current directory is FD, get the symbolic link value
-+   of FILENAME as a null-terminated string and put it into a buffer.
-+   If FD is AT_FDCWD, FILENAME is interpreted relative to the current
-+   working directory, as in openat.
-+
-+   If the link is small enough to fit into BUFFER put it there.
-+   BUFFER's size is BUFFER_SIZE, and BUFFER can be null
-+   if BUFFER_SIZE is zero.
-+
-+   If the link is not small, put it into a dynamically allocated
-+   buffer managed by ALLOC.  It is the caller's responsibility to free
-+   the returned value if it is nonnull and is not BUFFER.  A null
-+   ALLOC stands for the standard allocator.
-+
-+   The PREADLINKAT function specifies how to read links.  It operates
-+   like POSIX readlinkat()
-+   <https://pubs.opengroup.org/onlinepubs/9699919799/functions/readlink.html>
-+   but can assume that its first argument is the same as FD.
-+
-+   If successful, return the buffer address; otherwise return NULL and
-+   set errno.  */
-+
-+char *
-+careadlinkat (int fd, char const *filename,
-+              char *buffer, size_t buffer_size,
-+              struct allocator const *alloc,
-+              ssize_t (*preadlinkat) (int, char const *, char *, size_t))
-+{
-+  /* Allocate the initial buffer on the stack.  This way, in the
-+     common case of a symlink of small size, we get away with a
-+     single small malloc instead of a big malloc followed by a
-+     shrinking realloc.  */
-+  #ifdef GCC_BOGUS_WRETURN_LOCAL_ADDR
-+   #warning "GCC might issue a bogus -Wreturn-local-addr warning here."
-+   #warning "See <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=93644>."
-+  #endif
-+  char stack_buf[STACK_BUF_SIZE];
-+  return readlink_stk (fd, filename, buffer, buffer_size, alloc,
-+                       preadlinkat, stack_buf);
-+}
-diff -up diffutils-3.7/src/diff.c.me diffutils-3.7/src/diff.c
-diff -up diffutils-3.7/src/diff.h.me diffutils-3.7/src/diff.h
---- diffutils-3.7/src/diff.h.me	2021-03-23 22:47:04.509390138 +0100
-+++ diffutils-3.7/src/diff.h	2021-03-23 22:58:35.022552755 +0100
-@@ -392,7 +392,7 @@ 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 *);
--extern bool (*lines_differ) (char const *, size_t, char const *, size_t) _GL_ATTRIBUTE_PURE;
-+extern bool (*lines_differ) (char const *, size_t, char const *, size_t);
- extern bool lines_differ_singlebyte (char const *, size_t, char const *, size_t) _GL_ATTRIBUTE_PURE;
- #ifdef HANDLE_MULTIBYTE
- extern bool lines_differ_multibyte (char const *, size_t, char const *, size_t) _GL_ATTRIBUTE_PURE;
-diff -up diffutils-3.7/src/util.c.me diffutils-3.7/src/util.c
---- diffutils-3.7/src/util.c.me	2021-03-23 23:01:58.105168496 +0100
-+++ diffutils-3.7/src/util.c	2021-03-23 23:18:18.833918967 +0100
-@@ -1144,6 +1144,7 @@ lines_differ_singlebyte (char const *s1,
- }
- 
- #ifdef HANDLE_MULTIBYTE
-+#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
- # define MBC2WC(T, END, MBLENGTH, WC, STATE, CONVFAIL)	\
- do							\
-   {							\
-diff -up diffutils-3.7/lib/regcomp.c.me diffutils-3.7/lib/regcomp.c
---- diffutils-3.7/lib/regcomp.c.me	2021-03-24 09:01:20.582271604 +0100
-+++ diffutils-3.7/lib/regcomp.c	2021-03-24 09:03:54.125287605 +0100
-@@ -3674,7 +3674,6 @@ build_charclass_op (re_dfa_t *dfa, RE_TR
-   Idx alloc = 0;
- #endif /* not RE_ENABLE_I18N */
-   reg_errcode_t ret;
--  re_token_t br_token;
-   bin_tree_t *tree;
- 
-   sbcset = (re_bitset_ptr_t) calloc (sizeof (bitset_t), 1);
-@@ -3725,11 +3724,7 @@ build_charclass_op (re_dfa_t *dfa, RE_TR
- #endif
- 
-   /* Build a tree for simple bracket.  */
--#if defined GCC_LINT || defined lint
--  memset (&br_token, 0, sizeof br_token);
--#endif
--  br_token.type = SIMPLE_BRACKET;
--  br_token.opr.sbcset = sbcset;
-+  re_token_t br_token = { .type = SIMPLE_BRACKET, .opr.sbcset = sbcset };
-   tree = create_token_tree (dfa, NULL, NULL, &br_token);
-   if (__glibc_unlikely (tree == NULL))
-     goto build_word_op_espace;
-@@ -3820,11 +3815,7 @@ static bin_tree_t *
- create_tree (re_dfa_t *dfa, bin_tree_t *left, bin_tree_t *right,
- 	     re_token_type_t type)
- {
--  re_token_t t;
--#if defined GCC_LINT || defined lint
--  memset (&t, 0, sizeof t);
--#endif
--  t.type = type;
-+  re_token_t t = { .type = type };
-   return create_token_tree (dfa, left, right, &t);
- }
- 
-diff -up diffutils-3.7/lib/regexec.c.me diffutils-3.7/lib/regexec.c
---- diffutils-3.7/lib/regexec.c.me	2021-03-24 08:50:16.101143023 +0100
-+++ diffutils-3.7/lib/regexec.c	2021-03-24 08:55:03.347246385 +0100
-@@ -828,7 +828,9 @@ re_search_internal (const regex_t *preg,
- 		    break;
- 		  if (__glibc_unlikely (err != REG_NOMATCH))
- 		    goto free_return;
-+#ifdef DEBUG
- 		  match_last = -1;
-+#endif
- 		}
- 	      else
- 		break; /* We found a match.  */
-@@ -3693,6 +3695,7 @@ group_nodes_into_DFAstates (const re_dfa
- 	  bitset_empty (accepts);
- 	}
-     }
-+  assume (ndests <= SBC_MAX);
-   return ndests;
-  error_return:
-   for (j = 0; j < ndests; ++j)
-diff -up diffutils-3.7/lib/regex_internal.h.me diffutils-3.7/lib/regex_internal.h
---- diffutils-3.7/lib/regex_internal.h.me	2021-03-24 08:54:03.464477733 +0100
-+++ diffutils-3.7/lib/regex_internal.h	2021-03-24 08:54:22.824728618 +0100
-@@ -34,6 +34,7 @@
- #include <stdint.h>
- 
- #include <intprops.h>
-+#include <verify.h>
- 
- #ifdef _LIBC
- # include <libc-lock.h>
-diff -up diffutils-3.7/src/ifdef.c.me diffutils-3.7/src/ifdef.c
---- diffutils-3.7/src/ifdef.c.me	2021-03-24 18:10:43.265671781 +0100
-+++ diffutils-3.7/src/ifdef.c	2021-03-24 18:08:39.843320920 +0100
-@@ -362,7 +362,7 @@ do_printf_spec (FILE *out, char const *s
- 	    printint print_value = value;
- 	    size_t spec_prefix_len = f - spec - 2;
- 	    size_t pI_len = sizeof pI - 1;
--#if 0
-+#if HAVE_C_VARARRAYS
- 	    char format[spec_prefix_len + pI_len + 2];
- #else
- 	    char *format = xmalloc (spec_prefix_len + pI_len + 2);

SOURCES/diffutils-3.7-false-positive.patch

@@ -1,73 +0,0 @@
-diff -up diffutils-3.7/lib/freopen-safer.c.me diffutils-3.7/lib/freopen-safer.c
---- diffutils-3.7/lib/freopen-safer.c.me	2021-03-24 15:38:27.785170510 +0100
-+++ diffutils-3.7/lib/freopen-safer.c	2021-03-24 15:39:56.389523872 +0100
-@@ -49,6 +49,7 @@ protect_fd (int fd)
-         }
-       return false;
-     }
-+  /* coverity[leaked_handle : FALSE] */
-   return true;
- }
- 
-diff -up diffutils-3.7/lib/regex_internal.c.me diffutils-3.7/lib/regex_internal.c
---- diffutils-3.7/lib/regex_internal.c.me	2021-03-24 15:45:12.934308141 +0100
-+++ diffutils-3.7/lib/regex_internal.c	2021-03-24 15:48:06.165592478 +0100
-@@ -1724,6 +1724,7 @@ create_cd_newstate (const re_dfa_t *dfa,
- 		}
- 	      if (re_node_set_init_copy (newstate->entrance_nodes, nodes)
- 		  != REG_NOERROR)
-+		/* coverity[leaked_storage : FALSE] */
- 		return NULL;
- 	      nctx_nodes = 0;
- 	      newstate->has_constraint = 1;
-diff -up diffutils-3.7/src/analyze.c.me diffutils-3.7/src/analyze.c
---- diffutils-3.7/src/analyze.c.me	2021-03-24 17:16:35.560137760 +0100
-+++ diffutils-3.7/src/analyze.c	2021-03-24 17:18:02.298846273 +0100
-@@ -688,6 +688,7 @@ diff_2_files (struct comparison *cmp)
-       for (f = 0; f < 2; f++)
- 	{
- 	  free (cmp->file[f].equivs);
-+     /* coverity[offset_free : FALSE] */
- 	  free (cmp->file[f].linbuf + cmp->file[f].linbuf_base);
- 	}
- 
-diff -up diffutils-3.7/src/diff3.c.me diffutils-3.7/src/diff3.c
---- diffutils-3.7/src/diff3.c.me	2021-03-24 17:18:21.317231331 +0100
-+++ diffutils-3.7/src/diff3.c	2021-03-24 17:22:54.217398657 +0100
-@@ -795,6 +795,7 @@ using_to_diff3_block (struct diff_block
- 			      D_LINEARRAY (result, FILEC) + result_offset,
- 			      D_LENARRAY (result, FILEC) + result_offset,
- 			      D_NUMLINES (ptr, FC)))
-+	  /* coverity[leaked_storage : FALSE] */
- 	  return 0;
-       }
- 
-@@ -824,6 +825,7 @@ using_to_diff3_block (struct diff_block
- 				D_LINEARRAY (result, FILE0 + d) + result_offset,
- 				D_LENARRAY (result, FILE0 + d) + result_offset,
- 				D_NUMLINES (ptr, FO)))
-+	    /* coverity[leaked_storage : FALSE] */
- 	    return 0;
- 
- 	  /* Catch the lines between here and the next diff */
-diff -up diffutils-3.7/src/sdiff.c.me diffutils-3.7/src/sdiff.c
---- diffutils-3.7/src/sdiff.c.me	2021-03-24 17:24:37.022988328 +0100
-+++ diffutils-3.7/src/sdiff.c	2021-03-24 17:25:39.145495628 +0100
-@@ -1169,5 +1169,6 @@ temporary_file (void)
-   fd = mkstemp (buf);
-   if (0 <= fd)
-     tmpname = buf;
-+  /* coverity[leaked_storage : FALSE] */
-   return fd;
- }
-diff -up diffutils-3.7/src/util.c.me diffutils-3.7/src/util.c
---- diffutils-3.7/src/util.c.me	2021-03-24 17:25:51.419067091 +0100
-+++ diffutils-3.7/src/util.c	2021-03-24 17:36:28.882404028 +0100
-@@ -699,6 +699,7 @@ parse_diff_color (void)
-         }
-       colors_enabled = false;
-     }
-+/* coverity[leaked_storage : FALSE] */
- }
- 
- static void

SOURCES/diffutils-fix-gnulib-tests.patch

@@ -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);

SOURCES/diffutils-sigstksz.patch

@@ -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>

SPECS/diffutils.spec

@@ -1,21 +1,20 @@
-Summary: GNU collection of diff utilities
+Summary: A GNU collection of diff utilities
 Name: diffutils
-Version: 3.7
+Version: 3.6
-Release: 12%{?dist}
+Release: 6%{?dist}
-URL: https://www.gnu.org/software/diffutils/diffutils.html
+Group: Applications/Text
-Source: https://ftp.gnu.org/gnu/diffutils/diffutils-%{version}.tar.xz
+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-fix-gnulib-tests.patch
+Patch3: diffutils-3.6-covscan.patch
-Patch4: diffutils-3.7-coverity.patch
+Patch4: diffutils-3.6-shows_incorrect_data.patch
-Patch5: diffutils-3.7-false-positive.patch
-Patch6: diffutils-sigstksz.patch
 License: GPLv3+
+Requires(post): info
+Requires(preun): info
 Provides: bundled(gnulib)
-BuildRequires: gcc
 BuildRequires: help2man
 BuildRequires: autoconf, automake, texinfo
-BuildRequires: make
 
 %description
 Diffutils includes four utilities: diff, cmp, diff3 and sdiff. Diff
@@ -31,18 +30,29 @@ to merge two files interactively.
 Install diffutils if you need to compare text files.
 
 %prep
-%autosetup -p1
+%setup -q
+# For 'cmp -s', compare file sizes only if both non-zero (bug #563618).
+%patch1 -p1 -b .cmp-s-empty
+
+%patch2 -p1 -b .i18n
+
+# covscan issues
+%patch3 -p1 -b .covscan
+
+# bz#1732960, cmp -b shows incorrect data
+%patch4 -p1 -b .shows_incorrect_data
 
 # Run autoreconf for aarch64 support (bug #925256).
 autoreconf
 
 %build
-%global optflags %{optflags} -Dlint
+export CFLAGS="$RPM_OPT_FLAGS -Dlint"
 %configure
 make PR_PROGRAM=%{_bindir}/pr
 
 %install
-%make_install
+rm -rf $RPM_BUILD_ROOT
+make DESTDIR=$RPM_BUILD_ROOT install
 
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 %find_lang %{name}
@@ -52,54 +62,35 @@ rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 >gnulib-tests/test-update-copyright.sh
 make check
 
+%post
+/sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || :
+
+%preun
+if [ $1 = 0 ]; then
+  /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || :
+fi
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
 %files -f %{name}.lang
+%defattr(-,root,root)
 %doc NEWS README
+%{!?_licensedir:%global license %%doc}
 %license COPYING
 %{_bindir}/*
 %{_mandir}/*/*
-%{_infodir}/diffutils.info*
+%{_infodir}/diffutils.info*gz
 
 %changelog
-* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 3.7-12
+* Tue Jul 25 2023 MSVSphere Packaging Team <packager@msvsphere.ru> - 3.6-6
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+- Rebuilt for MSVSphere 8.8
-  Related: rhbz#1991688
-
-* Wed Jun 23 2021 Than Ngo <than@redhat.com> - 3.7-11
-- Resolves: #1975121, Handle SIGSTKSZ no longer being a constant.
-
-* Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 3.7-10
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
-
-* Wed Mar 24 2021 Than Ngo <than@redhat.com> - 3.7-9
-- Fix coverity issues
-
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.7-8
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Thu Oct  8 2020 Tim Waugh <twaugh@redhat.com> - 3.7-7
-- Fix from gnulib upstream, commit 175e0bc (bug #1863423).
-
-* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.7-6
-- Second attempt - Rebuilt for
-  https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.7-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.7-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.7-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.7-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
 
-* Mon Jan 07 2019 Than Ngo <than@redhat.com> - 3.7-1
+* Tue Nov 19 2019 Than Ngo <than@redhat.com> - 3.6-6
-- 3.7
+- Resolves: #1732960 - cmp -b shows incorrect data
 
-* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.6-5
+* Mon Aug 13 2018 Than Ngo <than@redhat.com> - 3.6-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+- Resolves: #1606949, covscan issues
 
 * Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.6-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild