Bug#1062735: libxmltok: NMU diff for 64-bit time_t transition

2024-02-29 Thread Steve Langasek
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')
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 libxmltok-1.2/debian/changelog libxmltok-1.2/debian/changelog
--- libxmltok-1.2/debian/changelog  2017-08-10 12:06:20.0 +
+++ libxmltok-1.2/debian/changelog  2024-03-01 07:20:23.0 +
@@ -1,3 +1,10 @@
+libxmltok (1.2-4.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Rename libraries for 64-bit time_t transition.  Closes: #1062735
+
+ -- Steve Langasek   Fri, 01 Mar 2024 07:20:23 +
+
 libxmltok (1.2-4) unstable; urgency=medium
 
   * Team upload.
diff -Nru libxmltok-1.2/debian/control libxmltok-1.2/debian/control
--- libxmltok-1.2/debian/control2017-08-10 12:02:58.0 +
+++ libxmltok-1.2/debian/control2024-03-01 07:20:23.0 +
@@ -5,12 +5,12 @@
 Uploaders: Ardo van Rangelrooij 
 Homepage: http://www.jclark.com/xml/expat.html
 Standards-Version: 4.0.1
-Build-Depends: debhelper (>= 10)
+Build-Depends: dpkg-dev (>= 1.22.5), debhelper (>= 10)
 
 Package: libxmltok1-dev
 Section: libdevel
 Architecture: any
-Depends: libxmltok1 (= ${binary:Version}), ${misc:Depends}, libc6-dev | 
libc-dev
+Depends: libxmltok1t64 (= ${binary:Version}), ${misc:Depends}, libc6-dev | 
libc-dev
 Description: XML Parser Toolkit, developer libraries
  Libraries for XML parsing in C.  It aims to be fully conforming. It
  is currently not a validating XML processor.
@@ -21,7 +21,10 @@
  .
  This package contains the development headers.
 
-Package: libxmltok1
+Package: libxmltok1t64
+Provides: ${t64:Provides}
+Replaces: libxmltok1
+Breaks: libxmltok1 (<< ${source:Version})
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: XML Parser Toolkit, runtime libraries
diff -Nru libxmltok-1.2/debian/libxmltok1.docs 
libxmltok-1.2/debian/libxmltok1.docs
--- libxmltok-1.2/debian/libxmltok1.docs2017-08-10 12:01:46.0 
+
+++ libxmltok-1.2/debian/libxmltok1.docs1970-01-01 00:00:00.0 
+
@@ -1 +0,0 @@
-debian/README.xmltok
diff -Nru libxmltok-1.2/debian/libxmltok1.install 
libxmltok-1.2/debian/libxmltok1.install
--- libxmltok-1.2/debian/libxmltok1.install 2017-08-10 12:01:46.0 
+
+++ libxmltok-1.2/debian/libxmltok1.install 1970-01-01 00:00:00.0 
+
@@ -1 +0,0 @@
-usr/lib/*.so.*
diff -Nru libxmltok-1.2/debian/libxmltok1t64.docs 
libxmltok-1.2/debian/libxmltok1t64.docs
--- libxmltok-1.2/debian/libxmltok1t64.docs 1970-01-01 00:00:00.0 
+
+++ libxmltok-1.2/debian/libxmltok1t64.docs 2017-08-10 12:01:46.0 
+
@@ -0,0 +1 @@
+debian/README.xmltok
diff -Nru libxmltok-1.2/debian/libxmltok1t64.install 
libxmltok-1.2/debian/libxmltok1t64.install
--- libxmltok-1.2/debian/libxmltok1t64.install  1970-01-01 00:00:00.0 
+
+++ libxmltok-1.2/debian/libxmltok1t64.install  2017-08-10 12:01:46.0 
+
@@ -0,0 +1 @@
+usr/lib/*.so.*
diff -Nru libxmltok-1.2/debian/libxmltok1t64.lintian-overrides 
libxmltok-1.2/debian/libxmltok1t64.lintian-overrides
--- libxmltok-1.2/debian/libxmltok1t64.lintian-overrides1970-01-01 
00:00:00.0 +
+++ libxmltok-1.2/debian/libxmltok1t64.lintian-overrides2024-03-01 
07:20:19.0 +
@@ -0,0 +1 @@
+libxmltok1t64: package-name-doesnt-match-sonames libxmltok1


Bug#1062735: libxmltok: NMU diff for 64-bit time_t transition

2024-02-29 Thread Steve Langasek
Sorry, for some reason a number of bugs failed to have their patches
attached.  Please find the debdiff from the experimental upload attached
now.

On Fri, Feb 02, 2024 at 11:00:41PM +, Steve Langasek wrote:
> Source: libxmltok
> Version: 1.2-4
> 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
> libxmltok 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 libxmltok
> 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'), (500, 'testing'), (500, 'stable'), (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)
> 

-- 
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 libxmltok-1.2/debian/changelog libxmltok-1.2/debian/changelog
--- libxmltok-1.2/debian/changelog  2017-08-10 12:06:20.0 +
+++ libxmltok-1.2/debian/changelog  2024-02-02 19:49:05.0 +
@@ -1,3 +1,10 @@
+libxmltok (1.2-4.1~exp1) experimental; urgency=medium
+
+  * Non-maintainer upload.
+  * Rename libraries for 64-bit time_t transition.
+
+ -- Steve Langasek   Fri, 02 Feb 2024 19:49:05 +
+
 libxmltok (1.2-4) unstable; urgency=medium
 
   * Team upload.
diff -Nru libxmltok-1.2/debian/control libxmltok-1.2/debian/control
--- libxmltok-1.2/debian/control2017-08-10 12:02:58.0 +
+++ libxmltok-1.2/debian/control2024-02-02 19:49:05.0 +
@@ -10,7 +10,7 @@
 Package: libxmltok1-dev
 Section: libdevel
 Architecture: any
-Depends: libxmltok1 (= ${binary:Version}), ${misc:Depends}, libc6-dev | 
libc-dev
+Depends: libxmltok1t64 (= ${binary:Version}), ${misc:Depends}, libc6-dev | 
libc-dev
 Description: XML Parser Toolkit, developer libraries
  Libraries for XML parsing in C.  It aims to be fully conforming. It
  is currently not a validating XML processor.
@@ -21,7 +21,10 @@
  .
  This package contains the development headers.
 
-Package: libxmltok1
+Package: libxmltok1t64
+Provides: ${t64:Provides}
+Replaces: libxmltok1
+Breaks: libxmltok1 (<< ${source:Version})
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: XML Parser Toolkit, runtime libraries
diff -Nru libxmltok-1.2/debian/libxmltok1.docs 
libxmltok-1.2/debian/libxmltok1.docs
--- libxmltok-1.2/debian/libxmltok1.docs2017-08-10 12:01:46.0 
+
+++ libxmltok-1.2/debian/libxmltok1.docs1970-01-01 00:00:00.0 
+
@@ -1 +0,0 @@
-debian/README.xmltok
diff -Nru libxmltok-1.2/debian/libxmltok1.install 
libxmltok-1.2/debian/libxmltok1.install
--- libxmltok-1.2/debian/libxmltok1.install 2017-08-10 12:01:46.0 
+
+++ libxmltok-1.2/debian/libxmltok1.install 1970-01-01 00:00:00.0 
+
@@ -1 +0,0 @@
-usr/lib/*.so.*
diff -Nru libxmltok-1.2/debian/libxmltok1t64.docs 
libxmltok-1.2/debian/libxmltok1t64.docs
--- libxmltok-1.2/debian/libxmltok1t64.docs 

Bug#1062735: libxmltok: NMU diff for 64-bit time_t transition

2024-02-02 Thread Steve Langasek
Source: libxmltok
Version: 1.2-4
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
libxmltok 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 libxmltok
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'), (500, 'testing'), (500, 'stable'), (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)