Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>

sed-covscan-annotations.patch

@@ -0,0 +1,60 @@
+From 87f411a001394948183aaf389c711f3837c361b5 Mon Sep 17 00:00:00 2001
+From: Jakub Martisko <jamartis@redhat.com>
+Date: Mon, 15 Nov 2021 16:06:54 +0100
+Subject: [PATCH] covscan annotations
+
+---
+ lib/malloca.c | 3 ++-
+ sed/compile.c | 2 ++
+ sed/utils.c   | 1 +
+ 3 files changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/lib/malloca.c b/lib/malloca.c
+index 975b166..36e2342 100644
+--- a/lib/malloca.c
++++ b/lib/malloca.c
+@@ -64,7 +64,8 @@ mmalloca (size_t n)
+              [mem, mem + nplus).  */
+           ((small_t *) p)[-1] = p - mem;
+           /* p ≡ sa_alignment_max mod 2*sa_alignment_max.  */
+-          return p;
++          /* cppcheck-suppress memleak */ 
++	  return p;
+         }
+     }
+   /* Out of memory.  */
+diff --git a/sed/compile.c b/sed/compile.c
+index 8321d68..df42794 100644
+--- a/sed/compile.c
++++ b/sed/compile.c
+@@ -829,6 +829,7 @@ setup_replacement (struct subst *sub, const char *text, size_t length)
+ 
+   tail->next = NULL;
+   sub->replacement = root.next;
++  /* coverity [leaked_storage] */
+ }
+ 
+ static void
+@@ -1312,6 +1313,7 @@ compile_program (struct vector *vector)
+                   bad_prog (_(Y_CMD_LEN));
+ 
+                 IF_LINT (free (src_lens));
++		/* 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
+

sed-gnulib.patch

@@ -1,218 +0,0 @@
-From 1831628c0630ae96a43586b2a25ca51cbdba3e53 Mon Sep 17 00:00:00 2001
-From: Paul Eggert <address@hidden>
-Date: Mon, 5 Mar 2018 10:56:29 -0800
-Subject: [PATCH] fflush: adjust to glibc 2.28 libio.h removal
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Problem reported by Daniel P. Berrangé in:
-https://lists.gnu.org/r/bug-gnulib/2018-03/msg00000.html
-* lib/fbufmode.c (fbufmode):
-* lib/fflush.c (clear_ungetc_buffer_preserving_position)
-(disable_seek_optimization, rpl_fflush):
-* lib/fpending.c (__fpending):
-* lib/fpurge.c (fpurge):
-* lib/freadable.c (freadable):
-* lib/freadahead.c (freadahead):
-* lib/freading.c (freading):
-* lib/freadptr.c (freadptr):
-* lib/freadseek.c (freadptrinc):
-* lib/fseeko.c (fseeko):
-* lib/fseterr.c (fseterr):
-* lib/fwritable.c (fwritable):
-* lib/fwriting.c (fwriting):
-Check _IO_EOF_SEEN instead of _IO_ftrylockfile.
-* lib/stdio-impl.h (_IO_IN_BACKUP) [_IO_EOF_SEEN]:
-Define if not already defined.
----
- ChangeLog        | 23 +++++++++++++++++++++++
- lib/fbufmode.c   |  2 +-
- lib/fflush.c     |  6 +++---
- lib/fpending.c   |  2 +-
- lib/fpurge.c     |  2 +-
- lib/freadable.c  |  2 +-
- lib/freadahead.c |  2 +-
- lib/freading.c   |  2 +-
- lib/freadptr.c   |  2 +-
- lib/freadseek.c  |  2 +-
- lib/fseeko.c     |  4 ++--
- lib/fseterr.c    |  2 +-
- lib/fwritable.c  |  2 +-
- lib/fwriting.c   |  2 +-
- lib/stdio-impl.h |  6 ++++++
- 15 files changed, 45 insertions(+), 16 deletions(-)
-
-diff --git a/ChangeLog b/ChangeLog
-index 667f91663..beb835670 100644
---- a/ChangeLog
-+++ b/ChangeLog
-@@ -1,3 +1,26 @@
-+2018-03-05  Paul Eggert  <address@hidden>
-+
-+	fflush: adjust to glibc 2.28 libio.h removal
-+	Problem reported by Daniel P. Berrangé in:
-+	https://lists.gnu.org/r/bug-gnulib/2018-03/msg00000.html
-+	* lib/fbufmode.c (fbufmode):
-+	* lib/fflush.c (clear_ungetc_buffer_preserving_position)
-+	(disable_seek_optimization, rpl_fflush):
-+	* lib/fpending.c (__fpending):
-+	* lib/fpurge.c (fpurge):
-+	* lib/freadable.c (freadable):
-+	* lib/freadahead.c (freadahead):
-+	* lib/freading.c (freading):
-+	* lib/freadptr.c (freadptr):
-+	* lib/freadseek.c (freadptrinc):
-+	* lib/fseeko.c (fseeko):
-+	* lib/fseterr.c (fseterr):
-+	* lib/fwritable.c (fwritable):
-+	* lib/fwriting.c (fwriting):
-+	Check _IO_EOF_SEEN instead of _IO_ftrylockfile.
-+	* lib/stdio-impl.h (_IO_IN_BACKUP) [_IO_EOF_SEEN]:
-+	Define if not already defined.
-+
- 2017-02-03  Jim Meyering  <meyering@fb.com>
- 
- 	version 4.4
-diff --git a/gnulib-tests/fflush.c b/gnulib-tests/fflush.c
-index 983ade0ff..a6edfa105 100644
---- a/gnulib-tests/fflush.c
-+++ b/gnulib-tests/fflush.c
-@@ -33,7 +33,7 @@
- #undef fflush
- 
- 
--#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
-+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
- 
- /* Clear the stream's ungetc buffer, preserving the value of ftello (fp).  */
- static void
-@@ -72,7 +72,7 @@ clear_ungetc_buffer (FILE *fp)
- 
- #endif
- 
--#if ! (defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */)
-+#if ! (defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */)
- 
- # if (defined __sferror || defined __DragonFly__ || defined __ANDROID__) && defined __SNPT
- /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */
-@@ -148,7 +148,7 @@ rpl_fflush (FILE *stream)
-   if (stream == NULL || ! freading (stream))
-     return fflush (stream);
- 
--#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
-+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
- 
-   clear_ungetc_buffer_preserving_position (stream);
- 
-diff --git a/lib/fpending.c b/lib/fpending.c
-index c84e3a5b4..789f50e4e 100644
---- a/lib/fpending.c
-+++ b/lib/fpending.c
-@@ -32,7 +32,7 @@ __fpending (FILE *fp)
-   /* Most systems provide FILE as a struct and the necessary bitmask in
-      <stdio.h>, because they need it for implementing getc() and putc() as
-      fast macros.  */
--#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
-+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
-   return fp->_IO_write_ptr - fp->_IO_write_base;
- #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__
-   /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */
-diff --git a/gnulib-tests/fpurge.c b/gnulib-tests/fpurge.c
-index b1d417c7a..3aedcc373 100644
---- a/gnulib-tests/fpurge.c
-+++ b/gnulib-tests/fpurge.c
-@@ -62,7 +62,7 @@ fpurge (FILE *fp)
-   /* Most systems provide FILE as a struct and the necessary bitmask in
-      <stdio.h>, because they need it for implementing getc() and putc() as
-      fast macros.  */
--# if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
-+# if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
-   fp->_IO_read_end = fp->_IO_read_ptr;
-   fp->_IO_write_ptr = fp->_IO_write_base;
-   /* Avoid memory leak when there is an active ungetc buffer.  */
-diff --git a/gnulib-tests/freading.c b/gnulib-tests/freading.c
-index 73c28acdd..c24d0c88a 100644
---- a/gnulib-tests/freading.c
-+++ b/gnulib-tests/freading.c
-@@ -31,7 +31,7 @@ freading (FILE *fp)
-   /* Most systems provide FILE as a struct and the necessary bitmask in
-      <stdio.h>, because they need it for implementing getc() and putc() as
-      fast macros.  */
--# if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
-+# if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
-   return ((fp->_flags & _IO_NO_WRITES) != 0
-           || ((fp->_flags & (_IO_NO_READS | _IO_CURRENTLY_PUTTING)) == 0
-               && fp->_IO_read_base != NULL));
-diff --git a/gnulib-tests/fseeko.c b/gnulib-tests/fseeko.c
-index 0101ab55f..193f4e8ce 100644
---- a/gnulib-tests/fseeko.c
-+++ b/gnulib-tests/fseeko.c
-@@ -47,7 +47,7 @@ fseeko (FILE *fp, off_t offset, int whence)
- #endif
- 
-   /* These tests are based on fpurge.c.  */
--#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
-+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
-   if (fp->_IO_read_end == fp->_IO_read_ptr
-       && fp->_IO_write_ptr == fp->_IO_write_base
-       && fp->_IO_save_base == NULL)
-@@ -123,7 +123,7 @@ fseeko (FILE *fp, off_t offset, int whence)
-           return -1;
-         }
- 
--#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
-+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
-       fp->_flags &= ~_IO_EOF_SEEN;
-       fp->_offset = pos;
- #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__
-diff --git a/lib/fwriting.c b/lib/fwriting.c
-index 461ab0f1f..4a3d9c8d4 100644
---- a/lib/fwriting.c
-+++ b/lib/fwriting.c
-@@ -27,7 +27,7 @@ fwriting (FILE *fp)
-   /* Most systems provide FILE as a struct and the necessary bitmask in
-      <stdio.h>, because they need it for implementing getc() and putc() as
-      fast macros.  */
--#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
-+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
-   return (fp->_flags & (_IO_NO_READS | _IO_CURRENTLY_PUTTING)) != 0;
- #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__
-   /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */
-diff --git a/lib/stdio-impl.h b/lib/stdio-impl.h
-index 78d896e9f..05c5752a2 100644
---- a/lib/stdio-impl.h
-+++ b/lib/stdio-impl.h
-@@ -18,6 +18,12 @@
-    the same implementation of stdio extension API, except that some fields
-    have different naming conventions, or their access requires some casts.  */
- 
-+/* Glibc 2.28 made _IO_IN_BACKUP private.  For now, work around this
-+   problem by defining it ourselves.  FIXME: Do not rely on glibc
-+   internals.  */
-+#if !defined _IO_IN_BACKUP && defined _IO_EOF_SEEN
-+# define _IO_IN_BACKUP 0x100
-+#endif
- 
- /* BSD stdio derived implementations.  */
- 
-diff --git a/lib/stdio-impl.h b/lib/stdio-impl.h
-index 78d896e9f..05c5752a2 100644
---- a/gnulib-tests/stdio-impl.h
-+++ b/gnulib-tests/stdio-impl.h
-@@ -18,6 +18,12 @@
-    the same implementation of stdio extension API, except that some fields
-    have different naming conventions, or their access requires some casts.  */
- 
-+/* Glibc 2.28 made _IO_IN_BACKUP private.  For now, work around this
-+   problem by defining it ourselves.  FIXME: Do not rely on glibc
-+   internals.  */
-+#if !defined _IO_IN_BACKUP && defined _IO_EOF_SEEN
-+# define _IO_IN_BACKUP 0x100
-+#endif
- 
- /* BSD stdio derived implementations.  */
- 
--- 
-2.14.3
-

sed-selinux.patch

@@ -1,29 +0,0 @@
-diff --git a/NEWS b/NEWS
-index e9335f0..e762b2d 100644
---- a/NEWS
-+++ b/NEWS
-@@ -1,4 +1,9 @@ GNU sed NEWS                                    -*- outline -*-
- GNU sed NEWS                                    -*- outline -*-
-+ 
-+  sed -i now creates selinux context based on the context of the symlink
-+  instead of the symlink target. [Bug present since at least sed-4.2]
-+  sed -i --follow-symlinks remains unchanged.
-+
- 
- * Noteworthy changes in release 4.4 (2017-02-03) [stable]
- 
-diff --git a/sed/execute.c b/sed/execute.c
-index 1843392..453886e 100644
---- a/sed/execute.c
-+++ b/sed/execute.c
-@@ -607,7 +607,7 @@ open_next_file(const char *name, struct input *input)
-       if (is_selinux_enabled () > 0)
-         {
-           security_context_t con;
--          if (getfilecon (input->in_file_name, &con) != -1)
-+          if (lgetfilecon (input->in_file_name, &con) != -1)
-             {
-               /* Save and restore the old context for the sake of w and W
-                  commands.  */
-2.9.5
-

sed.spec

@@ -3,19 +3,18 @@
 Summary: A GNU stream text editor
 Name: sed
 Version: 4.8
-Release: 1%{?dist}
+Release: 12%{?dist}
 License: GPLv3+
 URL: http://sed.sourceforge.net/
 Source0: ftp://ftp.gnu.org/pub/gnu/sed/sed-%{version}.tar.xz
 Source1: http://sed.sourceforge.net/sedfaq.txt
 Patch0: sed-b-flag.patch
 Patch1: sed-c-flag.patch
-#Patch1: sed-selinux.patch
-#Build failure with glibc-2.28
-#https://lists.gnu.org/r/bug-gnulib/2018-03/msg00000.html
-Patch2: sed-gnulib.patch
+Patch2: sed-covscan-annotations.patch
+BuildRequires: make
 BuildRequires: glibc-devel, libselinux-devel, libacl-devel, automake, autoconf, gcc
 BuildRequires: perl-Getopt-Long
+BuildRequires: perl(FileHandle)
 
 Provides: /bin/sed
 
@@ -33,11 +32,15 @@ specified in a script file or from the command line.
 %setup -q
 %patch0 -p1
 %patch1 -p1
-#%patch2 -p1
+%patch2 -p1
+
+
+sed -e 's/1729576/EPERM/' \
+    -i gnulib-tests/test-{strerror_r,perror2}.c
 
 %build
 %configure --without-included-regex
-make %{_smp_mflags}
+%make_build
 install -m 644 -p %{SOURCE1} sedfaq.txt
 gzip -9 sedfaq.txt
 
@@ -48,7 +51,7 @@ echo ====================TESTING END=====================
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
-make DESTDIR=$RPM_BUILD_ROOT install
+%make_install
 rm -f ${RPM_BUILD_ROOT}/%{_infodir}/dir
 
 %find_lang %{name}
@@ -62,6 +65,42 @@ rm -f ${RPM_BUILD_ROOT}/%{_infodir}/dir
 %{_mandir}/man1/sed.1*
 
 %changelog
+* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 4.8-12
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 4.8-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 4.8-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Tue Nov 16 2021 Jakub Martisko <jamartis@redhat.com> - 4.8-9
+- Add annotations to disable false positives in the covscan
+- Related: rhbz#1938867
+
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.8-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.8-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Mon Aug 17 2020 Jakub Martisko <jamartis@redhat.com> - 4.8-6
+- Minor spec cleanup
+
+* Mon Aug 03 2020 Jakub Martisko <jamartis@redhat.com> - 4.8-5
+- Use make macros
+
+* Mon Aug 03 2020 Jakub Martisko <jamartis@redhat.com> - 4.8-4
+- Replace some hardcoded constants in the gnulib-testsuite
+  ... that caused build failures on arm7
+
+* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.8-3
+- Second attempt - Rebuilt for
+  https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.8-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
 * Tue Feb 11 2020 Jakub Martisko <jamartis@redhat.com> - 4.8-1
 - Rebase to 4.8
 - Refresh the downstream patch and split it into two