Bug#1063251: xdelta: NMU diff for 64-bit time_t transition

2024-02-28 Thread Steve Langasek
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 xdelta-1.1.3/debian/changelog xdelta-1.1.3/debian/changelog
--- xdelta-1.1.3/debian/changelog   2021-12-31 16:50:22.0 +
+++ xdelta-1.1.3/debian/changelog   2024-02-29 06:20:41.0 +
@@ -1,3 +1,10 @@
+xdelta (1.1.3-10.5) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Rename libraries for 64-bit time_t transition.  Closes: #1063251
+
+ -- Steve Langasek   Thu, 29 Feb 2024 06:20:41 +
+
 xdelta (1.1.3-10.4) unstable; urgency=medium
 
   * Non-maintainer upload.
diff -Nru xdelta-1.1.3/debian/control xdelta-1.1.3/debian/control
--- xdelta-1.1.3/debian/control 2021-12-31 16:50:22.0 +
+++ xdelta-1.1.3/debian/control 2024-02-29 06:20:41.0 +
@@ -2,7 +2,7 @@
 Section: utils
 Priority: optional
 Maintainer: LaMont Jones 
-Build-Depends: debhelper-compat (= 13), libglib2.0-dev, zlib1g-dev, pkgconf | 
pkg-config
+Build-Depends: dpkg-dev (>= 1.22.5), debhelper-compat (= 13), libglib2.0-dev, 
zlib1g-dev, pkgconf | pkg-config
 Standards-Version: 4.6.0
 Rules-Requires-Root: no
 Vcs-Browser: https://salsa.debian.org/debian/xdelta
@@ -20,7 +20,10 @@
  these deltas to a copy of the original file.  Xdelta uses a fast,
  linear algorithm and performs well on both binary and text files.
 
-Package: libxdelta2
+Package: libxdelta2t64
+Provides: ${t64:Provides}
+Replaces: libxdelta2
+Breaks: libxdelta2 (<< ${source:Version})
 Architecture: any
 Section: libs
 Depends: ${misc:Depends}, ${shlibs:Depends}
@@ -39,7 +42,7 @@
 Package: libxdelta2-dev
 Architecture: any
 Section: libdevel
-Depends: ${misc:Depends}, libxdelta2 (= ${binary:Version})
+Depends: ${misc:Depends}, libxdelta2t64 (= ${binary:Version})
 Breaks: xdelta (<< 1.1.3-9.3~)
 Replaces: xdelta-dev, xdelta (<< 1.1.3-9.3~)
 Conflicts: libxdelta0-dev, libxdelta1-dev
diff -Nru xdelta-1.1.3/debian/libxdelta2.install 
xdelta-1.1.3/debian/libxdelta2.install
--- xdelta-1.1.3/debian/libxdelta2.install  2021-12-31 16:50:22.0 
+
+++ xdelta-1.1.3/debian/libxdelta2.install  1970-01-01 00:00:00.0 
+
@@ -1 +0,0 @@
-usr/lib/*/*.so.*
diff -Nru xdelta-1.1.3/debian/libxdelta2.shlibs 
xdelta-1.1.3/debian/libxdelta2.shlibs
--- xdelta-1.1.3/debian/libxdelta2.shlibs   2021-12-31 16:50:22.0 
+
+++ xdelta-1.1.3/debian/libxdelta2.shlibs   1970-01-01 00:00:00.0 
+
@@ -1,2 +0,0 @@
-libxdelta 2 libxdelta2 (>= 1.1.3)
-libedsio 0 libxdelta2 (>= 1.1.3)
diff -Nru xdelta-1.1.3/debian/libxdelta2t64.install 
xdelta-1.1.3/debian/libxdelta2t64.install
--- xdelta-1.1.3/debian/libxdelta2t64.install   1970-01-01 00:00:00.0 
+
+++ xdelta-1.1.3/debian/libxdelta2t64.install   2021-12-31 16:50:22.0 
+
@@ -0,0 +1 @@
+usr/lib/*/*.so.*
diff -Nru xdelta-1.1.3/debian/libxdelta2t64.lintian-overrides 
xdelta-1.1.3/debian/libxdelta2t64.lintian-overrides
--- xdelta-1.1.3/debian/libxdelta2t64.lintian-overrides 1970-01-01 
00:00:00.0 +
+++ xdelta-1.1.3/debian/libxdelta2t64.lintian-overrides 2024-02-29 
06:20:32.0 +
@@ -0,0 +1 @@
+libxdelta2t64: package-name-doesnt-match-sonames libxdelta2
diff -Nru xdelta-1.1.3/debian/libxdelta2t64.shlibs 
xdelta-1.1.3/debian/libxdelta2t64.shlibs
--- xdelta-1.1.3/debian/libxdelta2t64.shlibs1970-01-01 00:00:00.0 
+
+++ xdelta-1.1.3/debian/libxdelta2t64.shlibs2024-02-29 06:20:32.0 
+
@@ -0,0 +1,2 @@
+libxdelta 2 libxdelta2t64 (>= 1.1.3)
+libedsio 0 libxdelta2t64 (>= 1.1.3)


Bug#1063251: xdelta: NMU diff for 64-bit time_t transition

2024-02-05 Thread Steve Langasek
Source: xdelta
Version: 1.1.3-10.4
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
xdelta 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 xdelta
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'), (500, 'testing'), (500, 'stable'), (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 xdelta-1.1.3/debian/changelog xdelta-1.1.3/debian/changelog
--- xdelta-1.1.3/debian/changelog   2021-12-31 16:50:22.0 +
+++ xdelta-1.1.3/debian/changelog   2024-02-05 20:56:02.0 +
@@ -1,3 +1,10 @@
+xdelta (1.1.3-10.5) experimental; urgency=medium
+
+  * Non-maintainer upload.
+  * Rename libraries for 64-bit time_t transition.
+
+ -- Steve Langasek   Mon, 05 Feb 2024 20:56:02 +
+
 xdelta (1.1.3-10.4) unstable; urgency=medium
 
   * Non-maintainer upload.
diff -Nru xdelta-1.1.3/debian/control xdelta-1.1.3/debian/control
--- xdelta-1.1.3/debian/control 2021-12-31 16:50:22.0 +
+++ xdelta-1.1.3/debian/control 2024-02-05 20:56:01.0 +
@@ -20,7 +20,10 @@
  these deltas to a copy of the original file.  Xdelta uses a fast,
  linear algorithm and performs well on both binary and text files.
 
-Package: libxdelta2
+Package: libxdelta2t64
+Provides: ${t64:Provides}
+Replaces: libxdelta2
+Breaks: libxdelta2 (<< ${source:Version})
 Architecture: any
 Section: libs
 Depends: ${misc:Depends}, ${shlibs:Depends}
@@ -39,7 +42,7 @@
 Package: libxdelta2-dev
 Architecture: any
 Section: libdevel
-Depends: ${misc:Depends}, libxdelta2 (= ${binary:Version})
+Depends: ${misc:Depends}, libxdelta2t64 (= ${binary:Version})
 Breaks: xdelta (<< 1.1.3-9.3~)
 Replaces: xdelta-dev, xdelta (<< 1.1.3-9.3~)
 Conflicts: libxdelta0-dev, libxdelta1-dev
diff -Nru xdelta-1.1.3/debian/libxdelta2.install 
xdelta-1.1.3/debian/libxdelta2.install
--- xdelta-1.1.3/debian/libxdelta2.install  2021-12-31 16:50:22.0 
+
+++ xdelta-1.1.3/debian/libxdelta2.install  1970-01-01 00:00:00.0 
+
@@ -1 +0,0 @@
-usr/lib/*/*.so.*
diff -Nru xdelta-1.1.3/debian/libxdelta2.shlibs 
xdelta-1.1.3/debian/libxdelta2.shlibs
--- xdelta-1.1.3/debian/libxdelta2.shlibs   2021-12-31 16:50:22.0 
+
+++ xdelta-1.1.3/debian/libxdelta2.shlibs   1970-01-01 00:00:00.0 
+
@@ -1,2 +0,0 @@
-libxdelta 2 libxdelta2 (>= 1.1.3)
-libedsio 0 libxdelta2 (>= 1.1.3)
diff -Nru xdelta-1.1.3/debian/libxdelta2t64.install 
xdelta-1.1.3/debian/libxdelta2t64.install
--- xdelta-1.1.3/debian/libxdelta2t64.install   1970-01-01 00:00:00.0 
+
+++ xdelta-1.1.3/debian/libxdelta2t64.install   2021-12-31 16:50:22.0 
+
@@ -0,0 +1 @@
+usr/lib/*/*.so.*
diff -Nru xdelta-1.1.3/debian/libxdelta2t64.lintian-overrides 
xdelta-1.1.3/debian/libxdelta2t64.lintian-overrides
--- xdelta-1.1.3/debian/libxdelta2t64.lintian-overrides 1970-01-01 
00:00:00.0 +
+++ xdelta-1.1.3/debian/libxdelta2t64.lintian-overrides 2024-02-05 
20:56:01.0 +
@@ -0,0 +1 @@
+libxdelta2t64: package-name-doesnt-match-sonames libxdelta2
diff -Nru xdelta-1.1.3/debian/libxdelta2t64.shlibs 
xdelta-1.1.3/debian/libxdelta2t64.shlibs
---