[libvirt] [PATCH] Update to latest gnulib

GnuLib has now fixed the incompatibility with latest GLibC that was affecting builds on Fedora rawhide. We can thus update and drop our local workaround. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com&gt; --- Pushed to git since we don't review trivial gnulib updates. .gnulib | 2 +- bootstrap | 4 ++-- gnulib/local/lib/fflush.c.diff | 33 --------------------------------- gnulib/local/lib/fpurge.c.diff | 13 ------------- gnulib/local/lib/freading.c.diff | 13 ------------- gnulib/local/lib/fseeko.c.diff | 22 ---------------------- 6 files changed, 3 insertions(+), 84 deletions(-) delete mode 100644 gnulib/local/lib/fflush.c.diff delete mode 100644 gnulib/local/lib/fpurge.c.diff delete mode 100644 gnulib/local/lib/freading.c.diff delete mode 100644 gnulib/local/lib/fseeko.c.diff diff --git a/.gnulib b/.gnulib index 0404c9ae28..d6397dde2e 160000 --- a/.gnulib +++ b/.gnulib @@ -1 +1 @@ -Subproject commit 0404c9ae2845cbf93d71b295b67d6c8bd39382d8 +Subproject commit d6397dde2e127e246e3eeb5254a21f42cac783c8 diff --git a/bootstrap b/bootstrap index 25920e991c..92be11439a 100755 --- a/bootstrap +++ b/bootstrap @@ -1,6 +1,6 @@ #! /bin/sh # Print a version string. -scriptversion=2017-09-19.08; # UTC +scriptversion=2018-03-07.03; # UTC # Bootstrap this package from checked-out sources. @@ -1020,7 +1020,7 @@ bootstrap_epilogue echo "$0: done. Now you can run './configure'." # Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" # time-stamp-time-zone: "UTC0" diff --git a/gnulib/local/lib/fflush.c.diff b/gnulib/local/lib/fflush.c.diff deleted file mode 100644 index fa0e2431bd..0000000000 --- a/gnulib/local/lib/fflush.c.diff +++ /dev/null @@ -1,33 +0,0 @@ -diff --git a/lib/fflush.c b/lib/fflush.c -index 983ade0ff..5f617305a 100644 ---- a/lib/fflush.c -+++ b/lib/fflush.c -@@ -32,8 +32,8 @@ - - #undef fflush - -- --#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ -+#define _IO_IN_BACKUP 0x100 -+#if defined _IO_ftrylockfile || __GNU_LIBRARY__ /* 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_ftrylockfile || __GNU_LIBRARY__ /* 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_ftrylockfile || __GNU_LIBRARY__ /* GNU libc, BeOS, Haiku, Linux libc5 */ - - clear_ungetc_buffer_preserving_position (stream); - diff --git a/gnulib/local/lib/fpurge.c.diff b/gnulib/local/lib/fpurge.c.diff deleted file mode 100644 index 1fd87d8bfa..0000000000 --- a/gnulib/local/lib/fpurge.c.diff +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/lib/fpurge.c b/lib/fpurge.c -index b1d417c7a..75cf34ca2 100644 ---- a/lib/fpurge.c -+++ b/lib/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_ftrylockfile || __GNU_LIBRARY__ /* 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/local/lib/freading.c.diff b/gnulib/local/lib/freading.c.diff deleted file mode 100644 index c51e34dd6a..0000000000 --- a/gnulib/local/lib/freading.c.diff +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/lib/freading.c b/lib/freading.c -index 73c28acdd..b1c397016 100644 ---- a/lib/freading.c -+++ b/lib/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_ftrylockfile || __GNU_LIBRARY__ /* 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/local/lib/fseeko.c.diff b/gnulib/local/lib/fseeko.c.diff deleted file mode 100644 index b2c061fc97..0000000000 --- a/gnulib/local/lib/fseeko.c.diff +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/lib/fseeko.c b/lib/fseeko.c -index 0101ab55f..542241bb2 100644 ---- a/lib/fseeko.c -+++ b/lib/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_ftrylockfile || __GNU_LIBRARY__ /* 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_ftrylockfile || __GNU_LIBRARY__ /* GNU libc, BeOS, Haiku, Linux libc5 */ - fp->_flags &= ~_IO_EOF_SEEN; - fp->_offset = pos; - #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__ -- 2.14.3