Bug#1063186: rpm: NMU diff for 64-bit time_t transition

2024-03-01 Thread Benjamin Drung
Source: rpm
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 rpm-4.18.2+dfsg/debian/changelog rpm-4.18.2+dfsg/debian/changelog
--- rpm-4.18.2+dfsg/debian/changelog2024-02-25 13:29:45.0 +
+++ rpm-4.18.2+dfsg/debian/changelog2024-03-01 12:44:30.0 +
@@ -1,3 +1,10 @@
+rpm (4.18.2+dfsg-2.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Rename libraries for 64-bit time_t transition.  Closes: #1063186
+
+ -- Benjamin Drung   Fri, 01 Mar 2024 12:44:30 +
+
 rpm (4.18.2+dfsg-2) unstable; urgency=medium
 
   * Team upload.
diff -Nru rpm-4.18.2+dfsg/debian/control rpm-4.18.2+dfsg/debian/control
--- rpm-4.18.2+dfsg/debian/control  2024-02-25 13:12:25.0 +
+++ rpm-4.18.2+dfsg/debian/control  2024-03-01 12:44:30.0 +
@@ -3,7 +3,7 @@
 Uploaders: Michal Čihař 
 Section: admin
 Priority: optional
-Build-Depends: debhelper-compat (= 13),
+Build-Depends: dpkg-dev (>= 1.22.5), debhelper-compat (= 13),
binutils-dev,
bzip2,
debugedit (>= 1:5),
@@ -104,12 +104,15 @@
  .
  This package contains localization of rpm and localized man pages.
 
-Package: librpm9
+Package: librpm9t64
+Provides: ${t64:Provides}
+Replaces: librpm9
+Breaks: librpm9 (<< ${source:Version})
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends},
  ${misc:Depends},
- librpmio9 (= ${binary:Version})
+ librpmio9t64 (= ${binary:Version})
 Recommends: rpm-common (= ${binary:Version})
 Description: RPM shared library
  The RPM Package Manager (RPM) is a command-line driven package
@@ -119,7 +122,10 @@
  This library allows programs to make use of an RPM database or RPM packages
  without going through the program rpm.
 
-Package: librpmio9
+Package: librpmio9t64
+Provides: ${t64:Provides}
+Replaces: librpmio9
+Breaks: librpmio9 (<< ${source:Version})
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends},
@@ -131,13 +137,16 @@
  .
  This library provides basic IO functionality which is used by librpm.
 
-Package: librpmbuild9
+Package: librpmbuild9t64
+Provides: ${t64:Provides}
+Replaces: librpmbuild9
+Breaks: librpmbuild9 (<< ${source:Version})
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends},
  ${misc:Depends},
- librpm9 (= ${binary:Version}),
- librpmio9 (= ${binary:Version})
+ librpm9t64 (= ${binary:Version}),
+ librpmio9t64 (= ${binary:Version})
 Description: RPM build shared library
  The RPM Package Manager (RPM) is a command-line driven package
  management system capable of installing, uninstalling, verifying,
@@ -145,13 +154,16 @@
  .
  This library provides an interface for building RPM packages.
 
-Package: librpmsign9
+Package: librpmsign9t64
+Provides: ${t64:Provides}
+Replaces: librpmsign9
+Breaks: librpmsign9 (<< ${source:Version})
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends},
  ${misc:Depends},
- librpm9 (= ${binary:Version}),
- librpmio9 (= ${binary:Version})
+ librpm9t64 (= ${binary:Version}),
+ librpmio9t64 (= ${binary:Version})
 Description: RPM signing shared library
  The RPM Package Manager (RPM) is a command-line driven package
  management system capable of installing, uninstalling, verifying,
@@ -162,10 +174,10 @@
 Package: librpm-dev
 Architecture: any
 Section: libdevel
-Depends: librpm9 (= ${binary:Version}),
- librpmio9 (= ${binary:Version}),
- librpmbuild9 (= ${binary:Version}),
- librpmsign9 (= ${binary:Version}),
+Depends: librpm9t64 (= ${binary:Version}),
+ librpmio9t64 (= ${binary:Version}),
+ librpmbuild9t64 (= ${binary:Version}),
+ librpmsign9t64 (= ${binary:Version}),
  libpopt-dev,
  libbz2-dev,
  zlib1g-dev,
@@ -193,10 +205,10 @@
 Depends: ${misc:Depends},
  ${shlibs:Depends},
  ${python3:Depends},
- librpm9 (= ${binary:Version}),
- librpmio9 (= ${binary:Version}),
- librpmbuild9 (= ${binary:Version}),
- librpmsign9 (= ${binary:Version}),
+ librpm9t64 (= ${binary:Version}),
+ librpmio9t64 (= ${binary:Version}),
+ librpmbuild9t64 (= ${binary:Version}),
+ librpmsign9t64 (= ${binary:Version}),
  rpm-common (= ${binary:Version})
 Breaks: 

Bug#1063186: rpm: NMU diff for 64-bit time_t transition

2024-02-25 Thread Steve Langasek
Attached is an updated patch rebased against current unstable.

-- 
Steve Langasek   Give me a lever long enough and a Free OS
Debian Developer   to set it on, and I can move the world.
Ubuntu Developer   https://www.debian.org/
slanga...@ubuntu.com vor...@debian.org
diff -Nru rpm-4.18.2+dfsg/debian/changelog rpm-4.18.2+dfsg/debian/changelog
--- rpm-4.18.2+dfsg/debian/changelog2024-02-25 13:29:45.0 +
+++ rpm-4.18.2+dfsg/debian/changelog2024-02-26 00:41:38.0 +
@@ -1,3 +1,10 @@
+rpm (4.18.2+dfsg-2.1~exp1) experimental; urgency=medium
+
+  * Non-maintainer upload.
+  * Rename libraries for 64-bit time_t transition.
+
+ -- Steve Langasek   Mon, 26 Feb 2024 00:41:38 +
+
 rpm (4.18.2+dfsg-2) unstable; urgency=medium
 
   * Team upload.
diff -Nru rpm-4.18.2+dfsg/debian/control rpm-4.18.2+dfsg/debian/control
--- rpm-4.18.2+dfsg/debian/control  2024-02-25 13:12:25.0 +
+++ rpm-4.18.2+dfsg/debian/control  2024-02-26 00:40:33.0 +
@@ -104,12 +104,15 @@
  .
  This package contains localization of rpm and localized man pages.
 
-Package: librpm9
+Package: librpm9t64
+Provides: ${t64:Provides}
+Replaces: librpm9
+Breaks: librpm9 (<< ${source:Version})
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends},
  ${misc:Depends},
- librpmio9 (= ${binary:Version})
+ librpmio9t64 (= ${binary:Version})
 Recommends: rpm-common (= ${binary:Version})
 Description: RPM shared library
  The RPM Package Manager (RPM) is a command-line driven package
@@ -119,7 +122,10 @@
  This library allows programs to make use of an RPM database or RPM packages
  without going through the program rpm.
 
-Package: librpmio9
+Package: librpmio9t64
+Provides: ${t64:Provides}
+Replaces: librpmio9
+Breaks: librpmio9 (<< ${source:Version})
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends},
@@ -131,13 +137,16 @@
  .
  This library provides basic IO functionality which is used by librpm.
 
-Package: librpmbuild9
+Package: librpmbuild9t64
+Provides: ${t64:Provides}
+Replaces: librpmbuild9
+Breaks: librpmbuild9 (<< ${source:Version})
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends},
  ${misc:Depends},
- librpm9 (= ${binary:Version}),
- librpmio9 (= ${binary:Version})
+ librpm9t64 (= ${binary:Version}),
+ librpmio9t64 (= ${binary:Version})
 Description: RPM build shared library
  The RPM Package Manager (RPM) is a command-line driven package
  management system capable of installing, uninstalling, verifying,
@@ -145,13 +154,16 @@
  .
  This library provides an interface for building RPM packages.
 
-Package: librpmsign9
+Package: librpmsign9t64
+Provides: ${t64:Provides}
+Replaces: librpmsign9
+Breaks: librpmsign9 (<< ${source:Version})
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends},
  ${misc:Depends},
- librpm9 (= ${binary:Version}),
- librpmio9 (= ${binary:Version})
+ librpm9t64 (= ${binary:Version}),
+ librpmio9t64 (= ${binary:Version})
 Description: RPM signing shared library
  The RPM Package Manager (RPM) is a command-line driven package
  management system capable of installing, uninstalling, verifying,
@@ -162,10 +174,10 @@
 Package: librpm-dev
 Architecture: any
 Section: libdevel
-Depends: librpm9 (= ${binary:Version}),
- librpmio9 (= ${binary:Version}),
- librpmbuild9 (= ${binary:Version}),
- librpmsign9 (= ${binary:Version}),
+Depends: librpm9t64 (= ${binary:Version}),
+ librpmio9t64 (= ${binary:Version}),
+ librpmbuild9t64 (= ${binary:Version}),
+ librpmsign9t64 (= ${binary:Version}),
  libpopt-dev,
  libbz2-dev,
  zlib1g-dev,
@@ -193,10 +205,10 @@
 Depends: ${misc:Depends},
  ${shlibs:Depends},
  ${python3:Depends},
- librpm9 (= ${binary:Version}),
- librpmio9 (= ${binary:Version}),
- librpmbuild9 (= ${binary:Version}),
- librpmsign9 (= ${binary:Version}),
+ librpm9t64 (= ${binary:Version}),
+ librpmio9t64 (= ${binary:Version}),
+ librpmbuild9t64 (= ${binary:Version}),
+ librpmsign9t64 (= ${binary:Version}),
  rpm-common (= ${binary:Version})
 Breaks: ${python3:Breaks}
 Provides: ${python3:Provides}
diff -Nru rpm-4.18.2+dfsg/debian/librpm9.install 
rpm-4.18.2+dfsg/debian/librpm9.install
--- rpm-4.18.2+dfsg/debian/librpm9.install  2023-09-04 16:06:55.0 
+
+++ rpm-4.18.2+dfsg/debian/librpm9.install  1970-01-01 00:00:00.0 
+
@@ -1 +0,0 @@
-usr/lib/*/librpm.so.*
diff -Nru rpm-4.18.2+dfsg/debian/librpm9.symbols 
rpm-4.18.2+dfsg/debian/librpm9.symbols
--- rpm-4.18.2+dfsg/debian/librpm9.symbols  2024-02-25 13:12:25.0 
+
+++ rpm-4.18.2+dfsg/debian/librpm9.symbols  1970-01-01 00:00:00.0 
+
@@ -1,526 +0,0 @@
-librpm.so.9 

Bug#1063186: rpm: NMU diff for 64-bit time_t transition

2024-02-05 Thread Steve Langasek
Source: rpm
Version: 4.18.2+dfsg-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
rpm 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 rpm
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 rpm-4.18.2+dfsg/debian/changelog rpm-4.18.2+dfsg/debian/changelog
--- rpm-4.18.2+dfsg/debian/changelog2024-01-21 21:44:55.0 +
+++ rpm-4.18.2+dfsg/debian/changelog2024-02-05 16:16:01.0 +
@@ -1,3 +1,10 @@
+rpm (4.18.2+dfsg-1.1) experimental; urgency=medium
+
+  * Non-maintainer upload.
+  * Rename libraries for 64-bit time_t transition.
+
+ -- Steve Langasek   Mon, 05 Feb 2024 16:16:01 +
+
 rpm (4.18.2+dfsg-1) unstable; urgency=medium
 
   * Team upload.
diff -Nru rpm-4.18.2+dfsg/debian/control rpm-4.18.2+dfsg/debian/control
--- rpm-4.18.2+dfsg/debian/control  2024-01-21 21:44:55.0 +
+++ rpm-4.18.2+dfsg/debian/control  2024-02-05 16:16:01.0 +
@@ -104,12 +104,15 @@
  .
  This package contains localization of rpm and localized man pages.
 
-Package: librpm9
+Package: librpm9t64
+Provides: ${t64:Provides}
+Replaces: librpm9
+Breaks: librpm9 (<< ${source:Version})
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends},
  ${misc:Depends},
- librpmio9 (= ${binary:Version})
+ librpmio9t64 (= ${binary:Version})
 Recommends: rpm-common (= ${binary:Version})
 Description: RPM shared library
  The RPM Package Manager (RPM) is a command-line driven package
@@ -119,7 +122,10 @@
  This library allows programs to make use of an RPM database or RPM packages
  without going through the program rpm.
 
-Package: librpmio9
+Package: librpmio9t64
+Provides: ${t64:Provides}
+Replaces: librpmio9
+Breaks: librpmio9 (<< ${source:Version})
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends},
@@ -131,13 +137,16 @@
  .
  This library provides basic IO functionality which is used by librpm.
 
-Package: librpmbuild9
+Package: librpmbuild9t64
+Provides: ${t64:Provides}
+Replaces: librpmbuild9
+Breaks: librpmbuild9 (<< ${source:Version})
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends},
  ${misc:Depends},
- librpm9 (= ${binary:Version}),
- librpmio9 (= ${binary:Version})
+ librpm9t64 (= ${binary:Version}),
+ librpmio9t64 (= ${binary:Version})
 Description: RPM build shared library
  The RPM Package Manager (RPM) is a command-line driven package
  management system capable of installing, uninstalling, verifying,
@@ -145,13 +154,16 @@
  .
  This library provides an interface for building RPM packages.
 
-Package: librpmsign9
+Package: librpmsign9t64
+Provides: ${t64:Provides}
+Replaces: librpmsign9
+Breaks: librpmsign9 (<< ${source:Version})
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends},
  ${misc:Depends},
- librpm9 (= ${binary:Version}),
- librpmio9 (= ${binary:Version})
+ librpm9t64 (= ${binary:Version}),
+ librpmio9t64 (= ${binary:Version})
 Description: RPM signing shared library
  The RPM Package Manager (RPM) is a command-line driven package