From patchwork Tue Jun 22 11:26:40 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 4455 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4G8PHY2LLYz3wwK for ; Tue, 22 Jun 2021 11:26:49 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4G8PHX3MZsz13y; Tue, 22 Jun 2021 11:26:48 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4G8PHX23D4z2xmR; Tue, 22 Jun 2021 11:26:48 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4G8PHV2P0lz2xQm for ; Tue, 22 Jun 2021 11:26:46 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4G8PHT585BzBs; Tue, 22 Jun 2021 11:26:45 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1624361205; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=NU5aPOG/EwV4D62m9NI+iT/OQuzCzge1akHHsZGlWPw=; b=N9K61UwKe1KLTh7o0cN3SJ2zVLpLneQK0lp6mT/MTRxHe1govgVgTG8/eFT7oPUR8+nAWF oV1arA1TegQiNKBQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1624361205; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=NU5aPOG/EwV4D62m9NI+iT/OQuzCzge1akHHsZGlWPw=; b=JySS0UUPxHrBZWdPWEJYJcIcZGt43foRV3lyFpsjmWh6evCGvE7anNXQ3q+TqUbNd9lUDF sNk42hSauItwr3J1JbSfquovp6CEA7PwWbsToYMikWbgCgNsHmoqqvxwgNWDJD5jPxTOCY SgavH/B7gfqt3cInQnx4swZrtmsa/DgAudsBkKMzBqxBlEAe6VvYlVm765YVUHrtAlg9DV Mb8rfy8TGVE3cnjxes1CyqZn+gYtHtSpcNMqDESXSwfyAMZ1rCUxNuZr5k80jvBc/UywMo oXM4Ki8aDFIasI0A+blfr3RrQy9u1mzu1qUjzct2m4xx+z0Bhb8RdHFATHdz+A== From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH] m4: Update to 1.4.19 Date: Tue, 22 Jun 2021 13:26:40 +0200 Message-Id: <20210622112640.3743944-1-adolf.belka@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" - Update from 1.4.18 (2016-12-31) to 1.4.19 (2021-05-28) - patch no longer required as changes have been built into the source tarball. - Update of rootfile - Changelog is too large to fit here. Detail can be found in ChangeLog file in the source tarball. 6 bugs fixed in this update. https://lists.gnu.org/archive/html/bug-m4/2021-04/msg00000.html https://lists.gnu.org/archive/html/bug-m4/2021-05/msg00001.html https://lists.gnu.org/archive/html/bug-m4/2020-03/msg00000.html https://lists.gnu.org/archive/html/bug-m4/2021-05/msg00002.html https://lists.gnu.org/archive/html/bug-m4/2021-05/msg00003.html https://lists.gnu.org/archive/html/bug-m4/2021-05/msg00004.html Signed-off-by: Adolf Belka --- config/rootfiles/common/m4 | 26 ++++ lfs/m4 | 7 +- .../m4-1.4.18-glibc-change-work-around.patch | 115 ------------------ 3 files changed, 29 insertions(+), 119 deletions(-) delete mode 100644 src/patches/m4-1.4.18-glibc-change-work-around.patch diff --git a/config/rootfiles/common/m4 b/config/rootfiles/common/m4 index 5e9acac22..380178494 100644 --- a/config/rootfiles/common/m4 +++ b/config/rootfiles/common/m4 @@ -2,4 +2,30 @@ #usr/share/info/m4.info #usr/share/info/m4.info-1 #usr/share/info/m4.info-2 +#usr/share/locale/bg/LC_MESSAGES/m4.mo +#usr/share/locale/cs/LC_MESSAGES/m4.mo +#usr/share/locale/da/LC_MESSAGES/m4.mo +#usr/share/locale/de/LC_MESSAGES/m4.mo +#usr/share/locale/el/LC_MESSAGES/m4.mo +#usr/share/locale/eo/LC_MESSAGES/m4.mo +#usr/share/locale/es/LC_MESSAGES/m4.mo +#usr/share/locale/fi/LC_MESSAGES/m4.mo +#usr/share/locale/fr/LC_MESSAGES/m4.mo +#usr/share/locale/ga/LC_MESSAGES/m4.mo +#usr/share/locale/gl/LC_MESSAGES/m4.mo +#usr/share/locale/hr/LC_MESSAGES/m4.mo +#usr/share/locale/id/LC_MESSAGES/m4.mo +#usr/share/locale/ja/LC_MESSAGES/m4.mo +#usr/share/locale/ko/LC_MESSAGES/m4.mo +#usr/share/locale/nl/LC_MESSAGES/m4.mo +#usr/share/locale/pl/LC_MESSAGES/m4.mo +#usr/share/locale/pt_BR/LC_MESSAGES/m4.mo +#usr/share/locale/ro/LC_MESSAGES/m4.mo +#usr/share/locale/ru/LC_MESSAGES/m4.mo +#usr/share/locale/sr/LC_MESSAGES/m4.mo +#usr/share/locale/sv/LC_MESSAGES/m4.mo +#usr/share/locale/uk/LC_MESSAGES/m4.mo +#usr/share/locale/vi/LC_MESSAGES/m4.mo +#usr/share/locale/zh_CN/LC_MESSAGES/m4.mo +#usr/share/locale/zh_TW/LC_MESSAGES/m4.mo #usr/share/man/man1/m4.1 diff --git a/lfs/m4 b/lfs/m4 index 3aa503fc4..724735449 100644 --- a/lfs/m4 +++ b/lfs/m4 @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team # +# Copyright (C) 2007-2021 IPFire Team # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,7 +24,7 @@ include Config -VER = 1.4.18 +VER = 1.4.19 THISAPP = m4-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -47,7 +47,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 730bb15d96fffe47e148d1e09235af82 +$(DL_FILE)_MD5 = 0d90823e1426f1da2fd872df0311298d install : $(TARGET) @@ -77,7 +77,6 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/m4-1.4.18-glibc-change-work-around.patch cd $(DIR_APP) && ./configure --prefix=$(PREFIX) cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install diff --git a/src/patches/m4-1.4.18-glibc-change-work-around.patch b/src/patches/m4-1.4.18-glibc-change-work-around.patch deleted file mode 100644 index 582ae9b53..000000000 --- a/src/patches/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. */ -