Bug#1063185: readpe: NMU diff for 64-bit time_t transition

2024-03-01 Thread Benjamin Drung
Source: readpe
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 readpe-0.82/debian/changelog readpe-0.82/debian/changelog
--- readpe-0.82/debian/changelog2023-09-08 22:48:02.0 +
+++ readpe-0.82/debian/changelog2024-03-01 12:44:00.0 +
@@ -1,3 +1,10 @@
+readpe (0.82-3.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Rename libraries for 64-bit time_t transition.  Closes: #1063185
+
+ -- Benjamin Drung   Fri, 01 Mar 2024 12:44:00 +
+
 readpe (0.82-3) unstable; urgency=medium
 
   * debian/tests/control:
diff -Nru readpe-0.82/debian/control readpe-0.82/debian/control
--- readpe-0.82/debian/control  2023-09-08 22:48:02.0 +
+++ readpe-0.82/debian/control  2024-03-01 12:44:00.0 +
@@ -5,7 +5,7 @@
 Section: utils
 Priority: optional
 Standards-Version: 4.6.2
-Build-Depends: debhelper-compat (= 13), dh-exec, libssl-dev
+Build-Depends: dpkg-dev (>= 1.22.5), debhelper-compat (= 13), dh-exec, 
libssl-dev
 Rules-Requires-Root: no
 Vcs-Browser: https://salsa.debian.org/pkg-security-team/readpe
 Vcs-Git: https://salsa.debian.org/pkg-security-team/readpe.git
@@ -24,7 +24,7 @@
 Replaces: pev (<< 0.82-1~)
 Breaks: pev (<< 0.82-1~)
 Architecture: any
-Depends: libpe1, ${misc:Depends}, ${shlibs:Depends}
+Depends: libpe1t64, ${misc:Depends}, ${shlibs:Depends}
 Description: command-line tools to manipulate Windows PE files
  readpe is a toolkit designed to analyze Microsoft Windows PE (Portable
  Executable) binary files. Its tools can parse and compare PE32/PE32+
@@ -43,12 +43,15 @@
  This package provides the ofs2rva, pedis, pehash, peldd, pepack, peres,
  pescan, pesec, pestr, readpe and rva2ofs commands.
 
-Package: libpe1
+Package: libpe1t64
+Provides: ${t64:Provides}
+Replaces: libpe1
+Breaks: libpe1 (<< ${source:Version})
 Section: libs
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: library to read Windows PE files
- The libpe1 package provides a shared library which allows reading PE 32 and
+ The libpe1t64 package provides a shared library which allows reading PE 32 and
  64-bit files. Third party programs depend on this package to read internals of
  PE files.
  .
@@ -57,9 +60,9 @@
 Package: libpe-dev
 Section: libdevel
 Architecture: any
-Depends: libpe1 (= ${binary:Version}), ${misc:Depends}
+Depends: libpe1t64 (= ${binary:Version}), ${misc:Depends}
 Description: library to read Windows PE files (development files)
- The libpe1 package provides a shared library which allows reading PE 32 and
+ The libpe1t64 package provides a shared library which allows reading PE 32 and
  64-bit files. Third party programs depend on this package to read internals of
  PE files.
  .
diff -Nru readpe-0.82/debian/libpe1.install readpe-0.82/debian/libpe1.install
--- readpe-0.82/debian/libpe1.install   2023-09-08 22:48:02.0 +
+++ readpe-0.82/debian/libpe1.install   1970-01-01 00:00:00.0 +
@@ -1,2 +0,0 @@
-#!/usr/bin/dh-exec
-usr/lib/libpe.so.*  usr/lib/${DEB_HOST_MULTIARCH}/
diff -Nru readpe-0.82/debian/libpe1.symbols readpe-0.82/debian/libpe1.symbols
--- readpe-0.82/debian/libpe1.symbols   2023-09-08 22:48:02.0 +
+++ readpe-0.82/debian/libpe1.symbols   1970-01-01 00:00:00.0 +
@@ -1,83 +0,0 @@
-libpe.so.1 libpe1 #MINVER#
-* Build-Depends-Package: libpe1-dev
- cpl_analysis@Base 0.82
- edit_distn@Base 0.82
- fuzzy_compare@Base 0.82
- fuzzy_digest@Base 0.82
- fuzzy_free@Base 0.82
- fuzzy_hash_buf@Base 0.82
- fuzzy_hash_file@Base 0.82
- fuzzy_hash_filename@Base 0.82
- fuzzy_hash_stream@Base 0.82
- fuzzy_new@Base 0.82
- fuzzy_update@Base 0.82
- oleaut32_arr@Base 0.82
- pe_calculate_entropy_file@Base 0.82
- pe_can_read@Base 0.82
- pe_check_fake_entrypoint@Base 0.82
- pe_coff@Base 0.82
- pe_directories@Base 0.82
- pe_directories_count@Base 0.82
- pe_directory_by_entry@Base 0.82
- pe_directory_name@Base 0.82
- pe_dos@Base 0.82
- pe_error_msg@Base 0.82
- pe_error_print@Base 0.82
- pe_exports@Base 0.82
- pe_exports_dealloc@Base 0.82
- pe_filesize@Base 0.82
- pe_fpu_trick@Base 0.82
- pe_get_cpl_analysis@Base 0.82
- pe_get_file_hash@Base 0.82
- pe_get_headers_hashes@Base 0.82
- pe_get_sections_hash@Base 0.82
- pe_get_tls_callback@Base 0.82
- pe_get_tls_directory@Base 0.82
- pe_has_fake_entrypoint@Base 0.82
- pe_hash_dealloc@Base 0.82
- 

Bug#1063185: readpe: NMU diff for 64-bit time_t transition

2024-02-05 Thread Steve Langasek
Source: readpe
Version: 0.82-3
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
readpe 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 readpe
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.5.0-14-generic (SMP w/12 CPU threads; PREEMPT)
Kernel taint flags: TAINT_PROPRIETARY_MODULE, TAINT_OOT_MODULE
Locale: LANG=C, 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 readpe-0.82/debian/changelog readpe-0.82/debian/changelog
--- readpe-0.82/debian/changelog2023-09-08 22:48:02.0 +
+++ readpe-0.82/debian/changelog2024-02-05 16:15:33.0 +
@@ -1,3 +1,10 @@
+readpe (0.82-3.1) experimental; urgency=medium
+
+  * Non-maintainer upload.
+  * Rename libraries for 64-bit time_t transition.
+
+ -- Steve Langasek   Mon, 05 Feb 2024 16:15:33 +
+
 readpe (0.82-3) unstable; urgency=medium
 
   * debian/tests/control:
diff -Nru readpe-0.82/debian/control readpe-0.82/debian/control
--- readpe-0.82/debian/control  2023-09-08 22:48:02.0 +
+++ readpe-0.82/debian/control  2024-02-05 16:15:33.0 +
@@ -24,7 +24,7 @@
 Replaces: pev (<< 0.82-1~)
 Breaks: pev (<< 0.82-1~)
 Architecture: any
-Depends: libpe1, ${misc:Depends}, ${shlibs:Depends}
+Depends: libpe1t64, ${misc:Depends}, ${shlibs:Depends}
 Description: command-line tools to manipulate Windows PE files
  readpe is a toolkit designed to analyze Microsoft Windows PE (Portable
  Executable) binary files. Its tools can parse and compare PE32/PE32+
@@ -43,12 +43,15 @@
  This package provides the ofs2rva, pedis, pehash, peldd, pepack, peres,
  pescan, pesec, pestr, readpe and rva2ofs commands.
 
-Package: libpe1
+Package: libpe1t64
+Provides: ${t64:Provides}
+Replaces: libpe1
+Breaks: libpe1 (<< ${source:Version})
 Section: libs
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: library to read Windows PE files
- The libpe1 package provides a shared library which allows reading PE 32 and
+ The libpe1t64 package provides a shared library which allows reading PE 32 and
  64-bit files. Third party programs depend on this package to read internals of
  PE files.
  .
@@ -57,9 +60,9 @@
 Package: libpe-dev
 Section: libdevel
 Architecture: any
-Depends: libpe1 (= ${binary:Version}), ${misc:Depends}
+Depends: libpe1t64 (= ${binary:Version}), ${misc:Depends}
 Description: library to read Windows PE files (development files)
- The libpe1 package provides a shared library which allows reading PE 32 and
+ The libpe1t64 package provides a shared library which allows reading PE 32 and
  64-bit files. Third party programs depend on this package to read internals of
  PE files.
  .
diff -Nru readpe-0.82/debian/libpe1.install readpe-0.82/debian/libpe1.install
--- readpe-0.82/debian/libpe1.install   2023-09-08 22:48:02.0 +
+++ readpe-0.82/debian/libpe1.install   1970-01-01 00:00:00.0 +
@@ -1,2 +0,0 @@
-#!/usr/bin/dh-exec
-usr/lib/libpe.so.*  usr/lib/${DEB_HOST_MULTIARCH}/
diff -Nru readpe-0.82/debian/libpe1.symbols readpe-0.82/debian/libpe1.symbols
--- readpe-0.82/debian/libpe1.symbols   2023-09-08 22:48:02.0 +
+++ readpe-0.82/debian/libpe1.symbols   1970-01-01 00:00:00.0 +
@@ -1,83 +0,0 @@
-libpe.so.1 libpe1 #MINVER#
-* Build-Depends-Package: