Bug#1062924: st: NMU diff for 64-bit time_t transition

2024-02-29 Thread Benjamin Drung
Source: st
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 st-1.9/debian/changelog st-1.9/debian/changelog
--- st-1.9/debian/changelog 2020-06-20 23:31:02.0 +
+++ st-1.9/debian/changelog 2024-02-29 17:29:25.0 +
@@ -1,3 +1,10 @@
+st (1.9-3.3) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Rename libraries for 64-bit time_t transition.  Closes: #1062924
+
+ -- Benjamin Drung   Thu, 29 Feb 2024 17:29:25 +
+
 st (1.9-3.2) unstable; urgency=medium
 
   * Non-maintainer upload.
diff -Nru st-1.9/debian/control st-1.9/debian/control
--- st-1.9/debian/control   2020-06-20 23:20:22.0 +
+++ st-1.9/debian/control   2024-02-29 17:29:25.0 +
@@ -2,14 +2,14 @@
 Section: devel
 Priority: optional
 Maintainer: Wesley W. Terpstra (Debian) 
-Build-Depends: debhelper (>= 7.0.0), cdbs (>= 0.4.52), autotools-dev
+Build-Depends: dpkg-dev (>= 1.22.5), debhelper (>= 7.0.0), cdbs (>= 0.4.52), 
autotools-dev
 Standards-Version: 3.8.3.0
 Homepage: http://state-threads.sourceforge.net/
 
 Package: libst-dev
 Section: libdevel
 Architecture: any
-Depends: libst1 (= ${binary:Version}), ${misc:Depends}, libc6-dev
+Depends: libst1t64 (= ${binary:Version}), ${misc:Depends}, libc6-dev
 Recommends: pkg-config
 Conflicts: sox (<= 12.17.2-1), sox-dev
 Description: State Threads Library - Development files
@@ -25,7 +25,10 @@
  .
  This package contains the development files for compiling programs.
 
-Package: libst1
+Package: libst1t64
+Provides: ${t64:Provides}
+Replaces: libst1
+Breaks: libst1 (<< ${source:Version})
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
diff -Nru st-1.9/debian/libst1.install st-1.9/debian/libst1.install
--- st-1.9/debian/libst1.install2020-06-20 23:18:27.0 +
+++ st-1.9/debian/libst1.install1970-01-01 00:00:00.0 +
@@ -1 +0,0 @@
-obj/lib*.so.*  usr/lib
diff -Nru st-1.9/debian/libst1.lintian-overrides 
st-1.9/debian/libst1.lintian-overrides
--- st-1.9/debian/libst1.lintian-overrides  2020-06-20 23:18:27.0 
+
+++ st-1.9/debian/libst1.lintian-overrides  1970-01-01 00:00:00.0 
+
@@ -1,3 +0,0 @@
-# State-threads causes the program to exit when all threads terminate.
-# exit() is not invoked as the result of an error condition.
-libst1: shlib-calls-exit usr/lib/libst.so.1.9
diff -Nru st-1.9/debian/libst1.symbols st-1.9/debian/libst1.symbols
--- st-1.9/debian/libst1.symbols2020-06-20 23:18:27.0 +
+++ st-1.9/debian/libst1.symbols1970-01-01 00:00:00.0 +
@@ -1,63 +0,0 @@
-libst.so.1 libst1 #MINVER#
-* Build-Depends-Package: libst-dev
- st_accept@Base 1.9
- st_cond_broadcast@Base 1.9
- st_cond_destroy@Base 1.9
- st_cond_new@Base 1.9
- st_cond_signal@Base 1.9
- st_cond_timedwait@Base 1.9
- st_cond_wait@Base 1.9
- st_connect@Base 1.9
- st_get_eventsys@Base 1.9
- st_get_eventsys_name@Base 1.9
- st_getfdlimit@Base 1.9
- st_init@Base 1.9
- st_key_create@Base 1.9
- st_key_getlimit@Base 1.9
- st_mutex_destroy@Base 1.9
- st_mutex_lock@Base 1.9
- st_mutex_new@Base 1.9
- st_mutex_trylock@Base 1.9
- st_mutex_unlock@Base 1.9
- st_netfd_close@Base 1.9
- st_netfd_fileno@Base 1.9
- st_netfd_free@Base 1.9
- st_netfd_getspecific@Base 1.9
- st_netfd_open@Base 1.9
- st_netfd_open_socket@Base 1.9
- st_netfd_poll@Base 1.9
- st_netfd_serialize_accept@Base 1.9
- st_netfd_setspecific@Base 1.9
- st_open@Base 1.9
- st_poll@Base 1.9
- st_randomize_stacks@Base 1.9
- st_read@Base 1.9
- st_read_fully@Base 1.9
- st_read_resid@Base 1.9
- st_readv@Base 1.9
- st_readv_resid@Base 1.9
- st_recvfrom@Base 1.9
- st_recvmsg@Base 1.9
- st_sendmsg@Base 1.9
- st_sendto@Base 1.9
- st_set_eventsys@Base 1.9
- st_set_switch_in_cb@Base 1.9
- st_set_switch_out_cb@Base 1.9
- st_set_utime_function@Base 1.9
- st_sleep@Base 1.9
- st_thread_create@Base 1.9
- st_thread_exit@Base 1.9
- st_thread_getspecific@Base 1.9
- st_thread_interrupt@Base 1.9
- st_thread_join@Base 1.9
- st_thread_self@Base 1.9
- st_thread_setspecific@Base 1.9
- st_time@Base 1.9
- st_timecache_set@Base 1.9
- st_usleep@Base 1.9
- st_utime@Base 1.9
- st_utime_last_clock@Base 1.9
- st_write@Base 1.9
- st_write_resid@Base 1.9
- st_writev@Base 1.9
- st_writev_resid@Base 1.9
diff -Nru st-1.9/debian/libst1t64.install st-1.9/debian/libst1t64.install

Bug#1062924: st: NMU diff for 64-bit time_t transition

2024-02-03 Thread Steve Langasek
Source: st
Version: 1.9-3.2
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
st 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 st
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 st-1.9/debian/changelog st-1.9/debian/changelog
--- st-1.9/debian/changelog 2020-06-20 23:31:02.0 +
+++ st-1.9/debian/changelog 2024-02-04 00:03:27.0 +
@@ -1,3 +1,10 @@
+st (1.9-3.3) experimental; urgency=medium
+
+  * Non-maintainer upload.
+  * Rename libraries for 64-bit time_t transition.
+
+ -- Steve Langasek   Sun, 04 Feb 2024 00:03:27 +
+
 st (1.9-3.2) unstable; urgency=medium
 
   * Non-maintainer upload.
diff -Nru st-1.9/debian/control st-1.9/debian/control
--- st-1.9/debian/control   2020-06-20 23:20:22.0 +
+++ st-1.9/debian/control   2024-02-04 00:03:27.0 +
@@ -9,7 +9,7 @@
 Package: libst-dev
 Section: libdevel
 Architecture: any
-Depends: libst1 (= ${binary:Version}), ${misc:Depends}, libc6-dev
+Depends: libst1t64 (= ${binary:Version}), ${misc:Depends}, libc6-dev
 Recommends: pkg-config
 Conflicts: sox (<= 12.17.2-1), sox-dev
 Description: State Threads Library - Development files
@@ -25,7 +25,10 @@
  .
  This package contains the development files for compiling programs.
 
-Package: libst1
+Package: libst1t64
+Provides: ${t64:Provides}
+Replaces: libst1
+Breaks: libst1 (<< ${source:Version})
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
diff -Nru st-1.9/debian/libst1.install st-1.9/debian/libst1.install
--- st-1.9/debian/libst1.install2020-06-20 23:18:27.0 +
+++ st-1.9/debian/libst1.install1970-01-01 00:00:00.0 +
@@ -1 +0,0 @@
-obj/lib*.so.*  usr/lib
diff -Nru st-1.9/debian/libst1.lintian-overrides 
st-1.9/debian/libst1.lintian-overrides
--- st-1.9/debian/libst1.lintian-overrides  2020-06-20 23:18:27.0 
+
+++ st-1.9/debian/libst1.lintian-overrides  1970-01-01 00:00:00.0 
+
@@ -1,3 +0,0 @@
-# State-threads causes the program to exit when all threads terminate.
-# exit() is not invoked as the result of an error condition.
-libst1: shlib-calls-exit usr/lib/libst.so.1.9
diff -Nru st-1.9/debian/libst1.symbols st-1.9/debian/libst1.symbols
--- st-1.9/debian/libst1.symbols2020-06-20 23:18:27.0 +
+++ st-1.9/debian/libst1.symbols1970-01-01 00:00:00.0 +
@@ -1,63 +0,0 @@
-libst.so.1 libst1 #MINVER#
-* Build-Depends-Package: libst-dev
- st_accept@Base 1.9
- st_cond_broadcast@Base 1.9
- st_cond_destroy@Base 1.9
- st_cond_new@Base 1.9
- st_cond_signal@Base 1.9
- st_cond_timedwait@Base 1.9
- st_cond_wait@Base 1.9
- st_connect@Base 1.9
- st_get_eventsys@Base 1.9
- st_get_eventsys_name@Base 1.9
- st_getfdlimit@Base 1.9
- st_init@Base 1.9
- st_key_create@Base 1.9
- st_key_getlimit@Base 1.9
- st_mutex_destroy@Base 1.9
- st_mutex_lock@Base 1.9
- st_mutex_new@Base 1.9
- st_mutex_trylock@Base 1.9
- st_mutex_unlock@Base 1.9
- st_netfd_close@Base 1.9
- st_netfd_fileno@Base 1.9
- st_netfd_free@Base 1.9
- st_netfd_getspecific@Base 1.9
-