Bug#1063289: protobuf: NMU diff for 64-bit time_t transition

2024-02-29 Thread Benjamin Drung
Source: protobuf
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 protobuf-3.21.12/debian/changelog protobuf-3.21.12/debian/changelog
--- protobuf-3.21.12/debian/changelog   2023-11-08 16:59:09.0 +
+++ protobuf-3.21.12/debian/changelog   2024-02-29 21:15:00.0 +
@@ -1,3 +1,10 @@
+protobuf (3.21.12-8.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Rename libraries for 64-bit time_t transition.  Closes: #1063289
+
+ -- Benjamin Drung   Thu, 29 Feb 2024 21:15:00 +
+
 protobuf (3.21.12-8) unstable; urgency=medium
 
   [ Meng Sang  ]
diff -Nru protobuf-3.21.12/debian/control protobuf-3.21.12/debian/control
--- protobuf-3.21.12/debian/control 2023-11-08 16:59:09.0 +
+++ protobuf-3.21.12/debian/control 2024-02-29 21:15:00.0 +
@@ -2,7 +2,7 @@
 Section: devel
 Priority: optional
 Maintainer: Laszlo Boszormenyi (GCS) 
-Build-Depends:
+Build-Depends: dpkg-dev (>= 1.22.5),
 # Debian build system
debhelper-compat (= 13)
  , dh-elpa [amd64 arm64 armel armhf i386 loong64 mips64el mipsel ppc64el s390x 
hppa ppc64 riscv64 sh4 sparc64 x32]
@@ -63,12 +63,14 @@
  build process in this directory only installs the extension; you need to
  install protoc as well to have Ruby code generation functionality.
 
-Package: libprotobuf32
+Package: libprotobuf32t64
+Provides: ${t64:Provides}
+Replaces: libprotobuf32
 Architecture: any
 Multi-Arch: same
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Breaks: libarcus3 (<< 3.3.0-2), cura-engine (<< 1:3.3.0-2.1+b1)
+Breaks: libprotobuf32 (<< ${source:Version}), libarcus3 (<< 3.3.0-2), 
cura-engine (<< 1:3.3.0-2.1+b1)
 Description: protocol buffers C++ library
  Protocol buffers are a flexible, efficient, automated mechanism for
  serializing structured data - similar to XML, but smaller, faster, and
@@ -83,7 +85,10 @@
  .
  This package contains the runtime library needed for C++ applications.
 
-Package: libprotobuf-lite32
+Package: libprotobuf-lite32t64
+Provides: ${t64:Provides}
+Replaces: libprotobuf-lite32
+Breaks: libprotobuf-lite32 (<< ${source:Version})
 Architecture: any
 Multi-Arch: same
 Section: libs
@@ -108,7 +113,7 @@
 Multi-Arch: same
 Section: libdevel
 Depends: ${misc:Depends}, zlib1g-dev,
- libprotobuf32 (= ${binary:Version}), libprotobuf-lite32 (= ${binary:Version})
+ libprotobuf32t64 (= ${binary:Version}), libprotobuf-lite32t64 (= 
${binary:Version})
 Breaks: protobuf-compiler (<< ${binary:Version}), protobuf-compiler (>> 
${binary:Version})
 Provides: protobuf-api-${pb:API}
 Description: protocol buffers C++ library (development files) and proto files
@@ -126,7 +131,10 @@
  This package contains the development headers and static libraries needed for
  writing C++ applications. Includes well known proto type files.
 
-Package: libprotoc32
+Package: libprotoc32t64
+Provides: ${t64:Provides}
+Replaces: libprotoc32
+Breaks: libprotoc32 (<< ${source:Version})
 Architecture: any
 Multi-Arch: same
 Section: libs
@@ -151,7 +159,7 @@
 Multi-Arch: same
 Section: libdevel
 Depends: ${misc:Depends},
- libprotoc32 (= ${binary:Version}), libprotobuf-dev (= ${binary:Version})
+ libprotoc32t64 (= ${binary:Version}), libprotobuf-dev (= ${binary:Version})
 Replaces: libprotobuf-dev (<< 2.1.0)
 Breaks: libprotobuf-dev (<< 2.1.0)
 Description: protocol buffers compiler library (development files)
@@ -172,7 +180,7 @@
 Package: protobuf-compiler
 Architecture: any
 Multi-Arch: foreign
-Depends: ${shlibs:Depends}, ${misc:Depends}, libprotoc32 (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, libprotoc32t64 (= 
${binary:Version})
 Recommends: libprotobuf-dev
 Suggests: protobuf-mode-el
 Description: compiler for protocol buffer definition files
diff -Nru protobuf-3.21.12/debian/libprotobuf-lite32.install 
protobuf-3.21.12/debian/libprotobuf-lite32.install
--- protobuf-3.21.12/debian/libprotobuf-lite32.install  2016-08-22 
05:30:23.0 +
+++ protobuf-3.21.12/debian/libprotobuf-lite32.install  1970-01-01 
00:00:00.0 +
@@ -1 +0,0 @@
-usr/lib/*/libprotobuf-lite.so.*
diff -Nru protobuf-3.21.12/debian/libprotobuf-lite32t64.install 
protobuf-3.21.12/debian/libprotobuf-lite32t64.install
--- protobuf-3.21.12/debian/libprotobuf-lite32t64.install   1970-01-01 
00:00:00.0 +
+++ 

Bug#1063289: protobuf: NMU diff for 64-bit time_t transition

2024-02-05 Thread Lucas Kanashiro
Source: protobuf
Version: 3.21.12-8
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
protobuf 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 protobuf
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-15-generic (SMP w/32 CPU threads; PREEMPT)
Kernel taint flags: TAINT_PROPRIETARY_MODULE, TAINT_OOT_MODULE, 
TAINT_UNSIGNED_MODULE
Locale: LANG=C.UTF-8, 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 protobuf-3.21.12/debian/changelog protobuf-3.21.12/debian/changelog
--- protobuf-3.21.12/debian/changelog   2023-11-08 13:59:09.0 -0300
+++ protobuf-3.21.12/debian/changelog   2024-02-05 23:17:46.0 -0300
@@ -1,3 +1,10 @@
+protobuf (3.21.12-8.1) experimental; urgency=medium
+
+  * Non-maintainer upload.
+  * Rename libraries for 64-bit time_t transition.
+
+ -- Lucas Kanashiro   Mon, 05 Feb 2024 23:17:46 -0300
+
 protobuf (3.21.12-8) unstable; urgency=medium
 
   [ Meng Sang  ]
diff -Nru protobuf-3.21.12/debian/control protobuf-3.21.12/debian/control
--- protobuf-3.21.12/debian/control 2023-11-08 13:59:09.0 -0300
+++ protobuf-3.21.12/debian/control 2024-02-05 23:17:46.0 -0300
@@ -63,12 +63,14 @@
  build process in this directory only installs the extension; you need to
  install protoc as well to have Ruby code generation functionality.
 
-Package: libprotobuf32
+Package: libprotobuf32t64
+Provides: ${t64:Provides}
+Replaces: libprotobuf32
 Architecture: any
 Multi-Arch: same
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Breaks: libarcus3 (<< 3.3.0-2), cura-engine (<< 1:3.3.0-2.1+b1)
+Breaks: libprotobuf32 (<< ${source:Version}), libarcus3 (<< 3.3.0-2), 
cura-engine (<< 1:3.3.0-2.1+b1)
 Description: protocol buffers C++ library
  Protocol buffers are a flexible, efficient, automated mechanism for
  serializing structured data - similar to XML, but smaller, faster, and
@@ -83,7 +85,10 @@
  .
  This package contains the runtime library needed for C++ applications.
 
-Package: libprotobuf-lite32
+Package: libprotobuf-lite32t64
+Provides: ${t64:Provides}
+Replaces: libprotobuf-lite32
+Breaks: libprotobuf-lite32 (<< ${source:Version})
 Architecture: any
 Multi-Arch: same
 Section: libs
@@ -108,7 +113,7 @@
 Multi-Arch: same
 Section: libdevel
 Depends: ${misc:Depends}, zlib1g-dev,
- libprotobuf32 (= ${binary:Version}), libprotobuf-lite32 (= ${binary:Version})
+ libprotobuf32t64 (= ${binary:Version}), libprotobuf-lite32t64 (= 
${binary:Version})
 Breaks: protobuf-compiler (<< ${binary:Version}), protobuf-compiler (>> 
${binary:Version})
 Provides: protobuf-api-${pb:API}
 Description: protocol buffers C++ library (development files) and proto files
@@ -126,7 +131,10 @@
  This package contains the development headers and static libraries needed for
  writing C++ applications. Includes well known proto type files.
 
-Package: libprotoc32
+Package: libprotoc32t64
+Provides: ${t64:Provides}
+Replaces: libprotoc32
+Breaks: libprotoc32 (<< ${source:Version})
 Architecture: any
 Multi-Arch: same
 Section: libs
@@ -151,7 +159,7 @@
 Multi-Arch: same
 Section: libdevel
 Depends: ${misc:Depends},
- libprotoc32 (= ${binary:Version}), libprotobuf-dev (= ${binary:Version})
+ libprotoc32t64 (= ${binary:Version}), libprotobuf-dev (= ${binary:Version})