Bug#1063298: xrootd: NMU diff for 64-bit time_t transition

2024-02-29 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 xrootd-5.6.7/debian/changelog xrootd-5.6.7/debian/changelog
--- xrootd-5.6.7/debian/changelog   2024-02-08 14:47:53.0 +
+++ xrootd-5.6.7/debian/changelog   2024-02-29 07:58:29.0 +
@@ -1,3 +1,10 @@
+xrootd (5.6.7-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Rename libraries for 64-bit time_t transition.  Closes: #1063298
+
+ -- Steve Langasek   Thu, 29 Feb 2024 07:58:29 +
+
 xrootd (5.6.7-1) unstable; urgency=medium
 
   * Update to version 5.6.7
diff -Nru xrootd-5.6.7/debian/control xrootd-5.6.7/debian/control
--- xrootd-5.6.7/debian/control 2023-12-11 16:15:37.0 +
+++ xrootd-5.6.7/debian/control 2024-02-29 07:58:29.0 +
@@ -2,7 +2,7 @@
 Section: net
 Priority: optional
 Standards-Version: 4.6.2
-Build-Depends:
+Build-Depends: dpkg-dev (>= 1.22.5),
  debhelper-compat (= 13),
  dh-python,
  cmake,
@@ -72,7 +72,10 @@
  database servers. It provides enhanced capability along with lower
  latency and increased throughput.
 
-Package: libxrdapputils2
+Package: libxrdapputils2t64
+Provides: ${t64:Provides}
+Replaces: libxrdapputils2
+Breaks: libxrdapputils2 (<< ${source:Version})
 Architecture: any
 Multi-Arch: same
 Section: libs
@@ -82,7 +85,10 @@
 Description: Utilities library for xrootd applications
  This package contains the xrootd utilities library for applications.
 
-Package: libxrdcrypto2
+Package: libxrdcrypto2t64
+Provides: ${t64:Provides}
+Replaces: libxrdcrypto2
+Breaks: libxrdcrypto2 (<< ${source:Version})
 Architecture: any
 Multi-Arch: same
 Section: libs
@@ -92,7 +98,10 @@
 Description: Cryptograpic library for xrootd
  This package contains the xrootd cryptograpic library.
 
-Package: libxrdcryptolite2
+Package: libxrdcryptolite2t64
+Provides: ${t64:Provides}
+Replaces: libxrdcryptolite2
+Breaks: libxrdcryptolite2 (<< ${source:Version})
 Architecture: any
 Multi-Arch: same
 Section: libs
@@ -102,23 +111,27 @@
 Description: Light version of cryptograpic library for xrootd
  This package contains the light version of the xrootd cryptograpic library.
 
-Package: libxrdutils3
+Package: libxrdutils3t64
+Provides: ${t64:Provides}
 Architecture: any
 Multi-Arch: same
 Section: libs
 Depends:
  ${shlibs:Depends},
  ${misc:Depends}
-Replaces:
+Replaces:libxrdutils3, 
  libxrdcephposix0 [i386 armel armhf mips mipsel powerpc],
  xrootd-ceph-plugins [i386 armel armhf mips mipsel powerpc]
-Breaks:
+Breaks:libxrdutils3 (<< ${source:Version}), 
  libxrdcephposix0 [i386 armel armhf mips mipsel powerpc],
  xrootd-ceph-plugins [i386 armel armhf mips mipsel powerpc]
 Description: Utilities library for xrootd
  This package contains the xrootd utilities library.
 
-Package: libxrdxml3
+Package: libxrdxml3t64
+Provides: ${t64:Provides}
+Replaces: libxrdxml3
+Breaks: libxrdxml3 (<< ${source:Version})
 Architecture: any
 Multi-Arch: same
 Section: libs
@@ -143,17 +156,20 @@
 Multi-Arch: same
 Section: libdevel
 Depends:
- libxrdapputils2 (= ${binary:Version}),
- libxrdcrypto2 (= ${binary:Version}),
- libxrdcryptolite2 (= ${binary:Version}),
- libxrdutils3 (= ${binary:Version}),
- libxrdxml3 (= ${binary:Version}),
+ libxrdapputils2t64 (= ${binary:Version}),
+ libxrdcrypto2t64 (= ${binary:Version}),
+ libxrdcryptolite2t64 (= ${binary:Version}),
+ libxrdutils3t64 (= ${binary:Version}),
+ libxrdxml3t64 (= ${binary:Version}),
  ${misc:Depends}
 Description: Development files for xrootd
  This package contains header files and development libraries for xrootd
  development.
 
-Package: libxrdcl3
+Package: libxrdcl3t64
+Provides: ${t64:Provides}
+Replaces: libxrdcl3
+Breaks: libxrdcl3 (<< ${source:Version})
 Architecture: any
 Multi-Arch: same
 Section: libs
@@ -166,7 +182,10 @@
 Description: Client library for xrootd
  This package contains the xrootd client library.
 
-Package: libxrdec1
+Package: libxrdec1t64
+Provides: ${t64:Provides}
+Replaces: libxrdec1
+Breaks: libxrdec1 (<< ${source:Version})
 Architecture: any
 Multi-Arch: same
 Section: libs
@@ -176,7 +195,10 @@
 Description: Erasure code library for xrootd
  This package contains the xrootd erasure code library.
 
-Package: libxrdffs3
+Package: libxrdffs3t64
+Provides: ${t64:Provides}
+Replaces: libxrdffs3
+Breaks: libxrdffs3 (<< ${source:Version})
 Architecture: any
 Multi-Arch: same
 

Bug#1063298: xrootd: NMU diff for 64-bit time_t transition

2024-02-06 Thread Mattias Ellert
Hi!

The proposed change is incomplete, and the build failed on some
architectures.

You need to update debian/rules due to the changes package names:

Line 31 must change from

N = -Nlibxrdec1

to

N = -Nlibxrdec1t64

Regards,

Mattias (package maintainer)



signature.asc
Description: This is a digitally signed message part


Bug#1063298: xrootd: NMU diff for 64-bit time_t transition

2024-02-05 Thread Steve Langasek
Source: xrootd
Version: 5.6.6-1
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
xrootd 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 xrootd
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 xrootd-5.6.6/debian/changelog xrootd-5.6.6/debian/changelog
--- xrootd-5.6.6/debian/changelog   2024-01-26 09:15:04.0 +
+++ xrootd-5.6.6/debian/changelog   2024-02-06 02:33:33.0 +
@@ -1,3 +1,10 @@
+xrootd (5.6.6-1.1) experimental; urgency=medium
+
+  * Non-maintainer upload.
+  * Rename libraries for 64-bit time_t transition.
+
+ -- Steve Langasek   Tue, 06 Feb 2024 02:33:33 +
+
 xrootd (5.6.6-1) unstable; urgency=medium
 
   * Update to version 5.6.6
diff -Nru xrootd-5.6.6/debian/control xrootd-5.6.6/debian/control
--- xrootd-5.6.6/debian/control 2023-12-11 16:15:37.0 +
+++ xrootd-5.6.6/debian/control 2024-02-06 02:33:33.0 +
@@ -72,7 +72,10 @@
  database servers. It provides enhanced capability along with lower
  latency and increased throughput.
 
-Package: libxrdapputils2
+Package: libxrdapputils2t64
+Provides: ${t64:Provides}
+Replaces: libxrdapputils2
+Breaks: libxrdapputils2 (<< ${source:Version})
 Architecture: any
 Multi-Arch: same
 Section: libs
@@ -82,7 +85,10 @@
 Description: Utilities library for xrootd applications
  This package contains the xrootd utilities library for applications.
 
-Package: libxrdcrypto2
+Package: libxrdcrypto2t64
+Provides: ${t64:Provides}
+Replaces: libxrdcrypto2
+Breaks: libxrdcrypto2 (<< ${source:Version})
 Architecture: any
 Multi-Arch: same
 Section: libs
@@ -92,7 +98,10 @@
 Description: Cryptograpic library for xrootd
  This package contains the xrootd cryptograpic library.
 
-Package: libxrdcryptolite2
+Package: libxrdcryptolite2t64
+Provides: ${t64:Provides}
+Replaces: libxrdcryptolite2
+Breaks: libxrdcryptolite2 (<< ${source:Version})
 Architecture: any
 Multi-Arch: same
 Section: libs
@@ -102,23 +111,27 @@
 Description: Light version of cryptograpic library for xrootd
  This package contains the light version of the xrootd cryptograpic library.
 
-Package: libxrdutils3
+Package: libxrdutils3t64
+Provides: ${t64:Provides}
 Architecture: any
 Multi-Arch: same
 Section: libs
 Depends:
  ${shlibs:Depends},
  ${misc:Depends}
-Replaces:
+Replaces:libxrdutils3, 
  libxrdcephposix0 [i386 armel armhf mips mipsel powerpc],
  xrootd-ceph-plugins [i386 armel armhf mips mipsel powerpc]
-Breaks:
+Breaks:libxrdutils3 (<< ${source:Version}), 
  libxrdcephposix0 [i386 armel armhf mips mipsel powerpc],
  xrootd-ceph-plugins [i386 armel armhf mips mipsel powerpc]
 Description: Utilities library for xrootd
  This package contains the xrootd utilities library.
 
-Package: libxrdxml3
+Package: libxrdxml3t64
+Provides: ${t64:Provides}
+Replaces: libxrdxml3
+Breaks: libxrdxml3 (<< ${source:Version})
 Architecture: any
 Multi-Arch: same
 Section: libs
@@ -143,17 +156,20 @@
 Multi-Arch: same
 Section: libdevel
 Depends:
- libxrdapputils2 (= ${binary:Version}),
- libxrdcrypto2 (=