Properly check valgrind arches

riscv64 is not yet posrted.

See upstream:
https://bugs.kde.org/show_bug.cgi?id=468575

Signed-off-by: David Abdurachmanov <davidlt@rivosinc.com>

.gitignore

@@ -4,3 +4,4 @@ sed-4.2.1.tar.bz2
 /sed-4.4.tar.xz
 /sed-4.5.tar.xz
 /sed-4.8.tar.xz
+/sed-4.9.tar.xz

sed-b-flag.patch

@@ -1,17 +1,18 @@
-From 613057152c4f6caba22a15ed2ff0aeb9c4ce6a83 Mon Sep 17 00:00:00 2001
+From f40556883a40ed7aaa4f44c9c9c95215c95eab9f Mon Sep 17 00:00:00 2001
-From: Jakub Martisko <jamartis@redhat.com>
+From: Paolo Bonzini <pbonzini@redhat.com>
-Date: Wed, 5 Feb 2020 15:50:15 +0100
+Date: Tue, 30 Jan 2024 10:31:57 +0100
-Subject: [PATCH] enable the -b option on all platforms
+Subject: [PATCH 1/3] enable the -b option on all platforms
+Content-Type: text/plain; charset=UTF-8
 
 ---
  sed/sed.c | 5 +++++
  1 file changed, 5 insertions(+)
 
 diff --git a/sed/sed.c b/sed/sed.c
-index f75e4b6..1ca5839 100644
+index af83065..bdf590b 100644
 --- a/sed/sed.c
 +++ b/sed/sed.c
-@@ -174,7 +174,12 @@ Usage: %s [OPTION]... {script-only-if-no-other-script} [input-file]...\n\
+@@ -153,7 +153,12 @@ Usage: %s [OPTION]... {script-only-if-no-other-script} [input-file]...\n\
    fprintf (out, _("  -b, --binary\n\
                   open files in binary mode (CR+LFs are not" \
                   " processed specially)\n"));
@@ -25,5 +26,5 @@ index f75e4b6..1ca5839 100644
                   specify the desired line-wrap length for the `l' command\n"));
    fprintf (out, _("  --posix\n\
 -- 
-2.24.1
+2.43.0
 

sed-c-flag.patch

@@ -1,50 +1,43 @@
-From f336bde91e3fd9c3c2960aa548b8917eb1216678 Mon Sep 17 00:00:00 2001
+From 100738652ca35e39f21742b8c54c1181efb38a0f Mon Sep 17 00:00:00 2001
-From: Jakub Martisko <jamartis@redhat.com>
+From: Paolo Bonzini <pbonzini@redhat.com>
-Date: Thu, 6 Feb 2020 15:26:33 +0100
+Date: Tue, 30 Jan 2024 10:38:50 +0100
-Subject: [PATCH] -c flag
+Subject: [PATCH 2/3] -c flag
+Content-Type: text/plain; charset=UTF-8
 
 ---
- sed/execute.c | 18 +++++++++--
+ sed/execute.c | 10 ++++--
  sed/sed.c     | 20 +++++++++++-
  sed/sed.h     |  4 +++
  sed/utils.c   | 86 +++++++++++++++++++++++++++++++++++++++++++++++++++
  sed/utils.h   |  2 ++
- 5 files changed, 127 insertions(+), 3 deletions(-)
+ 5 files changed, 119 insertions(+), 3 deletions(-)
 
 diff --git a/sed/execute.c b/sed/execute.c
-index c5f07cc..4e5f5b3 100644
+index 485bca7..8d0cde7 100644
 --- a/sed/execute.c
 +++ b/sed/execute.c
-@@ -670,11 +670,25 @@ closedown (struct input *input)
+@@ -673,11 +673,17 @@ closedown (struct input *input)
        if (strcmp (in_place_extension, "*") != 0)
          {
            char *backup_file_name = get_backup_file_name (target_name);
--          ck_rename (target_name, backup_file_name, input->out_file_name);
+-          ck_rename (target_name, backup_file_name);
 +          if (copy_instead_of_rename)
-+          {
++            ck_fccopy (target_name, backup_file_name);
-+            ck_fccopy (target_name, backup_file_name, input->out_file_name);
-+          }
 +          else
-+          {
++            ck_rename (target_name, backup_file_name);
-+            ck_rename (target_name, backup_file_name, input->out_file_name);
-+          }
            free (backup_file_name);
          }
  
--      ck_rename (input->out_file_name, target_name, input->out_file_name);
+-      ck_rename (input->out_file_name, target_name);
 +      if (copy_instead_of_rename)
-+      {
++        ck_fcmove (input->out_file_name, target_name);
-+        ck_fcmove (input->out_file_name, target_name, input->out_file_name);
-+      }
 +      else
-+      {
++        ck_rename (input->out_file_name, target_name);
-+        ck_rename (input->out_file_name, target_name, input->out_file_name);
-+      }
        cancel_cleanup ();
        free (input->out_file_name);
      }
 diff --git a/sed/sed.c b/sed/sed.c
-index 1ca5839..745159e 100644
+index bdf590b..cebef70 100644
 --- a/sed/sed.c
 +++ b/sed/sed.c
 @@ -67,6 +67,10 @@ bool debug = false;
@@ -58,7 +51,7 @@ index 1ca5839..745159e 100644
  /* The mode to use to read/write files, either "r"/"w" or "rb"/"wb".  */
  char const *read_mode = "r";
  char const *write_mode = "w";
-@@ -170,6 +174,10 @@ Usage: %s [OPTION]... {script-only-if-no-other-script} [input-file]...\n\
+@@ -149,6 +153,10 @@ Usage: %s [OPTION]... {script-only-if-no-other-script} [input-file]...\n\
  #endif
    fprintf (out, _("  -i[SUFFIX], --in-place[=SUFFIX]\n\
                   edit files in place (makes backup if SUFFIX supplied)\n"));
@@ -69,7 +62,7 @@ index 1ca5839..745159e 100644
  #if O_BINARY
    fprintf (out, _("  -b, --binary\n\
                   open files in binary mode (CR+LFs are not" \
-@@ -214,7 +222,7 @@ specified, then the standard input is read.\n\
+@@ -193,7 +201,7 @@ specified, then the standard input is read.\n\
  int
  main (int argc, char **argv)
  {
@@ -78,7 +71,7 @@ index 1ca5839..745159e 100644
  
    enum { SANDBOX_OPTION = CHAR_MAX+1,
           DEBUG_OPTION
-@@ -228,6 +236,7 @@ main (int argc, char **argv)
+@@ -207,6 +215,7 @@ main (int argc, char **argv)
      {"file", 1, NULL, 'f'},
      {"in-place", 2, NULL, 'i'},
      {"line-length", 1, NULL, 'l'},
@@ -86,7 +79,7 @@ index 1ca5839..745159e 100644
      {"null-data", 0, NULL, 'z'},
      {"zero-terminated", 0, NULL, 'z'},
      {"quiet", 0, NULL, 'n'},
-@@ -306,6 +315,10 @@ main (int argc, char **argv)
+@@ -285,6 +294,10 @@ main (int argc, char **argv)
            follow_symlinks = true;
            break;
  
@@ -97,7 +90,7 @@ index 1ca5839..745159e 100644
          case 'i':
            separate_files = true;
            IF_LINT (free (in_place_extension));
-@@ -376,6 +389,11 @@ main (int argc, char **argv)
+@@ -355,6 +368,11 @@ main (int argc, char **argv)
          }
      }
  
@@ -110,10 +103,10 @@ index 1ca5839..745159e 100644
      {
        if (optind < argc)
 diff --git a/sed/sed.h b/sed/sed.h
-index 1c8e83a..0859e72 100644
+index 1c96bc5..2de60ae 100644
 --- a/sed/sed.h
 +++ b/sed/sed.h
-@@ -236,6 +236,10 @@ extern countT lcmd_out_line_len;
+@@ -241,6 +241,10 @@ extern countT lcmd_out_line_len;
  /* How do we edit files in-place? (we don't if NULL) */
  extern char *in_place_extension;
  
@@ -125,7 +118,7 @@ index 1c8e83a..0859e72 100644
  extern char const *read_mode;
  extern char const *write_mode;
 diff --git a/sed/utils.c b/sed/utils.c
-index 9576dd1..371d5a9 100644
+index 4bd6587..05f7a44 100644
 --- a/sed/utils.c
 +++ b/sed/utils.c
 @@ -25,6 +25,7 @@
@@ -135,8 +128,8 @@ index 9576dd1..371d5a9 100644
 +#include <fcntl.h>
  
  #include "binary-io.h"
- #include "unlocked-io.h"
+ #include "eloop-threshold.h"
-@@ -400,7 +401,92 @@ ck_rename (const char *from, const char *to, const char *unlink_if_fail)
+@@ -408,7 +409,78 @@ ck_rename (const char *from, const char *to)
    panic (_("cannot rename %s: %s"), from, strerror (errno));
  }
  
@@ -150,20 +143,6 @@ index 9576dd1..371d5a9 100644
 +    panic (_("cannot remove %s: %s"), name, strerror (errno));
 +}
 +
-+/* Attempt to unlink denoted file if operation rd failed. */
-+static int
-+_unlink_if_fail (int rd,const char * unlink_if_fail)
-+{
-+  if (rd == -1 && unlink_if_fail)
-+    {
-+      int save_errno = errno;
-+      ck_unlink (unlink_if_fail);
-+      errno = save_errno;
-+    }
-+
-+  return rd != -1;
-+}
-+
 +/* Copy contents between files. */
 +static int
 +_copy (from, to)
@@ -172,7 +151,7 @@ index 9576dd1..371d5a9 100644
 +  static char buf[4096];
 +
 +  FILE *infile, *outfile;
-+  int c, retval = 0;
++  int retval = 0;
 +  errno = 0;
 +
 +  infile = fopen (from, "r");
@@ -213,35 +192,35 @@ index 9576dd1..371d5a9 100644
 +
 +/* Attempt to copy file contents between the files. */
 +void
-+ck_fccopy (const char *from,const char *to, const char *unlink_if_fail)
++ck_fccopy (const char *from, const char *to)
 +{
-+   if (!_unlink_if_fail (_copy (from, to), unlink_if_fail))
++  if (_copy (from, to) == -1)
-+   panic (_("cannot copy %s to %s: %s"), from, to, strerror (errno));
++    panic (_("cannot copy %s to %s: %s"), from, to, strerror (errno));
-+  }
++}
 +
 +/* Copy contents between files, and then unlink the source. */
 +void
-+ck_fcmove (const char *from, const char *to,const char *unlink_if_fail)
++ck_fcmove (const char *from, const char *to)
 +{
-+   ck_fccopy (from, to, unlink_if_fail);
++   ck_fccopy (from, to);
-+    ck_unlink (from);
++   ck_unlink (from);
 +}
  
  
  /* Implement a variable sized buffer of `stuff'.  We don't know what it is,
 diff --git a/sed/utils.h b/sed/utils.h
-index 47a029e..0aba107 100644
+index cac8a05..93bbcf2 100644
 --- a/sed/utils.h
 +++ b/sed/utils.h
-@@ -40,6 +40,8 @@ size_t ck_getdelim (char **text, size_t *buflen, char buffer_delimiter,
+@@ -41,6 +41,8 @@ size_t ck_getdelim (char **text, size_t *buflen, char buffer_delimiter,
  FILE * ck_mkstemp (char **p_filename, const char *tmpdir, const char *base,
                     const char *mode) _GL_ARG_NONNULL ((1, 2, 3, 4));
- void ck_rename (const char *from, const char *to, const char *unlink_if_fail);
+ void ck_rename (const char *from, const char *to);
-+void ck_fccopy (const char *from, const char *to, const char *unlink_if_fail);
++void ck_fccopy (const char *from, const char *to);
-+void ck_fcmove (const char *from, const char *to, const char *unlink_if_fail);
++void ck_fcmove (const char *from, const char *to);
  
  void *ck_malloc (size_t size);
  void *ck_realloc (void *ptr, size_t size);
 -- 
-2.24.1
+2.43.0
 

sed-covscan-annotations.patch

@@ -1,33 +1,31 @@
-From 87f411a001394948183aaf389c711f3837c361b5 Mon Sep 17 00:00:00 2001
+From 7dbe9c0c2b3f2cac602ce352cad11dab4defe896 Mon Sep 17 00:00:00 2001
-From: Jakub Martisko <jamartis@redhat.com>
+From: Paolo Bonzini <pbonzini@redhat.com>
-Date: Mon, 15 Nov 2021 16:06:54 +0100
+Date: Tue, 30 Jan 2024 10:41:40 +0100
-Subject: [PATCH] covscan annotations
+Subject: [PATCH 3/3] covscan annotations
+Content-Type: text/plain; charset=UTF-8
 
 ---
- lib/malloca.c | 3 ++-
+ lib/malloca.c | 1 +
  sed/compile.c | 2 ++
- sed/utils.c   | 1 +
+ 2 files changed, 3 insertions(+)
- 3 files changed, 5 insertions(+), 1 deletion(-)
 
 diff --git a/lib/malloca.c b/lib/malloca.c
-index 975b166..36e2342 100644
+index 1e19978..11783b4 100644
 --- a/lib/malloca.c
 +++ b/lib/malloca.c
-@@ -64,7 +64,8 @@ mmalloca (size_t n)
+@@ -71,6 +71,7 @@ mmalloca (size_t n)
               [mem, mem + nplus).  */
-           ((small_t *) p)[-1] = p - mem;
+           p[-1] = offset;
            /* p ≡ sa_alignment_max mod 2*sa_alignment_max.  */
--          return p;
++          /* cppcheck-suppress memleak */
-+          /* cppcheck-suppress memleak */ 
+           return p;
-+	  return p;
          }
      }
-   /* Out of memory.  */
 diff --git a/sed/compile.c b/sed/compile.c
-index 8321d68..df42794 100644
+index f96fbca..52759a5 100644
 --- a/sed/compile.c
 +++ b/sed/compile.c
-@@ -829,6 +829,7 @@ setup_replacement (struct subst *sub, const char *text, size_t length)
+@@ -830,6 +830,7 @@ setup_replacement (struct subst *sub, const char *text, size_t length)
  
    tail->next = NULL;
    sub->replacement = root.next;
@@ -35,26 +33,14 @@ index 8321d68..df42794 100644
  }
  
  static void
-@@ -1312,6 +1313,7 @@ compile_program (struct vector *vector)
+@@ -1328,6 +1329,7 @@ compile_program (struct vector *vector)
                    bad_prog (_(Y_CMD_LEN));
  
                  IF_LINT (free (src_lens));
-+		/* coverity [leaked_storage] */
++                /* coverity [leaked_storage] */
                }
              else
                {
-diff --git a/sed/utils.c b/sed/utils.c
-index 371d5a9..0d68f60 100644
---- a/sed/utils.c
-+++ b/sed/utils.c
-@@ -294,6 +294,7 @@ do_ck_fclose (FILE *fp)
-   clearerr (fp);
- 
-   if (fclose (fp) == EOF)
-+    /* coverity[pass_freed_arg] */
-     panic ("couldn't close %s: %s", utils_fp_name (fp), strerror (errno));
- }
- 
 -- 
-2.33.0
+2.43.0
 

sed.spec

@@ -2,8 +2,8 @@
 
 Summary: A GNU stream text editor
 Name: sed
-Version: 4.8
+Version: 4.9
-Release: 14%{?dist}
+Release: 1.0.riscv64%{?dist}
 License: GPL-3.0-or-later
 URL: http://sed.sourceforge.net/
 Source0: ftp://ftp.gnu.org/pub/gnu/sed/sed-%{version}.tar.xz
@@ -16,6 +16,16 @@ BuildRequires: glibc-devel, libselinux-devel, libacl-devel, automake, autoconf,
 BuildRequires: perl-Getopt-Long
 BuildRequires: perl(FileHandle)
 
+# for tests.  More tests require a ja_JP locale, but glibc-langpack-ja gives:
+#   invalid-mb-seq-UMR.sh: skipped test: locale 'ja_JP' is buggy
+#   mb-charclass-non-utf8.sh: skipped test: ja_JP shift-jis locale not found
+BuildRequires: glibc-langpack-el, glibc-langpack-en
+BuildRequires: glibc-langpack-ru
+
+%ifarch %{valgrind_arches}
+BuildRequires: valgrind
+%endif
+
 Provides: /bin/sed
 
 #copylib
@@ -29,14 +39,7 @@ that sed performs (substitutions, deletions, insertions, etc.) can be
 specified in a script file or from the command line.
 
 %prep
-%setup -q
+%autosetup -p1
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-
-
-sed -e 's/1729576/EPERM/' \
-    -i gnulib-tests/test-{strerror_r,perror2}.c
 
 %build
 %configure --without-included-regex
@@ -65,6 +68,19 @@ rm -f ${RPM_BUILD_ROOT}/%{_infodir}/dir
 %{_mandir}/man1/sed.1*
 
 %changelog
+* Mon Apr 22 2024 David Abdurachmanov <davidlt@rivosinc.com> - 4.9-1.0.riscv64
+- Properly check valgrind arches (riscv64 is not ported)
+
+* Tue Jan 30 2024 Paolo Bonzini <pbonzini@redhat.com> - 4.9-1
+- Rebase to 4.9
+- Update downstream patches
+- Resolves: rhbz#2140486
+- Remove change to gnulib tests, they pass anyway
+- Install valgrind and langpacks to increase test coverage
+
+* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 4.8-15
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
 * Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 4.8-14
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
 

sources

@@ -1 +1 @@
-SHA512 (sed-4.8.tar.xz) = 7de25d9bc2981c63321c2223f3fbcab61d7b0df4fcf7d4394b72400b91993e1288d8bf53948ed5fffcf5a98c75265726a68ad4fb98e1d571bf768603a108c1c8
+SHA512 (sed-4.9.tar.xz) = 36157a4b4a2430cf421b7bd07f1675d680d9f1616be96cf6ad6ee74a9ec0fe695f8d0b1e1f0b008bbb33cc7fcde5e1c456359bbbc63f8aebdd4fedc3982cf6dc