Source: nut
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 nut-2.8.1/debian/changelog nut-2.8.1/debian/changelog
--- nut-2.8.1/debian/changelog 2024-01-11 16:01:16.000000000 +0000
+++ nut-2.8.1/debian/changelog 2024-02-29 01:26:20.000000000 +0000
@@ -1,3 +1,10 @@
+nut (2.8.1-3.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Rename libraries for 64-bit time_t transition. Closes: #1064256
+
+ -- Benjamin Drung <bdr...@debian.org> Thu, 29 Feb 2024 01:26:20 +0000
+
nut (2.8.1-3) unstable; urgency=medium
* debian/control: Add missing Breaks/Replaces on nut-modbus (Closes:
diff -Nru nut-2.8.1/debian/control nut-2.8.1/debian/control
--- nut-2.8.1/debian/control 2024-01-11 16:01:16.000000000 +0000
+++ nut-2.8.1/debian/control 2024-02-29 01:26:20.000000000 +0000
@@ -2,7 +2,7 @@
Section: admin
Priority: optional
Maintainer: Laurent Bigonville <bi...@debian.org>
-Build-Depends: asciidoc <!nodoc>,
+Build-Depends: dpkg-dev (>= 1.22.5), asciidoc <!nodoc>,
debhelper (>= 12),
dh-python,
docbook-xml <!nodoc>,
@@ -200,7 +200,10 @@
.
This package contains FAQ, user, developer and packager documentation.
-Package: libupsclient6
+Package: libupsclient6t64
+Provides: ${t64:Provides}
+Replaces: libupsclient6
+Breaks: libupsclient6 (<< ${source:Version})
Section: libs
Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends}
@@ -219,7 +222,7 @@
Section: libdevel
Architecture: any
Depends: libnss3-dev,
- libupsclient6 (= ${binary:Version}),
+ libupsclient6t64 (= ${binary:Version}),
${misc:Depends},
${shlibs:Depends}
Multi-Arch: same
@@ -232,7 +235,10 @@
.
This package provides the development files.
-Package: libnutclient2
+Package: libnutclient2t64
+Provides: ${t64:Provides}
+Replaces: libnutclient2
+Breaks: libnutclient2 (<< ${source:Version})
Section: libs
Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends}
@@ -250,7 +256,7 @@
Package: libnutclient-dev
Section: libdevel
Architecture: any
-Depends: libnutclient2 (= ${binary:Version}),
+Depends: libnutclient2t64 (= ${binary:Version}),
${misc:Depends},
${shlibs:Depends}
Multi-Arch: same
@@ -263,7 +269,10 @@
.
This package provides the development files for the new client library.
-Package: libnutscan2
+Package: libnutscan2t64
+Provides: ${t64:Provides}
+Replaces: libnutscan2
+Breaks: libnutscan2 (<< ${source:Version})
Section: libs
Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends}
@@ -281,7 +290,7 @@
Package: libnutscan-dev
Section: libdevel
Architecture: any
-Depends: libnutscan2 (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
+Depends: libnutscan2t64 (= ${binary:Version}), ${misc:Depends},
${shlibs:Depends}
Breaks: libupsclient-dev (<< 2.7.4-9~)
Replaces: libupsclient-dev (<< 2.7.4-9~)
Multi-Arch: same
diff -Nru nut-2.8.1/debian/libnutclient2.install
nut-2.8.1/debian/libnutclient2.install
--- nut-2.8.1/debian/libnutclient2.install 2024-01-11 16:01:16.000000000
+0000
+++ nut-2.8.1/debian/libnutclient2.install 1970-01-01 00:00:00.000000000
+0000
@@ -1,2 +0,0 @@
-lib/*/libnutclient.so.*
-lib/*/libnutclientstub.so.*
diff -Nru nut-2.8.1/debian/libnutclient2t64.install
nut-2.8.1/debian/libnutclient2t64.install
--- nut-2.8.1/debian/libnutclient2t64.install 1970-01-01 00:00:00.000000000
+0000
+++ nut-2.8.1/debian/libnutclient2t64.install 2024-01-11 16:01:16.000000000
+0000
@@ -0,0 +1,2 @@
+lib/*/libnutclient.so.*
+lib/*/libnutclientstub.so.*
diff -Nru nut-2.8.1/debian/libnutclient2t64.lintian-overrides
nut-2.8.1/debian/libnutclient2t64.lintian-overrides
--- nut-2.8.1/debian/libnutclient2t64.lintian-overrides 1970-01-01
00:00:00.000000000 +0000
+++ nut-2.8.1/debian/libnutclient2t64.lintian-overrides 2024-02-29
01:24:06.000000000 +0000
@@ -0,0 +1 @@
+libnutclient2t64: package-name-doesnt-match-sonames libnutclient2
diff -Nru nut-2.8.1/debian/libnutscan2.install
nut-2.8.1/debian/libnutscan2.install
--- nut-2.8.1/debian/libnutscan2.install 2024-01-11 16:01:16.000000000
+0000
+++ nut-2.8.1/debian/libnutscan2.install 1970-01-01 00:00:00.000000000
+0000
@@ -1,2 +0,0 @@
-lib/*/libnutscan.a
-lib/*/libnutscan.so.*
diff -Nru nut-2.8.1/debian/libnutscan2.symbols
nut-2.8.1/debian/libnutscan2.symbols
--- nut-2.8.1/debian/libnutscan2.symbols 2024-01-11 16:01:16.000000000
+0000
+++ nut-2.8.1/debian/libnutscan2.symbols 1970-01-01 00:00:00.000000000
+0000
@@ -1,49 +0,0 @@
-libnutscan.so.2 libnutscan2 #MINVER#
-* Build-Depends-Package: libnutscan-dev
- curr_threads@Base 2.8.0
- max_threads@Base 2.8.0
- max_threads_netsnmp@Base 2.8.0
- max_threads_netxml@Base 2.8.0
- max_threads_oldnut@Base 2.8.0
- nut_debug_level@Base 2.8.0
- nut_prepare_search_paths@Base 2.8.1
- nut_report_config_flags@Base 2.8.1
- nutscan_add_device_to_device@Base 2.8.0
- nutscan_add_option_to_device@Base 2.8.0
- nutscan_avail_avahi@Base 2.8.0
- nutscan_avail_ipmi@Base 2.8.0
- nutscan_avail_nut@Base 2.8.0
- nutscan_avail_snmp@Base 2.8.0
- nutscan_avail_usb@Base 2.8.0
- nutscan_avail_xml_http@Base 2.8.0
- nutscan_cidr_to_ip@Base 2.8.0
- nutscan_device_type_strings@Base 2.8.0
- nutscan_display_parsable@Base 2.8.0
- nutscan_display_sanity_check@Base 2.8.1
- nutscan_display_sanity_check_serial@Base 2.8.1
- nutscan_display_ups_conf@Base 2.8.0
- nutscan_display_ups_conf_with_sanity_check@Base 2.8.1
- nutscan_free@Base 2.8.0
- nutscan_free_device@Base 2.8.0
- nutscan_get_serial_ports_list@Base 2.8.0
- nutscan_init@Base 2.8.0
- nutscan_ip_iter_inc@Base 2.8.0
- nutscan_ip_iter_init@Base 2.8.0
- nutscan_load_avahi_library@Base 2.8.0
- (arch=!hurd-any)nutscan_load_ipmi_library@Base 2.8.0
- nutscan_load_neon_library@Base 2.8.0
- nutscan_load_snmp_library@Base 2.8.0
- nutscan_load_upsclient_library@Base 2.8.0
- nutscan_load_usb_library@Base 2.8.0
- nutscan_new_device@Base 2.8.0
- nutscan_rewind_device@Base 2.8.0
- nutscan_scan_avahi@Base 2.8.0
- nutscan_scan_eaton_serial@Base 2.8.0
- nutscan_scan_ipmi@Base 2.8.0
- nutscan_scan_nut@Base 2.8.0
- nutscan_scan_snmp@Base 2.8.0
- nutscan_scan_usb@Base 2.8.0
- nutscan_scan_xml_http_range@Base 2.8.0
- nutscan_semaphore@Base 2.8.0
- s_upsdebugx@Base 2.8.0
- upsdebugx_report_search_paths@Base 2.8.1
diff -Nru nut-2.8.1/debian/libnutscan2t64.install
nut-2.8.1/debian/libnutscan2t64.install
--- nut-2.8.1/debian/libnutscan2t64.install 1970-01-01 00:00:00.000000000
+0000
+++ nut-2.8.1/debian/libnutscan2t64.install 2024-01-11 16:01:16.000000000
+0000
@@ -0,0 +1,2 @@
+lib/*/libnutscan.a
+lib/*/libnutscan.so.*
diff -Nru nut-2.8.1/debian/libnutscan2t64.lintian-overrides
nut-2.8.1/debian/libnutscan2t64.lintian-overrides
--- nut-2.8.1/debian/libnutscan2t64.lintian-overrides 1970-01-01
00:00:00.000000000 +0000
+++ nut-2.8.1/debian/libnutscan2t64.lintian-overrides 2024-02-29
01:24:06.000000000 +0000
@@ -0,0 +1 @@
+libnutscan2t64: package-name-doesnt-match-sonames libnutscan2
diff -Nru nut-2.8.1/debian/libnutscan2t64.symbols
nut-2.8.1/debian/libnutscan2t64.symbols
--- nut-2.8.1/debian/libnutscan2t64.symbols 1970-01-01 00:00:00.000000000
+0000
+++ nut-2.8.1/debian/libnutscan2t64.symbols 2024-02-29 01:24:06.000000000
+0000
@@ -0,0 +1,49 @@
+libnutscan.so.2 libnutscan2t64 #MINVER#
+* Build-Depends-Package: libnutscan-dev
+ curr_threads@Base 2.8.0
+ max_threads@Base 2.8.0
+ max_threads_netsnmp@Base 2.8.0
+ max_threads_netxml@Base 2.8.0
+ max_threads_oldnut@Base 2.8.0
+ nut_debug_level@Base 2.8.0
+ nut_prepare_search_paths@Base 2.8.1
+ nut_report_config_flags@Base 2.8.1
+ nutscan_add_device_to_device@Base 2.8.0
+ nutscan_add_option_to_device@Base 2.8.0
+ nutscan_avail_avahi@Base 2.8.0
+ nutscan_avail_ipmi@Base 2.8.0
+ nutscan_avail_nut@Base 2.8.0
+ nutscan_avail_snmp@Base 2.8.0
+ nutscan_avail_usb@Base 2.8.0
+ nutscan_avail_xml_http@Base 2.8.0
+ nutscan_cidr_to_ip@Base 2.8.0
+ nutscan_device_type_strings@Base 2.8.0
+ nutscan_display_parsable@Base 2.8.0
+ nutscan_display_sanity_check@Base 2.8.1
+ nutscan_display_sanity_check_serial@Base 2.8.1
+ nutscan_display_ups_conf@Base 2.8.0
+ nutscan_display_ups_conf_with_sanity_check@Base 2.8.1
+ nutscan_free@Base 2.8.0
+ nutscan_free_device@Base 2.8.0
+ nutscan_get_serial_ports_list@Base 2.8.0
+ nutscan_init@Base 2.8.0
+ nutscan_ip_iter_inc@Base 2.8.0
+ nutscan_ip_iter_init@Base 2.8.0
+ nutscan_load_avahi_library@Base 2.8.0
+ (arch=!hurd-any)nutscan_load_ipmi_library@Base 2.8.0
+ nutscan_load_neon_library@Base 2.8.0
+ nutscan_load_snmp_library@Base 2.8.0
+ nutscan_load_upsclient_library@Base 2.8.0
+ nutscan_load_usb_library@Base 2.8.0
+ nutscan_new_device@Base 2.8.0
+ nutscan_rewind_device@Base 2.8.0
+ nutscan_scan_avahi@Base 2.8.0
+ nutscan_scan_eaton_serial@Base 2.8.0
+ nutscan_scan_ipmi@Base 2.8.0
+ nutscan_scan_nut@Base 2.8.0
+ nutscan_scan_snmp@Base 2.8.0
+ nutscan_scan_usb@Base 2.8.0
+ nutscan_scan_xml_http_range@Base 2.8.0
+ nutscan_semaphore@Base 2.8.0
+ s_upsdebugx@Base 2.8.0
+ upsdebugx_report_search_paths@Base 2.8.1
diff -Nru nut-2.8.1/debian/libupsclient6.install
nut-2.8.1/debian/libupsclient6.install
--- nut-2.8.1/debian/libupsclient6.install 2024-01-11 16:01:16.000000000
+0000
+++ nut-2.8.1/debian/libupsclient6.install 1970-01-01 00:00:00.000000000
+0000
@@ -1 +0,0 @@
-lib/*/libupsclient.so.*
diff -Nru nut-2.8.1/debian/libupsclient6.symbols
nut-2.8.1/debian/libupsclient6.symbols
--- nut-2.8.1/debian/libupsclient6.symbols 2024-01-11 16:01:16.000000000
+0000
+++ nut-2.8.1/debian/libupsclient6.symbols 1970-01-01 00:00:00.000000000
+0000
@@ -1,21 +0,0 @@
-libupsclient.so.6 libupsclient6 #MINVER#
-* Build-Depends-Package: libupsclient-dev
- upscli_add_host_cert@Base 2.8.0
- upscli_cleanup@Base 2.8.0
- upscli_connect@Base 2.8.0
- upscli_disconnect@Base 2.8.0
- upscli_fd@Base 2.8.0
- upscli_get@Base 2.8.0
- upscli_init@Base 2.8.0
- upscli_list_next@Base 2.8.0
- upscli_list_start@Base 2.8.0
- upscli_readline@Base 2.8.0
- upscli_readline_timeout@Base 2.8.0
- upscli_sendline@Base 2.8.0
- upscli_sendline_timeout@Base 2.8.0
- upscli_splitaddr@Base 2.8.0
- upscli_splitname@Base 2.8.0
- upscli_ssl@Base 2.8.0
- upscli_strerror@Base 2.8.0
- upscli_tryconnect@Base 2.8.0
- upscli_upserror@Base 2.8.0
diff -Nru nut-2.8.1/debian/libupsclient6t64.install
nut-2.8.1/debian/libupsclient6t64.install
--- nut-2.8.1/debian/libupsclient6t64.install 1970-01-01 00:00:00.000000000
+0000
+++ nut-2.8.1/debian/libupsclient6t64.install 2024-01-11 16:01:16.000000000
+0000
@@ -0,0 +1 @@
+lib/*/libupsclient.so.*
diff -Nru nut-2.8.1/debian/libupsclient6t64.lintian-overrides
nut-2.8.1/debian/libupsclient6t64.lintian-overrides
--- nut-2.8.1/debian/libupsclient6t64.lintian-overrides 1970-01-01
00:00:00.000000000 +0000
+++ nut-2.8.1/debian/libupsclient6t64.lintian-overrides 2024-02-29
01:24:06.000000000 +0000
@@ -0,0 +1 @@
+libupsclient6t64: package-name-doesnt-match-sonames libupsclient6
diff -Nru nut-2.8.1/debian/libupsclient6t64.symbols
nut-2.8.1/debian/libupsclient6t64.symbols
--- nut-2.8.1/debian/libupsclient6t64.symbols 1970-01-01 00:00:00.000000000
+0000
+++ nut-2.8.1/debian/libupsclient6t64.symbols 2024-02-29 01:24:06.000000000
+0000
@@ -0,0 +1,21 @@
+libupsclient.so.6 libupsclient6t64 #MINVER#
+* Build-Depends-Package: libupsclient-dev
+ upscli_add_host_cert@Base 2.8.0
+ upscli_cleanup@Base 2.8.0
+ upscli_connect@Base 2.8.0
+ upscli_disconnect@Base 2.8.0
+ upscli_fd@Base 2.8.0
+ upscli_get@Base 2.8.0
+ upscli_init@Base 2.8.0
+ upscli_list_next@Base 2.8.0
+ upscli_list_start@Base 2.8.0
+ upscli_readline@Base 2.8.0
+ upscli_readline_timeout@Base 2.8.0
+ upscli_sendline@Base 2.8.0
+ upscli_sendline_timeout@Base 2.8.0
+ upscli_splitaddr@Base 2.8.0
+ upscli_splitname@Base 2.8.0
+ upscli_ssl@Base 2.8.0
+ upscli_strerror@Base 2.8.0
+ upscli_tryconnect@Base 2.8.0
+ upscli_upserror@Base 2.8.0
diff -Nru nut-2.8.1/debian/rules nut-2.8.1/debian/rules
--- nut-2.8.1/debian/rules 2024-01-11 16:01:16.000000000 +0000
+++ nut-2.8.1/debian/rules 2024-02-29 01:26:19.000000000 +0000
@@ -147,5 +147,5 @@
dh_installchangelogs --remaining-packages
override_dh_makeshlibs:
- dh_makeshlibs -plibnutclient2 -V'libnutclient2 (= ${DEB_VERSION})'
- dh_makeshlibs -Nlibnutclient2
+ dh_makeshlibs -plibnutclient2t64 -V'libnutclient2t64 (= ${DEB_VERSION})'
+ dh_makeshlibs -Nlibnutclient2t64
