From 883d8ee5e6631e99b0055dd9110d1d148c329c57 Mon Sep 17 00:00:00 2001 From: eabdullin Date: Wed, 14 May 2025 15:53:07 +0000 Subject: [PATCH] import UBI m4-1.4.19-11.el10 --- .gitignore | 2 +- .m4.metadata | 1 - .../m4-1.4.18-glibc-change-work-around.patch | 115 ----------------- SOURCES/m4-1.4.18.tar.xz.sig | 11 -- m4-1.4.19.tar.xz.sig | 11 ++ SPECS/m4.spec => m4.spec | 117 +++++++++++++----- sources | 1 + 7 files changed, 98 insertions(+), 160 deletions(-) delete mode 100644 .m4.metadata 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 m4-1.4.19.tar.xz.sig rename SPECS/m4.spec => m4.spec (73%) create mode 100644 sources diff --git a/.gitignore b/.gitignore index 29695ca..4b72630 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/m4-1.4.18.tar.xz +m4-1.4.19.tar.xz diff --git a/.m4.metadata b/.m4.metadata deleted file mode 100644 index baef30a..0000000 --- a/.m4.metadata +++ /dev/null @@ -1 +0,0 @@ -228604686ca23f42e48b98930babeb5d217f1899 SOURCES/m4-1.4.18.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/m4-1.4.19.tar.xz.sig b/m4-1.4.19.tar.xz.sig new file mode 100644 index 0000000..d7d09e1 --- /dev/null +++ b/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/m4.spec similarity index 73% rename from SPECS/m4.spec rename to m4.spec index 8651845..672e39f 100644 --- a/SPECS/m4.spec +++ b/m4.spec @@ -1,17 +1,14 @@ -Summary: The GNU macro processor +Summary: GNU macro processor Name: m4 -Version: 1.4.18 -Release: 7%{?dist} -License: GPLv3+ -Group: Applications/Text -Source0: http://ftp.gnu.org/gnu/m4/m4-%{version}.tar.xz -Source1: http://ftp.gnu.org/gnu/m4/m4-%{version}.tar.xz.sig -URL: http://www.gnu.org/software/m4/ -# Patch0: update to glibc libio.h removal, rhbz#1573342 -Patch0: m4-1.4.18-glibc-change-work-around.patch -Requires(post): /sbin/install-info -Requires(preun): /sbin/install-info -BuildRequires: autoconf automake +Version: 1.4.19 +Release: 11%{?dist} +License: GPL-3.0-or-later AND GFDL-1.3-or-later +Source0: https://ftp.gnu.org/gnu/m4/m4-%{version}.tar.xz +Source1: https://ftp.gnu.org/gnu/m4/m4-%{version}.tar.xz.sig +URL: https://www.gnu.org/software/m4/ +BuildRequires: make +BuildRequires: gcc autoconf automake +BuildRequires: gettext %ifarch ppc ppc64 BuildRequires: texinfo %endif @@ -31,44 +28,100 @@ 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 %{?_smp_mflags} +%make_build %install -make install INSTALL="%{__install} -p" DESTDIR=$RPM_BUILD_ROOT +%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 %{_infodir}/* %{_mandir}/man1/m4.1* -%post -if [ -f %{_infodir}/m4.info.gz ]; then # --excludedocs? - /sbin/install-info %{_infodir}/m4.info.gz %{_infodir}/dir || : -fi - -%preun -if [ "$1" = 0 ]; then - if [ -f %{_infodir}/m4.info.gz ]; then # --excludedocs? - /sbin/install-info --delete %{_infodir}/m4.info.gz %{_infodir}/dir || : - fi -fi - %changelog -* Mon Aug 06 2018 Vitezslav Crhonek - 1.4.18-7 +* Tue Oct 29 2024 Troy Dawson - 1.4.19-11 +- Bump release for October 2024 mass rebuild: + Resolves: RHEL-64018 + +* Mon Jun 24 2024 Troy Dawson - 1.4.19-10 +- Bump release for June 2024 mass rebuild + +* Thu Jan 25 2024 Fedora Release Engineering - 1.4.19-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sun Jan 21 2024 Fedora Release Engineering - 1.4.19-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Tue Aug 08 2023 Frederic Berat - 1.4.19-7 +- Migrate to SPDX licenses (#2222092). + +* Thu Jul 20 2023 Fedora Release Engineering - 1.4.19-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Thu Jan 19 2023 Fedora Release Engineering - 1.4.19-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Thu Jul 21 2022 Fedora Release Engineering - 1.4.19-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Thu Jan 20 2022 Fedora Release Engineering - 1.4.19-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Thu Jul 22 2021 Fedora Release Engineering - 1.4.19-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Mon May 31 2021 Vitezslav Crhonek - 1.4.19-1 +- Update to m4-1.4.19 + Resolves: #1965719 + +* Tue Jan 26 2021 Fedora Release Engineering - 1.4.18-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Tue Oct 13 2020 Vitezslav Crhonek - 1.4.18-16 +- Drop workaround introduced in previous release + Resolves: #1864107 + +* Thu Aug 06 2020 Vitezslav Crhonek - 1.4.18-15 +- Disable %%check on ppc64le (workaround for FTBFS) + Resolves: #1864107 + +* Sat Aug 01 2020 Fedora Release Engineering - 1.4.18-14 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Tue Jul 28 2020 Fedora Release Engineering - 1.4.18-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Wed Jan 29 2020 Fedora Release Engineering - 1.4.18-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Thu Jul 25 2019 Fedora Release Engineering - 1.4.18-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Fri Feb 01 2019 Fedora Release Engineering - 1.4.18-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Fri Jul 13 2018 Fedora Release Engineering - 1.4.18-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Wed May 02 2018 Vitezslav Crhonek - 1.4.18-8 - Work around change in glibc - Resolves: #1611732 + Resolves: #1573342 + +* Thu Feb 22 2018 Vitezslav Crhonek - 1.4.18-7 +- Add BuildRequires gcc +- Remove Group tag * Thu Feb 08 2018 Fedora Release Engineering - 1.4.18-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild diff --git a/sources b/sources new file mode 100644 index 0000000..752b737 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (m4-1.4.19.tar.xz) = 47f595845c89709727bda0b3fc78e3188ef78ec818965b395532e7041cabe9e49677ee4aca3d042930095a7f8df81de3da1026b23b6897be471f6cf13ddd512b