Bug#1064321: elfutils: 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 elfutils-0.190/debian/changelog elfutils-0.190/debian/changelog
--- elfutils-0.190/debian/changelog 2023-11-16 13:54:07.000000000 +0000
+++ elfutils-0.190/debian/changelog 2024-02-29 00:13:08.000000000 +0000
@@ -1,3 +1,10 @@
+elfutils (0.190-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Rename libraries for 64-bit time_t transition.
+
+ -- Michael Hudson-Doyle <mwhudson@debian.org> Thu, 29 Feb 2024 00:13:08 +0000
+
elfutils (0.190-1) unstable; urgency=medium
* New upstream version.
diff -Nru elfutils-0.190/debian/control elfutils-0.190/debian/control
--- elfutils-0.190/debian/control 2023-07-02 07:43:49.000000000 +0000
+++ elfutils-0.190/debian/control 2024-02-29 00:13:08.000000000 +0000
@@ -4,7 +4,7 @@
Uploaders: Kurt Roeckx <kurt@roeckx.be>,
Matthias Klose <doko@debian.org>,
Sergio Durigan Junior <sergiodj@debian.org>,
-Build-Depends: debhelper (>= 11),
+Build-Depends: dpkg-dev (>= 1.22.5), debhelper (>= 11),
autoconf, automake, lsb-release,
bzip2, zlib1g-dev, zlib1g-dev:native, libbz2-dev, liblzma-dev,
libzstd-dev, zstd <!nocheck>,
@@ -28,7 +28,7 @@
Architecture: any
Multi-Arch: foreign
Depends: ${shlibs:Depends}, ${misc:Depends},
- libelf1 (= ${binary:Version}), libdw1 (= ${binary:Version})
+ libelf1t64 (= ${binary:Version}), libdw1t64 (= ${binary:Version})
Description: collection of utilities to handle ELF objects
Elfutils is a collection of utilities, including eu-ld (a linker),
eu-nm (for listing symbols from object files), eu-size (for listing the
@@ -36,13 +36,16 @@
symbols), eu-readelf (to see the raw ELF file structures), and eu-elflint
(to check for well-formed ELF files).
-Package: libelf1
+Package: libelf1t64
+Provides: ${t64:Provides}
+Replaces: libelf1
+Breaks: libelf1 (<< ${source:Version})
Architecture: any
Multi-Arch: same
Depends: ${shlibs:Depends}, ${misc:Depends}
Pre-Depends: ${misc:Pre-Depends}
Description: library to read and write ELF files
- The libelf1 package provides a shared library which allows reading and
+ The libelf1t64 package provides a shared library which allows reading and
writing ELF files on a high level. Third party programs depend on
this package to read internals of ELF files. The programs of the
elfutils package use it also to generate new ELF files.
@@ -53,11 +56,11 @@
Section: libdevel
Architecture: any
Multi-Arch: same
-Depends: libelf1 (= ${binary:Version}), ${misc:Depends},
+Depends: libelf1t64 (= ${binary:Version}), ${misc:Depends},
zlib1g-dev, libzstd-dev
Conflicts: libelfg0-dev
-Description: libelf1 development libraries and header files
- libelf1 provides a shared library which allows reading and writing of ELF
+Description: libelf1t64 development libraries and header files
+ libelf1t64 provides a shared library which allows reading and writing of ELF
files on a high level.
.
This package contains development libraries and header files for libelf1.
@@ -66,10 +69,10 @@
Section: libdevel
Architecture: any
Multi-Arch: same
-Depends: libelf-dev, libdw1 (= ${binary:Version}), ${misc:Depends},
+Depends: libelf-dev, libdw1t64 (= ${binary:Version}), ${misc:Depends},
zlib1g-dev, liblzma-dev
-Description: libdw1 development libraries and header files
- libdw1 provides a library that provides access to DWARF debug information
+Description: libdw1t64 development libraries and header files
+ libdw1t64 provides a library that provides access to DWARF debug information
stored inside ELF files.
.
This package contains development libraries and header files for libdw1.
@@ -77,25 +80,31 @@
It also contains a static version of libdw. Only link to the static version
for special cases and when you don't need anything from the ebl backends.
-Package: libdw1
+Package: libdw1t64
+Provides: ${t64:Provides}
+Replaces: libdw1
+Breaks: libdw1 (<< ${source:Version})
Architecture: any
Multi-Arch: same
-Depends: ${shlibs:Depends}, libelf1 (= ${binary:Version}), ${misc:Depends}
+Depends: ${shlibs:Depends}, libelf1t64 (= ${binary:Version}), ${misc:Depends}
Pre-Depends: ${misc:Pre-Depends}
Description: library that provides access to the DWARF debug information
- libdw1 provides a library that provides access to DWARF debug information
+ libdw1t64 provides a library that provides access to DWARF debug information
stored inside ELF files.
.
This library is part of elfutils.
-Package: libasm1
+Package: libasm1t64
+Provides: ${t64:Provides}
+Replaces: libasm1
+Breaks: libasm1 (<< ${source:Version})
Architecture: any
Multi-Arch: same
Depends: ${shlibs:Depends}, ${misc:Depends},
- libelf1 (= ${binary:Version}), libdw1 (= ${binary:Version})
+ libelf1t64 (= ${binary:Version}), libdw1t64 (= ${binary:Version})
Pre-Depends: ${misc:Pre-Depends}
Description: library with a programmable assembler interface
- The libasm1 package provides a library with a programmable assembler
+ The libasm1t64 package provides a library with a programmable assembler
interface. It allows you to create ELF files on a low level.
.
This library is part of elfutils.
@@ -104,19 +113,22 @@
Section: libdevel
Architecture: any
Multi-Arch: same
-Depends: libasm1 (= ${binary:Version}), libelf-dev, ${misc:Depends}
+Depends: libasm1t64 (= ${binary:Version}), libelf-dev, ${misc:Depends}
Conflicts: libelfsh0-dev, libasm0-dev
Description: libasm development libraries and header files
- libasm1 allows you to create ELF files on a low level.
+ libasm1t64 allows you to create ELF files on a low level.
.
This package contains development libraries and header files for libasm1.
-Package: libdebuginfod1
+Package: libdebuginfod1t64
+Provides: ${t64:Provides}
+Replaces: libdebuginfod1
+Breaks: libdebuginfod1 (<< ${source:Version})
Build-Profiles: <!pkg.elfutils.nodebuginfod>
Architecture: any
Multi-Arch: same
Depends: ${shlibs:Depends}, ${misc:Depends},
- libelf1 (= ${binary:Version}), libdw1 (= ${binary:Version}),
+ libelf1t64 (= ${binary:Version}), libdw1t64 (= ${binary:Version}),
libdebuginfod-common (>= ${source:Version})
Pre-Depends: ${misc:Pre-Depends}
Description: library to interact with debuginfod (development files)
@@ -130,9 +142,9 @@
Section: libdevel
Architecture: any
Multi-Arch: same
-Depends: libdebuginfod1 (= ${binary:Version}), ${misc:Depends}, libelf-dev,
+Depends: libdebuginfod1t64 (= ${binary:Version}), ${misc:Depends}, libelf-dev,
Description: libdebuginfod development libraries and header files
- libasm1 allows you to interact with debuginfod.
+ libasm1t64 allows you to interact with debuginfod.
.
This package contains development libraries and header files for
libdebuginfod1.
@@ -141,7 +153,7 @@
Build-Profiles: <!pkg.elfutils.nodebuginfod>
Section: devel
Architecture: any
-Depends: libdebuginfod1 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends: libdebuginfod1t64 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
Description: debuginfo-related http file-server daemon
Server, client tool and library to index and fetch ELF/DWARF files
addressed by build-id through HTTP.
diff -Nru elfutils-0.190/debian/libasm1.install elfutils-0.190/debian/libasm1.install
--- elfutils-0.190/debian/libasm1.install 2023-01-14 13:54:50.000000000 +0000
+++ elfutils-0.190/debian/libasm1.install 1970-01-01 00:00:00.000000000 +0000
@@ -1,2 +0,0 @@
-usr/lib/*/libasm.so.1
-usr/lib/*/libasm-*.so
diff -Nru elfutils-0.190/debian/libasm1.symbols elfutils-0.190/debian/libasm1.symbols
--- elfutils-0.190/debian/libasm1.symbols 2023-01-14 13:54:50.000000000 +0000
+++ elfutils-0.190/debian/libasm1.symbols 1970-01-01 00:00:00.000000000 +0000
@@ -1,6 +0,0 @@
-libasm.so.1 libasm1 #MINVER#
- *@ELFUTILS_1.0 0.120
- disasm_begin@ELFUTILS_1.0 0.132
- disasm_cb@ELFUTILS_1.0 0.132
- disasm_end@ELFUTILS_1.0 0.132
- disasm_str@ELFUTILS_1.0 0.132
diff -Nru elfutils-0.190/debian/libasm1t64.install elfutils-0.190/debian/libasm1t64.install
--- elfutils-0.190/debian/libasm1t64.install 1970-01-01 00:00:00.000000000 +0000
+++ elfutils-0.190/debian/libasm1t64.install 2024-02-29 00:12:44.000000000 +0000
@@ -0,0 +1,2 @@
+usr/lib/*/libasm.so.1
+usr/lib/*/libasm-*.so
diff -Nru elfutils-0.190/debian/libasm1t64.lintian-overrides elfutils-0.190/debian/libasm1t64.lintian-overrides
--- elfutils-0.190/debian/libasm1t64.lintian-overrides 1970-01-01 00:00:00.000000000 +0000
+++ elfutils-0.190/debian/libasm1t64.lintian-overrides 2024-02-29 00:12:44.000000000 +0000
@@ -0,0 +1 @@
+libasm1t64: package-name-doesnt-match-sonames libasm1
diff -Nru elfutils-0.190/debian/libasm1t64.symbols elfutils-0.190/debian/libasm1t64.symbols
--- elfutils-0.190/debian/libasm1t64.symbols 1970-01-01 00:00:00.000000000 +0000
+++ elfutils-0.190/debian/libasm1t64.symbols 2024-02-29 00:12:44.000000000 +0000
@@ -0,0 +1,6 @@
+libasm.so.1 libasm1t64 #MINVER#
+ *@ELFUTILS_1.0 0.120
+ disasm_begin@ELFUTILS_1.0 0.132
+ disasm_cb@ELFUTILS_1.0 0.132
+ disasm_end@ELFUTILS_1.0 0.132
+ disasm_str@ELFUTILS_1.0 0.132
diff -Nru elfutils-0.190/debian/libdebuginfod1.install elfutils-0.190/debian/libdebuginfod1.install
--- elfutils-0.190/debian/libdebuginfod1.install 2023-01-14 13:54:50.000000000 +0000
+++ elfutils-0.190/debian/libdebuginfod1.install 1970-01-01 00:00:00.000000000 +0000
@@ -1,2 +0,0 @@
-usr/lib/*/libdebuginfod.so.*
-usr/lib/*/libdebuginfod-*.so
diff -Nru elfutils-0.190/debian/libdebuginfod1.symbols elfutils-0.190/debian/libdebuginfod1.symbols
--- elfutils-0.190/debian/libdebuginfod1.symbols 2023-04-11 10:59:09.000000000 +0000
+++ elfutils-0.190/debian/libdebuginfod1.symbols 1970-01-01 00:00:00.000000000 +0000
@@ -1,6 +0,0 @@
-libdebuginfod.so.1 libdebuginfod1 #MINVER#
- (symver)ELFUTILS_0.178 0.180
- (symver)ELFUTILS_0.179 0.180
- (symver)ELFUTILS_0 0.180
- (symver)ELFUTILS_0.183 0.182+20210203
- (symver)ELFUTILS_0.188 0.188
diff -Nru elfutils-0.190/debian/libdebuginfod1t64.install elfutils-0.190/debian/libdebuginfod1t64.install
--- elfutils-0.190/debian/libdebuginfod1t64.install 1970-01-01 00:00:00.000000000 +0000
+++ elfutils-0.190/debian/libdebuginfod1t64.install 2024-02-29 00:12:44.000000000 +0000
@@ -0,0 +1,2 @@
+usr/lib/*/libdebuginfod.so.*
+usr/lib/*/libdebuginfod-*.so
diff -Nru elfutils-0.190/debian/libdebuginfod1t64.lintian-overrides elfutils-0.190/debian/libdebuginfod1t64.lintian-overrides
--- elfutils-0.190/debian/libdebuginfod1t64.lintian-overrides 1970-01-01 00:00:00.000000000 +0000
+++ elfutils-0.190/debian/libdebuginfod1t64.lintian-overrides 2024-02-29 00:12:44.000000000 +0000
@@ -0,0 +1 @@
+libdebuginfod1t64: package-name-doesnt-match-sonames libdebuginfod1
diff -Nru elfutils-0.190/debian/libdebuginfod1t64.symbols elfutils-0.190/debian/libdebuginfod1t64.symbols
--- elfutils-0.190/debian/libdebuginfod1t64.symbols 1970-01-01 00:00:00.000000000 +0000
+++ elfutils-0.190/debian/libdebuginfod1t64.symbols 2024-02-29 00:12:44.000000000 +0000
@@ -0,0 +1,6 @@
+libdebuginfod.so.1 libdebuginfod1t64 #MINVER#
+ (symver)ELFUTILS_0.178 0.180
+ (symver)ELFUTILS_0.179 0.180
+ (symver)ELFUTILS_0 0.180
+ (symver)ELFUTILS_0.183 0.182+20210203
+ (symver)ELFUTILS_0.188 0.188
diff -Nru elfutils-0.190/debian/libdw1.install elfutils-0.190/debian/libdw1.install
--- elfutils-0.190/debian/libdw1.install 2023-01-14 13:54:50.000000000 +0000
+++ elfutils-0.190/debian/libdw1.install 1970-01-01 00:00:00.000000000 +0000
@@ -1,2 +0,0 @@
-usr/lib/*/libdw.so.1
-usr/lib/*/libdw-0.*.so
diff -Nru elfutils-0.190/debian/libdw1.symbols elfutils-0.190/debian/libdw1.symbols
--- elfutils-0.190/debian/libdw1.symbols 2023-01-14 13:54:50.000000000 +0000
+++ elfutils-0.190/debian/libdw1.symbols 1970-01-01 00:00:00.000000000 +0000
@@ -1,29 +0,0 @@
-libdw.so.1 libdw1 #MINVER#
- *@ELFUTILS_0.122 0.126
- *@ELFUTILS_0.126 0.126
- *@ELFUTILS_0.127 0.127
- *@ELFUTILS_0.130 0.130
- *@ELFUTILS_0.136 0.136
- *@ELFUTILS_0.138 0.138
- *@ELFUTILS_0.142 0.142
- *@ELFUTILS_0.143 0.143
- *@ELFUTILS_0.144 0.144
- *@ELFUTILS_0.146 0.146
- *@ELFUTILS_0.148 0.148
- *@ELFUTILS_0.149 0.149
- *@ELFUTILS_0.156 0.156
- *@ELFUTILS_0.157 0.157
- *@ELFUTILS_0.158 0.158
- *@ELFUTILS_0.159 0.159
- *@ELFUTILS_0.160 0.160
- *@ELFUTILS_0.161 0.161
- *@ELFUTILS_0.165 0.165
- *@ELFUTILS_0.167 0.167
- *@ELFUTILS_0.170 0.170
- *@ELFUTILS_0.171 0.171
- *@ELFUTILS_0.173 0.173
- *@ELFUTILS_0.175 0.175
- *@ELFUTILS_0.177 0.177
- *@ELFUTILS_0.186 0.186
- *@ELFUTILS_0.188 0.188
- *@ELFUTILS_0 0.126
diff -Nru elfutils-0.190/debian/libdw1t64.install elfutils-0.190/debian/libdw1t64.install
--- elfutils-0.190/debian/libdw1t64.install 1970-01-01 00:00:00.000000000 +0000
+++ elfutils-0.190/debian/libdw1t64.install 2024-02-29 00:12:44.000000000 +0000
@@ -0,0 +1,2 @@
+usr/lib/*/libdw.so.1
+usr/lib/*/libdw-0.*.so
diff -Nru elfutils-0.190/debian/libdw1t64.lintian-overrides elfutils-0.190/debian/libdw1t64.lintian-overrides
--- elfutils-0.190/debian/libdw1t64.lintian-overrides 1970-01-01 00:00:00.000000000 +0000
+++ elfutils-0.190/debian/libdw1t64.lintian-overrides 2024-02-29 00:12:44.000000000 +0000
@@ -0,0 +1 @@
+libdw1t64: package-name-doesnt-match-sonames libdw1
diff -Nru elfutils-0.190/debian/libdw1t64.symbols elfutils-0.190/debian/libdw1t64.symbols
--- elfutils-0.190/debian/libdw1t64.symbols 1970-01-01 00:00:00.000000000 +0000
+++ elfutils-0.190/debian/libdw1t64.symbols 2024-02-29 00:12:44.000000000 +0000
@@ -0,0 +1,29 @@
+libdw.so.1 libdw1t64 #MINVER#
+ *@ELFUTILS_0.122 0.126
+ *@ELFUTILS_0.126 0.126
+ *@ELFUTILS_0.127 0.127
+ *@ELFUTILS_0.130 0.130
+ *@ELFUTILS_0.136 0.136
+ *@ELFUTILS_0.138 0.138
+ *@ELFUTILS_0.142 0.142
+ *@ELFUTILS_0.143 0.143
+ *@ELFUTILS_0.144 0.144
+ *@ELFUTILS_0.146 0.146
+ *@ELFUTILS_0.148 0.148
+ *@ELFUTILS_0.149 0.149
+ *@ELFUTILS_0.156 0.156
+ *@ELFUTILS_0.157 0.157
+ *@ELFUTILS_0.158 0.158
+ *@ELFUTILS_0.159 0.159
+ *@ELFUTILS_0.160 0.160
+ *@ELFUTILS_0.161 0.161
+ *@ELFUTILS_0.165 0.165
+ *@ELFUTILS_0.167 0.167
+ *@ELFUTILS_0.170 0.170
+ *@ELFUTILS_0.171 0.171
+ *@ELFUTILS_0.173 0.173
+ *@ELFUTILS_0.175 0.175
+ *@ELFUTILS_0.177 0.177
+ *@ELFUTILS_0.186 0.186
+ *@ELFUTILS_0.188 0.188
+ *@ELFUTILS_0 0.126
diff -Nru elfutils-0.190/debian/libelf1.install elfutils-0.190/debian/libelf1.install
--- elfutils-0.190/debian/libelf1.install 2023-01-14 13:54:50.000000000 +0000
+++ elfutils-0.190/debian/libelf1.install 1970-01-01 00:00:00.000000000 +0000
@@ -1,3 +0,0 @@
-usr/lib/*/libelf.so.1
-usr/lib/*/libelf-*.so
-usr/share/locale/
diff -Nru elfutils-0.190/debian/libelf1.symbols elfutils-0.190/debian/libelf1.symbols
--- elfutils-0.190/debian/libelf1.symbols 2023-01-14 13:54:50.000000000 +0000
+++ elfutils-0.190/debian/libelf1.symbols 1970-01-01 00:00:00.000000000 +0000
@@ -1,10 +0,0 @@
-libelf.so.1 libelf1 #MINVER#
- *@ELFUTILS_1.0 0.131
- *@ELFUTILS_1.1 0.131
- *@ELFUTILS_1.1.1 0.131
- *@ELFUTILS_1.2 0.131
- *@ELFUTILS_1.3 0.131
- *@ELFUTILS_1.4 0.132
- *@ELFUTILS_1.5 0.142
- *@ELFUTILS_1.6 0.144
- *@ELFUTILS_1.7 0.165
diff -Nru elfutils-0.190/debian/libelf1t64.install elfutils-0.190/debian/libelf1t64.install
--- elfutils-0.190/debian/libelf1t64.install 1970-01-01 00:00:00.000000000 +0000
+++ elfutils-0.190/debian/libelf1t64.install 2024-02-29 00:12:44.000000000 +0000
@@ -0,0 +1,3 @@
+usr/lib/*/libelf.so.1
+usr/lib/*/libelf-*.so
+usr/share/locale/
diff -Nru elfutils-0.190/debian/libelf1t64.lintian-overrides elfutils-0.190/debian/libelf1t64.lintian-overrides
--- elfutils-0.190/debian/libelf1t64.lintian-overrides 1970-01-01 00:00:00.000000000 +0000
+++ elfutils-0.190/debian/libelf1t64.lintian-overrides 2024-02-29 00:12:44.000000000 +0000
@@ -0,0 +1 @@
+libelf1t64: package-name-doesnt-match-sonames libelf1
diff -Nru elfutils-0.190/debian/libelf1t64.symbols elfutils-0.190/debian/libelf1t64.symbols
--- elfutils-0.190/debian/libelf1t64.symbols 1970-01-01 00:00:00.000000000 +0000
+++ elfutils-0.190/debian/libelf1t64.symbols 2024-02-29 00:12:44.000000000 +0000
@@ -0,0 +1,10 @@
+libelf.so.1 libelf1t64 #MINVER#
+ *@ELFUTILS_1.0 0.131
+ *@ELFUTILS_1.1 0.131
+ *@ELFUTILS_1.1.1 0.131
+ *@ELFUTILS_1.2 0.131
+ *@ELFUTILS_1.3 0.131
+ *@ELFUTILS_1.4 0.132
+ *@ELFUTILS_1.5 0.142
+ *@ELFUTILS_1.6 0.144
+ *@ELFUTILS_1.7 0.165
diff -Nru elfutils-0.190/debian/rules elfutils-0.190/debian/rules
--- elfutils-0.190/debian/rules 2023-01-14 13:54:50.000000000 +0000
+++ elfutils-0.190/debian/rules 2024-02-29 00:12:44.000000000 +0000
@@ -161,13 +161,13 @@
dh_strip_nondeterminism -a
dh_compress -a
dh_fixperms -a
- dpkg-gensymbols -Pdebian/libdw1/ -plibdw1 -c4
- dpkg-gensymbols -Pdebian/libasm1/ -plibasm1 -c4
- dpkg-gensymbols -Pdebian/libelf1/ -plibelf1 -c4
- dh_makeshlibs -plibelf1 -V "libelf1 (>= 0.132)"
- dh_makeshlibs -plibasm1 -V "libasm1 (>= 0.132)"
- dh_makeshlibs -plibdw1 -V "libdw1 (>= 0.138)"
- dh_makeshlibs -plibdebuginfod1
+ dpkg-gensymbols -Pdebian/libdw1t64/ -plibdw1t64 -c4
+ dpkg-gensymbols -Pdebian/libasm1t64/ -plibasm1t64 -c4
+ dpkg-gensymbols -Pdebian/libelf1t64/ -plibelf1t64 -c4
+ dh_makeshlibs -plibelf1t64 -V "libelf1t64 (>= 0.132)"
+ dh_makeshlibs -plibasm1t64 -V "libasm1t64 (>= 0.132)"
+ dh_makeshlibs -plibdw1t64 -V "libdw1t64 (>= 0.138)"
+ dh_makeshlibs -plibdebuginfod1t64
dh_installdebconf -a
dh_installdeb -a
dh_shlibdeps -a
Reply to: