Bug#1062526: efivar: 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-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.000000000 +0000
+++ efivar-38/debian/changelog 2024-02-28 02:57:40.000000000 +0000
@@ -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 <mwhudson@debian.org> Wed, 28 Feb 2024 02:57:40 +0000
+
efivar (38-3) unstable; urgency=medium
[ Mate Kukri ]
diff -Nru efivar-38/debian/control efivar-38/debian/control
--- efivar-38/debian/control 2023-10-31 11:58:06.000000000 +0000
+++ efivar-38/debian/control 2024-02-28 02:57:40.000000000 +0000
@@ -2,7 +2,7 @@
Priority: optional
Maintainer: Debian UEFI Maintainers <debian-efi@lists.debian.org>
Uploaders: Steve McIntyre <93sam@debian.org>, Mario Limonciello <mario.limonciello@dell.com>
-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.install 2023-10-31 11:58:06.000000000 +0000
+++ efivar-38/debian/libefiboot1.install 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-usr/lib/*/lib*boot*.so.*
diff -Nru efivar-38/debian/libefiboot1t64.install efivar-38/debian/libefiboot1t64.install
--- efivar-38/debian/libefiboot1t64.install 1970-01-01 00:00:00.000000000 +0000
+++ efivar-38/debian/libefiboot1t64.install 2023-10-31 11:58:06.000000000 +0000
@@ -0,0 +1 @@
+usr/lib/*/lib*boot*.so.*
diff -Nru efivar-38/debian/libefiboot1t64.lintian-overrides efivar-38/debian/libefiboot1t64.lintian-overrides
--- efivar-38/debian/libefiboot1t64.lintian-overrides 1970-01-01 00:00:00.000000000 +0000
+++ efivar-38/debian/libefiboot1t64.lintian-overrides 2024-02-28 02:57:31.000000000 +0000
@@ -0,0 +1 @@
+libefiboot1t64: package-name-doesnt-match-sonames libefiboot1
diff -Nru efivar-38/debian/libefisec1.install efivar-38/debian/libefisec1.install
--- efivar-38/debian/libefisec1.install 2023-10-31 11:58:06.000000000 +0000
+++ efivar-38/debian/libefisec1.install 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-usr/lib/*/lib*sec*.so.*
diff -Nru efivar-38/debian/libefisec1t64.install efivar-38/debian/libefisec1t64.install
--- efivar-38/debian/libefisec1t64.install 1970-01-01 00:00:00.000000000 +0000
+++ efivar-38/debian/libefisec1t64.install 2023-10-31 11:58:06.000000000 +0000
@@ -0,0 +1 @@
+usr/lib/*/lib*sec*.so.*
diff -Nru efivar-38/debian/libefisec1t64.lintian-overrides efivar-38/debian/libefisec1t64.lintian-overrides
--- efivar-38/debian/libefisec1t64.lintian-overrides 1970-01-01 00:00:00.000000000 +0000
+++ efivar-38/debian/libefisec1t64.lintian-overrides 2024-02-28 02:57:31.000000000 +0000
@@ -0,0 +1 @@
+libefisec1t64: package-name-doesnt-match-sonames libefisec1
diff -Nru efivar-38/debian/libefivar1.install efivar-38/debian/libefivar1.install
--- efivar-38/debian/libefivar1.install 2023-10-31 11:58:06.000000000 +0000
+++ efivar-38/debian/libefivar1.install 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-usr/lib/*/lib*var*.so.*
diff -Nru efivar-38/debian/libefivar1t64.install efivar-38/debian/libefivar1t64.install
--- efivar-38/debian/libefivar1t64.install 1970-01-01 00:00:00.000000000 +0000
+++ efivar-38/debian/libefivar1t64.install 2023-10-31 11:58:06.000000000 +0000
@@ -0,0 +1 @@
+usr/lib/*/lib*var*.so.*
diff -Nru efivar-38/debian/libefivar1t64.lintian-overrides efivar-38/debian/libefivar1t64.lintian-overrides
--- efivar-38/debian/libefivar1t64.lintian-overrides 1970-01-01 00:00:00.000000000 +0000
+++ efivar-38/debian/libefivar1t64.lintian-overrides 2024-02-28 02:57:31.000000000 +0000
@@ -0,0 +1 @@
+libefivar1t64: package-name-doesnt-match-sonames libefivar1
Reply to: