Bug#1061893: apr-util: NMU diff for 64-bit time_t transition
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-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 apr-util-1.6.3/debian/changelog apr-util-1.6.3/debian/changelog
--- apr-util-1.6.3/debian/changelog 2023-02-03 20:15:18.0 +
+++ apr-util-1.6.3/debian/changelog 2024-02-28 01:16:25.0 +
@@ -1,3 +1,10 @@
+apr-util (1.6.3-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Rename libraries for 64-bit time_t transition. Closes: #1061893
+
+ -- Steve Langasek Wed, 28 Feb 2024 01:16:25 +
+
apr-util (1.6.3-1) unstable; urgency=medium
[ Stefan Fritsch ]
diff -Nru apr-util-1.6.3/debian/control apr-util-1.6.3/debian/control
--- apr-util-1.6.3/debian/control 2023-02-02 22:42:28.0 +
+++ apr-util-1.6.3/debian/control 2024-02-28 01:16:24.0 +
@@ -3,7 +3,7 @@
Uploaders: Stefan Fritsch
Section: libs
Priority: optional
-Build-Depends: debhelper-compat (= 11),
+Build-Depends: dpkg-dev (>= 1.22.5), debhelper-compat (= 11),
autoconf,
mawk,
libldap2-dev,
@@ -22,7 +22,10 @@
Vcs-Git: https://salsa.debian.org/apache-team/apr-util.git
Homepage: https://apr.apache.org/
-Package: libaprutil1
+Package: libaprutil1t64
+Provides: ${t64:Provides}
+Replaces: libaprutil1
+Breaks: libaprutil1 (<< ${source:Version})
Architecture: any
Multi-Arch: same
Depends: ${shlibs:Depends},
@@ -39,7 +42,7 @@
Package: libaprutil1-ldap
Architecture: any
Multi-Arch: same
-Depends: libaprutil1 (= ${binary:Version}),
+Depends: libaprutil1t64 (= ${binary:Version}),
${shlibs:Depends},
${misc:Depends}
Pre-Depends: ${misc:Pre-Depends}
@@ -56,7 +59,7 @@
Package: libaprutil1-dbd-mysql
Architecture: any
Multi-Arch: same
-Depends: libaprutil1 (= ${binary:Version}),
+Depends: libaprutil1t64 (= ${binary:Version}),
${shlibs:Depends},
${misc:Depends}
Pre-Depends: ${misc:Pre-Depends}
@@ -73,7 +76,7 @@
Package: libaprutil1-dbd-sqlite3
Architecture: any
Multi-Arch: same
-Depends: libaprutil1 (= ${binary:Version}),
+Depends: libaprutil1t64 (= ${binary:Version}),
${shlibs:Depends},
${misc:Depends}
Pre-Depends: ${misc:Pre-Depends}
@@ -90,7 +93,7 @@
Package: libaprutil1-dbd-odbc
Architecture: any
Multi-Arch: same
-Depends: libaprutil1 (= ${binary:Version}),
+Depends: libaprutil1t64 (= ${binary:Version}),
${shlibs:Depends},
${misc:Depends}
Pre-Depends: ${misc:Pre-Depends}
@@ -107,7 +110,7 @@
Package: libaprutil1-dbd-pgsql
Architecture: any
Multi-Arch: same
-Depends: libaprutil1 (= ${binary:Version}),
+Depends: libaprutil1t64 (= ${binary:Version}),
${shlibs:Depends},
${misc:Depends}
Pre-Depends: ${misc:Pre-Depends}
@@ -124,7 +127,7 @@
Package: libaprutil1-dev
Architecture: any
Section: libdevel
-Depends: libaprutil1 (= ${binary:Version}),
+Depends: libaprutil1t64 (= ${binary:Version}),
libldap2-dev,
libexpat1-dev,
libapr1-dev,
diff -Nru apr-util-1.6.3/debian/libaprutil1.docs
apr-util-1.6.3/debian/libaprutil1.docs
--- apr-util-1.6.3/debian/libaprutil1.docs 2023-02-01 21:35:51.0
+
+++ apr-util-1.6.3/debian/libaprutil1.docs 1970-01-01 00:00:00.0
+
@@ -1 +0,0 @@
-NOTICE
diff -Nru apr-util-1.6.3/debian/libaprutil1.install
apr-util-1.6.3/debian/libaprutil1.install
--- apr-util-1.6.3/debian/libaprutil1.install 2023-02-01 21:35:51.0
+
+++ apr-util-1.6.3/debian/libaprutil1.install 1970-01-01 00:00:00.0
+
@@ -1,3 +0,0 @@
-usr/lib/*/libaprutil-1.so.*
-usr/lib/*/apr-util-1/apr_dbm*.so*
-usr/lib/*/apr-util-1/apr_crypt*.so*
diff -Nru apr-util-1.6.3/debian/libaprutil1.lintian-overrides
apr-util-1.6.3/debian/libaprutil1.lintian-overrides
--- apr-util-1.6.3/debian/libaprutil1.lintian-overrides 2023-02-01
21:35:51.0 +
+++ apr-util-1.6.3/debian/libaprutil1.lintian-overrides 1970-01-01
00:00:00.0 +
@@ -1,2 +0,0 @@
-libaprutil1: symbols-declares-dependency-on-other-package
-libaprutil1: package-name-doesnt-match-sonames libaprutil-1-0
diff -Nru apr-util-1.6.3/debian/libaprutil1.symbols
apr-util-1.6.3/debian/libaprutil1.symbols
--- apr-util-1.6.3/debian/libaprutil1.symbols 2023-02-01 21:35:51.0
+
+++ apr-util-1.6.3/debian/libaprutil1.symbols 1970-01-01 00:00:00.0
+
@@ -1,357 +0,0 @@
Bug#1061893: apr-util: NMU diff for 64-bit time_t transition
Source: apr-util
Followup-For: Bug #1061893
Apologies, an oversight in the conversion script caused us to fail to
update strict versioned dependencies on the previous package name.
Please find attached a fixed patch.
This has also now been uploaded to experimental.
diff -Nru apr-util-1.6.3/debian/changelog apr-util-1.6.3/debian/changelog
--- apr-util-1.6.3/debian/changelog 2023-02-03 20:15:18.0 +
+++ apr-util-1.6.3/debian/changelog 2024-01-31 05:58:19.0 +
@@ -1,3 +1,11 @@
+apr-util (1.6.3-1.1~exp2) experimental; urgency=medium
+
+ * Non-maintainer upload.
+ * Rename libraries for 64-bit time_t transition.
+ * Fix uninstallable packages from the previous upload.
+
+ -- Steve Langasek Wed, 31 Jan 2024 05:58:19 +
+
apr-util (1.6.3-1) unstable; urgency=medium
[ Stefan Fritsch ]
diff -Nru apr-util-1.6.3/debian/control apr-util-1.6.3/debian/control
--- apr-util-1.6.3/debian/control 2023-02-02 22:42:28.0 +
+++ apr-util-1.6.3/debian/control 2024-01-31 05:58:19.0 +
@@ -22,7 +22,10 @@
Vcs-Git: https://salsa.debian.org/apache-team/apr-util.git
Homepage: https://apr.apache.org/
-Package: libaprutil1
+Package: libaprutil1t64
+Provides: ${t64:Provides}
+Replaces: libaprutil1
+Breaks: libaprutil1 (<< ${source:Version})
Architecture: any
Multi-Arch: same
Depends: ${shlibs:Depends},
@@ -39,7 +42,7 @@
Package: libaprutil1-ldap
Architecture: any
Multi-Arch: same
-Depends: libaprutil1 (= ${binary:Version}),
+Depends: libaprutil1t64 (= ${binary:Version}),
${shlibs:Depends},
${misc:Depends}
Pre-Depends: ${misc:Pre-Depends}
@@ -56,7 +59,7 @@
Package: libaprutil1-dbd-mysql
Architecture: any
Multi-Arch: same
-Depends: libaprutil1 (= ${binary:Version}),
+Depends: libaprutil1t64 (= ${binary:Version}),
${shlibs:Depends},
${misc:Depends}
Pre-Depends: ${misc:Pre-Depends}
@@ -73,7 +76,7 @@
Package: libaprutil1-dbd-sqlite3
Architecture: any
Multi-Arch: same
-Depends: libaprutil1 (= ${binary:Version}),
+Depends: libaprutil1t64 (= ${binary:Version}),
${shlibs:Depends},
${misc:Depends}
Pre-Depends: ${misc:Pre-Depends}
@@ -90,7 +93,7 @@
Package: libaprutil1-dbd-odbc
Architecture: any
Multi-Arch: same
-Depends: libaprutil1 (= ${binary:Version}),
+Depends: libaprutil1t64 (= ${binary:Version}),
${shlibs:Depends},
${misc:Depends}
Pre-Depends: ${misc:Pre-Depends}
@@ -107,7 +110,7 @@
Package: libaprutil1-dbd-pgsql
Architecture: any
Multi-Arch: same
-Depends: libaprutil1 (= ${binary:Version}),
+Depends: libaprutil1t64 (= ${binary:Version}),
${shlibs:Depends},
${misc:Depends}
Pre-Depends: ${misc:Pre-Depends}
@@ -124,7 +127,7 @@
Package: libaprutil1-dev
Architecture: any
Section: libdevel
-Depends: libaprutil1 (= ${binary:Version}),
+Depends: libaprutil1t64 (= ${binary:Version}),
libldap2-dev,
libexpat1-dev,
libapr1-dev,
diff -Nru apr-util-1.6.3/debian/libaprutil1.docs
apr-util-1.6.3/debian/libaprutil1.docs
--- apr-util-1.6.3/debian/libaprutil1.docs 2023-02-01 21:35:51.0
+
+++ apr-util-1.6.3/debian/libaprutil1.docs 1970-01-01 00:00:00.0
+
@@ -1 +0,0 @@
-NOTICE
diff -Nru apr-util-1.6.3/debian/libaprutil1.install
apr-util-1.6.3/debian/libaprutil1.install
--- apr-util-1.6.3/debian/libaprutil1.install 2023-02-01 21:35:51.0
+
+++ apr-util-1.6.3/debian/libaprutil1.install 1970-01-01 00:00:00.0
+
@@ -1,3 +0,0 @@
-usr/lib/*/libaprutil-1.so.*
-usr/lib/*/apr-util-1/apr_dbm*.so*
-usr/lib/*/apr-util-1/apr_crypt*.so*
diff -Nru apr-util-1.6.3/debian/libaprutil1.lintian-overrides
apr-util-1.6.3/debian/libaprutil1.lintian-overrides
--- apr-util-1.6.3/debian/libaprutil1.lintian-overrides 2023-02-01
21:35:51.0 +
+++ apr-util-1.6.3/debian/libaprutil1.lintian-overrides 1970-01-01
00:00:00.0 +
@@ -1,2 +0,0 @@
-libaprutil1: symbols-declares-dependency-on-other-package
-libaprutil1: package-name-doesnt-match-sonames libaprutil-1-0
diff -Nru apr-util-1.6.3/debian/libaprutil1.symbols
apr-util-1.6.3/debian/libaprutil1.symbols
--- apr-util-1.6.3/debian/libaprutil1.symbols 2023-02-01 21:35:51.0
+
+++ apr-util-1.6.3/debian/libaprutil1.symbols 1970-01-01 00:00:00.0
+
@@ -1,357 +0,0 @@
-libaprutil-1.so.0 libaprutil1 #MINVER#
-| libaprutil1-ldap , libaprutil1 #MINVER#
-|
libaprutil1-dbd-sqlite3|libaprutil1-dbd-mysql|libaprutil1-dbd-odbc|libaprutil1-dbd-pgsql|libaprutil1-dbd-freetds
, libaprutil1 #MINVER#
- _crypt_blowfish_rn@Base 1.5.0
- _crypt_gensalt_blowfish_rn@Base 1.5.0
- _crypt_output_magic@Base 1.5.0
- apr__memzero_explicit@Base 1.6.0
- apr_base64_decode@Base 1.2.7+dfsg
- apr_base64_decode_binary@Base 1.2.7+dfsg
- apr_base64_decode_len@Base 1.2.7+dfsg
- apr_base64_encode@Base 1.2.7+dfsg
- apr_base64_encode_binary@Base 1.2.7+dfsg
- apr_base64_encode_len@Base 1.2.7+dfsg
- apr_bcrypt_encode@Base 1.5.0
-
Bug#1061893: apr-util: NMU diff for 64-bit time_t transition
Source: apr-util
Version: 1.6.3-1
Severity: serious
Tags: patch pending
Justification: library ABI skew on upgrade
User: debian-...@lists.debian.org
Usertags: time-t
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
apr-util 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 apr-util
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'), (1, 'experimental')
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 apr-util-1.6.3/debian/changelog apr-util-1.6.3/debian/changelog
--- apr-util-1.6.3/debian/changelog 2023-02-03 20:15:18.0 +
+++ apr-util-1.6.3/debian/changelog 2024-01-30 00:55:31.0 +
@@ -1,3 +1,10 @@
+apr-util (1.6.3-1.1) experimental; urgency=medium
+
+ * Non-maintainer upload.
+ * Rename libraries for 64-bit time_t transition.
+
+ -- Steve Langasek Tue, 30 Jan 2024 00:55:31 +
+
apr-util (1.6.3-1) unstable; urgency=medium
[ Stefan Fritsch ]
diff -Nru apr-util-1.6.3/debian/control apr-util-1.6.3/debian/control
--- apr-util-1.6.3/debian/control 2023-02-02 22:42:28.0 +
+++ apr-util-1.6.3/debian/control 2024-01-30 00:55:31.0 +
@@ -22,7 +22,10 @@
Vcs-Git: https://salsa.debian.org/apache-team/apr-util.git
Homepage: https://apr.apache.org/
-Package: libaprutil1
+Package: libaprutil1t64
+Provides: ${t64:Provides}
+Replaces: libaprutil1
+Breaks: libaprutil1 (<< ${source:Version})
Architecture: any
Multi-Arch: same
Depends: ${shlibs:Depends},
diff -Nru apr-util-1.6.3/debian/libaprutil1.docs
apr-util-1.6.3/debian/libaprutil1.docs
--- apr-util-1.6.3/debian/libaprutil1.docs 2023-02-01 21:35:51.0
+
+++ apr-util-1.6.3/debian/libaprutil1.docs 1970-01-01 00:00:00.0
+
@@ -1 +0,0 @@
-NOTICE
diff -Nru apr-util-1.6.3/debian/libaprutil1.install
apr-util-1.6.3/debian/libaprutil1.install
--- apr-util-1.6.3/debian/libaprutil1.install 2023-02-01 21:35:51.0
+
+++ apr-util-1.6.3/debian/libaprutil1.install 1970-01-01 00:00:00.0
+
@@ -1,3 +0,0 @@
-usr/lib/*/libaprutil-1.so.*
-usr/lib/*/apr-util-1/apr_dbm*.so*
-usr/lib/*/apr-util-1/apr_crypt*.so*
diff -Nru apr-util-1.6.3/debian/libaprutil1.lintian-overrides
apr-util-1.6.3/debian/libaprutil1.lintian-overrides
--- apr-util-1.6.3/debian/libaprutil1.lintian-overrides 2023-02-01
21:35:51.0 +
+++ apr-util-1.6.3/debian/libaprutil1.lintian-overrides 1970-01-01
00:00:00.0 +
@@ -1,2 +0,0 @@
-libaprutil1: symbols-declares-dependency-on-other-package
-libaprutil1: package-name-doesnt-match-sonames libaprutil-1-0
diff -Nru apr-util-1.6.3/debian/libaprutil1.symbols
apr-util-1.6.3/debian/libaprutil1.symbols
--- apr-util-1.6.3/debian/libaprutil1.symbols 2023-02-01 21:35:51.0
+
+++ apr-util-1.6.3/debian/libaprutil1.symbols 1970-01-01 00:00:00.0
+
@@ -1,357 +0,0 @@
-libaprutil-1.so.0 libaprutil1 #MINVER#
-| libaprutil1-ldap , libaprutil1 #MINVER#
-|
libaprutil1-dbd-sqlite3|libaprutil1-dbd-mysql|libaprutil1-dbd-odbc|libaprutil1-dbd-pgsql|libaprutil1-dbd-freetds
, libaprutil1 #MINVER#
- _crypt_blowfish_rn@Base 1.5.0
- _crypt_gensalt_blowfish_rn@Base 1.5.0
- _crypt_output_magic@Base 1.5.0
- apr__memzero_explicit@Base 1.6.0
- apr_base64_decode@Base 1.2.7+dfsg
- apr_base64_decode_binary@Base 1.2.7+dfsg
- apr_base64_decode_len@Base 1.2.7+dfsg
-
