[ptxdist] [PATCH] zlib: Version bump. 1.2.13 -> 1.3

[ptxdist] [PATCH] zlib: Version bump. 1.2.13 -> 1.3

[Christian Melki]

https://github.com/madler/zlib/releases/tag/v1.3
Some fixes.

* Remove patch. I don't think it's needed any more.
* Move zlib primary URL to fossils. Under fossils both
the new and old releases exist.
* Remove old SF URL. Wasn't updated at the time of writing.
* Add github URL. Contains the same release tarball, same
hash as the primary archive. Author seems to move to github.

Signed-off-by: Christian Melki <christian.melki@t2data.com>
---
 ..._FILE_OFFSET_BITS-when-_LARGEFILE64_.patch | 33 -------------------
 patches/zlib-1.2.13/series                    |  4 ---
 rules/zlib.make                               |  9 ++---
 3 files changed, 5 insertions(+), 41 deletions(-)
 delete mode 100644 patches/zlib-1.2.13/0001-Do-not-undefine-_FILE_OFFSET_BITS-when-_LARGEFILE64_.patch
 delete mode 100644 patches/zlib-1.2.13/series

diff --git a/patches/zlib-1.2.13/0001-Do-not-undefine-_FILE_OFFSET_BITS-when-_LARGEFILE64_.patch b/patches/zlib-1.2.13/0001-Do-not-undefine-_FILE_OFFSET_BITS-when-_LARGEFILE64_.patch
deleted file mode 100644
index d67f39093..000000000
--- a/patches/zlib-1.2.13/0001-Do-not-undefine-_FILE_OFFSET_BITS-when-_LARGEFILE64_.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From: Michael Olbrich <m.olbrich@pengutronix.de>
-Date: Mon, 5 Jun 2023 16:19:12 +0200
-Subject: [PATCH] Do not undefine _FILE_OFFSET_BITS when _LARGEFILE64_SOURCE is
- defined
-
-This ends up causing 64bit time_t to fail the build because it needs 64
-bit off_t.
-
-Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
----
- gzguts.h | 9 ---------
- 1 file changed, 9 deletions(-)
-
-diff --git a/gzguts.h b/gzguts.h
-index 57faf37165a3..3747f3c449d2 100644
---- a/gzguts.h
-+++ b/gzguts.h
-@@ -3,15 +3,6 @@
-  * For conditions of distribution and use, see copyright notice in zlib.h
-  */
- 
--#ifdef _LARGEFILE64_SOURCE
--#  ifndef _LARGEFILE_SOURCE
--#    define _LARGEFILE_SOURCE 1
--#  endif
--#  ifdef _FILE_OFFSET_BITS
--#    undef _FILE_OFFSET_BITS
--#  endif
--#endif
--
- #ifdef HAVE_HIDDEN
- #  define ZLIB_INTERNAL __attribute__((visibility ("hidden")))
- #else
diff --git a/patches/zlib-1.2.13/series b/patches/zlib-1.2.13/series
deleted file mode 100644
index 5d1de9562..000000000
--- a/patches/zlib-1.2.13/series
+++ /dev/null
@@ -1,4 +0,0 @@
-# generated by git-ptx-patches
-#tag:base --start-number 1
-0001-Do-not-undefine-_FILE_OFFSET_BITS-when-_LARGEFILE64_.patch
-# b97b2081b504f9c818c2144cf5384d77  - git-ptx-patches magic
diff --git a/rules/zlib.make b/rules/zlib.make
index 3bd4422ec..a8db413a4 100644
--- a/rules/zlib.make
+++ b/rules/zlib.make
@@ -15,13 +15,14 @@ PACKAGES-$(PTXCONF_ZLIB) += zlib
 #
 # Paths and names
 #
-ZLIB_VERSION	:= 1.2.13
-ZLIB_MD5	:= 7d9fc1d78ae2fa3e84fe98b77d006c63
+
+ZLIB_VERSION	:= 1.3
+ZLIB_MD5	:= b49e70aacafacfceb1107943497f5545
 ZLIB		:= zlib-$(ZLIB_VERSION)
 ZLIB_SUFFIX	:= tar.xz
 ZLIB_URL	:= \
-	http://zlib.net/$(ZLIB).$(ZLIB_SUFFIX) \
-	$(call ptx/mirror, SF, libpng/$(ZLIB).$(ZLIB_SUFFIX))
+	http://zlib.net/fossils/$(ZLIB).$(ZLIB_SUFFIX) \
+	https://github.com/madler/zlib/releases/download/v$(ZLIB_VERSION)/$(ZLIB).$(ZLIB_SUFFIX)
 ZLIB_SOURCE	:= $(SRCDIR)/$(ZLIB).$(ZLIB_SUFFIX)
 ZLIB_DIR	:= $(BUILDDIR)/$(ZLIB)
 ZLIB_LICENSE	:= Zlib
-- 
2.34.1

Re: [ptxdist] [APPLIED] zlib: Version bump. 1.2.13 -> 1.3

[Michael Olbrich]

Thanks, applied as 176346b9cd99042b1226aab01642adb3e41968c3.

Michael

[sent from post-receive hook]

On Mon, 04 Sep 2023 08:30:02 +0200, Christian Melki <christian.melki@t2data.com> wrote:
> https://github.com/madler/zlib/releases/tag/v1.3
> Some fixes.
> 
> * Remove patch. I don't think it's needed any more.
> * Move zlib primary URL to fossils. Under fossils both
> the new and old releases exist.
> * Remove old SF URL. Wasn't updated at the time of writing.
> * Add github URL. Contains the same release tarball, same
> hash as the primary archive. Author seems to move to github.
> 
> Signed-off-by: Christian Melki <christian.melki@t2data.com>
> Message-Id: <20230819172655.664301-1-christian.melki@t2data.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/patches/zlib-1.2.13/0001-Do-not-undefine-_FILE_OFFSET_BITS-when-_LARGEFILE64_.patch b/patches/zlib-1.2.13/0001-Do-not-undefine-_FILE_OFFSET_BITS-when-_LARGEFILE64_.patch
> deleted file mode 100644
> index d67f3909338d..000000000000
> --- a/patches/zlib-1.2.13/0001-Do-not-undefine-_FILE_OFFSET_BITS-when-_LARGEFILE64_.patch
> +++ /dev/null
> @@ -1,33 +0,0 @@
> -From: Michael Olbrich <m.olbrich@pengutronix.de>
> -Date: Mon, 5 Jun 2023 16:19:12 +0200
> -Subject: [PATCH] Do not undefine _FILE_OFFSET_BITS when _LARGEFILE64_SOURCE is
> - defined
> -
> -This ends up causing 64bit time_t to fail the build because it needs 64
> -bit off_t.
> -
> -Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> ----
> - gzguts.h | 9 ---------
> - 1 file changed, 9 deletions(-)
> -
> -diff --git a/gzguts.h b/gzguts.h
> -index 57faf37165a3..3747f3c449d2 100644
> ---- a/gzguts.h
> -+++ b/gzguts.h
> -@@ -3,15 +3,6 @@
> -  * For conditions of distribution and use, see copyright notice in zlib.h
> -  */
> - 
> --#ifdef _LARGEFILE64_SOURCE
> --#  ifndef _LARGEFILE_SOURCE
> --#    define _LARGEFILE_SOURCE 1
> --#  endif
> --#  ifdef _FILE_OFFSET_BITS
> --#    undef _FILE_OFFSET_BITS
> --#  endif
> --#endif
> --
> - #ifdef HAVE_HIDDEN
> - #  define ZLIB_INTERNAL __attribute__((visibility ("hidden")))
> - #else
> diff --git a/patches/zlib-1.2.13/series b/patches/zlib-1.2.13/series
> deleted file mode 100644
> index 5d1de95627a9..000000000000
> --- a/patches/zlib-1.2.13/series
> +++ /dev/null
> @@ -1,4 +0,0 @@
> -# generated by git-ptx-patches
> -#tag:base --start-number 1
> -0001-Do-not-undefine-_FILE_OFFSET_BITS-when-_LARGEFILE64_.patch
> -# b97b2081b504f9c818c2144cf5384d77  - git-ptx-patches magic
> diff --git a/rules/zlib.make b/rules/zlib.make
> index 3bd4422ec880..a8db413a4d29 100644
> --- a/rules/zlib.make
> +++ b/rules/zlib.make
> @@ -15,13 +15,14 @@ PACKAGES-$(PTXCONF_ZLIB) += zlib
>  #
>  # Paths and names
>  #
> -ZLIB_VERSION	:= 1.2.13
> -ZLIB_MD5	:= 7d9fc1d78ae2fa3e84fe98b77d006c63
> +
> +ZLIB_VERSION	:= 1.3
> +ZLIB_MD5	:= b49e70aacafacfceb1107943497f5545
>  ZLIB		:= zlib-$(ZLIB_VERSION)
>  ZLIB_SUFFIX	:= tar.xz
>  ZLIB_URL	:= \
> -	http://zlib.net/$(ZLIB).$(ZLIB_SUFFIX) \
> -	$(call ptx/mirror, SF, libpng/$(ZLIB).$(ZLIB_SUFFIX))
> +	http://zlib.net/fossils/$(ZLIB).$(ZLIB_SUFFIX) \
> +	https://github.com/madler/zlib/releases/download/v$(ZLIB_VERSION)/$(ZLIB).$(ZLIB_SUFFIX)
>  ZLIB_SOURCE	:= $(SRCDIR)/$(ZLIB).$(ZLIB_SUFFIX)
>  ZLIB_DIR	:= $(BUILDDIR)/$(ZLIB)
>  ZLIB_LICENSE	:= Zlib