From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Mon, 27 Apr 2026 09:46:40 +0200 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1wHGfw-00Gral-05 for lore@lore.pengutronix.de; Mon, 27 Apr 2026 09:46:40 +0200 Received: from [127.0.0.1] (helo=metis.whiteo.stw.pengutronix.de) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1wHGfv-0007TF-SS; Mon, 27 Apr 2026 09:46:39 +0200 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1wHGfO-0005ea-8B; Mon, 27 Apr 2026 09:46:06 +0200 Received: from dude05.red.stw.pengutronix.de ([2a0a:edc0:0:1101:1d::54]) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1wHGfO-007S0y-0B; Mon, 27 Apr 2026 09:46:06 +0200 Received: from mol by dude05.red.stw.pengutronix.de with local (Exim 4.98.2) (envelope-from ) id 1wHGfO-00000000Dc1-012b; Mon, 27 Apr 2026 09:46:06 +0200 From: Michael Olbrich To: ptxdist@pengutronix.de Date: Mon, 27 Apr 2026 09:46:05 +0200 Message-ID: <20260427074605.52318-1-m.olbrich@pengutronix.de> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260418182311.11653-4-ahelmcke@ela-soft.com> References: <20260418182311.11653-4-ahelmcke@ela-soft.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: Re: [ptxdist] [APPLIED] gzip: version bump 1.9 -> 1.14 X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Cc: Andreas Helmcke Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false Thanks, applied as 4aff24dd030399d90faa78f8e52a95bfe6c619b9. Michael [sent from post-receive hook] On Mon, 27 Apr 2026 09:46:05 +0200, Andreas Helmcke wrote: > - Various bug fixes and changes. > > link: https://lists.gnu.org/archive/html/info-gnu/2025-04/msg00007.html > link: https://lists.gnu.org/archive/html/info-gnu/2023-08/msg00002.html > link: https://savannah.gnu.org/news/?id=10121 > link: https://lists.gnu.org/archive/html/info-gnu/2021-09/msg00002.html > link: https://lists.gnu.org/archive/html/info-gnu/2018-12/msg00019.html > > - added license hash; with Y2038 support > - removed patches, since they are already included > > Signed-off-by: Andreas Helmcke > Message-Id: <20260418182311.11653-4-ahelmcke@ela-soft.com> > Signed-off-by: Michael Olbrich > > diff --git a/patches/gzip-1.9/0001-fflush-adjust-to-glibc-2.28-libio.h-removal.patch b/patches/gzip-1.9/0001-fflush-adjust-to-glibc-2.28-libio.h-removal.patch > deleted file mode 100644 > index 80d94b514a09..000000000000 > --- a/patches/gzip-1.9/0001-fflush-adjust-to-glibc-2.28-libio.h-removal.patch > +++ /dev/null > @@ -1,144 +0,0 @@ > -From: Paul Eggert > -Date: Mon, 5 Mar 2018 10:56:29 -0800 > -Subject: [PATCH] fflush: adjust to glibc 2.28 libio.h removal > -MIME-Version: 1.0 > -Content-Type: text/plain; charset=UTF-8 > -Content-Transfer-Encoding: 8bit > - > -Problem reported by Daniel P. Berrangé in: > -https://lists.gnu.org/r/bug-gnulib/2018-03/msg00000.html > -* lib/fbufmode.c (fbufmode): > -* lib/fflush.c (clear_ungetc_buffer_preserving_position) > -(disable_seek_optimization, rpl_fflush): > -* lib/fpending.c (__fpending): > -* lib/fpurge.c (fpurge): > -* lib/freadable.c (freadable): > -* lib/freadahead.c (freadahead): > -* lib/freading.c (freading): > -* lib/freadptr.c (freadptr): > -* lib/freadseek.c (freadptrinc): > -* lib/fseeko.c (fseeko): > -* lib/fseterr.c (fseterr): > -* lib/fwritable.c (fwritable): > -* lib/fwriting.c (fwriting): > -Check _IO_EOF_SEEN instead of _IO_ftrylockfile. > -* lib/stdio-impl.h (_IO_IN_BACKUP) [_IO_EOF_SEEN]: > -Define if not already defined. > ---- > - lib/fflush.c | 6 +++--- > - lib/fpurge.c | 2 +- > - lib/freading.c | 2 +- > - lib/fseeko.c | 4 ++-- > - lib/fseterr.c | 2 +- > - lib/stdio-impl.h | 6 ++++++ > - 6 files changed, 14 insertions(+), 8 deletions(-) > - > -diff --git a/lib/fflush.c b/lib/fflush.c > -index 983ade0ffbd9..a6edfa105b01 100644 > ---- a/lib/fflush.c > -+++ b/lib/fflush.c > -@@ -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, 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_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ > - > - clear_ungetc_buffer_preserving_position (stream); > - > -diff --git a/lib/fpurge.c b/lib/fpurge.c > -index b1d417c7a2b0..3aedcc373468 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__ == 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 --git a/lib/freading.c b/lib/freading.c > -index 73c28acddfdc..c24d0c88abf6 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__ == 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 --git a/lib/fseeko.c b/lib/fseeko.c > -index 56cdc596a6b1..88dd3fa3365a 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_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 whence) > - 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 --git a/lib/fseterr.c b/lib/fseterr.c > -index 82649c3ac1bf..adb637256dcf 100644 > ---- a/lib/fseterr.c > -+++ b/lib/fseterr.c > -@@ -29,7 +29,7 @@ fseterr (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->_flags |= _IO_ERR_SEEN; > - #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__ > - /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */ > -diff --git a/lib/stdio-impl.h b/lib/stdio-impl.h > -index 78d896e9f552..05c5752a2436 100644 > ---- a/lib/stdio-impl.h > -+++ b/lib/stdio-impl.h > -@@ -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/patches/gzip-1.9/gnulib-4af4a4a71827c0bc5.patch b/patches/gzip-1.9/gnulib-4af4a4a71827c0bc5.patch > deleted file mode 100644 > index 4ab2fe39042f..000000000000 > --- a/patches/gzip-1.9/gnulib-4af4a4a71827c0bc5.patch > +++ /dev/null > @@ -1,157 +0,0 @@ > -From 4af4a4a71827c0bc5e0ec67af23edef4f15cee8e Mon Sep 17 00:00:00 2001 > -From: Paul Eggert > -Date: Mon, 5 Mar 2018 10:56:29 -0800 > -Subject: fflush: adjust to glibc 2.28 libio.h removal > -MIME-Version: 1.0 > -Content-Type: text/plain; charset=UTF-8 > -Content-Transfer-Encoding: 8bit > - > -Problem reported by Daniel P. Berrangé in: > -https://lists.gnu.org/r/bug-gnulib/2018-03/msg00000.html > -* lib/fbufmode.c (fbufmode): > -* lib/fflush.c (clear_ungetc_buffer_preserving_position) > -(disable_seek_optimization, rpl_fflush): > -* lib/fpending.c (__fpending): > -* lib/fpurge.c (fpurge): > -* lib/freadable.c (freadable): > -* lib/freadahead.c (freadahead): > -* lib/freading.c (freading): > -* lib/freadptr.c (freadptr): > -* lib/freadseek.c (freadptrinc): > -* lib/fseeko.c (fseeko): > -* lib/fseterr.c (fseterr): > -* lib/fwritable.c (fwritable): > -* lib/fwriting.c (fwriting): > -Check _IO_EOF_SEEN instead of _IO_ftrylockfile. > -* lib/stdio-impl.h (_IO_IN_BACKUP) [_IO_EOF_SEEN]: > -Define if not already defined. > ---- > - ChangeLog | 23 +++++++++++++++++++++++ > - lib/fbufmode.c | 2 +- > - lib/fflush.c | 6 +++--- > - lib/fpending.c | 2 +- > - lib/fpurge.c | 2 +- > - lib/freadable.c | 2 +- > - lib/freadahead.c | 2 +- > - lib/freading.c | 2 +- > - lib/freadptr.c | 2 +- > - lib/freadseek.c | 2 +- > - lib/fseeko.c | 4 ++-- > - lib/fseterr.c | 2 +- > - lib/fwritable.c | 2 +- > - lib/fwriting.c | 2 +- > - lib/stdio-impl.h | 6 ++++++ > - 15 files changed, 45 insertions(+), 16 deletions(-) > - > -diff --git a/lib/fflush.c b/lib/fflush.c > -index 983ade0..a6edfa1 100644 > ---- a/lib/fflush.c > -+++ b/lib/fflush.c > -@@ -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, 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_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ > - > - clear_ungetc_buffer_preserving_position (stream); > - > -diff --git a/lib/fpurge.c b/lib/fpurge.c > -index b1d417c..3aedcc3 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__ == 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 --git a/lib/freading.c b/lib/freading.c > -index 73c28ac..c24d0c8 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__ == 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 --git a/lib/fseeko.c b/lib/fseeko.c > -index 0101ab5..193f4e8 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_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 whence) > - 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 --git a/lib/fseterr.c b/lib/fseterr.c > -index 82649c3..adb6372 100644 > ---- a/lib/fseterr.c > -+++ b/lib/fseterr.c > -@@ -29,7 +29,7 @@ fseterr (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->_flags |= _IO_ERR_SEEN; > - #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__ > - /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */ > -diff --git a/lib/stdio-impl.h b/lib/stdio-impl.h > -index 78d896e..05c5752 100644 > ---- a/lib/stdio-impl.h > -+++ b/lib/stdio-impl.h > -@@ -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. */ > - > --- > -cgit v1.0-41-gc330 > - > diff --git a/patches/gzip-1.9/series b/patches/gzip-1.9/series > deleted file mode 100644 > index c9993f08655d..000000000000 > --- a/patches/gzip-1.9/series > +++ /dev/null > @@ -1,4 +0,0 @@ > -# generated by git-ptx-patches > -#tag:base --start-number 1 > -0001-fflush-adjust-to-glibc-2.28-libio.h-removal.patch > -# b03bed9248af170f04892265a5918d5b - git-ptx-patches magic > diff --git a/rules/gzip.make b/rules/gzip.make > index 9f97ef9f5cf1..87111bad3e9f 100644 > --- a/rules/gzip.make > +++ b/rules/gzip.make > @@ -14,14 +14,15 @@ PACKAGES-$(PTXCONF_GZIP) += gzip > # > # Paths and names > # > -GZIP_VERSION := 1.9 > -GZIP_MD5 := 9492c6ccb2239ff679a5475a7bb543ed > +GZIP_VERSION := 1.14 > +GZIP_MD5 := 4bf5a10f287501ee8e8ebe00ef62b2c2 > GZIP := gzip-$(GZIP_VERSION) > GZIP_SUFFIX := tar.xz > GZIP_URL := $(call ptx/mirror, GNU, gzip/$(GZIP).$(GZIP_SUFFIX)) > GZIP_SOURCE := $(SRCDIR)/$(GZIP).$(GZIP_SUFFIX) > GZIP_DIR := $(BUILDDIR)/$(GZIP) > GZIP_LICENSE := GPL-3.0-only > +GZIP_LICENSE_FILES := file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464 > > # ---------------------------------------------------------------------------- > # Prepare > @@ -33,11 +34,11 @@ GZIP_LICENSE := GPL-3.0-only > GZIP_CONF_TOOL := autoconf > GZIP_CONF_OPT := \ > $(CROSS_AUTOCONF_USR) \ > - --runstatedir=/run \ > $(GLOBAL_LARGE_FILE_OPTION) \ > - --enable-threads=posix \ > - --disable-rpath \ > - --disable-gcc-warnings > + --disable-cross-guesses \ > + --disable-gcc-warnings \ > + --disable-dfltcc \ > + --$(call ptx/endis, PTXCONF_GLIBC_Y2038)-year2038 > > # ---------------------------------------------------------------------------- > # Target-Install