From nobody Thu Mar 28 17:05:09 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1520854167167241.61383999327143; Mon, 12 Mar 2018 04:29:27 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 42D9C58; Mon, 12 Mar 2018 11:29:25 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 75CF317A8F; Mon, 12 Mar 2018 11:29:24 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 1C87C181B9FD; Mon, 12 Mar 2018 11:29:23 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w2CBTLSv014271 for ; Mon, 12 Mar 2018 07:29:21 -0400 Received: by smtp.corp.redhat.com (Postfix) id 5A2261C719; Mon, 12 Mar 2018 11:29:21 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.42.22.189]) by smtp.corp.redhat.com (Postfix) with ESMTP id E01337C55; Mon, 12 Mar 2018 11:29:18 +0000 (UTC) From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Date: Mon, 12 Mar 2018 11:29:15 +0000 Message-Id: <20180312112915.6826-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH] Update to latest gnulib X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Mon, 12 Mar 2018 11:29:25 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 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=C3=A9 --- 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=3D2017-09-19.08; # UTC +scriptversion=3D2018-03-07.03; # UTC =20 # Bootstrap this package from checked-out sources. =20 @@ -1020,7 +1020,7 @@ bootstrap_epilogue echo "$0: done. Now you can run './configure'." =20 # Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "scriptversion=3D" # 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 @@ -=20 - #undef fflush -=20 -- --#if defined _IO_ftrylockfile || __GNU_LIBRARY__ =3D=3D 1 /* GNU libc, BeO= S, Haiku, Linux libc5 */ -+#define _IO_IN_BACKUP 0x100 -+#if defined _IO_ftrylockfile || __GNU_LIBRARY__ /* GNU libc, BeOS, Haiku,= Linux libc5 */ -=20 - /* Clear the stream's ungetc buffer, preserving the value of ftello (fp).= */ - static void -@@ -72,7 +72,7 @@ clear_ungetc_buffer (FILE *fp) -=20 - #endif -=20 --#if ! (defined _IO_ftrylockfile || __GNU_LIBRARY__ =3D=3D 1 /* GNU libc, = BeOS, Haiku, Linux libc5 */) -+#if ! (defined _IO_ftrylockfile || __GNU_LIBRARY__ /* GNU libc, BeOS, Hai= ku, Linux libc5 */) -=20 - # if (defined __sferror || defined __DragonFly__ || defined __ANDROID__) = && defined __SNPT - /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Androi= d */ -@@ -148,7 +148,7 @@ rpl_fflush (FILE *stream) - if (stream =3D=3D NULL || ! freading (stream)) - return fflush (stream); -=20 --#if defined _IO_ftrylockfile || __GNU_LIBRARY__ =3D=3D 1 /* GNU libc, BeO= S, Haiku, Linux libc5 */ -+#if defined _IO_ftrylockfile || __GNU_LIBRARY__ /* GNU libc, BeOS, Haiku,= Linux libc5 */ -=20 - clear_ungetc_buffer_preserving_position (stream); -=20 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 - , because they need it for implementing getc() and putc() as - fast macros. */ --# if defined _IO_ftrylockfile || __GNU_LIBRARY__ =3D=3D 1 /* GNU libc, Be= OS, Haiku, Linux libc5 */ -+# if defined _IO_ftrylockfile || __GNU_LIBRARY__ /* GNU libc, BeOS, Haiku= , Linux libc5 */ - fp->_IO_read_end =3D fp->_IO_read_ptr; - fp->_IO_write_ptr =3D 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 - , because they need it for implementing getc() and putc() as - fast macros. */ --# if defined _IO_ftrylockfile || __GNU_LIBRARY__ =3D=3D 1 /* GNU libc, Be= OS, Haiku, Linux libc5 */ -+# if defined _IO_ftrylockfile || __GNU_LIBRARY__ /* GNU libc, BeOS, Haiku= , Linux libc5 */ - return ((fp->_flags & _IO_NO_WRITES) !=3D 0 - || ((fp->_flags & (_IO_NO_READS | _IO_CURRENTLY_PUTTING)) =3D= =3D 0 - && fp->_IO_read_base !=3D 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 -=20 - /* These tests are based on fpurge.c. */ --#if defined _IO_ftrylockfile || __GNU_LIBRARY__ =3D=3D 1 /* GNU libc, BeO= S, Haiku, Linux libc5 */ -+#if defined _IO_ftrylockfile || __GNU_LIBRARY__ /* GNU libc, BeOS, Haiku,= Linux libc5 */ - if (fp->_IO_read_end =3D=3D fp->_IO_read_ptr - && fp->_IO_write_ptr =3D=3D fp->_IO_write_base - && fp->_IO_save_base =3D=3D NULL) -@@ -123,7 +123,7 @@ fseeko (FILE *fp, off_t offset, int whence) - return -1; - } -=20 --#if defined _IO_ftrylockfile || __GNU_LIBRARY__ =3D=3D 1 /* GNU libc, BeO= S, Haiku, Linux libc5 */ -+#if defined _IO_ftrylockfile || __GNU_LIBRARY__ /* GNU libc, BeOS, Haiku,= Linux libc5 */ - fp->_flags &=3D ~_IO_EOF_SEEN; - fp->_offset =3D pos; - #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__ --=20 2.14.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list