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.000000000 +0000
+++ zlib-1.3.dfsg/debian/changelog      2024-03-01 12:59:44.000000000 +0000
@@ -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 <bdr...@debian.org>  Fri, 01 Mar 2024 12:59:44 +0000
+
 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/control        2023-11-23 13:02:18.000000000 +0000
+++ zlib-1.3.dfsg/debian/control        2024-03-01 12:59:44.000000000 +0000
@@ -4,7 +4,7 @@
 Maintainer: Mark Brown <broo...@debian.org>
 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] <!nobiarch>, 
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] <!nobiarch>, 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.install    2023-11-06 16:28:51.000000000 
+0000
+++ zlib-1.3.dfsg/debian/libminizip1.install    1970-01-01 00:00:00.000000000 
+0000
@@ -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.symbols    2023-11-06 16:28:51.000000000 
+0000
+++ zlib-1.3.dfsg/debian/libminizip1.symbols    1970-01-01 00:00:00.000000000 
+0000
@@ -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 zlib-1.3.dfsg/debian/libminizip1t64.install 
zlib-1.3.dfsg/debian/libminizip1t64.install
--- zlib-1.3.dfsg/debian/libminizip1t64.install 1970-01-01 00:00:00.000000000 
+0000
+++ zlib-1.3.dfsg/debian/libminizip1t64.install 2023-11-06 16:28:51.000000000 
+0000
@@ -0,0 +1 @@
+usr/lib/*/libminizip.so.*
diff -Nru zlib-1.3.dfsg/debian/libminizip1t64.lintian-overrides 
zlib-1.3.dfsg/debian/libminizip1t64.lintian-overrides
--- zlib-1.3.dfsg/debian/libminizip1t64.lintian-overrides       1970-01-01 
00:00:00.000000000 +0000
+++ zlib-1.3.dfsg/debian/libminizip1t64.lintian-overrides       2024-03-01 
12:59:21.000000000 +0000
@@ -0,0 +1 @@
+libminizip1t64: package-name-doesnt-match-sonames libminizip1
diff -Nru zlib-1.3.dfsg/debian/libminizip1t64.symbols 
zlib-1.3.dfsg/debian/libminizip1t64.symbols
--- zlib-1.3.dfsg/debian/libminizip1t64.symbols 1970-01-01 00:00:00.000000000 
+0000
+++ zlib-1.3.dfsg/debian/libminizip1t64.symbols 2024-03-01 12:59:21.000000000 
+0000
@@ -0,0 +1,62 @@
+libminizip.so.1 libminizip1t64
+ 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 zlib-1.3.dfsg/debian/rules zlib-1.3.dfsg/debian/rules
--- zlib-1.3.dfsg/debian/rules  2023-11-17 22:07:41.000000000 +0000
+++ zlib-1.3.dfsg/debian/rules  2024-03-01 12:59:43.000000000 +0000
@@ -210,7 +210,7 @@
        dh_strip -a --dbgsym-migration="zlib1g-dbg (<< 1:1.2.11.dfsg-2~)"
        dh_compress -a
        dh_fixperms -a
-       dh_makeshlibs -plibminizip1 -V"libminizip1 (>> 1:1.2.13.dfsg-1)"
+       dh_makeshlibs -plibminizip1t64 -V"libminizip1t64 (>> 1:1.2.13.dfsg-1)"
        dh_makeshlibs -pzlib1g -V"zlib1g (>= 1:1.2.3.3.dfsg-1)" 
--add-udeb=zlib1g-udeb
 ifeq (,$(filter nobiarch,$(DEB_BUILD_PROFILES)))
 ifneq (,$(filter $(DEB_HOST_ARCH), $(32-ARCHS)))

Reply via email to