Bug#1061930: belle-sip: 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-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 belle-sip-5.2.0+dfsg/debian/changelog belle-sip-5.2.0+dfsg/debian/changelog --- belle-sip-5.2.0+dfsg/debian/changelog 2023-08-05 13:18:08.0 + +++ belle-sip-5.2.0+dfsg/debian/changelog 2024-02-28 03:16:17.0 + @@ -1,3 +1,10 @@ +belle-sip (5.2.0+dfsg-3.1) unstable; urgency=medium + + * Non-maintainer upload. + * Rename libraries for 64-bit time_t transition. Closes: #1061930 + + -- Steve Langasek Wed, 28 Feb 2024 03:16:17 + + belle-sip (5.2.0+dfsg-3) unstable; urgency=high * Add Breaks+Replaces against libbellesip1 (Closes: #1043055) diff -Nru belle-sip-5.2.0+dfsg/debian/control belle-sip-5.2.0+dfsg/debian/control --- belle-sip-5.2.0+dfsg/debian/control 2023-08-05 13:18:08.0 + +++ belle-sip-5.2.0+dfsg/debian/control 2024-02-28 03:16:17.0 + @@ -5,7 +5,7 @@ Uploaders: Kilian Krause , Tzafrir Cohen , Bernhard Schmidt , -Build-Depends: cmake, +Build-Depends: dpkg-dev (>= 1.22.5), cmake, debhelper-compat (= 13), libantlr3c-dev, libavahi-compat-libdnssd-dev, @@ -27,7 +27,7 @@ Architecture: any Multi-Arch: same Depends: libbctoolbox-dev (>= 5.2.0~), - libbellesip2 (= ${binary:Version}), + libbellesip2t64 (= ${binary:Version}), libbelr-dev (>= 5.2.0~), ${misc:Depends}, Description: SIP stack from the Linphone team (development files) @@ -42,15 +42,16 @@ . This package contains the development files. -Package: libbellesip2 +Package: libbellesip2t64 +Provides: ${t64:Provides} Pre-Depends: ${misc:Pre-Depends}, Architecture: any Multi-Arch: same Recommends: dns-root-data Depends: ${misc:Depends}, ${shlibs:Depends}, -Breaks: libbellesip1 (<< 5.2) -Replaces: libbellesip1 (<< 5.2) +Breaks: libbellesip2 (<< ${source:Version}), libbellesip1 (<< 5.2) +Replaces: libbellesip2, libbellesip1 (<< 5.2) Description: SIP stack from the Linphone team Belle-Sip is a new SIP stack (RFC3261) developed by the Linphone team. . diff -Nru belle-sip-5.2.0+dfsg/debian/libbellesip2.install belle-sip-5.2.0+dfsg/debian/libbellesip2.install --- belle-sip-5.2.0+dfsg/debian/libbellesip2.install2023-08-05 13:18:08.0 + +++ belle-sip-5.2.0+dfsg/debian/libbellesip2.install1970-01-01 00:00:00.0 + @@ -1,2 +0,0 @@ -usr/lib/*/lib*.so.* -usr/share/belr/*/* diff -Nru belle-sip-5.2.0+dfsg/debian/libbellesip2.shlibs belle-sip-5.2.0+dfsg/debian/libbellesip2.shlibs --- belle-sip-5.2.0+dfsg/debian/libbellesip2.shlibs 2023-08-05 13:18:08.0 + +++ belle-sip-5.2.0+dfsg/debian/libbellesip2.shlibs 1970-01-01 00:00:00.0 + @@ -1 +0,0 @@ -libbellesip 2 libbellesip2 (>= 5.2.0-1), libbellesip2 (<< 5.3.0-1) diff -Nru belle-sip-5.2.0+dfsg/debian/libbellesip2t64.install belle-sip-5.2.0+dfsg/debian/libbellesip2t64.install --- belle-sip-5.2.0+dfsg/debian/libbellesip2t64.install 1970-01-01 00:00:00.0 + +++ belle-sip-5.2.0+dfsg/debian/libbellesip2t64.install 2023-08-05 13:18:08.0 + @@ -0,0 +1,2 @@ +usr/lib/*/lib*.so.* +usr/share/belr/*/* diff -Nru belle-sip-5.2.0+dfsg/debian/libbellesip2t64.lintian-overrides belle-sip-5.2.0+dfsg/debian/libbellesip2t64.lintian-overrides --- belle-sip-5.2.0+dfsg/debian/libbellesip2t64.lintian-overrides 1970-01-01 00:00:00.0 + +++ belle-sip-5.2.0+dfsg/debian/libbellesip2t64.lintian-overrides 2024-02-28 03:15:59.0 + @@ -0,0 +1 @@ +libbellesip2t64: package-name-doesnt-match-sonames libbellesip2 diff -Nru belle-sip-5.2.0+dfsg/debian/libbellesip2t64.shlibs belle-sip-5.2.0+dfsg/debian/libbellesip2t64.shlibs --- belle-sip-5.2.0+dfsg/debian/libbellesip2t64.shlibs 1970-01-01 00:00:00.0 + +++ belle-sip-5.2.0+dfsg/debian/libbellesip2t64.shlibs 2024-02-28 03:15:59.0 + @@ -0,0 +1 @@ +libbellesip 2 libbellesip2t64 (>= 5.2.0-1), libbellesip2t64 (<< 5.3.0-1)
Bug#1061930: belle-sip: NMU diff for 64-bit time_t transition
Source: belle-sip Followup-For: Bug #1061930 Apologies, an oversight in the conversion script caused us to fail to update strict versioned dependencies on the previous package name. Please find attached a fixed patch. Since there is a new upstream version of belle-sip in experimental with a new soname, if dpkg is uploaded to unstable before belle-sip is, there is no need to merge this patch. diff -Nru belle-sip-5.2.0+dfsg/debian/changelog belle-sip-5.2.0+dfsg/debian/changelog --- belle-sip-5.2.0+dfsg/debian/changelog 2023-08-05 13:18:08.0 + +++ belle-sip-5.2.0+dfsg/debian/changelog 2024-01-31 09:19:40.0 + @@ -1,3 +1,11 @@ +belle-sip (5.2.0+dfsg-3.1~exp2) experimental; urgency=medium + + * Non-maintainer upload. + * Rename libraries for 64-bit time_t transition. + * Fix uninstallable packages from the previous upload. + + -- Steve Langasek Wed, 31 Jan 2024 09:19:40 + + belle-sip (5.2.0+dfsg-3) unstable; urgency=high * Add Breaks+Replaces against libbellesip1 (Closes: #1043055) diff -Nru belle-sip-5.2.0+dfsg/debian/control belle-sip-5.2.0+dfsg/debian/control --- belle-sip-5.2.0+dfsg/debian/control 2023-08-05 13:18:08.0 + +++ belle-sip-5.2.0+dfsg/debian/control 2024-01-31 09:19:40.0 + @@ -27,7 +27,7 @@ Architecture: any Multi-Arch: same Depends: libbctoolbox-dev (>= 5.2.0~), - libbellesip2 (= ${binary:Version}), + libbellesip2t64 (= ${binary:Version}), libbelr-dev (>= 5.2.0~), ${misc:Depends}, Description: SIP stack from the Linphone team (development files) @@ -42,15 +42,16 @@ . This package contains the development files. -Package: libbellesip2 +Package: libbellesip2t64 +Provides: ${t64:Provides} Pre-Depends: ${misc:Pre-Depends}, Architecture: any Multi-Arch: same Recommends: dns-root-data Depends: ${misc:Depends}, ${shlibs:Depends}, -Breaks: libbellesip1 (<< 5.2) -Replaces: libbellesip1 (<< 5.2) +Breaks: libbellesip2 (<< ${source:Version}), libbellesip1 (<< 5.2) +Replaces: libbellesip2, libbellesip1 (<< 5.2) Description: SIP stack from the Linphone team Belle-Sip is a new SIP stack (RFC3261) developed by the Linphone team. . diff -Nru belle-sip-5.2.0+dfsg/debian/libbellesip2.install belle-sip-5.2.0+dfsg/debian/libbellesip2.install --- belle-sip-5.2.0+dfsg/debian/libbellesip2.install2023-08-05 13:18:08.0 + +++ belle-sip-5.2.0+dfsg/debian/libbellesip2.install1970-01-01 00:00:00.0 + @@ -1,2 +0,0 @@ -usr/lib/*/lib*.so.* -usr/share/belr/*/* diff -Nru belle-sip-5.2.0+dfsg/debian/libbellesip2.shlibs belle-sip-5.2.0+dfsg/debian/libbellesip2.shlibs --- belle-sip-5.2.0+dfsg/debian/libbellesip2.shlibs 2023-08-05 13:18:08.0 + +++ belle-sip-5.2.0+dfsg/debian/libbellesip2.shlibs 1970-01-01 00:00:00.0 + @@ -1 +0,0 @@ -libbellesip 2 libbellesip2 (>= 5.2.0-1), libbellesip2 (<< 5.3.0-1) diff -Nru belle-sip-5.2.0+dfsg/debian/libbellesip2t64.install belle-sip-5.2.0+dfsg/debian/libbellesip2t64.install --- belle-sip-5.2.0+dfsg/debian/libbellesip2t64.install 1970-01-01 00:00:00.0 + +++ belle-sip-5.2.0+dfsg/debian/libbellesip2t64.install 2023-08-05 13:18:08.0 + @@ -0,0 +1,2 @@ +usr/lib/*/lib*.so.* +usr/share/belr/*/* diff -Nru belle-sip-5.2.0+dfsg/debian/libbellesip2t64.lintian-overrides belle-sip-5.2.0+dfsg/debian/libbellesip2t64.lintian-overrides --- belle-sip-5.2.0+dfsg/debian/libbellesip2t64.lintian-overrides 1970-01-01 00:00:00.0 + +++ belle-sip-5.2.0+dfsg/debian/libbellesip2t64.lintian-overrides 2024-01-31 09:19:40.0 + @@ -0,0 +1 @@ +libbellesip2t64: package-name-doesnt-match-sonames libbellesip2 diff -Nru belle-sip-5.2.0+dfsg/debian/libbellesip2t64.shlibs belle-sip-5.2.0+dfsg/debian/libbellesip2t64.shlibs --- belle-sip-5.2.0+dfsg/debian/libbellesip2t64.shlibs 1970-01-01 00:00:00.0 + +++ belle-sip-5.2.0+dfsg/debian/libbellesip2t64.shlibs 2024-01-31 09:19:40.0 + @@ -0,0 +1 @@ +libbellesip 2 libbellesip2t64 (>= 5.2.0-1), libbellesip2t64 (<< 5.3.0-1)
Bug#1061930: belle-sip: NMU diff for 64-bit time_t transition
Source: belle-sip Version: 5.2.0+dfsg-3 Severity: serious Tags: patch pending Justification: library ABI skew on upgrade User: debian-...@lists.debian.org Usertags: time-t 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 belle-sip 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 belle-sip 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'), (1, 'experimental') 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 belle-sip-5.2.0+dfsg/debian/changelog belle-sip-5.2.0+dfsg/debian/changelog --- belle-sip-5.2.0+dfsg/debian/changelog 2023-08-05 13:18:08.0 + +++ belle-sip-5.2.0+dfsg/debian/changelog 2024-01-30 04:31:34.0 + @@ -1,3 +1,10 @@ +belle-sip (5.2.0+dfsg-3.1) experimental; urgency=medium + + * Non-maintainer upload. + * Rename libraries for 64-bit time_t transition. + + -- Steve Langasek Tue, 30 Jan 2024 04:31:34 + + belle-sip (5.2.0+dfsg-3) unstable; urgency=high * Add Breaks+Replaces against libbellesip1 (Closes: #1043055) diff -Nru belle-sip-5.2.0+dfsg/debian/control belle-sip-5.2.0+dfsg/debian/control --- belle-sip-5.2.0+dfsg/debian/control 2023-08-05 13:18:08.0 + +++ belle-sip-5.2.0+dfsg/debian/control 2024-01-30 04:31:34.0 + @@ -42,15 +42,16 @@ . This package contains the development files. -Package: libbellesip2 +Package: libbellesip2t64 +Provides: ${t64:Provides} Pre-Depends: ${misc:Pre-Depends}, Architecture: any Multi-Arch: same Recommends: dns-root-data Depends: ${misc:Depends}, ${shlibs:Depends}, -Breaks: libbellesip1 (<< 5.2) -Replaces: libbellesip1 (<< 5.2) +Breaks: libbellesip2 (<< ${source:Version}), libbellesip1 (<< 5.2) +Replaces: libbellesip2, libbellesip1 (<< 5.2) Description: SIP stack from the Linphone team Belle-Sip is a new SIP stack (RFC3261) developed by the Linphone team. . diff -Nru belle-sip-5.2.0+dfsg/debian/libbellesip2.install belle-sip-5.2.0+dfsg/debian/libbellesip2.install --- belle-sip-5.2.0+dfsg/debian/libbellesip2.install2023-08-05 13:18:08.0 + +++ belle-sip-5.2.0+dfsg/debian/libbellesip2.install1970-01-01 00:00:00.0 + @@ -1,2 +0,0 @@ -usr/lib/*/lib*.so.* -usr/share/belr/*/* diff -Nru belle-sip-5.2.0+dfsg/debian/libbellesip2.shlibs belle-sip-5.2.0+dfsg/debian/libbellesip2.shlibs --- belle-sip-5.2.0+dfsg/debian/libbellesip2.shlibs 2023-08-05 13:18:08.0 + +++ belle-sip-5.2.0+dfsg/debian/libbellesip2.shlibs 1970-01-01 00:00:00.0 + @@ -1 +0,0 @@ -libbellesip 2 libbellesip2 (>= 5.2.0-1), libbellesip2 (<< 5.3.0-1) diff -Nru belle-sip-5.2.0+dfsg/debian/libbellesip2t64.install belle-sip-5.2.0+dfsg/debian/libbellesip2t64.install --- belle-sip-5.2.0+dfsg/debian/libbellesip2t64.install 1970-01-01 00:00:00.0 + +++ belle-sip-5.2.0+dfsg/debian/libbellesip2t64.install 2023-08-05 13:18:08.0 + @@ -0,0 +1,2 @@ +usr/lib/*/lib*.so.* +usr/share/belr/*/* diff -Nru belle-sip-5.2.0+dfsg/debian/libbellesip2t64.lintian-overrides belle-sip-5.2.0+dfsg/debian/libbellesip2t64.lintian-overrides --- belle-sip-5.2.0+dfsg/debian/libbellesip2t64.lintian-overrides 1970-01-01 00:00:00.0 + +++ belle-sip-5.2.0+dfsg/debian/libbellesip2t64.lintian-overrides 2024-01-30 04:31:34.0 + @@ -0,0 +1 @@ +libbellesip2t64: