Bug#1062030: btrfs-progs: NMU diff for 64-bit time_t transition

2024-02-27 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 btrfs-progs-6.6.3/debian/changelog btrfs-progs-6.6.3/debian/changelog
--- btrfs-progs-6.6.3/debian/changelog  2023-12-29 18:03:32.0 +
+++ btrfs-progs-6.6.3/debian/changelog  2024-02-28 05:21:59.0 +
@@ -1,3 +1,10 @@
+btrfs-progs (6.6.3-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Rename libraries for 64-bit time_t transition.  Closes: #1062030
+
+ -- Steve Langasek   Wed, 28 Feb 2024 05:21:59 +
+
 btrfs-progs (6.6.3-1) unstable; urgency=medium
 
   * New upstream release (closes: #1055372).
diff -Nru btrfs-progs-6.6.3/debian/control btrfs-progs-6.6.3/debian/control
--- btrfs-progs-6.6.3/debian/control2023-12-29 18:02:57.0 +
+++ btrfs-progs-6.6.3/debian/control2024-02-28 05:21:59.0 +
@@ -2,7 +2,7 @@
 Section: admin
 Priority: optional
 Maintainer: Adam Borowski 
-Build-Depends: debhelper-compat (= 13),
+Build-Depends: dpkg-dev (>= 1.22.5), debhelper-compat (= 13),
libext2fs-dev,
pkg-config,
libacl1-dev,
@@ -40,7 +40,10 @@
  This package contains utilities (mkfs, fsck) used to work with btrfs
  and an utility (btrfs-convert) to make a btrfs filesystem from an ext3.
 
-Package: libbtrfs0
+Package: libbtrfs0t64
+Provides: ${t64:Provides}
+Replaces: libbtrfs0
+Breaks: libbtrfs0 (<< ${source:Version})
 Architecture: linux-any
 Multi-Arch: same
 Section: libs
@@ -56,7 +59,7 @@
 Architecture: linux-any
 Multi-Arch: same
 Section: libdevel
-Depends: ${misc:Depends}, ${shlibs:Depends}, libbtrfs0 (= ${binary:Version})
+Depends: ${misc:Depends}, ${shlibs:Depends}, libbtrfs0t64 (= ${binary:Version})
 Description: Checksumming Copy on Write Filesystem utilities (development 
headers)
  Btrfs is a copy on write filesystem for Linux aimed at implementing
  advanced features while focusing on fault tolerance, repair and easy
@@ -64,7 +67,10 @@
  .
  This package contains development headers for the libbtrfs library.
 
-Package: libbtrfsutil1
+Package: libbtrfsutil1t64
+Provides: ${t64:Provides}
+Replaces: libbtrfsutil1
+Breaks: libbtrfsutil1 (<< ${source:Version})
 Architecture: linux-any
 Multi-Arch: same
 Section: libs
@@ -80,7 +86,7 @@
 Architecture: linux-any
 Multi-Arch: same
 Section: libdevel
-Depends: ${misc:Depends}, ${shlibs:Depends}, libbtrfsutil1 (= 
${binary:Version})
+Depends: ${misc:Depends}, ${shlibs:Depends}, libbtrfsutil1t64 (= 
${binary:Version})
 Description: Checksumming Copy on Write Filesystem utilities (util development 
headers)
  Btrfs is a copy on write filesystem for Linux aimed at implementing
  advanced features while focusing on fault tolerance, repair and easy
diff -Nru btrfs-progs-6.6.3/debian/libbtrfs0.install 
btrfs-progs-6.6.3/debian/libbtrfs0.install
--- btrfs-progs-6.6.3/debian/libbtrfs0.install  2023-12-29 13:16:04.0 
+
+++ btrfs-progs-6.6.3/debian/libbtrfs0.install  1970-01-01 00:00:00.0 
+
@@ -1 +0,0 @@
-usr/lib/*/libbtrfs.so.0*
diff -Nru btrfs-progs-6.6.3/debian/libbtrfs0.symbols 
btrfs-progs-6.6.3/debian/libbtrfs0.symbols
--- btrfs-progs-6.6.3/debian/libbtrfs0.symbols  2023-12-29 13:16:04.0 
+
+++ btrfs-progs-6.6.3/debian/libbtrfs0.symbols  1970-01-01 00:00:00.0 
+
@@ -1,7 +0,0 @@
-libbtrfs.so.0 libbtrfs0 #MINVER#
-* Build-Depends-Package: libbtrfs-dev
- LIBBTRFS_0.1@LIBBTRFS_0.1 5.3.1
- btrfs_read_and_process_send_stream@LIBBTRFS_0.1 5.3.1
- btrfs_subvolid_resolve@LIBBTRFS_0.1 5.3.1
- subvol_uuid_search@LIBBTRFS_0.1 5.3.1
- subvol_uuid_search_init@LIBBTRFS_0.1 5.3.1
diff -Nru btrfs-progs-6.6.3/debian/libbtrfs0t64.install 
btrfs-progs-6.6.3/debian/libbtrfs0t64.install
--- btrfs-progs-6.6.3/debian/libbtrfs0t64.install   1970-01-01 
00:00:00.0 +
+++ btrfs-progs-6.6.3/debian/libbtrfs0t64.install   2023-12-29 
13:16:04.0 +
@@ -0,0 +1 @@
+usr/lib/*/libbtrfs.so.0*
diff -Nru btrfs-progs-6.6.3/debian/libbtrfs0t64.lintian-overrides 
btrfs-progs-6.6.3/debian/libbtrfs0t64.lintian-overrides
--- btrfs-progs-6.6.3/debian/libbtrfs0t64.lintian-overrides 1970-01-01 
00:00:00.0 +
+++ btrfs-progs-6.6.3/debian/libbtrfs0t64.lintian-overrides 2024-02-28 
05:21:34.0 +
@@ -0,0 +1 @@
+libbtrfs0t64: package-name-doesnt-match-sonames libbtrfs0
diff -Nru

Bug#1062030: btrfs-progs: NMU diff for 64-bit time_t transition

2024-01-30 Thread Steve Langasek 
Source: btrfs-progs
Version: 6.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
btrfs-progs 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 btrfs-progs
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 btrfs-progs-6.6.3/debian/changelog btrfs-progs-6.6.3/debian/changelog
--- btrfs-progs-6.6.3/debian/changelog  2023-12-29 18:03:32.0 +
+++ btrfs-progs-6.6.3/debian/changelog  2024-01-31 03:07:05.0 +
@@ -1,3 +1,10 @@
+btrfs-progs (6.6.3-1.1) experimental; urgency=medium
+
+  * Non-maintainer upload.
+  * Rename libraries for 64-bit time_t transition.
+
+ -- Steve Langasek   Wed, 31 Jan 2024 03:07:05 +
+
 btrfs-progs (6.6.3-1) unstable; urgency=medium
 
   * New upstream release (closes: #1055372).
diff -Nru btrfs-progs-6.6.3/debian/control btrfs-progs-6.6.3/debian/control
--- btrfs-progs-6.6.3/debian/control2023-12-29 18:02:57.0 +
+++ btrfs-progs-6.6.3/debian/control2024-01-31 03:07:04.0 +
@@ -40,7 +40,10 @@
  This package contains utilities (mkfs, fsck) used to work with btrfs
  and an utility (btrfs-convert) to make a btrfs filesystem from an ext3.
 
-Package: libbtrfs0
+Package: libbtrfs0t64
+Provides: ${t64:Provides}
+Replaces: libbtrfs0
+Breaks: libbtrfs0 (<< ${source:Version})
 Architecture: linux-any
 Multi-Arch: same
 Section: libs
@@ -56,7 +59,7 @@
 Architecture: linux-any
 Multi-Arch: same
 Section: libdevel
-Depends: ${misc:Depends}, ${shlibs:Depends}, libbtrfs0 (= ${binary:Version})
+Depends: ${misc:Depends}, ${shlibs:Depends}, libbtrfs0t64 (= ${binary:Version})
 Description: Checksumming Copy on Write Filesystem utilities (development 
headers)
  Btrfs is a copy on write filesystem for Linux aimed at implementing
  advanced features while focusing on fault tolerance, repair and easy
@@ -64,7 +67,10 @@
  .
  This package contains development headers for the libbtrfs library.
 
-Package: libbtrfsutil1
+Package: libbtrfsutil1t64
+Provides: ${t64:Provides}
+Replaces: libbtrfsutil1
+Breaks: libbtrfsutil1 (<< ${source:Version})
 Architecture: linux-any
 Multi-Arch: same
 Section: libs
@@ -80,7 +86,7 @@
 Architecture: linux-any
 Multi-Arch: same
 Section: libdevel
-Depends: ${misc:Depends}, ${shlibs:Depends}, libbtrfsutil1 (= 
${binary:Version})
+Depends: ${misc:Depends}, ${shlibs:Depends}, libbtrfsutil1t64 (= 
${binary:Version})
 Description: Checksumming Copy on Write Filesystem utilities (util development 
headers)
  Btrfs is a copy on write filesystem for Linux aimed at implementing
  advanced features while focusing on fault tolerance, repair and easy
diff -Nru btrfs-progs-6.6.3/debian/libbtrfs0.install 
btrfs-progs-6.6.3/debian/libbtrfs0.install
--- btrfs-progs-6.6.3/debian/libbtrfs0.install  2023-12-29 13:16:04.0 
+
+++ btrfs-progs-6.6.3/debian/libbtrfs0.install  1970-01-01 00:00:00.0 
+
@@ -1 +0,0 @@
-usr/lib/*/libbtrfs.so.0*
diff -Nru btrfs-progs-6.6.3/debian/libbtrfs0.symbols 
btrfs-progs-6.6.3/debian/libbtrfs0.symbols
--- btrfs-progs-6.6.3/debian/libbtrfs0.symbols  2023-12-29 13:16:04.0 
+
+++ btrfs-progs-6.6.3/debian/libbtrfs0.symbols  1970-01-01