From 2270004c9b206d4a94e59c779e7b6e52399a768b Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Thu, 27 Nov 2025 20:42:25 +0100 Subject: [PATCH] package/unzip: bump to Debian patch level -29 to fix GCC 15.x issues unzip currently fails to build with GCC 15.x. We're already fetching from Debian, using patchlevel -27, and it turns out that Debian patchlevel -29 has the GCC 15.x fix, and very few other fixes: unzip (6.0-29) unstable; urgency=medium * Ignore invalid "Total number of disks" field on Microsoft ZIP64 files. Closes: #661956, #1064000. * Drop conflicting declarations of gmtime() and localtime(). Should fix build with gcc-15. Closes: #1098043. * Fix zipgrep handling of escapes. Closes: #1054628. * Stop using update-mime. Closes: #1072396. * Add debian/source/lintian-overrides for *.a files. * Do not trim Debian changelog. * Add debian/salsa-ci.yml. * Add Vcs-Git and Vcs-Browser fields. * Update Standards-Version. unzip (6.0-28) unstable; urgency=medium * Drop debian/source/lintian-overrides, obsolete since version 6.0-18. * Update URI for Info-ZIP license in copyright file. * Update standards version to 4.6.2. * Run wrap-and-sort. * Update Homepage. So let's just bump to this patchlevel version. Note that the .dsc file link in the .hash file was wrong, it was still referring to patchlevel -26. Fixes: https://autobuild.buildroot.net/results/d81cb9d7c9e87dd233dde350d15cb03427ba2036/ Signed-off-by: Thomas Petazzoni Tested-by: Christian Stewart Signed-off-by: Bernd Kuhls [Bernd: Updated _SITE from /debian-debug/ to /debian/ (Baruch) Updated comment of UNZIP_IGNORE_CVES to reflect bump.] Signed-off-by: Thomas Petazzoni (cherry picked from commit 15bb41a461d798484387ecd824225a3577d29a55) Signed-off-by: Thomas Perale --- package/unzip/unzip.hash | 4 ++-- package/unzip/unzip.mk | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/unzip/unzip.hash b/package/unzip/unzip.hash index bbf4f7d71f..0b371e5454 100644 --- a/package/unzip/unzip.hash +++ b/package/unzip/unzip.hash @@ -1,6 +1,6 @@ -# From https://snapshot.debian.org/archive/debian/20210110T204103Z/pool/main/u/unzip/unzip_6.0-26.dsc +# From https://snapshot.debian.org/archive/debian/20250311T215724Z/pool/main/u/unzip/unzip_6.0-29.dsc sha256 036d96991646d0449ed0aa952e4fbe21b476ce994abc276e49d30e686708bd37 unzip_6.0.orig.tar.gz -sha256 67bde7c71d52afd61aa936d4415c8d12fd90ca26e9637a3cd67cae9b71298c12 unzip_6.0-27.debian.tar.xz +sha256 14043e5ea351c02b3bc8676e1e6d20d79b9a690b6d7520e8138ac629cc048417 unzip_6.0-29.debian.tar.xz # Locally computed: sha256 7469b81d5d29ac4fd670f7c86ba0cb9fa34f137a2d4d5198437d92ddf918984b LICENSE diff --git a/package/unzip/unzip.mk b/package/unzip/unzip.mk index 5effebee4a..8dccaf6ce3 100644 --- a/package/unzip/unzip.mk +++ b/package/unzip/unzip.mk @@ -6,13 +6,13 @@ UNZIP_VERSION = 6.0 UNZIP_SOURCE = unzip_$(UNZIP_VERSION).orig.tar.gz -UNZIP_PATCH = unzip_$(UNZIP_VERSION)-27.debian.tar.xz -UNZIP_SITE = https://snapshot.debian.org/archive/debian/20220916T090657Z/pool/main/u/unzip +UNZIP_PATCH = unzip_$(UNZIP_VERSION)-29.debian.tar.xz +UNZIP_SITE = https://snapshot.debian.org/archive/debian/20250311T215724Z/pool/main/u/unzip UNZIP_LICENSE = Info-ZIP UNZIP_LICENSE_FILES = LICENSE UNZIP_CPE_ID_VALID = YES -# unzip_$(UNZIP_VERSION)-27.debian.tar.xz has patches to fix: +# unzip_$(UNZIP_VERSION)-29.debian.tar.xz has patches to fix: UNZIP_IGNORE_CVES = \ CVE-2014-8139 \ CVE-2014-8140 \