From 4a94a7ecb42b6146e9aa6582c4413dc6e7be4345 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Tue, 1 Mar 2022 06:15:46 -0500 Subject: [PATCH] import m4-1.4.19-1.el9 --- .gitignore | 2 +- .m4.metadata | 2 +- .../m4-1.4.18-glibc-change-work-around.patch | 115 ------------------ SOURCES/m4-1.4.18.tar.xz.sig | 11 -- SOURCES/m4-1.4.19.tar.xz.sig | 11 ++ SPECS/m4.spec | 20 +-- 6 files changed, 26 insertions(+), 135 deletions(-) delete mode 100644 SOURCES/m4-1.4.18-glibc-change-work-around.patch delete mode 100644 SOURCES/m4-1.4.18.tar.xz.sig create mode 100644 SOURCES/m4-1.4.19.tar.xz.sig diff --git a/.gitignore b/.gitignore index 29695ca..c3d32bc 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/m4-1.4.18.tar.xz +SOURCES/m4-1.4.19.tar.xz diff --git a/.m4.metadata b/.m4.metadata index baef30a..772a1b0 100644 --- a/.m4.metadata +++ b/.m4.metadata @@ -1 +1 @@ -228604686ca23f42e48b98930babeb5d217f1899 SOURCES/m4-1.4.18.tar.xz +b44b5c9746b69ee19204b7cb76d3a7b3eac69259 SOURCES/m4-1.4.19.tar.xz diff --git a/SOURCES/m4-1.4.18-glibc-change-work-around.patch b/SOURCES/m4-1.4.18-glibc-change-work-around.patch deleted file mode 100644 index 582ae9b..0000000 --- a/SOURCES/m4-1.4.18-glibc-change-work-around.patch +++ /dev/null @@ -1,115 +0,0 @@ -diff -up m4-1.4.18/lib/fflush.c.orig m4-1.4.18/lib/fflush.c ---- m4-1.4.18/lib/fflush.c.orig 2018-05-02 12:35:59.536851666 +0200 -+++ m4-1.4.18/lib/fflush.c 2018-05-02 12:37:02.768958606 +0200 -@@ -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, 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 -up m4-1.4.18/lib/fpending.c.orig m4-1.4.18/lib/fpending.c ---- m4-1.4.18/lib/fpending.c.orig 2018-05-02 12:35:32.305806774 +0200 -+++ m4-1.4.18/lib/fpending.c 2018-05-02 12:35:44.944827347 +0200 -@@ -32,7 +32,7 @@ __fpending (FILE *fp) - /* Most systems provide FILE as a struct and the necessary bitmask in - , 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, Android */ -diff -up m4-1.4.18/lib/fpurge.c.orig m4-1.4.18/lib/fpurge.c ---- m4-1.4.18/lib/fpurge.c.orig 2018-05-02 12:38:13.586078669 +0200 -+++ m4-1.4.18/lib/fpurge.c 2018-05-02 12:38:38.785121867 +0200 -@@ -62,7 +62,7 @@ fpurge (FILE *fp) - /* Most systems provide FILE as a struct and the necessary bitmask in - , 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 -up m4-1.4.18/lib/freadahead.c.orig m4-1.4.18/lib/freadahead.c ---- m4-1.4.18/lib/freadahead.c.orig 2016-12-31 14:54:41.000000000 +0100 -+++ m4-1.4.18/lib/freadahead.c 2018-05-02 11:43:19.570336724 +0200 -@@ -25,7 +25,7 @@ - size_t - freadahead (FILE *fp) - { --#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_write_ptr > fp->_IO_write_base) - return 0; - return (fp->_IO_read_end - fp->_IO_read_ptr) -diff -up m4-1.4.18/lib/freading.c.orig m4-1.4.18/lib/freading.c ---- m4-1.4.18/lib/freading.c.orig 2018-05-02 12:37:33.970011368 +0200 -+++ m4-1.4.18/lib/freading.c 2018-05-02 12:37:59.393054359 +0200 -@@ -31,7 +31,7 @@ freading (FILE *fp) - /* Most systems provide FILE as a struct and the necessary bitmask in - , 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 -up m4-1.4.18/lib/fseeko.c.orig m4-1.4.18/lib/fseeko.c ---- m4-1.4.18/lib/fseeko.c.orig 2018-05-02 11:44:17.947460233 +0200 -+++ m4-1.4.18/lib/fseeko.c 2018-05-02 12:39:49.537216897 +0200 -@@ -47,7 +47,7 @@ fseeko (FILE *fp, off_t offset, int when - #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 when - 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 -up m4-1.4.18/lib/stdio-impl.h.orig m4-1.4.18/lib/stdio-impl.h ---- m4-1.4.18/lib/stdio-impl.h.orig 2016-12-31 14:54:42.000000000 +0100 -+++ m4-1.4.18/lib/stdio-impl.h 2018-05-02 11:43:19.570336724 +0200 -@@ -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/SOURCES/m4-1.4.18.tar.xz.sig b/SOURCES/m4-1.4.18.tar.xz.sig deleted file mode 100644 index 49b9600..0000000 --- a/SOURCES/m4-1.4.18.tar.xz.sig +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Comment: Public key at http://people.redhat.com/eblake/eblake.gpg - -iQEcBAABCAAGBQJYaDOKAAoJEKeha0olJ0NqT5oH/jyPC2chKyoCSrBAAmMT/0ac -xbDOiymNbaj6twhoZNunE8m8OzySfBQxANFf0yepZ0dCPf8/SzCWt9eHs12xzTrs -htcrsXBJ0woVdSG1SVaCzeOna8dvQ5fRJUHdWqTCa8sJdEBNk/zh2i72wGzMtpLo -Ord+dXOplvRe+LTUyu7eMAQfccPb5PnL4sh6WgmvQpjUiP4y2BlpbcI7hU1OOPNz -Gq63o3sO8OkwB2LP//M3fyi6Y4CHa7V6mfYz0PDboks1UruNYclbwVuJ8tLMYae+ -YlRMuMCs1hssICNcMyhtks8jdbXlMm7E8Nhk2+Uc6eRnA97zZQ0ADthNjA47/TA= -=TQTI ------END PGP SIGNATURE----- diff --git a/SOURCES/m4-1.4.19.tar.xz.sig b/SOURCES/m4-1.4.19.tar.xz.sig new file mode 100644 index 0000000..d7d09e1 --- /dev/null +++ b/SOURCES/m4-1.4.19.tar.xz.sig @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- + +iQEzBAABCAAdFiEEccLMIrHEYCkn0vOqp6FrSiUnQ2oFAmCxZrsACgkQp6FrSiUn +Q2pwdgf+NzRGVyKye6sHsOz9oOuP7Leh6/MRqjvQVSWSV5zBCPeAlfTBHBJ/kVyk +yfvLqi07p/swWFY/xI4kUdr3rjjI6Zn+9YiryWCmm7GzKi17jRa03gj9TTki9c7A +abpHL0yx/PUJUC76P0NQOBVCse0C1/gav2Tab9C2Ik7X2L5nar+wvB/jM+v015xc ++0xwq5CZgl0PqTeb+XrOK1D+a8IEnrIwdwrZoZwS6FVjU16cyOYSqvKmiYPoZm/D +9QpQvtMZwoJpZTbxto82t4nRJpe426g8LXMGry+n7IH3l4l6iALq2ZItqBwowXXo +YeRvWAAgzTRH6bJb8ZB65Eqwe4SDVg== +=h6jw +-----END PGP SIGNATURE----- diff --git a/SPECS/m4.spec b/SPECS/m4.spec index 203a285..7fcf7cf 100644 --- a/SPECS/m4.spec +++ b/SPECS/m4.spec @@ -1,15 +1,14 @@ Summary: GNU macro processor Name: m4 -Version: 1.4.18 -Release: 18%{?dist} +Version: 1.4.19 +Release: 1%{?dist} License: GPLv3+ Source0: https://ftp.gnu.org/gnu/m4/m4-%{version}.tar.xz Source1: https://ftp.gnu.org/gnu/m4/m4-%{version}.tar.xz.sig -# Patch0: update to glibc libio.h removal, rhbz#1573342 -Patch0: m4-1.4.18-glibc-change-work-around.patch URL: https://www.gnu.org/software/m4/ BuildRequires: make BuildRequires: gcc autoconf automake +BuildRequires: gettext %ifarch ppc ppc64 BuildRequires: texinfo %endif @@ -29,22 +28,21 @@ Install m4 if you need a macro processor. %prep %setup -q -%patch0 -p1 -b .glibc-change-work-around chmod 644 COPYING %build -autoreconf -ivf %configure %make_build %install %make_install rm -f $RPM_BUILD_ROOT%{_infodir}/dir +%find_lang %{name} %check make %{?_smp_mflags} check -%files +%files -f %{name}.lang %license COPYING %doc AUTHORS ChangeLog NEWS README THANKS TODO %{_bindir}/m4 @@ -52,6 +50,14 @@ make %{?_smp_mflags} check %{_mandir}/man1/m4.1* %changelog +* Mon Sep 13 2021 Vitezslav Crhonek - 1.4.19-1 +- Update to m4-1.4.19 + Resolves: #1975101 + +* Mon Aug 09 2021 Mohan Boddu - 1.4.18-19 +- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags + Related: rhbz#1991688 + * Fri Apr 16 2021 Mohan Boddu - 1.4.18-18 - Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937