Bug#1063242: zlib: NMU diff for 64-bit time_t transition

2024-03-01 Thread Benjamin Drung
Source: zlib
Dear maintainer,

Please find attached a final version of this patch for the time_t
transition.  This patch is being uploaded to unstable.

Note that this adds a versioned build-dependency on dpkg-dev, to guard
against accidental backports with a wrong ABI.

Thanks!


-- System Information:
Debian Release: trixie/sid
  APT prefers unstable
  APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)

Kernel: Linux 6.5.0-21-generic (SMP w/16 CPU threads; PREEMPT)
Kernel taint flags: TAINT_PROPRIETARY_MODULE, TAINT_OOT_MODULE, 
TAINT_UNSIGNED_MODULE
Locale: LANG=C, LC_CTYPE=C.UTF-8 (charmap=UTF-8), LANGUAGE not set
Shell: /bin/sh linked to /usr/bin/dash
Init: unable to detect
diff -Nru zlib-1.3.dfsg/debian/changelog zlib-1.3.dfsg/debian/changelog
--- zlib-1.3.dfsg/debian/changelog  2023-11-23 13:02:20.0 +
+++ zlib-1.3.dfsg/debian/changelog  2024-03-01 12:59:44.0 +
@@ -1,3 +1,10 @@
+zlib (1:1.3.dfsg-3.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Rename libraries for 64-bit time_t transition.  Closes: #1063242
+
+ -- Benjamin Drung   Fri, 01 Mar 2024 12:59:44 +
+
 zlib (1:1.3.dfsg-3) unstable; urgency=low
 
   * Update the version of texlive-binaries we break since they still had
diff -Nru zlib-1.3.dfsg/debian/control zlib-1.3.dfsg/debian/control
--- zlib-1.3.dfsg/debian/control2023-11-23 13:02:18.0 +
+++ zlib-1.3.dfsg/debian/control2024-03-01 12:59:44.0 +
@@ -4,7 +4,7 @@
 Maintainer: Mark Brown 
 Standards-Version: 4.6.1
 Homepage: http://zlib.net/
-Build-Depends: debhelper (>= 13), gcc-multilib [amd64 i386 kfreebsd-amd64 mips 
mipsel powerpc ppc64 s390 sparc s390x mipsn32 mipsn32el mipsr6 mipsr6el 
mipsn32r6 mipsn32r6el mips64 mips64el mips64r6 mips64r6el x32] , 
dpkg-dev (>= 1.16.1), autoconf
+Build-Depends: dpkg-dev (>= 1.22.5), debhelper (>= 13), gcc-multilib [amd64 
i386 kfreebsd-amd64 mips mipsel powerpc ppc64 s390 sparc s390x mipsn32 
mipsn32el mipsr6 mipsr6el mipsn32r6 mipsn32r6el mips64 mips64el mips64r6 
mips64r6el x32] , dpkg-dev (>= 1.16.1), autoconf
 
 Package: zlib1g
 Architecture: any
@@ -135,7 +135,10 @@
  .
  This package includes the minizip and miniunzip tools.
 
-Package: libminizip1
+Package: libminizip1t64
+Provides: ${t64:Provides}
+Replaces: libminizip1
+Breaks: libminizip1 (<< ${source:Version})
 Architecture: any
 Multi-Arch: same
 Pre-Depends:
@@ -155,7 +158,7 @@
 Section: libdevel
 Depends:
  ${misc:Depends},
- libminizip1 (= ${binary:Version})
+ libminizip1t64 (= ${binary:Version})
 Replaces:
  libkml-dev (<< 1.3.0~r864+git20150723-0fa2f22-1~),
 Breaks:
diff -Nru zlib-1.3.dfsg/debian/libminizip1.install 
zlib-1.3.dfsg/debian/libminizip1.install
--- zlib-1.3.dfsg/debian/libminizip1.install2023-11-06 16:28:51.0 
+
+++ zlib-1.3.dfsg/debian/libminizip1.install1970-01-01 00:00:00.0 
+
@@ -1 +0,0 @@
-usr/lib/*/libminizip.so.*
diff -Nru zlib-1.3.dfsg/debian/libminizip1.symbols 
zlib-1.3.dfsg/debian/libminizip1.symbols
--- zlib-1.3.dfsg/debian/libminizip1.symbols2023-11-06 16:28:51.0 
+
+++ zlib-1.3.dfsg/debian/libminizip1.symbols1970-01-01 00:00:00.0 
+
@@ -1,62 +0,0 @@
-libminizip.so.1 libminizip1
- call_zopen64@Base 1.1
- call_zseek64@Base 1.1
- call_ztell64@Base 1.1
- fill_fopen64_filefunc@Base 1.1
- fill_fopen_filefunc@Base 1.1
- fill_zlib_filefunc64_32_def_from_filefunc32@Base 1.1
- unzClose@Base 1.1
- unzCloseCurrentFile@Base 1.1
- unzGetCurrentFileInfo64@Base 1.1
- unzGetCurrentFileInfo@Base 1.1
- unzGetCurrentFileZStreamPos64@Base 1.1
- unzGetFilePos64@Base 1.1
- unzGetFilePos@Base 1.1
- unzGetGlobalComment@Base 1.1
- unzGetGlobalInfo64@Base 1.1
- unzGetGlobalInfo@Base 1.1
- unzGetLocalExtrafield@Base 1.1
- unzGetOffset64@Base 1.1
- unzGetOffset@Base 1.1
- unzGoToFilePos64@Base 1.1
- unzGoToFilePos@Base 1.1
- unzGoToFirstFile@Base 1.1
- unzGoToNextFile@Base 1.1
- unzLocateFile@Base 1.1
- unzOpen2@Base 1.1
- unzOpen2_64@Base 1.1
- unzOpen64@Base 1.1
- unzOpen@Base 1.1
- unzOpenCurrentFile2@Base 1.1
- unzOpenCurrentFile3@Base 1.1
- unzOpenCurrentFile@Base 1.1
- unzOpenCurrentFilePassword@Base 1.1
- unzReadCurrentFile@Base 1.1
- unzRepair@Base 1.1
- unzSetOffset64@Base 1.1
- unzSetOffset@Base 1.1
- unzStringFileNameCompare@Base 1.1
- unz_copyright@Base 1.1
- unzeof@Base 1.1
- unztell64@Base 1.1
- unztell@Base 1.1
- zipClose@Base 1.1
- zipCloseFileInZip@Base 1.1
- zipCloseFileInZipRaw64@Base 1.1
- zipCloseFileInZipRaw@Base 1.1
- zipOpen2@Base 1.1
- zipOpen2_64@Base 1.1
- zipOpen3@Base 1.1
- zipOpen64@Base 1.1
- zipOpen@Base 1.1
- zipOpenNewFileInZip2@Base 1.1
- zipOpenNewFileInZip2_64@Base 1.1
- zipOpenNewFileInZip3@Base 1.1
- zipOpenNewFileInZip3_64@Base 1.1
- zipOpenNewFileInZip4@Base 1.1
- zipOpenNewFileInZip4_64@Base 1.1
- zipOpenNewFileInZip64@Base 1.1
- zipOpenNewFileInZip@Base 1.1
- zipRemoveExtraInfoBlock@Base 1.1
- zipWriteInFileInZip@Base 1.1
- zip_copyright@Base 1.1
diff -Nru 

Bug#1063242: zlib: NMU diff for 64-bit time_t transition

2024-02-05 Thread Steve Langasek
Source: zlib
Version: 1:1.3.dfsg-3
Severity: serious
Tags: patch pending sid trixie
Justification: library ABI skew on upgrade
User: debian-...@lists.debian.org
Usertags: time-t

NOTICE: these changes must not be uploaded to unstable yet!

Dear maintainer,

As part of the 64-bit time_t transition required to support 32-bit
architectures in 2038 and beyond
(https://wiki.debian.org/ReleaseGoals/64bit-time), we have identified
zlib as a source package shipping runtime libraries whose ABI
either is affected by the change in size of time_t, or could not be
analyzed via abi-compliance-checker (and therefore to be on the safe
side we assume is affected).

To ensure that inconsistent combinations of libraries with their
reverse-dependencies are never installed together, it is necessary to
have a library transition, which is most easily done by renaming the
runtime library package.

Since turning on 64-bit time_t is being handled centrally through a change
to the default dpkg-buildflags (https://bugs.debian.org/1037136), it is
important that libraries affected by this ABI change all be uploaded close
together in time.  Therefore I have prepared a 0-day NMU for zlib
which will initially be uploaded to experimental if possible, then to
unstable after packages have cleared binary NEW.

Please find the patch for this NMU attached.

If you have any concerns about this patch, please reach out ASAP.  Although
this package will be uploaded to experimental immediately, there will be a
period of several days before we begin uploads to unstable; so if information
becomes available that your package should not be included in the transition,
there is time for us to amend the planned uploads.



-- System Information:
Debian Release: trixie/sid
  APT prefers unstable
  APT policy: (500, 'unstable')
Architecture: amd64 (x86_64)

Kernel: Linux 6.5.0-14-generic (SMP w/12 CPU threads; PREEMPT)
Kernel taint flags: TAINT_PROPRIETARY_MODULE, TAINT_OOT_MODULE
Locale: LANG=C, LC_CTYPE=C.UTF-8 (charmap=UTF-8), LANGUAGE not set
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
diff -Nru zlib-1.3.dfsg/debian/changelog zlib-1.3.dfsg/debian/changelog
--- zlib-1.3.dfsg/debian/changelog  2023-11-23 13:02:20.0 +
+++ zlib-1.3.dfsg/debian/changelog  2024-02-05 16:50:11.0 +
@@ -1,3 +1,10 @@
+zlib (1:1.3.dfsg-3.1) experimental; urgency=medium
+
+  * Non-maintainer upload.
+  * Rename libraries for 64-bit time_t transition.
+
+ -- Steve Langasek   Mon, 05 Feb 2024 16:50:11 +
+
 zlib (1:1.3.dfsg-3) unstable; urgency=low
 
   * Update the version of texlive-binaries we break since they still had
diff -Nru zlib-1.3.dfsg/debian/control zlib-1.3.dfsg/debian/control
--- zlib-1.3.dfsg/debian/control2023-11-23 13:02:18.0 +
+++ zlib-1.3.dfsg/debian/control2024-02-05 16:50:11.0 +
@@ -135,7 +135,10 @@
  .
  This package includes the minizip and miniunzip tools.
 
-Package: libminizip1
+Package: libminizip1t64
+Provides: ${t64:Provides}
+Replaces: libminizip1
+Breaks: libminizip1 (<< ${source:Version})
 Architecture: any
 Multi-Arch: same
 Pre-Depends:
@@ -155,7 +158,7 @@
 Section: libdevel
 Depends:
  ${misc:Depends},
- libminizip1 (= ${binary:Version})
+ libminizip1t64 (= ${binary:Version})
 Replaces:
  libkml-dev (<< 1.3.0~r864+git20150723-0fa2f22-1~),
 Breaks:
diff -Nru zlib-1.3.dfsg/debian/libminizip1.install 
zlib-1.3.dfsg/debian/libminizip1.install
--- zlib-1.3.dfsg/debian/libminizip1.install2023-11-06 16:28:51.0 
+
+++ zlib-1.3.dfsg/debian/libminizip1.install1970-01-01 00:00:00.0 
+
@@ -1 +0,0 @@
-usr/lib/*/libminizip.so.*
diff -Nru zlib-1.3.dfsg/debian/libminizip1.symbols 
zlib-1.3.dfsg/debian/libminizip1.symbols
--- zlib-1.3.dfsg/debian/libminizip1.symbols2023-11-06 16:28:51.0 
+
+++ zlib-1.3.dfsg/debian/libminizip1.symbols1970-01-01 00:00:00.0 
+
@@ -1,62 +0,0 @@
-libminizip.so.1 libminizip1
- call_zopen64@Base 1.1
- call_zseek64@Base 1.1
- call_ztell64@Base 1.1
- fill_fopen64_filefunc@Base 1.1
- fill_fopen_filefunc@Base 1.1
- fill_zlib_filefunc64_32_def_from_filefunc32@Base 1.1
- unzClose@Base 1.1
- unzCloseCurrentFile@Base 1.1
- unzGetCurrentFileInfo64@Base 1.1
- unzGetCurrentFileInfo@Base 1.1
- unzGetCurrentFileZStreamPos64@Base 1.1
- unzGetFilePos64@Base 1.1
- unzGetFilePos@Base 1.1
- unzGetGlobalComment@Base 1.1
- unzGetGlobalInfo64@Base 1.1
- unzGetGlobalInfo@Base 1.1
- unzGetLocalExtrafield@Base 1.1
- unzGetOffset64@Base 1.1
- unzGetOffset@Base 1.1
- unzGoToFilePos64@Base 1.1
- unzGoToFilePos@Base 1.1
- unzGoToFirstFile@Base 1.1
- unzGoToNextFile@Base 1.1
- unzLocateFile@Base 1.1
- unzOpen2@Base 1.1
- unzOpen2_64@Base 1.1
- unzOpen64@Base 1.1
- unzOpen@Base 1.1
- unzOpenCurrentFile2@Base 1.1
- unzOpenCurrentFile3@Base 1.1
- unzOpenCurrentFile@Base 1.1
- unzOpenCurrentFilePassword@Base 1.1
- unzReadCurrentFile@Base 1.1
- unzRepair@Base 1.1
- unzSetOffset64@Base 1.1
-