From 2c6a345022d9f43d6ba3a655a1895ec595dbbaaf Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Tue, 7 May 2019 09:14:44 -0400 Subject: [PATCH] import m4-1.4.18-7.el8 --- .gitignore | 1 + .m4.metadata | 1 + .../m4-1.4.18-glibc-change-work-around.patch | 115 ++++++ SOURCES/m4-1.4.18.tar.xz.sig | 11 + SPECS/m4.spec | 336 ++++++++++++++++++ 5 files changed, 464 insertions(+) create mode 100644 .gitignore create mode 100644 .m4.metadata create mode 100644 SOURCES/m4-1.4.18-glibc-change-work-around.patch create mode 100644 SOURCES/m4-1.4.18.tar.xz.sig create mode 100644 SPECS/m4.spec diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..29695ca --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/m4-1.4.18.tar.xz diff --git a/.m4.metadata b/.m4.metadata new file mode 100644 index 0000000..baef30a --- /dev/null +++ b/.m4.metadata @@ -0,0 +1 @@ +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 new file mode 100644 index 0000000..582ae9b --- /dev/null +++ b/SOURCES/m4-1.4.18-glibc-change-work-around.patch @@ -0,0 +1,115 @@ +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 new file mode 100644 index 0000000..49b9600 --- /dev/null +++ b/SOURCES/m4-1.4.18.tar.xz.sig @@ -0,0 +1,11 @@ +-----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/SPECS/m4.spec b/SPECS/m4.spec new file mode 100644 index 0000000..8651845 --- /dev/null +++ b/SPECS/m4.spec @@ -0,0 +1,336 @@ +Summary: The 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 +%ifarch ppc ppc64 +BuildRequires: texinfo +%endif +# Gnulib bundled - the library has been granted an exception, see https://fedorahosted.org/fpc/ticket/174 +# Gnulib is not versioned, see m4 ChangeLog for approximate date of Gnulib copy +Provides: bundled(gnulib) + +%description +A GNU implementation of the traditional UNIX macro processor. M4 is +useful for writing text files which can be logically parsed, and is used +by many programs as part of their build process. M4 has built-in +functions for including files, running shell commands, doing arithmetic, +etc. The autoconf program needs m4 for generating configure scripts, but +not for running configure scripts. + +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} + +%install +make install INSTALL="%{__install} -p" DESTDIR=$RPM_BUILD_ROOT +rm -f $RPM_BUILD_ROOT%{_infodir}/dir + +%check +make %{?_smp_mflags} check + +%files +%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 +- Work around change in glibc + Resolves: #1611732 + +* Thu Feb 08 2018 Fedora Release Engineering - 1.4.18-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Thu Aug 03 2017 Fedora Release Engineering - 1.4.18-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Wed Jul 26 2017 Fedora Release Engineering - 1.4.18-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Fri Feb 10 2017 Fedora Release Engineering - 1.4.18-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Wed Feb 01 2017 Stephen Gallagher - 1.4.18-2 +- Add missing %%license macro + Resolves: #1418521 + +* Mon Jan 02 2017 Vitezslav Crhonek - 1.4.18-1 +- Update to m4-1.4.18 + Resolves: #1409340 + +* Thu Feb 04 2016 Fedora Release Engineering - 1.4.17-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Mon Jul 13 2015 Vitezslav Crhonek - 1.4.17-8 +- Fix m4 FTBFS in rawhide + Resolves: #1239665 + +* Wed Jun 17 2015 Fedora Release Engineering - 1.4.17-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Sun Aug 17 2014 Fedora Release Engineering - 1.4.17-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Sat Jun 07 2014 Fedora Release Engineering - 1.4.17-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Thu Apr 10 2014 Vitezslav Crhonek - 1.4.17-4 +- Fix ppc64le test fails + Resolves: #1083434 + +* Mon Dec 09 2013 Vitezslav Crhonek - 1.4.17-3 +- Buildrequire texinfo for ppc architecture + Resolves: #1038230 + +* Tue Nov 12 2013 Vitezslav Crhonek - 1.4.17-2 +- Fix installation of info documentation + Resolves: #1020194 + +* Tue Nov 05 2013 Vitezslav Crhonek - 1.4.17-1 +- Update to m4-1.4.17 + Resolves: #1010895 +- Fix bogus date in the %%changelog + +* Sat Aug 03 2013 Fedora Release Engineering - 1.4.16-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Thu Apr 04 2013 Vitezslav Crhonek - 1.4.16-8 +- Rerun autoreconf + Resolves: #926109 + +* Thu Feb 14 2013 Fedora Release Engineering - 1.4.16-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Tue Aug 28 2012 Vitezslav Crhonek - 1.4.16-6 +- Fix issues found by fedora-review utility in the spec file + +* Thu Jul 19 2012 Fedora Release Engineering - 1.4.16-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Mon May 28 2012 Vitezslav Crhonek - 1.4.16-4 +- Fix handling of bundled gnulib in the spec file + Resolves: #821777 + +* Fri Jan 13 2012 Fedora Release Engineering - 1.4.16-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Tue Sep 20 2011 Vitezslav Crhonek - 1.4.16-2 +- Temporarily fix readlink test to accept EINVAL also + Resolves: #739189 + +* Wed Mar 02 2011 Vitezslav Crhonek - 1.4.16-1 +- Update to m4-1.4.16 + +* Tue Feb 08 2011 Fedora Release Engineering - 1.4.15-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Tue Sep 7 2010 Vitezslav Crhonek - 1.4.15-1 +- Update to m4-1.4.15 (removed include patch, already applied in upstream source) + Resolves: #630709 + +* Mon Mar 1 2010 Vitezslav Crhonek - 1.4.14-1 +- Update to m4-1.4.14 + Resolves: #568339 + +* Thu Sep 3 2009 Vitezslav Crhonek - 1.4.13-4 +- Fix errors installing m4 with --excludedocs + Resolves: #516013 + +* Wed Aug 12 2009 Ville Skyttä - 1.4.13-3 +- Use xz compressed upstream tarball. + +* Sat Jul 25 2009 Fedora Release Engineering - 1.4.13-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Wed May 27 2009 Stepan Kasal - 1.4.13-1 +- new upstream release +- drop the ununsed Source1: %%{SOURCE0}.sig +- enable %%check again + +* Wed Feb 25 2009 Fedora Release Engineering - 1.4.12-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Wed Nov 5 2008 Vitezslav Crhonek - 1.4.12-1 +- Update to m4-1.4.12 + Resolves: #469944 +- Merge review + Resolves: #226115 + +* Wed Apr 23 2008 Vitezslav Crhonek - 1.4.11-1 +- Update to m4-1.4.11 (removed vasnprintf patch, it's included in + upstream source) + Resolves: #443589 + +* Mon Feb 11 2008 Vitezslav Crhonek - 1.4.10-3 +- Fix Buildroot + +* Mon Dec 17 2007 Vitezslav Crhonek - 1.4.10-2 +- Fix vasnprintf puts %%n into a writeable format string in all cases + Resolves: #345651 + +* Wed Aug 22 2007 Vitezslav Crhonek - 1.4.10-1 +- Update to m4-1.4.10 +- Fix license to GPL version 3 or later + +* Tue Jun 5 2007 Vitezslav Crhonek - 1.4.9-1 +- Update to m4-1.4.9 + +* Thu Apr 19 2007 Vitezslav Crhonek - 1.4.8-2 +- Rebuild + +* Sun Nov 26 2006 Miloslav Trmac - 1.4.8-1 +- Update to m4-1.4.8 + +* Wed Oct 25 2006 Miloslav Trmac - 1.4.7-2 +- Drop %%check again. SIGPIPE is set to SIG_IGN in mock, which breaks the + sysval test. + +* Tue Oct 24 2006 Miloslav Trmac - 1.4.7-1 +- Update to m4-1.4.7 +- Add %%check +- Fix a rpmlint warning about Summary: + +* Mon Jul 17 2006 Miloslav Trmac - 1.4.5-3 +- Use the install-info scriptlets recommended in the Fedora Extras wiki +- Move $RPM_BUILD_ROOT cleaning from %%prep to %%install + +* Mon Jul 17 2006 Tomas Mraz - 1.4.5-2 +- remove infodir/dir so it isn't included in the package + +* Mon Jul 17 2006 Miloslav Trmac - 1.4.5-1 +- Update to m4-1.4.5 + +* Wed Jul 12 2006 Jesse Keating - 1.4.4-1.2.2 +- rebuild + +* Fri Feb 10 2006 Jesse Keating - 1.4.4-1.2.1 +- bump again for double-long bug on ppc(64) + +* Tue Feb 07 2006 Jesse Keating - 1.4.4-1.2 +- rebuilt for new gcc4.1 snapshot and glibc changes + +* Fri Dec 09 2005 Jesse Keating +- rebuilt + +* Sat Oct 22 2005 Miloslav Trmac - 1.4.4-1 +- Update to m4-1.4.4 + +* Sun Sep 18 2005 Miloslav Trmac - 1.4.3-2 +- Ship COPYING and ChangeLog + +* Fri Apr 1 2005 Miloslav Trmac - 1.4.3-1 +- Update to m4-1.4.3 + +* Wed Mar 02 2005 Karsten Hopp 1.4.2-3 +- build with gcc-4 + +* Sun Feb 27 2005 Florian La Roche +- rebuild + +* Sun Dec 12 2004 Miloslav Trmac - 1.4.2-1 +- Update to m4-1.4.2 + +* Tue Jun 15 2004 Elliot Lee +- rebuilt + +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Wed Jun 04 2003 Elliot Lee +- rebuilt + +* Wed Jan 22 2003 Tim Powers +- rebuilt + +* Mon Nov 11 2002 Florian La Roche +- add french translation file + +* Fri Jun 21 2002 Tim Powers +- automated rebuild + +* Wed Jun 19 2002 Florian La Roche +- do not strip apps + +* Fri Jun 14 2002 Florian La Roche +- rebuild + +* Thu May 23 2002 Tim Powers +- automated rebuild + +* Thu Mar 07 2002 Florian La Roche +- use _infodir on popular request #47465 + +* Sat Jan 05 2002 Florian La Roche +- add URL tag +- improved spec file +- add hack to update config.guess config.sub +- fix to build with newer autoconf versions + +* Sun Jun 24 2001 Elliot Lee +- Bump release + rebuild. + +* Tue Feb 13 2001 Florian La Roche +- signal patch is not necessary anymore +- fix printf buffer overflow problem + +* Wed Jul 12 2000 Prospector +- automatic rebuild + +* Sat Jun 17 2000 Matt Wilson +- added defattr + +* Mon Jun 5 2000 Bernhard Rosenkraenzer +- FHS compliance +- 1.4.1 +- some fixes to spec file + +* Sun Mar 21 1999 Cristian Gafton +- auto rebuild in the new build environment (release 12) + +* Thu Dec 17 1998 Cristian Gafton +- build against glibc 2.1 + +* Fri Apr 24 1998 Prospector System +- translations modified for de, fr, tr + +* Fri Apr 10 1998 Cristian Gafton +- Manhattan build + +* Tue Oct 21 1997 Cristian Gafton +- added info file handling and BuildRoot + +* Mon Jun 02 1997 Erik Troan +- built against glibc +