[Debian-ha-maintainers] Bug#1062501: kronosnet: NMU diff for 64-bit time_t transition

Wed Feb 28 15:32:09 GMT 2024

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-21-generic (SMP w/4 CPU threads; PREEMPT)
Kernel taint flags: TAINT_PROPRIETARY_MODULE, TAINT_OOT_MODULE
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), LANGUAGE not set
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
-------------- next part --------------
diff -Nru kronosnet-1.28/debian/changelog kronosnet-1.28/debian/changelog

--- kronosnet-1.28/debian/changelog	2023-09-29 16:59:46.000000000 +0000
+++ kronosnet-1.28/debian/changelog	2024-02-28 15:31:26.000000000 +0000
@@ -1,3 +1,10 @@
+kronosnet (1.28-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Rename libraries for 64-bit time_t transition.  Closes: #1062501
+
+ -- Lukas M?rdian <slyon at debian.org>  Wed, 28 Feb 2024 15:31:26 +0000
+
 kronosnet (1.28-1) unstable; urgency=medium
 
   * [b4ef57b] New upstream release (1.28)
diff -Nru kronosnet-1.28/debian/control kronosnet-1.28/debian/control
--- kronosnet-1.28/debian/control	2023-01-04 11:35:11.000000000 +0000
+++ kronosnet-1.28/debian/control	2024-02-28 15:31:26.000000000 +0000
@@ -6,7 +6,7 @@
  Ferenc W?gner <wferi at debian.org>,
 Standards-Version: 4.6.2
 Rules-Requires-Root: no
-Build-Depends:
+Build-Depends: dpkg-dev (>= 1.22.5),
  debhelper-compat (= 13),
 # nozzle tests on Linux use the ip utility from:
  iproute2 [linux-any],
@@ -55,7 +55,7 @@
 Architecture: linux-any kfreebsd-any
 Multi-Arch: same
 Depends:
- libknet1 (= ${binary:Version}),
+ libknet1t64 (= ${binary:Version}),
  ${misc:Depends},
 Suggests:
  libknet-doc (= ${binary:Version}),
@@ -80,7 +80,10 @@
  .
  This package contains the man pages of the API functions.
 
-Package: libknet1
+Package: libknet1t64
+Provides: ${t64:Provides}
+Replaces: libknet1
+Breaks: libknet1 (<< ${source:Version})
 Section: libs
 # Hurd misses both epoll and kevent:
 Architecture: linux-any kfreebsd-any
@@ -99,7 +102,7 @@
 Architecture: linux-any kfreebsd-any
 Multi-Arch: same
 Depends:
- libnozzle1 (= ${binary:Version}),
+ libnozzle1t64 (= ${binary:Version}),
  ${misc:Depends},
 Suggests:
  libknet-doc (= ${binary:Version}),
@@ -108,7 +111,10 @@
  .
  This package contains header files required to build libnozzle clients.
 
-Package: libnozzle1
+Package: libnozzle1t64
+Provides: ${t64:Provides}
+Replaces: libnozzle1
+Breaks: libnozzle1 (<< ${source:Version})
 Section: libs
 # Hurd misses both epoll and kevent:
 Architecture: linux-any kfreebsd-any
diff -Nru kronosnet-1.28/debian/libknet1.install kronosnet-1.28/debian/libknet1.install
--- kronosnet-1.28/debian/libknet1.install	2023-01-04 11:32:32.000000000 +0000
+++ kronosnet-1.28/debian/libknet1.install	1970-01-01 00:00:00.000000000 +0000
@@ -1,2 +0,0 @@
-usr/lib/*/libknet.so.*
-usr/lib/*/kronosnet/*.so
diff -Nru kronosnet-1.28/debian/libknet1.symbols kronosnet-1.28/debian/libknet1.symbols
--- kronosnet-1.28/debian/libknet1.symbols	2023-01-04 11:32:32.000000000 +0000
+++ kronosnet-1.28/debian/libknet1.symbols	1970-01-01 00:00:00.000000000 +0000
@@ -1,71 +0,0 @@
-libknet.so.1 libknet1 #MINVER#
-* Build-Depends-Package: libknet-dev
- LIBKNET at LIBKNET 0.9
- knet_addrtostr at LIBKNET 0.9
- knet_get_compress_list at LIBKNET 0.9
- knet_get_crypto_list at LIBKNET 0.9
- knet_get_transport_id_by_name at LIBKNET 0.9
- knet_get_transport_list at LIBKNET 0.9
- knet_get_transport_name_by_id at LIBKNET 0.9
- knet_handle_add_datafd at LIBKNET 0.9
- knet_handle_clear_stats at LIBKNET 0.9
- knet_handle_compress at LIBKNET 0.9
- knet_handle_crypto at LIBKNET 0.9
- knet_handle_crypto_rx_clear_traffic at LIBKNET 1.18
- knet_handle_crypto_set_config at LIBKNET 1.18
- knet_handle_crypto_use_config at LIBKNET 1.18
- knet_handle_enable_access_lists at LIBKNET 1.11
- knet_handle_enable_filter at LIBKNET 0.9
- knet_handle_enable_pmtud_notify at LIBKNET 0.9
- knet_handle_enable_sock_notify at LIBKNET 0.9
- knet_handle_free at LIBKNET 0.9
- knet_handle_get_channel at LIBKNET 0.9
- knet_handle_get_datafd at LIBKNET 0.9
- knet_handle_get_stats at LIBKNET 0.9
- knet_handle_get_transport_reconnect_interval at LIBKNET 0.9
- knet_handle_new at LIBKNET 0.9
- knet_handle_new_ex at LIBKNET 1.1
- knet_handle_pmtud_get at LIBKNET 0.9
- knet_handle_pmtud_getfreq at LIBKNET 0.9
- knet_handle_pmtud_set at LIBKNET 1.11
- knet_handle_pmtud_setfreq at LIBKNET 0.9
- knet_handle_remove_datafd at LIBKNET 0.9
- knet_handle_set_transport_reconnect_interval at LIBKNET 0.9
- knet_handle_setfwd at LIBKNET 0.9
- knet_host_add at LIBKNET 0.9
- knet_host_enable_status_change_notify at LIBKNET 0.9
- knet_host_get_host_list at LIBKNET 0.9
- knet_host_get_id_by_host_name at LIBKNET 0.9
- knet_host_get_name_by_host_id at LIBKNET 0.9
- knet_host_get_policy at LIBKNET 0.9
- knet_host_get_status at LIBKNET 0.9
- knet_host_remove at LIBKNET 0.9
- knet_host_set_name at LIBKNET 0.9
- knet_host_set_policy at LIBKNET 0.9
- knet_link_add_acl at LIBKNET 1.11
- knet_link_clear_acl at LIBKNET 1.11
- knet_link_clear_config at LIBKNET 0.9
- knet_link_get_config at LIBKNET 0.9
- knet_link_get_enable at LIBKNET 0.9
- knet_link_get_link_list at LIBKNET 0.9
- knet_link_get_ping_timers at LIBKNET 0.9
- knet_link_get_pong_count at LIBKNET 0.9
- knet_link_get_priority at LIBKNET 0.9
- knet_link_get_status at LIBKNET 0.9
- knet_link_insert_acl at LIBKNET 1.11
- knet_link_rm_acl at LIBKNET 1.11
- knet_link_set_config at LIBKNET 0.9
- knet_link_set_enable at LIBKNET 0.9
- knet_link_set_ping_timers at LIBKNET 0.9
- knet_link_set_pong_count at LIBKNET 0.9
- knet_link_set_priority at LIBKNET 0.9
- knet_log_get_loglevel at LIBKNET 0.9
- knet_log_get_loglevel_id at LIBKNET 0.9
- knet_log_get_loglevel_name at LIBKNET 0.9
- knet_log_get_subsystem_id at LIBKNET 0.9
- knet_log_get_subsystem_name at LIBKNET 0.9
- knet_log_set_loglevel at LIBKNET 0.9
- knet_recv at LIBKNET 0.9
- knet_send at LIBKNET 0.9
- knet_send_sync at LIBKNET 0.9
- knet_strtoaddr at LIBKNET 0.9
diff -Nru kronosnet-1.28/debian/libknet1t64.install kronosnet-1.28/debian/libknet1t64.install
--- kronosnet-1.28/debian/libknet1t64.install	1970-01-01 00:00:00.000000000 +0000
+++ kronosnet-1.28/debian/libknet1t64.install	2023-01-04 11:32:32.000000000 +0000
@@ -0,0 +1,2 @@
+usr/lib/*/libknet.so.*
+usr/lib/*/kronosnet/*.so
diff -Nru kronosnet-1.28/debian/libknet1t64.lintian-overrides kronosnet-1.28/debian/libknet1t64.lintian-overrides
--- kronosnet-1.28/debian/libknet1t64.lintian-overrides	1970-01-01 00:00:00.000000000 +0000
+++ kronosnet-1.28/debian/libknet1t64.lintian-overrides	2024-02-28 15:31:17.000000000 +0000
@@ -0,0 +1 @@
+libknet1t64: package-name-doesnt-match-sonames libknet1
diff -Nru kronosnet-1.28/debian/libknet1t64.symbols kronosnet-1.28/debian/libknet1t64.symbols
--- kronosnet-1.28/debian/libknet1t64.symbols	1970-01-01 00:00:00.000000000 +0000
+++ kronosnet-1.28/debian/libknet1t64.symbols	2024-02-28 15:31:17.000000000 +0000
@@ -0,0 +1,71 @@
+libknet.so.1 libknet1t64 #MINVER#
+* Build-Depends-Package: libknet-dev
+ LIBKNET at LIBKNET 0.9
+ knet_addrtostr at LIBKNET 0.9
+ knet_get_compress_list at LIBKNET 0.9
+ knet_get_crypto_list at LIBKNET 0.9
+ knet_get_transport_id_by_name at LIBKNET 0.9
+ knet_get_transport_list at LIBKNET 0.9
+ knet_get_transport_name_by_id at LIBKNET 0.9
+ knet_handle_add_datafd at LIBKNET 0.9
+ knet_handle_clear_stats at LIBKNET 0.9
+ knet_handle_compress at LIBKNET 0.9
+ knet_handle_crypto at LIBKNET 0.9
+ knet_handle_crypto_rx_clear_traffic at LIBKNET 1.18
+ knet_handle_crypto_set_config at LIBKNET 1.18
+ knet_handle_crypto_use_config at LIBKNET 1.18
+ knet_handle_enable_access_lists at LIBKNET 1.11
+ knet_handle_enable_filter at LIBKNET 0.9
+ knet_handle_enable_pmtud_notify at LIBKNET 0.9
+ knet_handle_enable_sock_notify at LIBKNET 0.9
+ knet_handle_free at LIBKNET 0.9
+ knet_handle_get_channel at LIBKNET 0.9
+ knet_handle_get_datafd at LIBKNET 0.9
+ knet_handle_get_stats at LIBKNET 0.9
+ knet_handle_get_transport_reconnect_interval at LIBKNET 0.9
+ knet_handle_new at LIBKNET 0.9
+ knet_handle_new_ex at LIBKNET 1.1
+ knet_handle_pmtud_get at LIBKNET 0.9
+ knet_handle_pmtud_getfreq at LIBKNET 0.9
+ knet_handle_pmtud_set at LIBKNET 1.11
+ knet_handle_pmtud_setfreq at LIBKNET 0.9
+ knet_handle_remove_datafd at LIBKNET 0.9
+ knet_handle_set_transport_reconnect_interval at LIBKNET 0.9
+ knet_handle_setfwd at LIBKNET 0.9
+ knet_host_add at LIBKNET 0.9
+ knet_host_enable_status_change_notify at LIBKNET 0.9
+ knet_host_get_host_list at LIBKNET 0.9
+ knet_host_get_id_by_host_name at LIBKNET 0.9
+ knet_host_get_name_by_host_id at LIBKNET 0.9
+ knet_host_get_policy at LIBKNET 0.9
+ knet_host_get_status at LIBKNET 0.9
+ knet_host_remove at LIBKNET 0.9
+ knet_host_set_name at LIBKNET 0.9
+ knet_host_set_policy at LIBKNET 0.9
+ knet_link_add_acl at LIBKNET 1.11
+ knet_link_clear_acl at LIBKNET 1.11
+ knet_link_clear_config at LIBKNET 0.9
+ knet_link_get_config at LIBKNET 0.9
+ knet_link_get_enable at LIBKNET 0.9
+ knet_link_get_link_list at LIBKNET 0.9
+ knet_link_get_ping_timers at LIBKNET 0.9
+ knet_link_get_pong_count at LIBKNET 0.9
+ knet_link_get_priority at LIBKNET 0.9
+ knet_link_get_status at LIBKNET 0.9
+ knet_link_insert_acl at LIBKNET 1.11
+ knet_link_rm_acl at LIBKNET 1.11
+ knet_link_set_config at LIBKNET 0.9
+ knet_link_set_enable at LIBKNET 0.9
+ knet_link_set_ping_timers at LIBKNET 0.9
+ knet_link_set_pong_count at LIBKNET 0.9
+ knet_link_set_priority at LIBKNET 0.9
+ knet_log_get_loglevel at LIBKNET 0.9
+ knet_log_get_loglevel_id at LIBKNET 0.9
+ knet_log_get_loglevel_name at LIBKNET 0.9
+ knet_log_get_subsystem_id at LIBKNET 0.9
+ knet_log_get_subsystem_name at LIBKNET 0.9
+ knet_log_set_loglevel at LIBKNET 0.9
+ knet_recv at LIBKNET 0.9
+ knet_send at LIBKNET 0.9
+ knet_send_sync at LIBKNET 0.9
+ knet_strtoaddr at LIBKNET 0.9
diff -Nru kronosnet-1.28/debian/libnozzle1.install kronosnet-1.28/debian/libnozzle1.install
--- kronosnet-1.28/debian/libnozzle1.install	2023-01-04 11:32:32.000000000 +0000
+++ kronosnet-1.28/debian/libnozzle1.install	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-usr/lib/*/libnozzle.so.*
diff -Nru kronosnet-1.28/debian/libnozzle1.symbols kronosnet-1.28/debian/libnozzle1.symbols
--- kronosnet-1.28/debian/libnozzle1.symbols	2023-01-04 11:32:32.000000000 +0000
+++ kronosnet-1.28/debian/libnozzle1.symbols	1970-01-01 00:00:00.000000000 +0000
@@ -1,20 +0,0 @@
-libnozzle.so.1 libnozzle1 #MINVER#
-* Build-Depends-Package: libnozzle-dev
- LIBNOZZLE at LIBNOZZLE 1.6
- nozzle_add_ip at LIBNOZZLE 1.6
- nozzle_close at LIBNOZZLE 1.6
- nozzle_del_ip at LIBNOZZLE 1.6
- nozzle_get_fd at LIBNOZZLE 1.6
- nozzle_get_handle_by_name at LIBNOZZLE 1.6
- nozzle_get_ips at LIBNOZZLE 1.6
- nozzle_get_mac at LIBNOZZLE 1.6
- nozzle_get_mtu at LIBNOZZLE 1.6
- nozzle_get_name_by_handle at LIBNOZZLE 1.6
- nozzle_open at LIBNOZZLE 1.6
- nozzle_reset_mac at LIBNOZZLE 1.6
- nozzle_reset_mtu at LIBNOZZLE 1.6
- nozzle_run_updown at LIBNOZZLE 1.6
- nozzle_set_down at LIBNOZZLE 1.6
- nozzle_set_mac at LIBNOZZLE 1.6
- nozzle_set_mtu at LIBNOZZLE 1.6
- nozzle_set_up at LIBNOZZLE 1.6
diff -Nru kronosnet-1.28/debian/libnozzle1t64.install kronosnet-1.28/debian/libnozzle1t64.install
--- kronosnet-1.28/debian/libnozzle1t64.install	1970-01-01 00:00:00.000000000 +0000
+++ kronosnet-1.28/debian/libnozzle1t64.install	2023-01-04 11:32:32.000000000 +0000
@@ -0,0 +1 @@
+usr/lib/*/libnozzle.so.*
diff -Nru kronosnet-1.28/debian/libnozzle1t64.lintian-overrides kronosnet-1.28/debian/libnozzle1t64.lintian-overrides
--- kronosnet-1.28/debian/libnozzle1t64.lintian-overrides	1970-01-01 00:00:00.000000000 +0000
+++ kronosnet-1.28/debian/libnozzle1t64.lintian-overrides	2024-02-28 15:31:17.000000000 +0000
@@ -0,0 +1 @@
+libnozzle1t64: package-name-doesnt-match-sonames libnozzle1
diff -Nru kronosnet-1.28/debian/libnozzle1t64.symbols kronosnet-1.28/debian/libnozzle1t64.symbols
--- kronosnet-1.28/debian/libnozzle1t64.symbols	1970-01-01 00:00:00.000000000 +0000
+++ kronosnet-1.28/debian/libnozzle1t64.symbols	2024-02-28 15:31:17.000000000 +0000
@@ -0,0 +1,20 @@
+libnozzle.so.1 libnozzle1t64 #MINVER#
+* Build-Depends-Package: libnozzle-dev
+ LIBNOZZLE at LIBNOZZLE 1.6
+ nozzle_add_ip at LIBNOZZLE 1.6
+ nozzle_close at LIBNOZZLE 1.6
+ nozzle_del_ip at LIBNOZZLE 1.6
+ nozzle_get_fd at LIBNOZZLE 1.6
+ nozzle_get_handle_by_name at LIBNOZZLE 1.6
+ nozzle_get_ips at LIBNOZZLE 1.6
+ nozzle_get_mac at LIBNOZZLE 1.6
+ nozzle_get_mtu at LIBNOZZLE 1.6
+ nozzle_get_name_by_handle at LIBNOZZLE 1.6
+ nozzle_open at LIBNOZZLE 1.6
+ nozzle_reset_mac at LIBNOZZLE 1.6
+ nozzle_reset_mtu at LIBNOZZLE 1.6
+ nozzle_run_updown at LIBNOZZLE 1.6
+ nozzle_set_down at LIBNOZZLE 1.6
+ nozzle_set_mac at LIBNOZZLE 1.6
+ nozzle_set_mtu at LIBNOZZLE 1.6
+ nozzle_set_up at LIBNOZZLE 1.6
