.diffutils.metadata

@@ -0,0 +1 @@
+1287a553868b808ebfff3790a5cdc6fdf7cb2886 SOURCES/diffutils-3.6.tar.xz

.gitignore

@@ -1,11 +1 @@
-diffutils-2.8.1.tar.gz
-/diffutils-3.0.tar.xz
-/diffutils-3.1.tar.xz
-/diffutils-3.2.tar.xz
-/diffutils-3.3.tar.xz
-/diffutils-3.5.tar.xz
-/diffutils-3.6.tar.xz
-/diffutils-3.7.tar.xz
-/diffutils-3.8.tar.xz
-/diffutils-3.9.tar.xz
-/diffutils-3.10.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-cmp-s-empty.patch

@@ -0,0 +1,20 @@
+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,
++     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);

SOURCES/diffutils-i18n.patch

@@ -1,7 +1,7 @@
-diff -up diffutils-3.10/src/diff.c.i18n diffutils-3.10/src/diff.c
---- diffutils-3.10/src/diff.c.i18n	2023-05-20 11:17:26.000000000 +0200
-+++ diffutils-3.10/src/diff.c	2023-06-29 13:24:19.567608253 +0200
-@@ -76,6 +76,8 @@ static _Noreturn void try_help (char con
+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.10/src/diff.c.i18n diffutils-3.10/src/diff.c
  /* If comparing directories, compare their common subdirectories
     recursively.  */
  static bool recursive;
-@@ -310,6 +312,14 @@ main (int argc, char **argv)
+@@ -298,6 +300,13 @@ main (int argc, char **argv)
+   excluded = new_exclude ();
    presume_output_tty = false;
-   xstdopen ();
  
 +#ifdef HANDLE_MULTIBYTE
 +  if (MB_CUR_MAX > 1)
@@ -20,17 +20,16 @@ diff -up diffutils-3.10/src/diff.c.i18n diffutils-3.10/src/diff.c
 +  else
 +#endif
 +    lines_differ = lines_differ_singlebyte;
-+
 +
    /* Decode the options.  */
  
-   while ((c = getopt_long (argc, argv, shortopts, longopts, nullptr)) != -1)
-diff -up diffutils-3.10/src/diff.h.i18n diffutils-3.10/src/diff.h
---- diffutils-3.10/src/diff.h.i18n	2023-05-20 11:37:55.000000000 +0200
-+++ diffutils-3.10/src/diff.h	2023-06-29 13:25:49.451271873 +0200
-@@ -33,6 +33,17 @@ _GL_INLINE_HEADER_BEGIN
- # define XTERN extern
- #endif
+   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
+@@ -23,6 +23,17 @@
+ #include <stdio.h>
+ #include <unlocked-io.h>
  
 +/* For platforms which support the ISO C ammendment 1 functionality we
 +   support user-defined character classes. */
@@ -46,22 +45,22 @@ diff -up diffutils-3.10/src/diff.h.i18n diffutils-3.10/src/diff.h
  /* What kind of changes a hunk contains.  */
  enum changes
  {
-@@ -392,7 +403,11 @@ extern void print_sdiff_script (struct c
- /* util.c */
+@@ -381,7 +392,11 @@ extern void print_sdiff_script (struct c
  extern char const change_letter[4];
  extern char const pr_program[];
--extern bool lines_differ (char const *, char const *) 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) ATTRIBUTE_PURE;
+ 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;
 +#ifdef HANDLE_MULTIBYTE
-+extern bool lines_differ_multibyte (char const *, size_t, char const *, size_t) ATTRIBUTE_PURE;
++extern bool lines_differ_multibyte (char const *, size_t, char const *, size_t) _GL_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.10/src/io.c.i18n diffutils-3.10/src/io.c
---- diffutils-3.10/src/io.c.i18n	2023-05-20 11:17:26.000000000 +0200
-+++ diffutils-3.10/src/io.c	2023-06-29 13:20:52.457820950 +0200
+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 <cmpbuf.h>
  #include <file-type.h>
@@ -70,7 +69,7 @@ diff -up diffutils-3.10/src/io.c.i18n diffutils-3.10/src/io.c
  
  /* Rotate an unsigned value to the left.  */
  #define ROL(v, n) ((v) << (n) | (v) >> (sizeof (v) * CHAR_BIT - (n)))
-@@ -223,6 +224,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.  */
@@ -99,7 +98,7 @@ diff -up diffutils-3.10/src/io.c.i18n diffutils-3.10/src/io.c
  
  static void
  find_and_hash_each_line (struct file_data *current)
-@@ -249,12 +272,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;
  
@@ -400,7 +399,7 @@ diff -up diffutils-3.10/src/io.c.i18n diffutils-3.10/src/io.c
        /* Hash this line until we find a newline.  */
        switch (ig_white_space)
  	{
-@@ -405,7 +716,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;
  
@@ -409,10 +408,10 @@ diff -up diffutils-3.10/src/io.c.i18n diffutils-3.10/src/io.c
  	      break;
  	  }
  
-diff -up diffutils-3.10/src/util.c.i18n diffutils-3.10/src/util.c
---- diffutils-3.10/src/util.c.i18n	2023-02-19 19:04:39.000000000 +0100
-+++ diffutils-3.10/src/util.c	2023-06-29 13:20:52.457820950 +0200
-@@ -1085,7 +1085,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
@@ -422,7 +421,7 @@ diff -up diffutils-3.10/src/util.c.i18n diffutils-3.10/src/util.c
  {
    register char const *t1 = s1;
    register char const *t2 = s2;
-@@ -1241,6 +1242,354 @@ lines_differ (char const *s1, char const
+@@ -1141,6 +1142,354 @@ lines_differ (char const *s1, char const
  
    return true;
  }

SPECS/diffutils.spec

@@ -1,19 +1,20 @@
-Summary: GNU collection of diff utilities
+Summary: A GNU collection of diff utilities
 Name: diffutils
-Version: 3.10
-Release: 7%{?dist}
-URL: https://www.gnu.org/software/diffutils/diffutils.html
-Source: https://ftp.gnu.org/gnu/diffutils/diffutils-%{version}.tar.xz
-# Multibyte
-Patch0: diffutils-i18n.patch
-Patch1: diffutils-3.10-cmp-s-empty.patch
-Patch2: diffutils-3.10-coverity.patch
-License: GPL-3.0-or-later
+Version: 3.6
+Release: 6%{?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.6-covscan.patch
+Patch4: diffutils-3.6-shows_incorrect_data.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
@@ -29,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
-export CFLAGS="$RPM_OPT_FLAGS -DGCC_LINT"
+export CFLAGS="$RPM_OPT_FLAGS -Dlint"
 %configure
-make PR_PROGRAM=%{_bindir}/pr V=1
+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}
@@ -50,90 +62,32 @@ 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
-* Tue Jul 30 2024 Than Ngo <than@redhat.com> - 3.10-7
-- Resolves: RHEL-50780, regression, compare file sizes only if both non-zero
+* Tue Nov 19 2019 Than Ngo <than@redhat.com> - 3.6-6
+- Resolves: #1732960 - cmp -b shows incorrect data
 
-* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 3.10-6
-- Bump release for June 2024 mass rebuild
-
-* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.10-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.10-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.10-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Wed Jul 05 2023 Than Ngo <than@redhat.com> - 3.10-2
-- Fix output of "diff -l -y" for non-ASCII input files
-
-* Thu Jun 29 2023 Than Ngo <than@redhat.com> - 3.10-1
-- Fix bz#2208831, update to 3.10
-- Fix bz#2196671, diff -D no longer fails to output #ifndef lines introduced in 3.9
-
-* Tue Mar 28 2023 Than Ngo <than@redhat.com> - 3.9-4
-- Fix deprecated patch rpm marco
-
-* Tue Feb 21 2023 Than Ngo <than@redhat.com> - 3.9-3
-- migrated to SPDX license
-
-* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.9-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Mon Jan 16 2023 Tim Waugh <twaugh@redhat.com> - 3.9-1
-- 3.9 (bug #2161117).
-
-* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.8-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.8-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* 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
-
-* Mon Apr 12 2021 Tim Waugh <twaugh@redhat.com> - 3.7-9
-- Handle SIGSTKSZ no longer being a constant (bug #1943016).
-
-* 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
-- 3.7
-
-* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.6-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+* Mon Aug 13 2018 Than Ngo <than@redhat.com> - 3.6-5
+- 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

STAGE1-diffutils

@@ -1,7 +0,0 @@
-srpm $1
-mcd $BUILDDIR/$1
-$SRC/${1}-*/configure $TCONFIGARGS
-notparallel
-test -d tools/gnulib/lib && make $J V=1 -C tools/gnulib/lib
-make $J V=1
-make $J install DESTDIR=${ROOTFS}

diffutils-3.10-cmp-s-empty.patch

@@ -1,31 +0,0 @@
-diff --git a/src/cmp.c b/src/cmp.c
-index 4bf0a4c..936125c 100644
---- a/src/cmp.c
-+++ b/src/cmp.c
-@@ -338,13 +338,14 @@ main (int argc, char **argv)
-     }
- 
-   /* If only a return code is needed,
--     and if both input descriptors are associated with plain files,
-+     and both input descriptors are associated with plain files,
-+     and the file sizes are nonzero so they are not Linux /proc files,
-      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
--      && 0 <= stat_buf[0].st_size && S_ISREG (stat_buf[0].st_mode)
--      && 0 <= stat_buf[1].st_size && S_ISREG (stat_buf[1].st_mode))
-+      && 0 < stat_buf[0].st_size && S_ISREG (stat_buf[0].st_mode)
-+      && 0 < stat_buf[1].st_size && S_ISREG (stat_buf[1].st_mode))
-     {
-       off_t s0 = stat_buf[0].st_size - file_position (0);
-       off_t s1 = stat_buf[1].st_size - file_position (1);
-@@ -401,7 +402,7 @@ cmp (void)
- 			       ? bytes : TYPE_MAXIMUM (off_t));
- 
-       for (f = 0; f < 2; f++)
--        if (0 <= stat_buf[f].st_size && S_ISREG (stat_buf[f].st_mode))
-+        if (0 < stat_buf[f].st_size && S_ISREG (stat_buf[f].st_mode))
-           {
-             off_t file_bytes = stat_buf[f].st_size - file_position (f);
-             if (file_bytes < byte_number_max)

diffutils-3.10-coverity.patch

@@ -1,184 +0,0 @@
-diff -up diffutils-3.10/lib/nstrftime.c.orig diffutils-3.10/lib/nstrftime.c
---- diffutils-3.10/lib/nstrftime.c.orig	2023-05-20 11:05:07.000000000 +0200
-+++ diffutils-3.10/lib/nstrftime.c	2024-07-30 16:36:42.914438967 +0200
-@@ -882,6 +882,7 @@ __strftime_internal (STREAM_OR_CHAR_T *s
-             *u = '\0';
-             len = strftime (ubuf, sizeof ubuf, ufmt, tp);
-             if (len != 0)
-+              /* coverity[verrun-buffer-arg: FALSE] */
-               cpy (len - 1, ubuf + 1);
-           }
-           break;
-@@ -1044,10 +1045,13 @@ __strftime_internal (STREAM_OR_CHAR_T *s
-                     i += padding;
-                     width -= padding;
-                   }
-+                /* coverity[bad_memset : FALSE] */
-+                /* coverity[overrun-buffer-arg : FALSE] */
-                 width_add1 (0, sign_char);
-                 width--;
-               }
- 
-+            /* coverity[bad_memset : FALSE] */
-             cpy (numlen, bufp);
-           }
-           break;
-@@ -1126,7 +1130,9 @@ __strftime_internal (STREAM_OR_CHAR_T *s
-               buf[j - 1] = n % 10 + L_('0'), n /= 10;
-             if (!pad)
-               pad = L_('0');
-+            /* coverity[bad_memset : FALSE] */
-             width_cpy (0, ndigs, buf);
-+            /* coverity[bad_memset : FALSE] */
-             width_add (width - ndigs, 0, (void) 0);
-           }
-           break;
-@@ -1495,6 +1501,7 @@ __strftime_internal (STREAM_OR_CHAR_T *s
-              since this is most likely the right thing to do if a
-              multibyte string has been misparsed.  */
-         bad_format:
-+          /* coverity[bad_memset : FALSE] */
-           cpy (f - percent + 1, percent);
-           break;
-         }
-diff -up diffutils-3.10/lib/regcomp.c.orig diffutils-3.10/lib/regcomp.c
---- diffutils-3.10/lib/regcomp.c.orig	2024-07-30 16:42:46.745614022 +0200
-+++ diffutils-3.10/lib/regcomp.c	2024-07-30 16:45:16.815548192 +0200
-@@ -1175,6 +1175,8 @@ analyze (regex_t *preg)
-       dfa->inveclosures = re_malloc (re_node_set, dfa->nodes_len);
-       if (__glibc_unlikely (dfa->inveclosures == NULL))
- 	return REG_ESPACE;
-+      /* The 'postorder' function initializes that memory */
-+      /* coverity[alloc_fn: FALSE] */
-       ret = calc_inveclosure (dfa);
-     }
- 
-diff -up diffutils-3.10/lib/sigsegv.c.orig diffutils-3.10/lib/sigsegv.c
---- diffutils-3.10/lib/sigsegv.c.orig	2023-05-20 11:05:07.000000000 +0200
-+++ diffutils-3.10/lib/sigsegv.c	2024-07-30 16:36:42.914438967 +0200
-@@ -1459,6 +1459,7 @@ stackoverflow_deinstall_handler (void)
-   {
-     stack_t ss;
-     ss.ss_flags = SS_DISABLE;
-+    /* coverity[uninit_use_in_call : FALSE] */
-     if (sigaltstack (&ss, (stack_t *) 0) < 0)
-       perror ("gnulib sigsegv (stackoverflow_deinstall_handler)");
-   }
-diff -up diffutils-3.10/lib/stackvma.c.orig diffutils-3.10/lib/stackvma.c
---- diffutils-3.10/lib/stackvma.c.orig	2023-01-30 01:17:41.000000000 +0100
-+++ diffutils-3.10/lib/stackvma.c	2024-07-30 16:38:45.404872853 +0200
-@@ -176,7 +176,7 @@ rof_open (struct rofile *rof, const char
-       /* Attempt to read the contents in a single system call.  */
-       if (size > MIN_LEFTOVER)
-         {
--          int n = read (fd, rof->buffer, size);
-+          size_t n = read (fd, rof->buffer, size);
-           if (n < 0 && errno == EINTR)
-             goto retry;
- # if defined __DragonFly__
-@@ -186,7 +186,7 @@ rof_open (struct rofile *rof, const char
-               if (n <= 0)
-                 /* Empty file.  */
-                 goto fail1;
--              if (n + MIN_LEFTOVER <= size)
-+              if (MIN_LEFTOVER <= size -n)
-                 {
-                   /* The buffer was sufficiently large.  */
-                   rof->filled = n;
-@@ -195,21 +195,23 @@ rof_open (struct rofile *rof, const char
-                      large enough.  We need the equivalent of full_read().  */
-                   for (;;)
-                     {
-+                      /* rof->filled cannot exceed size (due to the buffer size check), the subtraction is unlikely to overflow. */
-+                      /* coverity[overflow_sink : FALSE] */
-                       n = read (fd, rof->buffer + rof->filled, size - rof->filled);
-                       if (n < 0 && errno == EINTR)
-                         goto retry;
-                       if (n < 0)
-                         /* Some error.  */
-                         goto fail1;
--                      if (n + MIN_LEFTOVER > size - rof->filled)
--                        /* Allocate a larger buffer.  */
--                        break;
-                       if (n == 0)
-                         {
-                           /* Reached the end of file.  */
-                           close (fd);
-                           return 0;
-                         }
-+                      if (size - rof->filled - n < MIN_LEFTOVER)
-+                        /* Allocate a larger buffer.  */
-+                        break;
-                       rof->filled += n;
-                     }
- # else
-diff -up diffutils-3.10/lib/time_rz.c.orig diffutils-3.10/lib/time_rz.c
---- diffutils-3.10/lib/time_rz.c.orig	2023-01-02 02:20:08.000000000 +0100
-+++ diffutils-3.10/lib/time_rz.c	2024-07-30 16:36:42.914438967 +0200
-@@ -303,10 +303,12 @@ mktime_z (timezone_t tz, struct tm *tm)
-           time_t t = mktime (&tm_1);
-           bool ok = 0 <= tm_1.tm_yday;
- #if HAVE_STRUCT_TM_TM_ZONE || HAVE_TZNAME
-+          /* coverity[uninit_use_in_call : FALSE] */
-           ok = ok && save_abbr (tz, &tm_1);
- #endif
-           if (revert_tz (old_tz) && ok)
-             {
-+              /* coverity[uninit_use : FALSE] */
-               *tm = tm_1;
-               return t;
-             }
-diff -up diffutils-3.10/src/analyze.c.orig diffutils-3.10/src/analyze.c
---- diffutils-3.10/src/analyze.c.orig	2023-05-20 11:17:26.000000000 +0200
-+++ diffutils-3.10/src/analyze.c	2024-07-30 16:36:42.915438987 +0200
-@@ -689,6 +689,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.10/src/diff3.c.orig diffutils-3.10/src/diff3.c
---- diffutils-3.10/src/diff3.c.orig	2023-05-20 11:17:26.000000000 +0200
-+++ diffutils-3.10/src/diff3.c	2024-07-30 16:36:42.915438987 +0200
-@@ -798,6 +798,8 @@ using_to_diff3_block (struct diff_block
-                               D_LINEARRAY (result, FILEC) + result_offset,
-                               D_LENARRAY (result, FILEC) + result_offset,
-                               D_NUMLINES (ptr, FC)))
-+          /* There is a potential resource leak here, but it is not important */
-+          /* coverity[leaked_storage : FALSE] */
-           return 0;
-       }
- 
-@@ -827,6 +829,8 @@ 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)))
-+            /* There is a potential resource leak here, but it is not important */
-+            /* coverity[leaked_storage : FALSE] */
-             return 0;
- 
-           /* Catch the lines between here and the next diff */
-diff -up diffutils-3.10/src/diff.c.orig diffutils-3.10/src/diff.c
---- diffutils-3.10/src/diff.c.orig	2024-07-30 16:35:17.766783183 +0200
-+++ diffutils-3.10/src/diff.c	2024-07-30 16:36:42.915438987 +0200
-@@ -429,6 +429,7 @@ main (int argc, char **argv)
- 				  sizeof C_ifdef_group_formats - 7 /* 7*"@" */,
- 				  &alloc))
- 	      xalloc_die ();
-+	    /* coverity[alloc_strlen : FALSE] */
- 	    char *b = xmalloc (alloc);
- 	    char *base = b;
- 	    int changes = 0;
-diff -up diffutils-3.10/src/ifdef.c.orig diffutils-3.10/src/ifdef.c
---- diffutils-3.10/src/ifdef.c.orig	2023-02-19 19:04:39.000000000 +0100
-+++ diffutils-3.10/src/ifdef.c	2024-07-30 16:36:42.915438987 +0200
-@@ -361,6 +361,7 @@ do_printf_spec (FILE *out, char const *s
-                format spec "%3lx".  Here the spec prefix is "%3".  */
-             size_t spec_prefix_len = f - spec - 2;
-             size_t pI_len = sizeof pI - 1;
-+            /* coverity[bad_alloc_arithmetic : FALSE] */
-             char *format = xmalloca (spec_prefix_len + pI_len + 2);
-             char *p = mempcpy (format, spec, spec_prefix_len);
-             p = stpcpy (p, pI);

diffutils-3.10.tar.xz.sig

@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEEFV0/xQDINEhtHupnf9n8ywAL7u4FAmRp3HUACgkQf9n8ywAL
-7u5uJA/+MAaQc6ovuxdBJomue6M+KkLLjUhlA5GILfVmV1Jr99P+ke8QlKmr5kOX
-q9xxGJS+Rkp4coEqtuS+lKnhRoXq2OhYuO439zrm3BKOz9il9gR7yd2hN21zEQ3I
-kW+TEqjswawOh9wpubCk/C5WozxSLSVu3nUefF3rzVDGwNtG73Z4etDpTQ0OXCYw
-9Owy3F7Bmnxg0Ae/ETkZ/l95zPOAGUXGNrHYJ5KaxT5AJVbeNAgqlP2SWQmyBX8m
-Ui6ffjvjn8tr99uAZUoD64FDehQ6xPIS7uknuQ9yUMa6SR4877Axhaekfy0pwR6j
-lKSZI2PAJqufaVCnlM8ZQzDleHHqbKUD8cvbjW2upPg0Ow6Ppu/VFnFAgtREQnIP
-Wd6WdRil7WVcglrurPGiykENrRG204ZGIEauZkUgsSB9ONZKgEt13jsu7PAQn+Qf
-vGQf7/sk3+eRMIhkglPgJVDqV36GlYkxt0MDe2yJ3tsu7ZUzREYSQ8m8EcUdJ3h1
-xqFqaIpxxNzvyn7WtNeu3Ej1dD+lGTj8osLmGzSnCQ7eaFghtKJuUoTLnd0rcD9N
-gW60pBb4DBEiPcAwqYmVmVwYKJ/afPf2qjfCDJDDm+nVHHPKeitzVNCnRVvnzJZc
-55BV6ftNOHLV/H6Q7LDG9bF/WQR0HPu9UatdpYNUyggh45a3jlc=
-=cXRh
------END PGP SIGNATURE-----

sources

@@ -1 +0,0 @@
-SHA512 (diffutils-3.10.tar.xz) = 219d2c815a120690c6589846271e43aee5c96c61a7ee4abbef97dfcdb3d6416652ed494b417de0ab6688c4322540d48be63b5e617beb6d20530b5d55d723ccbb

tests/cmp-s-returns-1-even-if-files-are-identical/Makefile

@@ -1,63 +0,0 @@
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Makefile of /CoreOS/diffutils/Regression/cmp-s-returns-1-even-if-files-are-identical
-#   Description: Test for cmp -s returns 1 even if files are identical
-#   Author: Jeffrey Bastian <jbastian@redhat.com>
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Copyright (c) 2010 Red Hat, Inc. All rights reserved.
-#
-#   This copyrighted material is made available to anyone wishing
-#   to use, modify, copy, or redistribute it subject to the terms
-#   and conditions of the GNU General Public License version 2.
-#
-#   This program is distributed in the hope that it will be
-#   useful, but WITHOUT ANY WARRANTY; without even the implied
-#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-#   PURPOSE. See the GNU General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public
-#   License along with this program; if not, write to the Free
-#   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-#   Boston, MA 02110-1301, USA.
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-export TEST=/CoreOS/diffutils/Regression/cmp-s-returns-1-even-if-files-are-identical
-export TESTVERSION=1.0
-
-BUILT_FILES=
-
-FILES=$(METADATA) runtest.sh Makefile PURPOSE
-
-.PHONY: all install download clean
-
-run: $(FILES) build
-	./runtest.sh
-
-build: $(BUILT_FILES)
-	chmod a+x runtest.sh
-
-clean:
-	rm -f *~ $(BUILT_FILES)
-
-
-include /usr/share/rhts/lib/rhts-make.include
-
-$(METADATA): Makefile
-	@echo "Owner:           Jeffrey Bastian <jbastian@redhat.com>" > $(METADATA)
-	@echo "Name:            $(TEST)" >> $(METADATA)
-	@echo "TestVersion:     $(TESTVERSION)" >> $(METADATA)
-	@echo "Path:            $(TEST_DIR)" >> $(METADATA)
-	@echo "Description:     Test for cmp -s returns 1 even if files are identical" >> $(METADATA)
-	@echo "Type:            Regression" >> $(METADATA)
-	@echo "TestTime:        5m" >> $(METADATA)
-	@echo "RunFor:          diffutils" >> $(METADATA)
-	@echo "Requires:        diffutils" >> $(METADATA)
-	@echo "Priority:        Normal" >> $(METADATA)
-	@echo "License:         GPLv2" >> $(METADATA)
-	@echo "Confidential:    no" >> $(METADATA)
-	@echo "Destructive:     no" >> $(METADATA)
-
-	rhts-lint $(METADATA)

tests/cmp-s-returns-1-even-if-files-are-identical/PURPOSE

@@ -1,9 +0,0 @@
-PURPOSE of /CoreOS/diffutils/Regression/cmp-s-returns-1-even-if-files-are-identical
-Description: Test for cmp -s returns 1 even if files are identical
-Author: Jeffrey Bastian <jbastian@redhat.com>
-Bug summary: cmp -s returns 1 even if files are identical
-
-Description:
-'cmp -s' can return 1 even if files are identical, for example, if comparing
-a file from /proc with a copy of that file in /tmp, since all files in
-/proc have a size of 0 bytes.

tests/cmp-s-returns-1-even-if-files-are-identical/runtest.sh

@@ -1,51 +0,0 @@
-#!/bin/bash
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   runtest.sh of /CoreOS/diffutils/Regression/cmp-s-returns-1-even-if-files-are-identical
-#   Description: Test for cmp -s returns 1 even if files are identical
-#   Author: Jeffrey Bastian <jbastian@redhat.com>
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Copyright (c) 2010 Red Hat, Inc. All rights reserved.
-#
-#   This copyrighted material is made available to anyone wishing
-#   to use, modify, copy, or redistribute it subject to the terms
-#   and conditions of the GNU General Public License version 2.
-#
-#   This program is distributed in the hope that it will be
-#   useful, but WITHOUT ANY WARRANTY; without even the implied
-#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-#   PURPOSE. See the GNU General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public
-#   License along with this program; if not, write to the Free
-#   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-#   Boston, MA 02110-1301, USA.
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-# Include rhts environment
-. /usr/bin/rhts-environment.sh
-. /usr/share/rhts-library/rhtslib.sh
-
-PACKAGE="diffutils"
-#set -x
-
-rlJournalStart
-  rlPhaseStartSetup
-    rlAssertRpm $PACKAGE
-    rlRun "TmpDir=\`mktemp -d\`" 0 "Creating tmp directory"
-  rlPhaseEnd
-
-  rlPhaseStartTest
-    rlAssertExists $TmpDir
-    rlRun "cp /proc/version $TmpDir" 0 "Copy /proc/version to tmp directory"
-    rlRun "cmp -s /proc/version $TmpDir/version" 0 "Compare /proc/version to tmp copy"
-  rlPhaseEnd
-
-  rlPhaseStartCleanup
-    rlRun "rm -fr $TmpDir" 0 "Removing tmp directory"
-  rlPhaseEnd
-rlJournalEnd
-rlJournalPrintText

tests/diff-Z-hangs/Makefile

@@ -1,64 +0,0 @@
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Makefile of /CoreOS/diffutils/Regression/diff-Z-hangs
-#   Description: Test for diffutils to check if comparing two files using diff -Z with mixed line endings doesn't hang
-#   Author: Filip Holec <fholec@redhat.com>
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Copyright (c) 2014 Red Hat, Inc. All rights reserved.
-#
-#   This copyrighted material is made available to anyone wishing
-#   to use, modify, copy, or redistribute it subject to the terms
-#   and conditions of the GNU General Public License version 2.
-#
-#   This program is distributed in the hope that it will be
-#   useful, but WITHOUT ANY WARRANTY; without even the implied
-#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-#   PURPOSE. See the GNU General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public
-#   License along with this program; if not, write to the Free
-#   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-#   Boston, MA 02110-1301, USA.
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-export TEST=/CoreOS/diffutils/Regression/diff-Z-hangs
-export TESTVERSION=1.0
-
-BUILT_FILES=
-
-FILES=$(METADATA) runtest.sh Makefile PURPOSE
-
-.PHONY: all install download clean
-
-run: $(FILES) build
-	./runtest.sh
-
-build: $(BUILT_FILES)
-	test -x runtest.sh || chmod a+x runtest.sh
-
-clean:
-	rm -f *~ $(BUILT_FILES)
-
-
-include /usr/share/rhts/lib/rhts-make.include
-
-$(METADATA): Makefile
-	@echo "Owner:           Filip Holec <fholec@redhat.com>" > $(METADATA)
-	@echo "Name:            $(TEST)" >> $(METADATA)
-	@echo "TestVersion:     $(TESTVERSION)" >> $(METADATA)
-	@echo "Path:            $(TEST_DIR)" >> $(METADATA)
-	@echo "Description:     Test for diffutils to check if comparing two files using diff -Z with mixed line endings doesn't hang" >> $(METADATA)
-	@echo "Type:            Regression" >> $(METADATA)
-	@echo "TestTime:        5m" >> $(METADATA)
-	@echo "RunFor:          diffutils" >> $(METADATA)
-	@echo "Requires:        diffutils" >> $(METADATA)
-	@echo "Priority:        Normal" >> $(METADATA)
-	@echo "License:         GPLv2" >> $(METADATA)
-	@echo "Confidential:    no" >> $(METADATA)
-	@echo "Destructive:     no" >> $(METADATA)
-	@echo "Releases:        RHEL7" >> $(METADATA)
-
-	rhts-lint $(METADATA)

tests/diff-Z-hangs/PURPOSE

@@ -1,4 +0,0 @@
-PURPOSE of /CoreOS/diffutils/Regression/diff-Z-hangs
-Description: Test for diffutils to check if comparing two files using diff -Z with mixed line endings doesn't hang
-Author: Filip Holec <fholec@redhat.com>
-Bug summary: diff -Z hangs

tests/diff-Z-hangs/runtest.sh

@@ -1,56 +0,0 @@
-#!/bin/bash
-# vim: dict=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   runtest.sh of /CoreOS/diffutils/Regression/diff-Z-hangs
-#   Description: Test for diffutils to check if comparing two files using diff -Z with mixed line endings doesn't hang
-#   Author: Filip Holec <fholec@redhat.com>
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Copyright (c) 2014 Red Hat, Inc. All rights reserved.
-#
-#   This copyrighted material is made available to anyone wishing
-#   to use, modify, copy, or redistribute it subject to the terms
-#   and conditions of the GNU General Public License version 2.
-#
-#   This program is distributed in the hope that it will be
-#   useful, but WITHOUT ANY WARRANTY; without even the implied
-#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-#   PURPOSE. See the GNU General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public
-#   License along with this program; if not, write to the Free
-#   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-#   Boston, MA 02110-1301, USA.
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-# Include Beaker environment
-. /usr/bin/rhts-environment.sh
-. /usr/share/beakerlib/beakerlib.sh
-
-PACKAGE="diffutils"
-
-rlJournalStart
-    rlPhaseStartSetup
-        rlAssertRpm $PACKAGE
-        rlRun "TmpDir=\$(mktemp -d)" 0 "Creating tmp directory"
-        rlRun "pushd $TmpDir"
-    rlPhaseEnd
-
-    rlPhaseStartTest
-        rlRun "diff -Z <(printf 'a\nb\n') <(printf 'a\nb\n'); echo $?" \
-                0 "First simple test"
-        rlRun "timeout 10s diff -Z <(printf 'a\r\nb\n') <(printf 'a\nb\r\n')" \
-                0 "Main test, should not timeout (124)"
-        rlRun "timeout 10s diff -Z <(echo 'a') <(echo -n 'a')" \
-                0 "Second test, should not timeout (124)"
-    rlPhaseEnd
-
-    rlPhaseStartCleanup
-        rlRun "popd"
-        rlRun "rm -r $TmpDir" 0 "Removing tmp directory"
-    rlPhaseEnd
-rlJournalPrintText
-rlJournalEnd

tests/diff-hang-long-files/Makefile

@@ -1,61 +0,0 @@
-# Makefile - diff-hang-long-files
-# Author: Michal Fabry <mfabry@redhat.com>
-# Location: /CoreOS/diffutils/Regression/diff-hang-long-files/Makefile
-
-# Description: Diff appears to hang in long file
-
-# Copyright (c) 2009 Red Hat, Inc. All rights reserved. This copyrighted material
-# is made available to anyone wishing to use, modify, copy, or
-# redistribute it subject to the terms and conditions of the GNU General
-# Public License v.2.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE. See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-
-
-TOPLEVEL_NAMESPACE=/CoreOS
-PACKAGE_NAME=diffutils
-RELATIVE_PATH=Regression/diff-hang-long-files
-
-export TEST=$(TOPLEVEL_NAMESPACE)/$(PACKAGE_NAME)/$(RELATIVE_PATH)
-export TESTVERSION=1.0
-
-BUILT_FILES=
-
-FILES=$(METADATA) runtest.sh Makefile
-
-.PHONY: all install download clean
-
-run: $(FILES) build
-	./runtest.sh
-
-build: $(BUILT_FILES)
-	chmod a+x ./runtest.sh
-
-clean:
-	rm -f *~ $(BUILT_FILES)
-
-
-include /usr/share/rhts/lib/rhts-make.include
-
-
-$(METADATA): Makefile
-	@touch $(METADATA)
-	@echo "Owner:        Michal Fabry <mfabry@redhat.com>" > $(METADATA)
-	@echo "Name:         $(TEST)" >> $(METADATA)
-	@echo "Path:         $(TEST_DIR)"       >> $(METADATA)
-	@echo "TestVersion:  $(TESTVERSION)"    >> $(METADATA)
-	@echo "Description:  Diff appears to hang in long file" >> $(METADATA)
-	@echo "Type:         Regression" >> $(METADATA)
-	@echo "TestTime:     5m" >> $(METADATA)
-	@echo "RunFor:       $(PACKAGE_NAME)" >> $(METADATA)
-	@echo "Requires:     $(PACKAGE_NAME) words time" >> $(METADATA)
-	@echo "License:      GPLv2" >> $(METADATA)
-
-	rhts-lint $(METADATA)

tests/diff-hang-long-files/PURPOSE

@@ -1,10 +0,0 @@
-Test Name: diff-hang-long-files
-Author: Michal Fabry <mfabry@redhat.com>
-Location: /CoreOS/diffutils/Regression/diff-hang-long-files
-
-Short Description: Diff appears to hang in long file
-
-
-Long Description:
-
-Running the "diff -bBw" command on a very large input file (eg 250 MB), in a multi-byte locale (ie UTF-8), took a very long time to complete, if at all. In a reported case, a diff ran for multiple days and did not complete. In certain situations, this could cause 100% CPU usage.

tests/diff-hang-long-files/runtest.sh

@@ -1,78 +0,0 @@
-#!/bin/bash
-# Author: Michal Fabry <mfabry@redhat.com>
-
-# Copyright (c) 2009 Red Hat, Inc. All rights reserved. This copyrighted material
-# is made available to anyone wishing to use, modify, copy, or
-# redistribute it subject to the terms and conditions of the GNU General
-# Public License v.2.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE. See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-# Include Beaker environment
-. /usr/bin/rhts-environment.sh || exit 1
-. /usr/share/beakerlib/beakerlib.sh || exit 1
-
-
-rlJournalStart
-
-# ===================================================================
-# Setup - ABORT if some assert fails
-# ===================================================================
-rlPhaseStartSetup Setup
-
-set -o pipefail
-
-function count_lines() {
-  [ ! -r "$1" ] && return 1
-  wc -l "$1" | sed "s/^\s*\([0-9]\+\)\s\+.*$/\1/"
-}
-
-rlPhaseEnd
-
-
-# ===================================================================
-# Start the test
-# ===================================================================
-# -------------------------------------------------------------------
-# Create connection
-rlPhaseStartTest "Create big file"
-# -------------------------------------------------------------------
-
-log=$( mktemp /tmp/log.XXXXXX )
-
-rlRun "tr -d \"'\" <words | xargs echo >long-line" 0 "Create big file part 1"
-rlRun "for a in \$(seq 30); do cat long-line; done >long-lines" 0 "Create big file part 2"
-rlAssertExists 'long-lines'
-
-# -------------------------------------------------------------------
-# Test /usr/sbin/ss output
-rlPhaseEnd; rlPhaseStartTest "Test diff"
-# -------------------------------------------------------------------
-
-log2=$( mktemp /tmp/log.XXXXXX )
-now=$(date '+%s')
-rlRun "diff -bBw long-lines <(sed -e 's/ /  /' long-lines) >/dev/null"
-rlAssertGreater "Less than 150 seconds" 150 `expr $now - $(date '+%s')`
-
-rlPhaseEnd
-
-
-
-# ===================================================================
-# Start the cleanup
-# ===================================================================
-rlPhaseStartCleanup Cleanup
-
-rm -f $log $log2 long-line long-lines
-rlAssert0 "Remove the log" $?
-
-rlPhaseEnd
-
-#rlCreateLogFromJournal | tee $OUTPUTFILE
-rlJournalPrintText

tests/diff-w-b-doesn-t-treat-U3000-IDEOGRAPHIC-SPACE-as-space/Makefile

@@ -1,63 +0,0 @@
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Makefile of /CoreOS/diffutils/Regression/diff-w-b-doesn-t-treat-U3000-IDEOGRAPHIC-SPACE-as-space
-#   Description: Test for diffutils to ensure U3000 ideographic space is treated as space when used -b or -w options
-#   Author: Filip Holec <fholec@redhat.com>
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Copyright (c) 2013 Red Hat, Inc. All rights reserved.
-#
-#   This copyrighted material is made available to anyone wishing
-#   to use, modify, copy, or redistribute it subject to the terms
-#   and conditions of the GNU General Public License version 2.
-#
-#   This program is distributed in the hope that it will be
-#   useful, but WITHOUT ANY WARRANTY; without even the implied
-#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-#   PURPOSE. See the GNU General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public
-#   License along with this program; if not, write to the Free
-#   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-#   Boston, MA 02110-1301, USA.
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-export TEST=/CoreOS/diffutils/Regression/diff-w-b-doesn-t-treat-U3000-IDEOGRAPHIC-SPACE-as-space
-export TESTVERSION=1.0
-
-BUILT_FILES=
-
-FILES=$(METADATA) runtest.sh Makefile PURPOSE a b
-
-.PHONY: all install download clean
-
-run: $(FILES) build
-	./runtest.sh
-
-build: $(BUILT_FILES)
-	test -x runtest.sh || chmod a+x runtest.sh
-
-clean:
-	rm -f *~ $(BUILT_FILES)
-
-
-include /usr/share/rhts/lib/rhts-make.include
-
-$(METADATA): Makefile
-	@echo "Owner:           Filip Holec <fholec@redhat.com>" > $(METADATA)
-	@echo "Name:            $(TEST)" >> $(METADATA)
-	@echo "TestVersion:     $(TESTVERSION)" >> $(METADATA)
-	@echo "Path:            $(TEST_DIR)" >> $(METADATA)
-	@echo "Description:     Test for diffutils to ensure U3000 ideographic space is treated as space when used -b or -w options" >> $(METADATA)
-	@echo "Type:            Regression" >> $(METADATA)
-	@echo "TestTime:        5m" >> $(METADATA)
-	@echo "RunFor:          diffutils" >> $(METADATA)
-	@echo "Requires:        diffutils" >> $(METADATA)
-	@echo "Priority:        Normal" >> $(METADATA)
-	@echo "License:         GPLv2" >> $(METADATA)
-	@echo "Confidential:    no" >> $(METADATA)
-	@echo "Destructive:     no" >> $(METADATA)
-
-	rhts-lint $(METADATA)

tests/diff-w-b-doesn-t-treat-U3000-IDEOGRAPHIC-SPACE-as-space/PURPOSE

@@ -1,6 +0,0 @@
-PURPOSE of /CoreOS/diffutils/Regression/diff-w-b-doesn-t-treat-U3000-IDEOGRAPHIC-SPACE-as-space
-Description: Test for diffutils to ensure U3000 ideographic space is treated as space when used -b or -w options
-Author: Filip Holec <fholec@redhat.com>
-Bug summary: diff -w/-b doesn't treat U3000 (IDEOGRAPHIC SPACE) as space
-
-Test for diffutils to ensure U3000 ideographic space is treated as space when used -b or -w options

tests/diff-w-b-doesn-t-treat-U3000-IDEOGRAPHIC-SPACE-as-space/a

@@ -1 +0,0 @@
-a b

tests/diff-w-b-doesn-t-treat-U3000-IDEOGRAPHIC-SPACE-as-space/b

@@ -1 +0,0 @@
-a　b

tests/diff-w-b-doesn-t-treat-U3000-IDEOGRAPHIC-SPACE-as-space/runtest.sh

@@ -1,58 +0,0 @@
-#!/bin/bash
-# vim: dict=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   runtest.sh of /CoreOS/diffutils/Regression/diff-w-b-doesn-t-treat-U3000-IDEOGRAPHIC-SPACE-as-space
-#   Description: Test for diffutils to ensure U3000 ideographic space is treated as space when used -b or -w options
-#   Author: Filip Holec <fholec@redhat.com>
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Copyright (c) 2013 Red Hat, Inc. All rights reserved.
-#
-#   This copyrighted material is made available to anyone wishing
-#   to use, modify, copy, or redistribute it subject to the terms
-#   and conditions of the GNU General Public License version 2.
-#
-#   This program is distributed in the hope that it will be
-#   useful, but WITHOUT ANY WARRANTY; without even the implied
-#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-#   PURPOSE. See the GNU General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public
-#   License along with this program; if not, write to the Free
-#   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-#   Boston, MA 02110-1301, USA.
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-# Include Beaker environment
-. /usr/bin/rhts-environment.sh
-. /usr/share/beakerlib/beakerlib.sh
-
-PACKAGE="diffutils"
-
-# This test requires a non-C locale. Lets make it predictable
-export LC_ALL=en_US.utf8
-
-rlJournalStart
-    rlPhaseStartSetup
-        rlAssertRpm $PACKAGE
-        rlRun "TmpDir=\$(mktemp -d)" 0 "Creating tmp directory"
-        rlRun "cp a b $TmpDir" 0 "Copy files to $TmpDir"
-        rlRun "pushd $TmpDir"
-    rlPhaseEnd
-
-    rlPhaseStartTest
-        rlRun "diff -w a b >out" 0 "diff with -w option"
-        rlRun "[ ! -s out ]" 0 "Output should be empty"
-        rlRun "diff -b a b >out" 0 "diff with -b option"
-        rlRun "[ ! -s out ]" 0 "Output should be empty"
-    rlPhaseEnd
-
-    rlPhaseStartCleanup
-        rlRun "popd"
-        rlRun "rm -r $TmpDir" 0 "Removing tmp directory"
-    rlPhaseEnd
-rlJournalPrintText
-rlJournalEnd

tests/sdiff-does-not-recognize-E-option/Makefile

@@ -1,63 +0,0 @@
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Makefile of /CoreOS/diffutils/Regression/sdiff-does-not-recognize-E-option
-#   Description: Test for sdiff does not recognize -E option
-#   Author: Martin Kyral <mkyral@redhat.com>
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Copyright (c) 2012 Red Hat, Inc. All rights reserved.
-#
-#   This copyrighted material is made available to anyone wishing
-#   to use, modify, copy, or redistribute it subject to the terms
-#   and conditions of the GNU General Public License version 2.
-#
-#   This program is distributed in the hope that it will be
-#   useful, but WITHOUT ANY WARRANTY; without even the implied
-#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-#   PURPOSE. See the GNU General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public
-#   License along with this program; if not, write to the Free
-#   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-#   Boston, MA 02110-1301, USA.
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-export TEST=/CoreOS/diffutils/Regression/sdiff-does-not-recognize-E-option
-export TESTVERSION=1.0
-
-BUILT_FILES=
-
-FILES=$(METADATA) runtest.sh Makefile PURPOSE file1 file2
-
-.PHONY: all install download clean
-
-run: $(FILES) build
-	./runtest.sh
-
-build: $(BUILT_FILES)
-	test -x runtest.sh || chmod a+x runtest.sh
-
-clean:
-	rm -f *~ $(BUILT_FILES)
-
-
-include /usr/share/rhts/lib/rhts-make.include
-
-$(METADATA): Makefile
-	@echo "Owner:           Martin Kyral <mkyral@redhat.com>" > $(METADATA)
-	@echo "Name:            $(TEST)" >> $(METADATA)
-	@echo "TestVersion:     $(TESTVERSION)" >> $(METADATA)
-	@echo "Path:            $(TEST_DIR)" >> $(METADATA)
-	@echo "Description:     Test for sdiff does not recognize -E option" >> $(METADATA)
-	@echo "Type:            Regression" >> $(METADATA)
-	@echo "TestTime:        10m" >> $(METADATA)
-	@echo "RunFor:          diffutils" >> $(METADATA)
-	@echo "Requires:        diffutils" >> $(METADATA)
-	@echo "Priority:        Normal" >> $(METADATA)
-	@echo "License:         GPLv2" >> $(METADATA)
-	@echo "Confidential:    yes" >> $(METADATA)
-	@echo "Destructive:     no" >> $(METADATA)
-
-	rhts-lint $(METADATA)

tests/sdiff-does-not-recognize-E-option/PURPOSE

@@ -1,6 +0,0 @@
-PURPOSE of /CoreOS/diffutils/Regression/sdiff-does-not-recognize-E-option
-Description: Test for sdiff does not recognize -E option
-Author: Martin Kyral <mkyral@redhat.com>
-Bug summary: sdiff does not recognize -E option
-
-The test runs sdiff -E on two files differing just in use of tab/8 spaces. sdiff shall not fail and shall return that the files are identical.

tests/sdiff-does-not-recognize-E-option/file1

@@ -1,2 +0,0 @@
-        aaa
-        bbb

tests/sdiff-does-not-recognize-E-option/file2

@@ -1,2 +0,0 @@
-	aaa
-	bbb

tests/sdiff-does-not-recognize-E-option/runtest.sh

@@ -1,52 +0,0 @@
-#!/bin/bash
-# vim: dict=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   runtest.sh of /CoreOS/diffutils/Regression/sdiff-does-not-recognize-E-option
-#   Description: Test for sdiff does not recognize -E option
-#   Author: Martin Kyral <mkyral@redhat.com>
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Copyright (c) 2012 Red Hat, Inc. All rights reserved.
-#
-#   This copyrighted material is made available to anyone wishing
-#   to use, modify, copy, or redistribute it subject to the terms
-#   and conditions of the GNU General Public License version 2.
-#
-#   This program is distributed in the hope that it will be
-#   useful, but WITHOUT ANY WARRANTY; without even the implied
-#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-#   PURPOSE. See the GNU General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public
-#   License along with this program; if not, write to the Free
-#   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-#   Boston, MA 02110-1301, USA.
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-# Include Beaker environment
-. /usr/bin/rhts-environment.sh
-. /usr/lib/beakerlib/beakerlib.sh
-
-PACKAGE="diffutils"
-
-rlJournalStart
-    rlPhaseStartSetup
-        rlAssertRpm $PACKAGE
-        rlRun "TmpDir=\$(mktemp -d)" 0 "Creating tmp directory"
-        rlRun "cp file1 file2 $TmpDir"
-        rlRun "pushd $TmpDir"
-    rlPhaseEnd
-
-    rlPhaseStartTest
-        rlRun "sdiff -E file1 file2"
-    rlPhaseEnd
-
-    rlPhaseStartCleanup
-        rlRun "popd"
-        rlRun "rm -r $TmpDir" 0 "Removing tmp directory"
-    rlPhaseEnd
-rlJournalPrintText
-rlJournalEnd

tests/tests.yml

@@ -1,18 +0,0 @@
----
-# Tests that run in classic context
-- hosts: localhost
-  roles:
-  - role: standard-test-beakerlib
-    tags:
-    - classic
-    - container
-    - atomic
-    tests:
-    - cmp-s-returns-1-even-if-files-are-identical
-    - diff-hang-long-files
-    - diff-w-b-doesn-t-treat-U3000-IDEOGRAPHIC-SPACE-as-space
-    - diff-Z-hangs
-    - sdiff-does-not-recognize-E-option
-    - whitespace
-    required_packages:
-    - findutils         # beakerlib needs find command

tests/whitespace/Makefile

@@ -1,85 +0,0 @@
-# Copyright (c) 2006 Red Hat, Inc. All rights reserved. This copyrighted material 
-# is made available to anyone wishing to use, modify, copy, or
-# redistribute it subject to the terms and conditions of the GNU General
-# Public License v.2.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE. See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# Author: bpeck@redhat.com
-
-#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~#
-# Example Makefile for RHTS                                          #
-# This example is geared towards a test for a specific package       #
-# It does most of the work for you, but may require further coding   #
-#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~#
-
-# The toplevel namespace within which the test lives.
-# FIXME: You will need to change this:
-TOPLEVEL_NAMESPACE=CoreOS
-
-# The name of the package under test:
-# FIXME: you wil need to change this:
-PACKAGE_NAME=diffutils
-
-# The path of the test below the package:
-# FIXME: you wil need to change this:
-RELATIVE_PATH=whitespace
-
-# Version of the Test. Used with make tag.
-export TESTVERSION=1.1
-
-# The combined namespace of the test.
-export TEST=/$(TOPLEVEL_NAMESPACE)/$(PACKAGE_NAME)/$(RELATIVE_PATH)
-
-
-# A phony target is one that is not really the name of a file.
-# It is just a name for some commands to be executed when you
-# make an explicit request. There are two reasons to use a
-# phony target: to avoid a conflict with a file of the same
-# name, and to improve performance.
-.PHONY: all install download clean
-
-# executables to be built should be added here, they will be generated on the system under test.
-BUILT_FILES= 
-
-# data files, .c files, scripts anything needed to either compile the test and/or run it.
-FILES=$(METADATA) runtest.sh Makefile PURPOSE file1 file2
-
-run: $(FILES) build
-	./runtest.sh
-
-build: $(BUILT_FILES)
-	chmod a+x ./runtest.sh
-
-clean:
-	rm -f *~ *.rpm $(BUILT_FILES)
-
-# You may need to add other targets e.g. to build executables from source code
-# Add them here:
-
-
-# Include Common Makefile
-include /usr/share/rhts/lib/rhts-make.include
-
-# Generate the testinfo.desc here:
-$(METADATA): Makefile
-	@touch $(METADATA)
-# Change to the test owner's name
-	@echo "Owner:        Bill Peck <bpeck@redhat.com>" > $(METADATA)
-	@echo "Name:         $(TEST)" >> $(METADATA)
-	@echo "Path:         $(TEST_DIR)"	>> $(METADATA)
-	@echo "License:      GPL V2" >> $(METADATA)
-	@echo "TestVersion:  $(TESTVERSION)"	>> $(METADATA)
-	@echo "Description:  diff -b should ignore whitespace ">> $(METADATA)
-	@echo "TestTime:     5m" >> $(METADATA)
-	@echo "RunFor:       $(PACKAGE_NAME)" >> $(METADATA)  
-	@echo "Requires:     $(PACKAGE_NAME)" >> $(METADATA)  
-
-# You may need other fields here; see the documentation
-	rhts-lint $(METADATA)

tests/whitespace/PURPOSE

@@ -1,10 +0,0 @@
-Create 2 files, f1, f2 with contents "abc" and "abc " (without quotes),
-i.e. the same line with a space on the end.
-
-Diff ignoring whitespace:
-
-diff -b f1 f2
-
-should produce no diff output, but does on F8. Works fine on FC6.
-
-version: diffutils-2.8.1-17.fc8

tests/whitespace/file1

@@ -1 +0,0 @@
-abc

tests/whitespace/file2

@@ -1 +0,0 @@
-abc 

tests/whitespace/runtest.sh

@@ -1,37 +0,0 @@
-#!/bin/sh
-
-# Copyright (c) 2006 Red Hat, Inc. All rights reserved. This copyrighted material 
-# is made available to anyone wishing to use, modify, copy, or
-# redistribute it subject to the terms and conditions of the GNU General
-# Public License v.2.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE. See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# Author: Bill Peck
-
-. /usr/bin/rhts-environment.sh
-. /usr/share/rhts-library/rhtslib.sh
-
-PACKAGE="diffutils"
-
-rlJournalStart
-  rlPhaseStartSetup
-    rlAssertRpm $PACKAGE
-    rlRun "TmpDir=\`mktemp -d\`" 0 "Creating tmp directory"
-  rlPhaseEnd
-
-  rlPhaseStartTest
-    rlRun "diff -b file1 file2"
-  rlPhaseEnd
-
-  rlPhaseStartCleanup
-    rlRun "rm -fr $TmpDir" 0 "Removing tmp directory"
-  rlPhaseEnd
-rlJournalEnd
-rlJournalPrintText

upstream-key.gpg

@@ -1,371 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.11 (GNU/Linux)
-
-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
-TsT5hoBVIBulDJ13iotYt5qIhAlhASJs
-=Nb2k
------END PGP PUBLIC KEY BLOCK-----