On Wed, 27 May 2020 11:56:07 +0200 "Santiago R.R." <santiagorr@riseup.net> wrote: > Package: release.debian.org > Severity: normal > Tags: buster > User: release.debian.org@packages.debian.org > Usertags: pu > > Dear Release Managers, > > Since 1.0.6-9, bzip2 was built without the -D_FILE_OFFSET_BITS=64 > CPPFLAG, and so it's not able to handle > 2GB files in 32-bit archs. > See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=944557 > > I've uploaded a fixed version to unstable yesterday. It would be great > to fix it also in buster. Please, consider the attached debdiff. > Would it be OK for you to upload it? > > I've confirmed the issue is solved in an armhf machine running buster. … Dear RM, I would like to include another important bug fix in this upload. Attached you can find a refreshed debdiff that also address #965309 in buster: https://bugs.debian.org/965309 Would it be OK to upload it? Thanks, -- Santiago
diff -Nru bzip2-1.0.6/debian/changelog bzip2-1.0.6/debian/changelog
--- bzip2-1.0.6/debian/changelog 2019-07-10 21:17:52.000000000 +0200
+++ bzip2-1.0.6/debian/changelog 2020-07-21 10:36:47.000000000 +0200
@@ -1,3 +1,13 @@
+bzip2 (1.0.6-9.2~deb10u2) buster; urgency=medium
+
+ * Append -D_FILE_OFFSET_BITS=64 variable to buildflags, to renable handling
+ big files in 32-bit archs (Closes: #944557)
+ * debian/patches/40-bzdiff-l.patch: Fix bzdiff does not work when comparing
+ two bzip2 compressed files. Thanks to Joey Schulze <joey@infodrom.org>.
+ (Closes: #965309)
+
+ -- Santiago Ruano Rincón <santiago@debian.org> Tue, 21 Jul 2020 10:36:47 +0200
+
bzip2 (1.0.6-9.2~deb10u1) buster; urgency=medium
* Rebuild for buster
diff -Nru bzip2-1.0.6/debian/patches/40-bzdiff-l.patch bzip2-1.0.6/debian/patches/40-bzdiff-l.patch
--- bzip2-1.0.6/debian/patches/40-bzdiff-l.patch 2019-06-24 22:16:40.000000000 +0200
+++ bzip2-1.0.6/debian/patches/40-bzdiff-l.patch 2020-07-21 10:32:51.000000000 +0200
@@ -2,10 +2,14 @@
This patch is far from sufficient. See the bug log for details.
Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/bzip2/+bug/735675
Origin: ubuntu, https://bugs.launchpad.net/ubuntu/+source/bzip2/+bug/735675
+Reviewed-by: Santiago Ruano Rincón <santiago@debian.org>
+Last-Update: 2020-07-20
---- a/bzdiff
-+++ b/bzdiff
-@@ -24,7 +24,11 @@
+Index: bzip2/bzdiff
+===================================================================
+--- bzip2.orig/bzdiff
++++ bzip2/bzdiff
+@@ -24,7 +24,11 @@ FILES=
for ARG
do
case "$ARG" in
@@ -18,12 +22,3 @@
*) if test -f "$ARG"; then
FILES="$FILES $ARG"
else
-@@ -54,7 +58,7 @@
- exit 1
- }
- bzip2 -cdfq "$2" > "$tmp"
-- bzip2 -cdfq "$1" | $comp $OPTIONS - "$tmp"
-+ bzip2 -cdfq "$1" | $comp "$OPTIONS" - "$tmp"
- STAT="$?"
- /bin/rm -f "$tmp";;
-
diff -Nru bzip2-1.0.6/debian/rules bzip2-1.0.6/debian/rules
--- bzip2-1.0.6/debian/rules 2019-06-24 22:16:40.000000000 +0200
+++ bzip2-1.0.6/debian/rules 2020-07-21 10:31:21.000000000 +0200
@@ -14,6 +14,9 @@
DEB_BUILD_MAINT_OPTIONS := hardening=+all
DEB_CFLAGS_MAINT_APPEND := -Wall -Winline
DEB_CPPFLAGS_MAINT_APPEND := -D_REENTRANT
+# This -D_FILE_OFFSET_BITS=64 is needed to make bzip2 able to handle > 2GB-size
+# files in 32-bit archs. See #944557
+DEB_CPPFLAGS_MAINT_APPEND += -D_FILE_OFFSET_BITS=64
include /usr/share/dpkg/buildflags.mk
include /usr/share/dpkg/pkg-info.mk
Attachment:
signature.asc
Description: PGP signature