Bug#1062020: db5.3: NMU diff for 64-bit time_t transition

2024-02-27 Thread mwhudson
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
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), LANGUAGE not set
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
diff -Nru db5.3-5.3.28+dfsg2/debian/changelog 
db5.3-5.3.28+dfsg2/debian/changelog
--- db5.3-5.3.28+dfsg2/debian/changelog 2023-11-10 13:13:50.0 +
+++ db5.3-5.3.28+dfsg2/debian/changelog 2024-02-28 01:11:42.0 +
@@ -1,3 +1,10 @@
+db5.3 (5.3.28+dfsg2-4.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Rename libraries for 64-bit time_t transition.  Closes: #1062020
+
+ -- Michael Hudson-Doyle   Wed, 28 Feb 2024 01:11:42 +
+
 db5.3 (5.3.28+dfsg2-4) unstable; urgency=medium
 
   * QA upload
diff -Nru db5.3-5.3.28+dfsg2/debian/control db5.3-5.3.28+dfsg2/debian/control
--- db5.3-5.3.28+dfsg2/debian/control   2023-11-10 12:58:52.0 +
+++ db5.3-5.3.28+dfsg2/debian/control   2024-02-28 01:11:42.0 +
@@ -4,7 +4,7 @@
 Maintainer: Debian QA Group 
 Standards-Version: 3.9.6
 # For DEB_STAGE=stage1 build tcl-dev can be dropped
-Build-Depends: debhelper (>= 10),
+Build-Depends: dpkg-dev (>= 1.22.5), debhelper (>= 10),
   tcl ,
   tcl-dev ,
   procps [!hurd-i386] ,
@@ -26,7 +26,7 @@
 Package: libdb5.3-dev
 Architecture: any
 Section: libdevel
-Depends: libdb5.3 (= ${binary:Version}),
+Depends: libdb5.3t64 (= ${binary:Version}),
 ${misc:Depends}
 Suggests: db5.3-doc
 Conflicts: libdb4.6-dev, libdb4.7-dev, libdb4.8-dev, libdb5.1-dev, libdb5.2-dev
@@ -34,7 +34,10 @@
  This is the development package which contains headers and static
  libraries for the Berkeley v5.3 database library.
 
-Package: libdb5.3
+Package: libdb5.3t64
+Provides: ${t64:Provides}
+Replaces: libdb5.3
+Breaks: libdb5.3 (<< ${source:Version})
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
@@ -68,7 +71,10 @@
 contain.
   - db5.3_verify: check the structure of files and their databases.
 
-Package: libdb5.3++
+Package: libdb5.3++t64
+Provides: ${t64:Provides}
+Replaces: libdb5.3++
+Breaks: libdb5.3++ (<< ${source:Version})
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
@@ -81,7 +87,7 @@
 Package: libdb5.3++-dev
 Architecture: any
 Section: libdevel
-Depends: libdb5.3++ (= ${binary:Version}),
+Depends: libdb5.3++t64 (= ${binary:Version}),
 libdb5.3-dev (= ${binary:Version}),
 ${misc:Depends}
 Conflicts: libdb4.6++-dev, libdb4.7++-dev, libdb4.8++-dev, libdb5.1++-dev, 
libdb5.2++-dev
@@ -93,7 +99,7 @@
 Package: libdb5.3-dbg
 Architecture: any
 Section: debug
-Depends: libdb5.3 (= ${binary:Version}),
+Depends: libdb5.3t64 (= ${binary:Version}),
 ${misc:Depends}
 Multi-Arch: same
 Description: Berkeley v5.3 Database Libraries [debug]
diff -Nru db5.3-5.3.28+dfsg2/debian/libdb5.3.dirs 
db5.3-5.3.28+dfsg2/debian/libdb5.3.dirs
--- db5.3-5.3.28+dfsg2/debian/libdb5.3.dirs 2023-11-10 12:58:52.0 
+
+++ db5.3-5.3.28+dfsg2/debian/libdb5.3.dirs 1970-01-01 00:00:00.0 
+
@@ -1 +0,0 @@
-usr/lib
diff -Nru db5.3-5.3.28+dfsg2/debian/libdb5.3++.dirs 
db5.3-5.3.28+dfsg2/debian/libdb5.3++.dirs
--- db5.3-5.3.28+dfsg2/debian/libdb5.3++.dirs   2023-11-10 12:58:52.0 
+
+++ db5.3-5.3.28+dfsg2/debian/libdb5.3++.dirs   1970-01-01 00:00:00.0 
+
@@ -1 +0,0 @@
-usr/lib
diff -Nru db5.3-5.3.28+dfsg2/debian/libdb5.3.install 
db5.3-5.3.28+dfsg2/debian/libdb5.3.install
--- db5.3-5.3.28+dfsg2/debian/libdb5.3.install  2023-11-10 12:58:52.0 
+
+++ db5.3-5.3.28+dfsg2/debian/libdb5.3.install  1970-01-01 00:00:00.0 
+
@@ -1 +0,0 @@
-usr/lib/*/libdb-*.so
diff -Nru db5.3-5.3.28+dfsg2/debian/libdb5.3++.install 
db5.3-5.3.28+dfsg2/debian/libdb5.3++.install
--- db5.3-5.3.28+dfsg2/debian/libdb5.3++.install2023-11-10 
12:58:52.0 +
+++ db5.3-5.3.28+dfsg2/debian/libdb5.3++.install1970-01-01 
00:00:00.0 +
@@ -1 +0,0 @@
-usr/lib/*/libdb_cxx-*.so
diff -Nru db5.3-5.3.28+dfsg2/debian/libdb5.3.lintian-overrides 
db5.3-5.3.28+dfsg2/debian/libdb5.3.lintian-overrides
--- db5.3-5.3.28+dfsg2/debian/libdb5.3.lintian-overrides2023-11-10 
12:58:52.0 +
+++ db5.3-5.3.28+dfsg2/debian/libdb5.3.lintian-overrides1970-01-01 
00:00:00.0 +
@@ -1,2 +0,0 @@
-# historical reasons
-libdb5.3: package-name-doesnt-match-sonames libdb-5.3
diff -Nru db5.3-5.3.28+dfsg2/debian/libdb5.3++.lintian-overrides 

Bug#1062020: db5.3: NMU diff for 64-bit time_t transition

2024-01-30 Thread mwhudson
Source: db5.3
Version: 5.3.28+dfsg2-4
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
db5.3 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 db5.3
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-15-generic (SMP w/16 CPU threads; PREEMPT)
Kernel taint flags: TAINT_PROPRIETARY_MODULE, TAINT_WARN, TAINT_OOT_MODULE
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), LANGUAGE not set
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
diff -Nru db5.3-5.3.28+dfsg2/debian/changelog 
db5.3-5.3.28+dfsg2/debian/changelog
--- db5.3-5.3.28+dfsg2/debian/changelog 2023-11-10 13:13:50.0 +
+++ db5.3-5.3.28+dfsg2/debian/changelog 2024-01-30 23:51:56.0 +
@@ -1,3 +1,10 @@
+db5.3 (5.3.28+dfsg2-4.1) experimental; urgency=medium
+
+  * Non-maintainer upload.
+  * Rename libraries for 64-bit time_t transition.
+
+ -- Michael Hudson-Doyle   Tue, 30 Jan 2024 23:51:56 +
+
 db5.3 (5.3.28+dfsg2-4) unstable; urgency=medium
 
   * QA upload
diff -Nru db5.3-5.3.28+dfsg2/debian/control db5.3-5.3.28+dfsg2/debian/control
--- db5.3-5.3.28+dfsg2/debian/control   2023-11-10 12:58:52.0 +
+++ db5.3-5.3.28+dfsg2/debian/control   2024-01-30 23:51:56.0 +
@@ -26,7 +26,7 @@
 Package: libdb5.3-dev
 Architecture: any
 Section: libdevel
-Depends: libdb5.3 (= ${binary:Version}),
+Depends: libdb5.3t64 (= ${binary:Version}),
 ${misc:Depends}
 Suggests: db5.3-doc
 Conflicts: libdb4.6-dev, libdb4.7-dev, libdb4.8-dev, libdb5.1-dev, libdb5.2-dev
@@ -34,7 +34,10 @@
  This is the development package which contains headers and static
  libraries for the Berkeley v5.3 database library.
 
-Package: libdb5.3
+Package: libdb5.3t64
+Provides: ${t64:Provides}
+Replaces: libdb5.3
+Breaks: libdb5.3 (<< ${source:Version})
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
@@ -68,7 +71,10 @@
 contain.
   - db5.3_verify: check the structure of files and their databases.
 
-Package: libdb5.3++
+Package: libdb5.3++t64
+Provides: ${t64:Provides}
+Replaces: libdb5.3++
+Breaks: libdb5.3++ (<< ${source:Version})
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
@@ -81,7 +87,7 @@
 Package: libdb5.3++-dev
 Architecture: any
 Section: libdevel
-Depends: libdb5.3++ (= ${binary:Version}),
+Depends: libdb5.3++t64 (= ${binary:Version}),
 libdb5.3-dev (= ${binary:Version}),
 ${misc:Depends}
 Conflicts: libdb4.6++-dev, libdb4.7++-dev, libdb4.8++-dev, libdb5.1++-dev, 
libdb5.2++-dev
@@ -93,7 +99,7 @@
 Package: libdb5.3-dbg
 Architecture: any
 Section: debug
-Depends: libdb5.3 (= ${binary:Version}),
+Depends: libdb5.3t64 (= ${binary:Version}),
 ${misc:Depends}
 Multi-Arch: same
 Description: Berkeley v5.3 Database Libraries [debug]
diff -Nru db5.3-5.3.28+dfsg2/debian/libdb5.3.dirs 
db5.3-5.3.28+dfsg2/debian/libdb5.3.dirs
--- db5.3-5.3.28+dfsg2/debian/libdb5.3.dirs 2023-11-10 12:58:52.0 
+
+++ db5.3-5.3.28+dfsg2/debian/libdb5.3.dirs 1970-01-01 00:00:00.0 
+
@@ -1 +0,0 @@
-usr/lib
diff -Nru db5.3-5.3.28+dfsg2/debian/libdb5.3++.dirs 
db5.3-5.3.28+dfsg2/debian/libdb5.3++.dirs
--- db5.3-5.3.28+dfsg2/debian/libdb5.3++.dirs   2023-11-10 12:58:52.0 
+
+++ db5.3-5.3.28+dfsg2/debian/libdb5.3++.dirs   1970-01-01 00:00:00.0 
+
@@ -1 +0,0 @@
-usr/lib
diff -Nru