Bug#1063085: uhd: NMU diff for 64-bit time_t transition
Control: reopen -1 Reopening, closed by an upload of an unrelated package. On Fri, Mar 22, 2024 at 12:20:06PM +0100, Andreas Beckmann wrote: > Control: reopen -1 > Control: severity -1 serious > I'm reopening this due to the regression (file conflict) #1063324 > Both libuhd4.6.0 and libuhd4.6.0-dpdk provide > /usr/lib/x86_64-linux-gnu/libuhd.so.4.6.0 > and are conflicting with each other. > So I'm a bit confused that only libuhd4.6.0 got renamed to libuhd4.6.0t64 > ... > Even if libuhd4.6.0-dpdk would not need to be renamed, I'd suggest to rename > it anyway to not make the logic too complicated. > Anyway libuhd4.6.0-dpdk (or libuhd4.6.0t64-dpdk) needs > Conflicts: libuhd4.6.0, libuhd4.6.0t64 > to solve #1063324. Ah libuhd4.6.0-dpdk would not have been renamed because it is not built on any 32-bit architectures. So I think the Conflicts: just needs updating but the package does not need renamed. -- Steve Langasek Give me a lever long enough and a Free OS Debian Developer to set it on, and I can move the world. Ubuntu Developer https://www.debian.org/ slanga...@ubuntu.com vor...@debian.org signature.asc Description: PGP signature
Bug#1063085: uhd: NMU diff for 64-bit time_t transition
Control: reopen -1 Control: severity -1 serious I'm reopening this due to the regression (file conflict) #1063324 Both libuhd4.6.0 and libuhd4.6.0-dpdk provide /usr/lib/x86_64-linux-gnu/libuhd.so.4.6.0 and are conflicting with each other. So I'm a bit confused that only libuhd4.6.0 got renamed to libuhd4.6.0t64 ... Even if libuhd4.6.0-dpdk would not need to be renamed, I'd suggest to rename it anyway to not make the logic too complicated. Anyway libuhd4.6.0-dpdk (or libuhd4.6.0t64-dpdk) needs Conflicts: libuhd4.6.0, libuhd4.6.0t64 to solve #1063324. Andreas
Bug#1063085: uhd: 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 uhd-4.6.0.0+ds1/debian/changelog uhd-4.6.0.0+ds1/debian/changelog
--- uhd-4.6.0.0+ds1/debian/changelog2023-12-16 03:34:58.0 +
+++ uhd-4.6.0.0+ds1/debian/changelog2024-02-28 20:10:38.0 +
@@ -1,3 +1,10 @@
+uhd (4.6.0.0+ds1-5.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Rename libraries for 64-bit time_t transition. Closes: #1063085
+
+ -- Steve Langasek Wed, 28 Feb 2024 20:10:38 +
+
uhd (4.6.0.0+ds1-5) unstable; urgency=medium
* install utilities on hurd
diff -Nru uhd-4.6.0.0+ds1/debian/control uhd-4.6.0.0+ds1/debian/control
--- uhd-4.6.0.0+ds1/debian/control 2023-12-04 01:45:35.0 +
+++ uhd-4.6.0.0+ds1/debian/control 2024-02-28 20:10:37.0 +
@@ -2,7 +2,7 @@
Section: science
Priority: optional
Maintainer: A. Maitland Bottoms
-Build-Depends: cmake,
+Build-Depends: dpkg-dev (>= 1.22.5), cmake,
debhelper-compat (= 13),
dh-python,
libboost-date-time-dev,
@@ -38,7 +38,7 @@
Package: uhd-host
Architecture: any
-Depends: libuhd4.6.0 (= ${binary:Version}),
+Depends: libuhd4.6.0t64 (= ${binary:Version}),
python3-requests,
${misc:Depends},
${python3:Depends},
@@ -57,7 +57,10 @@
display hardware configuration information and Doxygen generated
documentation.
-Package: libuhd4.6.0
+Package: libuhd4.6.0t64
+Provides: ${t64:Provides}
+Replaces: libuhd4.6.0
+Breaks: libuhd4.6.0 (<< ${source:Version})
Architecture: any
Section: libs
Pre-Depends: ${misc:Pre-Depends}
@@ -77,8 +80,8 @@
Pre-Depends: ${misc:Pre-Depends}
Depends: ${misc:Depends}, ${shlibs:Depends}
Suggests: uhd-host
-Conflicts: libuhd4.6.0
-Provides: libuhd4.6.0
+Conflicts: libuhd4.6.0t64
+Provides: libuhd4.6.0t64
Multi-Arch: same
Description: universal hardware driver for Ettus Research products - DPDK
Host library for the Universal Hardware Driver for Ettus Research products.
@@ -103,7 +106,7 @@
Package: libuhd-dev
Architecture: any
Section: libdevel
-Depends: libuhd4.6.0 (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
+Depends: libuhd4.6.0t64 (= ${binary:Version}), ${misc:Depends},
${shlibs:Depends}
Recommends: gnuradio-dev
Suggests: uhd-doc
Multi-Arch: same
@@ -120,7 +123,7 @@
Package: python3-uhd
Architecture: any
Section: python
-Depends: libuhd4.6.0 (= ${binary:Version}),
+Depends: libuhd4.6.0t64 (= ${binary:Version}),
python3-ruamel.yaml,
${misc:Depends},
${python3:Depends},
diff -Nru uhd-4.6.0.0+ds1/debian/libuhd4.6.0.install
uhd-4.6.0.0+ds1/debian/libuhd4.6.0.install
--- uhd-4.6.0.0+ds1/debian/libuhd4.6.0.install 2023-11-26 20:12:26.0
+
+++ uhd-4.6.0.0+ds1/debian/libuhd4.6.0.install 1970-01-01 00:00:00.0
+
@@ -1,2 +0,0 @@
-usr/lib/*/*.so.*
-usr/share/uhd
diff -Nru uhd-4.6.0.0+ds1/debian/libuhd4.6.0t64.install
uhd-4.6.0.0+ds1/debian/libuhd4.6.0t64.install
--- uhd-4.6.0.0+ds1/debian/libuhd4.6.0t64.install 1970-01-01
00:00:00.0 +
+++ uhd-4.6.0.0+ds1/debian/libuhd4.6.0t64.install 2023-11-26
20:12:26.0 +
@@ -0,0 +1,2 @@
+usr/lib/*/*.so.*
+usr/share/uhd
diff -Nru uhd-4.6.0.0+ds1/debian/libuhd4.6.0t64.lintian-overrides
uhd-4.6.0.0+ds1/debian/libuhd4.6.0t64.lintian-overrides
--- uhd-4.6.0.0+ds1/debian/libuhd4.6.0t64.lintian-overrides 1970-01-01
00:00:00.0 +
+++ uhd-4.6.0.0+ds1/debian/libuhd4.6.0t64.lintian-overrides 2024-02-28
20:06:16.0 +
@@ -0,0 +1 @@
+libuhd4.6.0t64: package-name-doesnt-match-sonames libuhd4.6.0
diff -Nru uhd-4.6.0.0+ds1/debian/rules uhd-4.6.0.0+ds1/debian/rules
--- uhd-4.6.0.0+ds1/debian/rules2023-11-26 20:12:26.0 +
+++ uhd-4.6.0.0+ds1/debian/rules2024-02-28 20:10:37.0 +
@@ -57,12 +57,12 @@
rm -rf debian/tmp/usr/share/doc/uhd/doxygen/latex
override_dh_shlibdeps:
- dh_shlibdeps --package=uhd-host --libpackage=libuhd4.6.0
- dh_shlibdeps --package=libuhd4.6.0 --libpackage=libuhd4.6.0
+ dh_shlibdeps --package=uhd-host --libpackage=libuhd4.6.0t64
+ dh_shlibdeps --package=libuhd4.6.0t64 --libpackage=libuhd4.6.0t64
dh_shlibdeps --package=libuhd4.6.0-dpdk --libpackage=libuhd4.6.0-dpdk
dh_shlibdeps
Bug#1063085: uhd: NMU diff for 64-bit time_t transition
Source: uhd
Version: 4.6.0.0+ds1-5
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
uhd 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 uhd
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 uhd-4.6.0.0+ds1/debian/changelog uhd-4.6.0.0+ds1/debian/changelog
--- uhd-4.6.0.0+ds1/debian/changelog2023-12-16 03:34:58.0 +
+++ uhd-4.6.0.0+ds1/debian/changelog2024-02-04 23:57:27.0 +
@@ -1,3 +1,10 @@
+uhd (4.6.0.0+ds1-5.1) experimental; urgency=medium
+
+ * Non-maintainer upload.
+ * Rename libraries for 64-bit time_t transition.
+
+ -- Steve Langasek Sun, 04 Feb 2024 23:57:27 +
+
uhd (4.6.0.0+ds1-5) unstable; urgency=medium
* install utilities on hurd
diff -Nru uhd-4.6.0.0+ds1/debian/control uhd-4.6.0.0+ds1/debian/control
--- uhd-4.6.0.0+ds1/debian/control 2023-12-04 01:45:35.0 +
+++ uhd-4.6.0.0+ds1/debian/control 2024-02-04 23:57:27.0 +
@@ -38,7 +38,7 @@
Package: uhd-host
Architecture: any
-Depends: libuhd4.6.0 (= ${binary:Version}),
+Depends: libuhd4.6.0t64 (= ${binary:Version}),
python3-requests,
${misc:Depends},
${python3:Depends},
@@ -57,7 +57,10 @@
display hardware configuration information and Doxygen generated
documentation.
-Package: libuhd4.6.0
+Package: libuhd4.6.0t64
+Provides: ${t64:Provides}
+Replaces: libuhd4.6.0
+Breaks: libuhd4.6.0 (<< ${source:Version})
Architecture: any
Section: libs
Pre-Depends: ${misc:Pre-Depends}
@@ -77,8 +80,8 @@
Pre-Depends: ${misc:Pre-Depends}
Depends: ${misc:Depends}, ${shlibs:Depends}
Suggests: uhd-host
-Conflicts: libuhd4.6.0
-Provides: libuhd4.6.0
+Conflicts: libuhd4.6.0t64
+Provides: libuhd4.6.0t64
Multi-Arch: same
Description: universal hardware driver for Ettus Research products - DPDK
Host library for the Universal Hardware Driver for Ettus Research products.
@@ -103,7 +106,7 @@
Package: libuhd-dev
Architecture: any
Section: libdevel
-Depends: libuhd4.6.0 (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
+Depends: libuhd4.6.0t64 (= ${binary:Version}), ${misc:Depends},
${shlibs:Depends}
Recommends: gnuradio-dev
Suggests: uhd-doc
Multi-Arch: same
@@ -120,7 +123,7 @@
Package: python3-uhd
Architecture: any
Section: python
-Depends: libuhd4.6.0 (= ${binary:Version}),
+Depends: libuhd4.6.0t64 (= ${binary:Version}),
python3-ruamel.yaml,
${misc:Depends},
${python3:Depends},
diff -Nru uhd-4.6.0.0+ds1/debian/libuhd4.6.0.install
uhd-4.6.0.0+ds1/debian/libuhd4.6.0.install
--- uhd-4.6.0.0+ds1/debian/libuhd4.6.0.install 2023-11-26 20:12:26.0
+
+++ uhd-4.6.0.0+ds1/debian/libuhd4.6.0.install 1970-01-01 00:00:00.0
+
@@ -1,2 +0,0 @@
-usr/lib/*/*.so.*
-usr/share/uhd
diff -Nru uhd-4.6.0.0+ds1/debian/libuhd4.6.0t64.install
uhd-4.6.0.0+ds1/debian/libuhd4.6.0t64.install
--- uhd-4.6.0.0+ds1/debian/libuhd4.6.0t64.install 1970-01-01
00:00:00.0 +
+++ uhd-4.6.0.0+ds1/debian/libuhd4.6.0t64.install 2023-11-26
20:12:26.0 +
@@ -0,0 +1,2 @@
