Source: s6
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 s6-2.12.0.0/debian/changelog s6-2.12.0.0/debian/changelog
--- s6-2.12.0.0/debian/changelog        2023-11-07 21:49:58.000000000 +0000
+++ s6-2.12.0.0/debian/changelog        2024-02-29 15:39:39.000000000 +0000
@@ -1,3 +1,10 @@
+s6 (2.12.0.0-2.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Rename libraries for 64-bit time_t transition.  Closes: #1062877
+
+ -- Benjamin Drung <bdr...@debian.org>  Thu, 29 Feb 2024 15:39:39 +0000
+
 s6 (2.12.0.0-2) unstable; urgency=medium
 
   * Source only upload for testing migration
diff -Nru s6-2.12.0.0/debian/control s6-2.12.0.0/debian/control
--- s6-2.12.0.0/debian/control  2023-11-07 21:49:58.000000000 +0000
+++ s6-2.12.0.0/debian/control  2024-02-29 15:39:39.000000000 +0000
@@ -3,9 +3,9 @@
 Priority: optional
 Maintainer: Shengjing Zhu <z...@debian.org>
 Rules-Requires-Root: no
-Build-Depends:
+Build-Depends: dpkg-dev (>= 1.22.5),
  debhelper-compat (= 13),
-Build-Depends-Arch:
+Build-Depends-Arch: dpkg-dev (>= 1.22.5),
  libexecline-dev (>= 2.9.0.0),
  skalibs-dev (>= 2.14.0.0),
 Standards-Version: 4.6.2
@@ -13,14 +13,16 @@
 Vcs-Git: https://salsa.debian.org/zhsj/s6.git
 Vcs-Browser: https://salsa.debian.org/zhsj/s6
 
-Package: libs6-2.12
+Package: libs6-2.12t64
+Provides: ${t64:Provides}
+Replaces: libs6-2.12
 Architecture: any
 Section: libs
 Multi-Arch: same
 Depends:
  ${misc:Depends},
  ${shlibs:Depends},
-Breaks:
+Breaks:libs6-2.12 (<< ${source:Version}), 
  s6 (<< 2.8.0.1),
 Description: small and secure supervision software suite (shared library)
  s6 is a small suite of programs for UNIX, designed to allow process
@@ -38,7 +40,7 @@
 Section: libdevel
 Multi-Arch: same
 Depends:
- libs6-2.12 (= ${binary:Version}),
+ libs6-2.12t64 (= ${binary:Version}),
  ${misc:Depends},
 Description: small and secure supervision software suite (development files)
  s6 is a small suite of programs for UNIX, designed to allow process
diff -Nru s6-2.12.0.0/debian/libs6-2.12.install 
s6-2.12.0.0/debian/libs6-2.12.install
--- s6-2.12.0.0/debian/libs6-2.12.install       2023-11-07 21:49:58.000000000 
+0000
+++ s6-2.12.0.0/debian/libs6-2.12.install       1970-01-01 00:00:00.000000000 
+0000
@@ -1 +0,0 @@
-usr/lib/*/*.so.*
diff -Nru s6-2.12.0.0/debian/libs6-2.12.symbols 
s6-2.12.0.0/debian/libs6-2.12.symbols
--- s6-2.12.0.0/debian/libs6-2.12.symbols       2023-11-07 21:49:58.000000000 
+0000
+++ s6-2.12.0.0/debian/libs6-2.12.symbols       1970-01-01 00:00:00.000000000 
+0000
@@ -1,63 +0,0 @@
-libs6.so.2.12 libs6-2.12 #MINVER#
-* Build-Depends-Package: libs6-dev
- ftrigr1_zero@Base 2.7.2.0
- ftrigr_ack@Base 2.7.2.0
- ftrigr_check@Base 2.7.2.0
- ftrigr_checksa@Base 2.7.2.0
- ftrigr_end@Base 2.7.2.0
- ftrigr_start@Base 2.7.2.0
- ftrigr_startf@Base 2.7.2.0
- ftrigr_subscribe@Base 2.7.2.0
- ftrigr_unsubscribe@Base 2.7.2.0
- ftrigr_update@Base 2.7.2.0
- ftrigr_updateb@Base 2.7.2.0
- ftrigr_wait_and@Base 2.7.2.0
- ftrigr_wait_or@Base 2.7.2.0
- ftrigr_zero@Base 2.7.2.0
- ftrigw_clean@Base 2.7.2.0
- ftrigw_fifodir_make@Base 2.7.2.0
- ftrigw_notify@Base 2.7.2.0
- ftrigw_notifyb@Base 2.7.2.0
- ftrigw_notifyb_nosig@Base 2.7.2.0
- s6_accessrules_backend_cdb@Base 2.7.2.0
- s6_accessrules_backend_fs@Base 2.7.2.0
- s6_accessrules_keycheck_ip4@Base 2.7.2.0
- s6_accessrules_keycheck_ip6@Base 2.7.2.0
- s6_accessrules_keycheck_reversedns@Base 2.7.2.0
- s6_accessrules_keycheck_uidgid@Base 2.7.2.0
- s6_accessrules_params_free@Base 2.7.2.0
- s6_accessrules_uidgid_cdb@Base 2.7.2.0
- s6_accessrules_uidgid_fs@Base 2.7.2.0
- s6_dtally_pack@Base 2.7.2.0
- s6_dtally_read@Base 2.7.2.0
- s6_dtally_unpack@Base 2.7.2.0
- s6_dtally_write@Base 2.7.2.0
- s6_fdholder_delete@Base 2.7.2.0
- s6_fdholder_delete_async@Base 2.7.2.0
- s6_fdholder_end@Base 2.7.2.0
- s6_fdholder_getdump@Base 2.7.2.0
- s6_fdholder_list@Base 2.7.2.0
- s6_fdholder_list_async@Base 2.7.2.0
- s6_fdholder_list_cb@Base 2.7.2.0
- s6_fdholder_retrieve_cb@Base 2.7.2.0
- s6_fdholder_retrieve_maybe_delete@Base 2.7.2.0
- s6_fdholder_retrieve_maybe_delete_async@Base 2.7.2.0
- s6_fdholder_setdump@Base 2.7.2.0
- s6_fdholder_start@Base 2.7.2.0
- s6_fdholder_store@Base 2.7.2.0
- s6_fdholder_store_async@Base 2.7.2.0
- s6_instance_chdirservice@Base 2.11.2.0
- s6_servicedir_file_list@Base 2.11.2.0
- s6_servicedir_instances_recreate_offline@Base 2.11.3.0
- s6_servicedir_instances_recreate_offline_tmp@Base 2.11.3.0
- s6_supervise_link@Base 2.10.0.0
- s6_supervise_link_names@Base 2.11.0.0
- s6_supervise_unlink@Base 2.10.0.0
- s6_supervise_unlink_names@Base 2.11.0.0
- s6_svc_ok@Base 2.7.2.0
- s6_svc_write@Base 2.7.2.0
- s6_svc_writectl@Base 2.7.2.0
- s6_svstatus_pack@Base 2.7.2.0
- s6_svstatus_read@Base 2.7.2.0
- s6_svstatus_unpack@Base 2.7.2.0
- s6_svstatus_write@Base 2.7.2.0
diff -Nru s6-2.12.0.0/debian/libs6-2.12t64.install 
s6-2.12.0.0/debian/libs6-2.12t64.install
--- s6-2.12.0.0/debian/libs6-2.12t64.install    1970-01-01 00:00:00.000000000 
+0000
+++ s6-2.12.0.0/debian/libs6-2.12t64.install    2023-11-07 21:49:58.000000000 
+0000
@@ -0,0 +1 @@
+usr/lib/*/*.so.*
diff -Nru s6-2.12.0.0/debian/libs6-2.12t64.lintian-overrides 
s6-2.12.0.0/debian/libs6-2.12t64.lintian-overrides
--- s6-2.12.0.0/debian/libs6-2.12t64.lintian-overrides  1970-01-01 
00:00:00.000000000 +0000
+++ s6-2.12.0.0/debian/libs6-2.12t64.lintian-overrides  2024-02-29 
15:39:34.000000000 +0000
@@ -0,0 +1 @@
+libs6-2.12t64: package-name-doesnt-match-sonames libs6-2.12
diff -Nru s6-2.12.0.0/debian/libs6-2.12t64.symbols 
s6-2.12.0.0/debian/libs6-2.12t64.symbols
--- s6-2.12.0.0/debian/libs6-2.12t64.symbols    1970-01-01 00:00:00.000000000 
+0000
+++ s6-2.12.0.0/debian/libs6-2.12t64.symbols    2024-02-29 15:39:34.000000000 
+0000
@@ -0,0 +1,63 @@
+libs6.so.2.12 libs6-2.12t64 #MINVER#
+* Build-Depends-Package: libs6-dev
+ ftrigr1_zero@Base 2.7.2.0
+ ftrigr_ack@Base 2.7.2.0
+ ftrigr_check@Base 2.7.2.0
+ ftrigr_checksa@Base 2.7.2.0
+ ftrigr_end@Base 2.7.2.0
+ ftrigr_start@Base 2.7.2.0
+ ftrigr_startf@Base 2.7.2.0
+ ftrigr_subscribe@Base 2.7.2.0
+ ftrigr_unsubscribe@Base 2.7.2.0
+ ftrigr_update@Base 2.7.2.0
+ ftrigr_updateb@Base 2.7.2.0
+ ftrigr_wait_and@Base 2.7.2.0
+ ftrigr_wait_or@Base 2.7.2.0
+ ftrigr_zero@Base 2.7.2.0
+ ftrigw_clean@Base 2.7.2.0
+ ftrigw_fifodir_make@Base 2.7.2.0
+ ftrigw_notify@Base 2.7.2.0
+ ftrigw_notifyb@Base 2.7.2.0
+ ftrigw_notifyb_nosig@Base 2.7.2.0
+ s6_accessrules_backend_cdb@Base 2.7.2.0
+ s6_accessrules_backend_fs@Base 2.7.2.0
+ s6_accessrules_keycheck_ip4@Base 2.7.2.0
+ s6_accessrules_keycheck_ip6@Base 2.7.2.0
+ s6_accessrules_keycheck_reversedns@Base 2.7.2.0
+ s6_accessrules_keycheck_uidgid@Base 2.7.2.0
+ s6_accessrules_params_free@Base 2.7.2.0
+ s6_accessrules_uidgid_cdb@Base 2.7.2.0
+ s6_accessrules_uidgid_fs@Base 2.7.2.0
+ s6_dtally_pack@Base 2.7.2.0
+ s6_dtally_read@Base 2.7.2.0
+ s6_dtally_unpack@Base 2.7.2.0
+ s6_dtally_write@Base 2.7.2.0
+ s6_fdholder_delete@Base 2.7.2.0
+ s6_fdholder_delete_async@Base 2.7.2.0
+ s6_fdholder_end@Base 2.7.2.0
+ s6_fdholder_getdump@Base 2.7.2.0
+ s6_fdholder_list@Base 2.7.2.0
+ s6_fdholder_list_async@Base 2.7.2.0
+ s6_fdholder_list_cb@Base 2.7.2.0
+ s6_fdholder_retrieve_cb@Base 2.7.2.0
+ s6_fdholder_retrieve_maybe_delete@Base 2.7.2.0
+ s6_fdholder_retrieve_maybe_delete_async@Base 2.7.2.0
+ s6_fdholder_setdump@Base 2.7.2.0
+ s6_fdholder_start@Base 2.7.2.0
+ s6_fdholder_store@Base 2.7.2.0
+ s6_fdholder_store_async@Base 2.7.2.0
+ s6_instance_chdirservice@Base 2.11.2.0
+ s6_servicedir_file_list@Base 2.11.2.0
+ s6_servicedir_instances_recreate_offline@Base 2.11.3.0
+ s6_servicedir_instances_recreate_offline_tmp@Base 2.11.3.0
+ s6_supervise_link@Base 2.10.0.0
+ s6_supervise_link_names@Base 2.11.0.0
+ s6_supervise_unlink@Base 2.10.0.0
+ s6_supervise_unlink_names@Base 2.11.0.0
+ s6_svc_ok@Base 2.7.2.0
+ s6_svc_write@Base 2.7.2.0
+ s6_svc_writectl@Base 2.7.2.0
+ s6_svstatus_pack@Base 2.7.2.0
+ s6_svstatus_read@Base 2.7.2.0
+ s6_svstatus_unpack@Base 2.7.2.0
+ s6_svstatus_write@Base 2.7.2.0

Reply via email to