From 0c226316c4f00aeb4ba93c8b7d151f4aca84b37a Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Fri, 12 Oct 2018 07:59:30 +0200 Subject: autotools-latest-m4: sync with rawhide --- .../m4/m4-1.4.18-glibc-change-work-around.patch | 115 +++++++++++++++++++++ repos/autotools/autotools-latest/m4/m4.spec | 26 ++--- 2 files changed, 128 insertions(+), 13 deletions(-) create mode 100644 repos/autotools/autotools-latest/m4/m4-1.4.18-glibc-change-work-around.patch (limited to 'repos/autotools') diff --git a/repos/autotools/autotools-latest/m4/m4-1.4.18-glibc-change-work-around.patch b/repos/autotools/autotools-latest/m4/m4-1.4.18-glibc-change-work-around.patch new file mode 100644 index 0000000..582ae9b --- /dev/null +++ b/repos/autotools/autotools-latest/m4/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/repos/autotools/autotools-latest/m4/m4.spec b/repos/autotools/autotools-latest/m4/m4.spec index d2b058c..aeb35a6 100644 --- a/repos/autotools/autotools-latest/m4/m4.spec +++ b/repos/autotools/autotools-latest/m4/m4.spec @@ -6,22 +6,21 @@ Summary: The GNU macro processor Name: %{scl_prefix}m4 -Version: 1.4.17 -Release: 11%{?dist} +Version: 1.4.18 +Release: 1%{?dist} License: GPLv3+ Group: Applications/Text -Source0: http://ftp.gnu.org/gnu/m4/m4-%{version}.tar.gz -Source1: http://ftp.gnu.org/gnu/m4/m4-%{version}.tar.gz.sig +Source0: http://ftp.gnu.org/gnu/m4/m4-%{version}.tar.xz +Source1: http://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: http://www.gnu.org/software/m4/ -# Patch1: Fixes FTBFS, already upstream -Patch1: m4-1.4.17-perl-make-check.patch +BuildRequires: gcc Requires(post): /sbin/install-info Requires(preun): /sbin/install-info -BuildRequires: gcc %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) @@ -31,7 +30,6 @@ BuildRequires: scl-utils-build Requires:%scl_runtime } - %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 @@ -44,16 +42,15 @@ Install m4 if you need a macro processor. %prep %setup -q -n m4-%{version} -%patch1 -p1 -b .perl-make-check +%patch0 -p1 -b .glibc-change-work-around chmod 644 COPYING %build %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 %check @@ -80,6 +77,9 @@ fi %changelog +* Fri Oct 12 2018 Pavel Raiskup - 1.4.18-1 +- sync with fedora Rawhide + * Thu Oct 11 2018 Pavel Raiskup - 1.4.17-11 - buildrequire gcc -- cgit