Bug#1061995: cwiid: 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 cwiid-0.6.91/debian/changelog cwiid-0.6.91/debian/changelog
--- cwiid-0.6.91/debian/changelog   2024-01-18 15:02:15.0 +
+++ cwiid-0.6.91/debian/changelog   2024-02-27 23:25:09.0 +
@@ -1,3 +1,10 @@
+cwiid (0.6.91-7.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Rename libraries for 64-bit time_t transition.  Closes: #1061995
+
+ -- Michael Hudson-Doyle   Tue, 27 Feb 2024 23:25:09 +
+
 cwiid (0.6.91-7) unstable; urgency=medium
 
   * modified the Homepage. Closes: #977204
diff -Nru cwiid-0.6.91/debian/control cwiid-0.6.91/debian/control
--- cwiid-0.6.91/debian/control 2024-01-18 14:58:21.0 +
+++ cwiid-0.6.91/debian/control 2024-02-27 23:25:09.0 +
@@ -2,7 +2,7 @@
 Section: utils
 Priority: optional
 Maintainer: Georges Khaznadar 
-Build-Depends: debhelper-compat (= 13),
+Build-Depends: dpkg-dev (>= 1.22.5), debhelper-compat (= 13),
  libtool,
  automake,
  autoconf,
@@ -21,7 +21,7 @@
 
 Package: python3-cwiid
 Architecture: any
-Depends: ${python3:Depends}, ${shlibs:Depends}, libcwiid1 (>= 
${binary:Version}), ${misc:Depends}
+Depends: ${python3:Depends}, ${shlibs:Depends}, libcwiid1t64 (>= 
${binary:Version}), ${misc:Depends}
 Section: python
 Description: library to interface with the wiimote
  CWiid is a working userspace driver along with various
@@ -31,7 +31,10 @@
  .
  This package provides the Python cwiid module.
 
-Package: libcwiid1
+Package: libcwiid1t64
+Provides: ${t64:Provides}
+Replaces: libcwiid1
+Breaks: libcwiid1 (<< ${source:Version})
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Section: libs
@@ -47,7 +50,7 @@
 
 Package: libcwiid-dev
 Architecture: any
-Depends: libcwiid1 (= ${binary:Version}), libbluetooth-dev, pkg-config, 
${misc:Depends}
+Depends: libcwiid1t64 (= ${binary:Version}), libbluetooth-dev, pkg-config, 
${misc:Depends}
 Conflicts: libcwiid0-dev
 Replaces: libcwiid0-dev, libcwiid1-dev
 Section: libdevel
diff -Nru cwiid-0.6.91/debian/control.in cwiid-0.6.91/debian/control.in
--- cwiid-0.6.91/debian/control.in  2023-09-21 16:20:23.0 +
+++ cwiid-0.6.91/debian/control.in  2024-02-27 23:25:03.0 +
@@ -10,7 +10,7 @@
 
 Package: python-cwiid
 Architecture: any
-Depends: ${python:Depends}, ${shlibs:Depends}, libcwiid1 (>= 
${binary:Version}), ${misc:Depends}
+Depends: ${python:Depends}, ${shlibs:Depends}, libcwiid1t64 (>= 
${binary:Version}), ${misc:Depends}
 Section: python
 Description: library to interface with the wiimote
  CWiid is a working userspace driver along with various
@@ -20,7 +20,10 @@
  .
  This package provides the Python cwiid module.
 
-Package: libcwiid1
+Package: libcwiid1t64
+Provides: ${t64:Provides}
+Replaces: libcwiid1
+Breaks: libcwiid1 (<< ${source:Version})
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Section: libs
@@ -36,7 +39,7 @@
 
 Package: libcwiid-dev
 Architecture: any
-Depends: libcwiid1 (= ${binary:Version}), libbluetooth-dev, pkg-config, 
${misc:Depends}
+Depends: libcwiid1t64 (= ${binary:Version}), libbluetooth-dev, pkg-config, 
${misc:Depends}
 Conflicts: libcwiid0-dev
 Replaces: libcwiid0-dev, libcwiid1-dev
 Section: libdevel
diff -Nru cwiid-0.6.91/debian/libcwiid1.install 
cwiid-0.6.91/debian/libcwiid1.install
--- cwiid-0.6.91/debian/libcwiid1.install   2023-09-08 14:25:59.0 
+
+++ cwiid-0.6.91/debian/libcwiid1.install   1970-01-01 00:00:00.0 
+
@@ -1 +0,0 @@
-debian/tmp/usr/lib/libcwiid.so.1* 
diff -Nru cwiid-0.6.91/debian/libcwiid1.shlibs 
cwiid-0.6.91/debian/libcwiid1.shlibs
--- cwiid-0.6.91/debian/libcwiid1.shlibs2023-09-08 14:25:59.0 
+
+++ cwiid-0.6.91/debian/libcwiid1.shlibs1970-01-01 00:00:00.0 
+
@@ -1 +0,0 @@
-libcwiid 1 libcwiid1 (>= 0.6~)
\ No newline at end of file
diff -Nru cwiid-0.6.91/debian/libcwiid1.symbols 
cwiid-0.6.91/debian/libcwiid1.symbols
--- cwiid-0.6.91/debian/libcwiid1.symbols   2023-09-08 14:25:59.0 
+
+++ cwiid-0.6.91/debian/libcwiid1.symbols   1970-01-01 00:00:00.0 
+
@@ -1,57 +0,0 @@
-libcwiid.so.1 libcwiid1 #MINVER#
- cancel_mesg_callback@Base 0.6.00+svn184
- cancel_rw@Base 0.6.00+svn184
- cwiid_beep@Base 0.6.00+svn184
- cwiid_close@Base 0.6.00+svn184
- 

Bug#1061995: cwiid: NMU diff for 64-bit time_t transition

2024-01-30 Thread mwhudson
Source: cwiid
Version: 0.6.91-7
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
cwiid 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 cwiid
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 cwiid-0.6.91/debian/changelog cwiid-0.6.91/debian/changelog
--- cwiid-0.6.91/debian/changelog   2024-01-18 15:02:15.0 +
+++ cwiid-0.6.91/debian/changelog   2024-01-30 19:15:45.0 +
@@ -1,3 +1,10 @@
+cwiid (0.6.91-7.1) experimental; urgency=medium
+
+  * Non-maintainer upload.
+  * Rename libraries for 64-bit time_t transition.
+
+ -- Michael Hudson-Doyle   Tue, 30 Jan 2024 19:15:45 +
+
 cwiid (0.6.91-7) unstable; urgency=medium
 
   * modified the Homepage. Closes: #977204
diff -Nru cwiid-0.6.91/debian/control cwiid-0.6.91/debian/control
--- cwiid-0.6.91/debian/control 2024-01-18 14:58:21.0 +
+++ cwiid-0.6.91/debian/control 2024-01-30 19:15:45.0 +
@@ -21,7 +21,7 @@
 
 Package: python3-cwiid
 Architecture: any
-Depends: ${python3:Depends}, ${shlibs:Depends}, libcwiid1 (>= 
${binary:Version}), ${misc:Depends}
+Depends: ${python3:Depends}, ${shlibs:Depends}, libcwiid1t64 (>= 
${binary:Version}), ${misc:Depends}
 Section: python
 Description: library to interface with the wiimote
  CWiid is a working userspace driver along with various
@@ -31,7 +31,10 @@
  .
  This package provides the Python cwiid module.
 
-Package: libcwiid1
+Package: libcwiid1t64
+Provides: ${t64:Provides}
+Replaces: libcwiid1
+Breaks: libcwiid1 (<< ${source:Version})
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Section: libs
@@ -47,7 +50,7 @@
 
 Package: libcwiid-dev
 Architecture: any
-Depends: libcwiid1 (= ${binary:Version}), libbluetooth-dev, pkg-config, 
${misc:Depends}
+Depends: libcwiid1t64 (= ${binary:Version}), libbluetooth-dev, pkg-config, 
${misc:Depends}
 Conflicts: libcwiid0-dev
 Replaces: libcwiid0-dev, libcwiid1-dev
 Section: libdevel
diff -Nru cwiid-0.6.91/debian/control.in cwiid-0.6.91/debian/control.in
--- cwiid-0.6.91/debian/control.in  2023-09-21 16:20:23.0 +
+++ cwiid-0.6.91/debian/control.in  2024-01-30 19:15:45.0 +
@@ -10,7 +10,7 @@
 
 Package: python-cwiid
 Architecture: any
-Depends: ${python:Depends}, ${shlibs:Depends}, libcwiid1 (>= 
${binary:Version}), ${misc:Depends}
+Depends: ${python:Depends}, ${shlibs:Depends}, libcwiid1t64 (>= 
${binary:Version}), ${misc:Depends}
 Section: python
 Description: library to interface with the wiimote
  CWiid is a working userspace driver along with various
@@ -20,7 +20,10 @@
  .
  This package provides the Python cwiid module.
 
-Package: libcwiid1
+Package: libcwiid1t64
+Provides: ${t64:Provides}
+Replaces: libcwiid1
+Breaks: libcwiid1 (<< ${source:Version})
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Section: libs
@@ -36,7 +39,7 @@
 
 Package: libcwiid-dev
 Architecture: any
-Depends: libcwiid1 (= ${binary:Version}), libbluetooth-dev, pkg-config, 
${misc:Depends}
+Depends: libcwiid1t64 (= ${binary:Version}), libbluetooth-dev, pkg-config, 
${misc:Depends}
 Conflicts: libcwiid0-dev
 Replaces: