Bug#1062526: efivar: 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 efivar-38/debian/changelog efivar-38/debian/changelog
--- efivar-38/debian/changelog  2023-11-29 14:30:24.0 +
+++ efivar-38/debian/changelog  2024-02-28 02:57:40.0 +
@@ -1,3 +1,10 @@
+efivar (38-3.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Rename libraries for 64-bit time_t transition.  Closes: #1062526
+
+ -- Michael Hudson-Doyle   Wed, 28 Feb 2024 02:57:40 +
+
 efivar (38-3) unstable; urgency=medium
 
   [ Mate Kukri ]
diff -Nru efivar-38/debian/control efivar-38/debian/control
--- efivar-38/debian/control2023-10-31 11:58:06.0 +
+++ efivar-38/debian/control2024-02-28 02:57:40.0 +
@@ -2,7 +2,7 @@
 Priority: optional
 Maintainer: Debian UEFI Maintainers 
 Uploaders: Steve McIntyre <93...@debian.org>, Mario Limonciello 

-Build-Depends: debhelper-compat (= 13), libpopt-dev, pkg-config, mandoc, 
grub-common
+Build-Depends: dpkg-dev (>= 1.22.5), debhelper-compat (= 13), libpopt-dev, 
pkg-config, mandoc, grub-common
 Standards-Version: 4.1.1
 Section: libs
 Homepage: https://github.com/rhinstaller/efivar
@@ -13,7 +13,7 @@
 Section: libdevel
 Architecture: amd64 i386 ia64 armhf arm64 armel riscv64 x32 mips64el loong64
 Multi-Arch: same
-Depends: libefivar1 (= ${binary:Version}), ${misc:Depends}
+Depends: libefivar1t64 (= ${binary:Version}), ${misc:Depends}
 Description: Development headers for libefivar
  development headers required to use libefivar
 
@@ -21,7 +21,7 @@
 Section: libdevel
 Architecture: amd64 i386 ia64 armhf arm64 armel riscv64 x32 mips64el loong64
 Multi-Arch: same
-Depends: libefiboot1 (= ${binary:Version}), ${misc:Depends}
+Depends: libefiboot1t64 (= ${binary:Version}), ${misc:Depends}
 Description: Development headers for libefiboot
  development headers required to use libefiboot
 
@@ -29,7 +29,7 @@
 Section: libdevel
 Architecture: amd64 i386 ia64 armhf arm64 armel riscv64 x32 mips64el loong64
 Multi-Arch: same
-Depends: libefisec1 (= ${binary:Version}), ${misc:Depends}
+Depends: libefisec1t64 (= ${binary:Version}), ${misc:Depends}
 Description: Development headers for libefisec
  development headers required to use libefisec
 
@@ -37,11 +37,14 @@
 Section: admin
 Architecture: amd64 i386 ia64 armhf arm64 armel riscv64 x32 mips64el loong64
 Multi-Arch: foreign
-Depends: ${shlibs:Depends}, ${misc:Depends}, libefivar1 (= ${binary:Version}), 
libefiboot1 (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, libefivar1t64 (= 
${binary:Version}), libefiboot1t64 (= ${binary:Version})
 Description: Tools to manage UEFI variables
  efivar provides a simple command line interface to the UEFI variable facility.
 
-Package: libefiboot1
+Package: libefiboot1t64
+Provides: ${t64:Provides}
+Replaces: libefiboot1
+Breaks: libefiboot1 (<< ${source:Version})
 Architecture: amd64 i386 ia64 armhf arm64 armel riscv64 x32 mips64el loong64
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
@@ -49,7 +52,10 @@
 Description: Library to manage UEFI variables
  Library to allow for the manipulation of UEFI variables related to booting.
 
-Package: libefivar1
+Package: libefivar1t64
+Provides: ${t64:Provides}
+Replaces: libefivar1
+Breaks: libefivar1 (<< ${source:Version})
 Architecture: amd64 i386 ia64 armhf arm64 armel riscv64 x32 mips64el loong64
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
@@ -57,12 +63,14 @@
 Description: Library to manage UEFI variables
  Library to allow for the simple manipulation of UEFI variables.
 
-Package: libefisec1
+Package: libefisec1t64
+Provides: ${t64:Provides}
+Replaces: libefisec1
 Architecture: amd64 i386 ia64 armhf arm64 armel riscv64 x32 mips64el loong64
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Breaks: efibootmgr (<< 0.12-2)
+Breaks: libefisec1 (<< ${source:Version}), efibootmgr (<< 0.12-2)
 Description: Library to manage UEFI variables
  Library to allow for the simple manipulation of UEFI variables related to
  security.
diff -Nru efivar-38/debian/libefiboot1.install 
efivar-38/debian/libefiboot1.install
--- efivar-38/debian/libefiboot1.install2023-10-31 11:58:06.0 
+
+++ efivar-38/debian/libefiboot1.install1970-01-01 00:00:00.0 
+
@@ -1 +0,0 @@
-usr/lib/*/lib*boot*.so.*

Bug#1062526: efivar: NMU diff for 64-bit time_t transition

2024-02-01 Thread mwhudson
Source: efivar
Version: 38-3
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
efivar 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 efivar
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_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 efivar-38/debian/changelog efivar-38/debian/changelog
--- efivar-38/debian/changelog  2023-11-29 14:30:24.0 +
+++ efivar-38/debian/changelog  2024-02-01 18:30:58.0 +
@@ -1,3 +1,10 @@
+efivar (38-3.1) experimental; urgency=medium
+
+  * Non-maintainer upload.
+  * Rename libraries for 64-bit time_t transition.
+
+ -- Michael Hudson-Doyle   Thu, 01 Feb 2024 18:30:58 +
+
 efivar (38-3) unstable; urgency=medium
 
   [ Mate Kukri ]
diff -Nru efivar-38/debian/control efivar-38/debian/control
--- efivar-38/debian/control2023-10-31 11:58:06.0 +
+++ efivar-38/debian/control2024-02-01 18:30:58.0 +
@@ -13,7 +13,7 @@
 Section: libdevel
 Architecture: amd64 i386 ia64 armhf arm64 armel riscv64 x32 mips64el loong64
 Multi-Arch: same
-Depends: libefivar1 (= ${binary:Version}), ${misc:Depends}
+Depends: libefivar1t64 (= ${binary:Version}), ${misc:Depends}
 Description: Development headers for libefivar
  development headers required to use libefivar
 
@@ -21,7 +21,7 @@
 Section: libdevel
 Architecture: amd64 i386 ia64 armhf arm64 armel riscv64 x32 mips64el loong64
 Multi-Arch: same
-Depends: libefiboot1 (= ${binary:Version}), ${misc:Depends}
+Depends: libefiboot1t64 (= ${binary:Version}), ${misc:Depends}
 Description: Development headers for libefiboot
  development headers required to use libefiboot
 
@@ -29,7 +29,7 @@
 Section: libdevel
 Architecture: amd64 i386 ia64 armhf arm64 armel riscv64 x32 mips64el loong64
 Multi-Arch: same
-Depends: libefisec1 (= ${binary:Version}), ${misc:Depends}
+Depends: libefisec1t64 (= ${binary:Version}), ${misc:Depends}
 Description: Development headers for libefisec
  development headers required to use libefisec
 
@@ -37,11 +37,14 @@
 Section: admin
 Architecture: amd64 i386 ia64 armhf arm64 armel riscv64 x32 mips64el loong64
 Multi-Arch: foreign
-Depends: ${shlibs:Depends}, ${misc:Depends}, libefivar1 (= ${binary:Version}), 
libefiboot1 (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, libefivar1t64 (= 
${binary:Version}), libefiboot1t64 (= ${binary:Version})
 Description: Tools to manage UEFI variables
  efivar provides a simple command line interface to the UEFI variable facility.
 
-Package: libefiboot1
+Package: libefiboot1t64
+Provides: ${t64:Provides}
+Replaces: libefiboot1
+Breaks: libefiboot1 (<< ${source:Version})
 Architecture: amd64 i386 ia64 armhf arm64 armel riscv64 x32 mips64el loong64
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
@@ -49,7 +52,10 @@
 Description: Library to manage UEFI variables
  Library to allow for the manipulation of UEFI variables related to booting.
 
-Package: libefivar1
+Package: libefivar1t64
+Provides: ${t64:Provides}
+Replaces: libefivar1
+Breaks: libefivar1 (<< ${source:Version})
 Architecture: amd64 i386 ia64 armhf arm64 armel riscv64 x32 mips64el loong64
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
@@ -57,12