Bug#1063174: optee-client: NMU diff for 64-bit time_t transition

2024-02-29 Thread Benjamin Drung
Source: optee-client
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, 
TAINT_UNSIGNED_MODULE
Locale: LANG=C, LC_CTYPE=C.UTF-8 (charmap=UTF-8), LANGUAGE not set
Shell: /bin/sh linked to /usr/bin/dash
Init: unable to detect
diff -Nru optee-client-4.1.0/debian/changelog 
optee-client-4.1.0/debian/changelog
--- optee-client-4.1.0/debian/changelog 2024-01-28 22:25:33.0 +
+++ optee-client-4.1.0/debian/changelog 2024-02-29 23:09:47.0 +
@@ -1,3 +1,10 @@
+optee-client (4.1.0-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Rename libraries for 64-bit time_t transition.  Closes: #1063174
+
+ -- Benjamin Drung   Thu, 29 Feb 2024 23:09:47 +
+
 optee-client (4.1.0-1) unstable; urgency=low
 
   * New upstream release.
diff -Nru optee-client-4.1.0/debian/control optee-client-4.1.0/debian/control
--- optee-client-4.1.0/debian/control   2023-12-10 17:07:42.0 +
+++ optee-client-4.1.0/debian/control   2024-02-29 23:09:47.0 +
@@ -1,7 +1,7 @@
 Source: optee-client
 Priority: optional
 Maintainer: Ying-Chun Liu (PaulLiu) 
-Build-Depends: debhelper-compat (= 12),
+Build-Depends: dpkg-dev (>= 1.22.5), debhelper-compat (= 12),
docbook-xml,
docbook-xsl,
pkg-config,
@@ -18,10 +18,10 @@
 Section: libdevel
 Architecture: arm64 armhf
 Multi-Arch: same
-Depends: libckteec0 (= ${binary:Version}),
- libseteec0 (= ${binary:Version}),
- libteeacl0.1.0 (= ${binary:Version}),
- libteec1 (= ${binary:Version}),
+Depends: libckteec0t64 (= ${binary:Version}),
+ libseteec0t64 (= ${binary:Version}),
+ libteeacl0.1.0t64 (= ${binary:Version}),
+ libteec1t64 (= ${binary:Version}),
  ${misc:Depends}
 Description: normal world user space client APIs for OP-TEE (development)
  OP-TEE is a Trusted Execution Environment (TEE) designed as companion to a
@@ -33,7 +33,10 @@
  .
  This package contains the development files OpTEE Client API
 
-Package: libteeacl0.1.0
+Package: libteeacl0.1.0t64
+Provides: ${t64:Provides}
+Replaces: libteeacl0.1.0
+Breaks: libteeacl0.1.0 (<< ${source:Version})
 Architecture: arm64 armhf
 Multi-Arch: same
 Depends: ${misc:Depends}, ${shlibs:Depends}
@@ -47,7 +50,10 @@
  .
  This package contains libteeacl library.
 
-Package: libteec1
+Package: libteec1t64
+Provides: ${t64:Provides}
+Replaces: libteec1
+Breaks: libteec1 (<< ${source:Version})
 Architecture: arm64 armhf
 Multi-Arch: same
 Depends: ${misc:Depends}, ${shlibs:Depends}
@@ -61,7 +67,10 @@
  .
  This package contains libteec library.
 
-Package: libckteec0
+Package: libckteec0t64
+Provides: ${t64:Provides}
+Replaces: libckteec0
+Breaks: libckteec0 (<< ${source:Version})
 Architecture: arm64 armhf
 Multi-Arch: same
 Depends: ${misc:Depends}, ${shlibs:Depends}
@@ -75,7 +84,10 @@
  .
  This package contains libckteec library.
 
-Package: libseteec0
+Package: libseteec0t64
+Provides: ${t64:Provides}
+Replaces: libseteec0
+Breaks: libseteec0 (<< ${source:Version})
 Architecture: arm64 armhf
 Multi-Arch: same
 Depends: ${misc:Depends}, ${shlibs:Depends}
diff -Nru optee-client-4.1.0/debian/libckteec0.install 
optee-client-4.1.0/debian/libckteec0.install
--- optee-client-4.1.0/debian/libckteec0.install2023-12-10 
17:07:42.0 +
+++ optee-client-4.1.0/debian/libckteec0.install1970-01-01 
00:00:00.0 +
@@ -1 +0,0 @@
-usr/lib/*/libckteec*.so.*
diff -Nru optee-client-4.1.0/debian/libckteec0t64.install 
optee-client-4.1.0/debian/libckteec0t64.install
--- optee-client-4.1.0/debian/libckteec0t64.install 1970-01-01 
00:00:00.0 +
+++ optee-client-4.1.0/debian/libckteec0t64.install 2023-12-10 
17:07:42.0 +
@@ -0,0 +1 @@
+usr/lib/*/libckteec*.so.*
diff -Nru optee-client-4.1.0/debian/libckteec0t64.lintian-overrides 
optee-client-4.1.0/debian/libckteec0t64.lintian-overrides
--- optee-client-4.1.0/debian/libckteec0t64.lintian-overrides   1970-01-01 
00:00:00.0 +
+++ optee-client-4.1.0/debian/libckteec0t64.lintian-overrides   2024-02-29 
23:09:41.0 +
@@ -0,0 +1 @@
+libckteec0t64: package-name-doesnt-match-sonames libckteec0
diff -Nru optee-client-4.1.0/debian/libseteec0.install 
optee-client-4.1.0/debian/libseteec0.install
--- optee-client-4.1.0/debian/libseteec0.install2023-12-10 
17:07:42.0 +
+++ optee-client-4.1.0/debian/libseteec0.install1970-01-01 
00:00:00.0 +
@@ -1 +0,0 @@

Bug#1063174: optee-client: NMU diff for 64-bit time_t transition

2024-02-05 Thread Lucas Kanashiro
Source: optee-client
Version: 4.1.0-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
optee-client 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 optee-client
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')
Architecture: amd64 (x86_64)

Kernel: Linux 6.2.0-39-generic (SMP w/32 CPU threads; PREEMPT)
Kernel taint flags: TAINT_PROPRIETARY_MODULE, TAINT_OOT_MODULE, 
TAINT_UNSIGNED_MODULE
Locale: LANG=C.UTF-8, 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 optee-client-4.1.0/debian/changelog 
optee-client-4.1.0/debian/changelog
--- optee-client-4.1.0/debian/changelog 2024-01-28 19:25:33.0 -0300
+++ optee-client-4.1.0/debian/changelog 2024-02-05 12:58:18.0 -0300
@@ -1,3 +1,10 @@
+optee-client (4.1.0-1.1) experimental; urgency=medium
+
+  * Non-maintainer upload.
+  * Rename libraries for 64-bit time_t transition.
+
+ -- Lucas Kanashiro   Mon, 05 Feb 2024 12:58:18 -0300
+
 optee-client (4.1.0-1) unstable; urgency=low
 
   * New upstream release.
diff -Nru optee-client-4.1.0/debian/control optee-client-4.1.0/debian/control
--- optee-client-4.1.0/debian/control   2023-12-10 14:07:42.0 -0300
+++ optee-client-4.1.0/debian/control   2024-02-05 12:58:18.0 -0300
@@ -18,10 +18,10 @@
 Section: libdevel
 Architecture: arm64 armhf
 Multi-Arch: same
-Depends: libckteec0 (= ${binary:Version}),
- libseteec0 (= ${binary:Version}),
- libteeacl0.1.0 (= ${binary:Version}),
- libteec1 (= ${binary:Version}),
+Depends: libckteec0t64 (= ${binary:Version}),
+ libseteec0t64 (= ${binary:Version}),
+ libteeacl0.1.0t64 (= ${binary:Version}),
+ libteec1t64 (= ${binary:Version}),
  ${misc:Depends}
 Description: normal world user space client APIs for OP-TEE (development)
  OP-TEE is a Trusted Execution Environment (TEE) designed as companion to a
@@ -33,7 +33,10 @@
  .
  This package contains the development files OpTEE Client API
 
-Package: libteeacl0.1.0
+Package: libteeacl0.1.0t64
+Provides: ${t64:Provides}
+Replaces: libteeacl0.1.0
+Breaks: libteeacl0.1.0 (<< ${source:Version})
 Architecture: arm64 armhf
 Multi-Arch: same
 Depends: ${misc:Depends}, ${shlibs:Depends}
@@ -47,7 +50,10 @@
  .
  This package contains libteeacl library.
 
-Package: libteec1
+Package: libteec1t64
+Provides: ${t64:Provides}
+Replaces: libteec1
+Breaks: libteec1 (<< ${source:Version})
 Architecture: arm64 armhf
 Multi-Arch: same
 Depends: ${misc:Depends}, ${shlibs:Depends}
@@ -61,7 +67,10 @@
  .
  This package contains libteec library.
 
-Package: libckteec0
+Package: libckteec0t64
+Provides: ${t64:Provides}
+Replaces: libckteec0
+Breaks: libckteec0 (<< ${source:Version})
 Architecture: arm64 armhf
 Multi-Arch: same
 Depends: ${misc:Depends}, ${shlibs:Depends}
@@ -75,7 +84,10 @@
  .
  This package contains libckteec library.
 
-Package: libseteec0
+Package: libseteec0t64
+Provides: ${t64:Provides}
+Replaces: libseteec0
+Breaks: libseteec0 (<< ${source:Version})
 Architecture: arm64 armhf
 Multi-Arch: same
 Depends: ${misc:Depends}, ${shlibs:Depends}
diff -Nru optee-client-4.1.0/debian/libckteec0.install 
optee-client-4.1.0/debian/libckteec0.install
--- optee-client-4.1.0/debian/libckteec0.install2023-12-10 
14:07:42.0 -0300
+++ optee-client-4.1.0/debian/libckteec0.install