On Sat, Feb 24, 2024 at 01:25:38PM -0800, Steve Langasek wrote: > On Wed, Jan 31, 2024 at 02:30:16PM +0100, Gregor Jasny wrote: > > On 31.01.24 04:15, Steve Langasek wrote: > > > 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 c-ares > > > 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.
> > Currently, for c-ares2 the library package does not match the SONAME and > > needs a lintian > > override:https://salsa.debian.org/debian/c-ares/-/blob/master/debian/libc-ares2.lintian-overrides?ref_type=heads > > I wonder if you could rename the package into libcares2 instead of the > > proposed libc-ares2t64. That would make the package name matching the > > SONAME. But I'm also fine with your NMU. > Thanks for pointing this out, that's a good idea. I've reuploaded with the > attached patch. Here is the patch rebased on current unstable. -- 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 c-ares-1.27.0/debian/changelog c-ares-1.27.0/debian/changelog
--- c-ares-1.27.0/debian/changelog 2024-02-24 19:00:16.000000000 +0000
+++ c-ares-1.27.0/debian/changelog 2024-02-24 22:24:25.000000000 +0000
@@ -1,3 +1,10 @@
+c-ares (1.27.0-1.1~exp1) experimental; urgency=medium
+
+ * Non-maintainer upload.
+ * Rename libraries for 64-bit time_t transition.
+
+ -- Steve Langasek <vor...@debian.org> Sat, 24 Feb 2024 22:24:25 +0000
+
c-ares (1.27.0-1) unstable; urgency=high
* Imported Upstream version 1.27.0 (fixes CVE-2024-25629)
diff -Nru c-ares-1.27.0/debian/control c-ares-1.27.0/debian/control
--- c-ares-1.27.0/debian/control 2023-12-17 14:41:52.000000000 +0000
+++ c-ares-1.27.0/debian/control 2024-02-24 22:24:14.000000000 +0000
@@ -16,7 +16,7 @@
Section: libdevel
Architecture: any
Conflicts: libares-dev
-Depends: libc-ares2 (= ${binary:Version}),
+Depends: libcares2 (= ${binary:Version}),
${shlibs:Depends},
${misc:Depends}
Multi-Arch: same
@@ -31,10 +31,13 @@
.
This package contains development files (headers and static libraries).
-Package: libc-ares2
+Package: libcares2
+X-Time64-Compat: libc-ares2
+Provides: ${t64:Provides}
+Breaks: libc-ares2 (<< ${source:Version})
Conflicts: libcares2
Architecture: any
-Replaces: libc-ares1
+Replaces: libc-ares2, libc-ares1
Depends: ${shlibs:Depends}, ${misc:Depends}
Pre-Depends: ${misc:Pre-Depends}
Multi-Arch: same
diff -Nru c-ares-1.27.0/debian/libc-ares2.dirs
c-ares-1.27.0/debian/libc-ares2.dirs
--- c-ares-1.27.0/debian/libc-ares2.dirs 2023-05-22 15:13:13.000000000
+0000
+++ c-ares-1.27.0/debian/libc-ares2.dirs 1970-01-01 00:00:00.000000000
+0000
@@ -1 +0,0 @@
-usr/lib
diff -Nru c-ares-1.27.0/debian/libc-ares2.install
c-ares-1.27.0/debian/libc-ares2.install
--- c-ares-1.27.0/debian/libc-ares2.install 2023-05-22 15:13:13.000000000
+0000
+++ c-ares-1.27.0/debian/libc-ares2.install 1970-01-01 00:00:00.000000000
+0000
@@ -1 +0,0 @@
-usr/lib/*/lib*.so.*
diff -Nru c-ares-1.27.0/debian/libc-ares2.lintian-overrides
c-ares-1.27.0/debian/libc-ares2.lintian-overrides
--- c-ares-1.27.0/debian/libc-ares2.lintian-overrides 2023-06-14
19:20:26.000000000 +0000
+++ c-ares-1.27.0/debian/libc-ares2.lintian-overrides 1970-01-01
00:00:00.000000000 +0000
@@ -1 +0,0 @@
-package-name-doesnt-match-sonames libcares2
diff -Nru c-ares-1.27.0/debian/libc-ares2.symbols
c-ares-1.27.0/debian/libc-ares2.symbols
--- c-ares-1.27.0/debian/libc-ares2.symbols 2024-02-24 19:00:16.000000000
+0000
+++ c-ares-1.27.0/debian/libc-ares2.symbols 1970-01-01 00:00:00.000000000
+0000
@@ -1,120 +0,0 @@
-libcares.so.2 libc-ares2 #MINVER#
-* Build-Depends-Package: libc-ares-dev
- ares_cancel@Base 1.7.0
- ares_create_query@Base 1.10.0
- ares_destroy@Base 1.7.0
- ares_destroy_options@Base 1.7.0
- ares_dns_addr_to_ptr@Base 1.22.0
- ares_dns_class_fromstr@Base 1.22.0
- ares_dns_class_tostr@Base 1.22.0
- ares_dns_opcode_tostr@Base 1.22.0
- ares_dns_opt_get_datatype@Base 1.22.0
- ares_dns_opt_get_name@Base 1.22.0
- ares_dns_parse@Base 1.22.0
- ares_dns_pton@Base 1.22.0
- ares_dns_rcode_tostr@Base 1.22.0
- ares_dns_rec_type_fromstr@Base 1.22.0
- ares_dns_rec_type_tostr@Base 1.22.0
- ares_dns_record_create@Base 1.22.0
- ares_dns_record_destroy@Base 1.22.0
- ares_dns_record_get_flags@Base 1.22.0
- ares_dns_record_get_id@Base 1.22.0
- ares_dns_record_get_opcode@Base 1.22.0
- ares_dns_record_get_rcode@Base 1.22.0
- ares_dns_record_query_add@Base 1.22.0
- ares_dns_record_query_cnt@Base 1.22.0
- ares_dns_record_query_get@Base 1.22.0
- ares_dns_record_rr_add@Base 1.22.0
- ares_dns_record_rr_cnt@Base 1.22.0
- ares_dns_record_rr_del@Base 1.22.0
- ares_dns_record_rr_get@Base 1.22.0
- ares_dns_rr_get_addr6@Base 1.22.0
- ares_dns_rr_get_addr@Base 1.22.0
- ares_dns_rr_get_bin@Base 1.22.0
- ares_dns_rr_get_class@Base 1.22.0
- ares_dns_rr_get_keys@Base 1.22.0
- ares_dns_rr_get_name@Base 1.22.0
- ares_dns_rr_get_opt@Base 1.22.0
- ares_dns_rr_get_opt_byid@Base 1.22.0
- ares_dns_rr_get_opt_cnt@Base 1.22.0
- ares_dns_rr_get_str@Base 1.22.0
- ares_dns_rr_get_ttl@Base 1.22.0
- ares_dns_rr_get_type@Base 1.22.0
- ares_dns_rr_get_u16@Base 1.22.0
- ares_dns_rr_get_u32@Base 1.22.0
- ares_dns_rr_get_u8@Base 1.22.0
- ares_dns_rr_key_datatype@Base 1.22.0
- ares_dns_rr_key_to_rec_type@Base 1.22.0
- ares_dns_rr_key_tostr@Base 1.22.0
- ares_dns_rr_set_addr6@Base 1.22.0
- ares_dns_rr_set_addr@Base 1.22.0
- ares_dns_rr_set_bin@Base 1.22.0
- ares_dns_rr_set_opt@Base 1.22.0
- ares_dns_rr_set_str@Base 1.22.0
- ares_dns_rr_set_u16@Base 1.22.0
- ares_dns_rr_set_u32@Base 1.22.0
- ares_dns_rr_set_u8@Base 1.22.0
- ares_dns_section_tostr@Base 1.22.0
- ares_dns_write@Base 1.22.0
- ares_dup@Base 1.7.0
- ares_expand_name@Base 1.7.0
- ares_expand_string@Base 1.7.0
- ares_fds@Base 1.7.0
- ares_free_data@Base 1.7.0
- ares_free_hostent@Base 1.7.0
- ares_free_string@Base 1.7.0
- ares_freeaddrinfo@Base 1.16.0
- ares_get_servers@Base 1.7.1
- ares_get_servers_csv@Base 1.24.0
- ares_get_servers_ports@Base 1.11.0~rc1
- ares_getaddrinfo@Base 1.16.0
- ares_gethostbyaddr@Base 1.7.0
- ares_gethostbyname@Base 1.7.0
- ares_gethostbyname_file@Base 1.7.0
- ares_getnameinfo@Base 1.7.0
- ares_getsock@Base 1.7.0
- ares_inet_ntop@Base 1.10.0
- ares_inet_pton@Base 1.10.0
- ares_init@Base 1.7.0
- ares_init_options@Base 1.7.0
- ares_library_cleanup@Base 1.7.0
- ares_library_init@Base 1.7.0
- ares_library_init_mem@Base 1.11.0~rc1
- ares_library_initialized@Base 1.11.0~rc1
- ares_mkquery@Base 1.7.0
- ares_parse_a_reply@Base 1.7.0
- ares_parse_aaaa_reply@Base 1.7.0
- ares_parse_caa_reply@Base 1.17.0
- ares_parse_mx_reply@Base 1.7.3
- ares_parse_naptr_reply@Base 1.8.0
- ares_parse_ns_reply@Base 1.7.0
- ares_parse_ptr_reply@Base 1.7.0
- ares_parse_soa_reply@Base 1.9.1
- ares_parse_srv_reply@Base 1.7.0
- ares_parse_txt_reply@Base 1.7.0
- ares_parse_txt_reply_ext@Base 1.11.0~rc1
- ares_parse_uri_reply@Base 1.18.0
- ares_process@Base 1.7.0
- ares_process_fd@Base 1.7.0
- ares_query@Base 1.7.0
- ares_queue_active_queries@Base 1.27.0
- ares_queue_wait_empty@Base 1.27.0
- ares_reinit@Base 1.22.0
- ares_save_options@Base 1.7.0
- ares_search@Base 1.7.0
- ares_send@Base 1.7.0
- ares_set_local_dev@Base 1.7.4
- ares_set_local_ip4@Base 1.7.4
- ares_set_local_ip6@Base 1.7.4
- ares_set_servers@Base 1.7.1
- ares_set_servers_csv@Base 1.7.4
- ares_set_servers_ports@Base 1.11.0~rc1
- ares_set_servers_ports_csv@Base 1.11.0~rc1
- ares_set_socket_callback@Base 1.7.0
- ares_set_socket_configure_callback@Base 1.11.0~rc1
- ares_set_socket_functions@Base 1.13.0
- ares_set_sortlist@Base 1.11.0~rc1
- ares_strerror@Base 1.7.0
- ares_threadsafety@Base 1.23.0
- ares_timeout@Base 1.7.0
- ares_version@Base 1.7.0
diff -Nru c-ares-1.27.0/debian/libcares2.dirs
c-ares-1.27.0/debian/libcares2.dirs
--- c-ares-1.27.0/debian/libcares2.dirs 1970-01-01 00:00:00.000000000 +0000
+++ c-ares-1.27.0/debian/libcares2.dirs 2023-05-22 15:13:13.000000000 +0000
@@ -0,0 +1 @@
+usr/lib
diff -Nru c-ares-1.27.0/debian/libcares2.install
c-ares-1.27.0/debian/libcares2.install
--- c-ares-1.27.0/debian/libcares2.install 1970-01-01 00:00:00.000000000
+0000
+++ c-ares-1.27.0/debian/libcares2.install 2023-05-22 15:13:13.000000000
+0000
@@ -0,0 +1 @@
+usr/lib/*/lib*.so.*
diff -Nru c-ares-1.27.0/debian/libcares2.lintian-overrides
c-ares-1.27.0/debian/libcares2.lintian-overrides
--- c-ares-1.27.0/debian/libcares2.lintian-overrides 1970-01-01
00:00:00.000000000 +0000
+++ c-ares-1.27.0/debian/libcares2.lintian-overrides 2024-02-24
22:23:49.000000000 +0000
@@ -0,0 +1,2 @@
+package-name-doesnt-match-sonames libcares2
+libcares2: package-name-doesnt-match-sonames libc-ares2
diff -Nru c-ares-1.27.0/debian/libcares2.symbols
c-ares-1.27.0/debian/libcares2.symbols
--- c-ares-1.27.0/debian/libcares2.symbols 1970-01-01 00:00:00.000000000
+0000
+++ c-ares-1.27.0/debian/libcares2.symbols 2024-02-24 22:23:49.000000000
+0000
@@ -0,0 +1,120 @@
+libcares.so.2 libcares2 #MINVER#
+* Build-Depends-Package: libc-ares-dev
+ ares_cancel@Base 1.7.0
+ ares_create_query@Base 1.10.0
+ ares_destroy@Base 1.7.0
+ ares_destroy_options@Base 1.7.0
+ ares_dns_addr_to_ptr@Base 1.22.0
+ ares_dns_class_fromstr@Base 1.22.0
+ ares_dns_class_tostr@Base 1.22.0
+ ares_dns_opcode_tostr@Base 1.22.0
+ ares_dns_opt_get_datatype@Base 1.22.0
+ ares_dns_opt_get_name@Base 1.22.0
+ ares_dns_parse@Base 1.22.0
+ ares_dns_pton@Base 1.22.0
+ ares_dns_rcode_tostr@Base 1.22.0
+ ares_dns_rec_type_fromstr@Base 1.22.0
+ ares_dns_rec_type_tostr@Base 1.22.0
+ ares_dns_record_create@Base 1.22.0
+ ares_dns_record_destroy@Base 1.22.0
+ ares_dns_record_get_flags@Base 1.22.0
+ ares_dns_record_get_id@Base 1.22.0
+ ares_dns_record_get_opcode@Base 1.22.0
+ ares_dns_record_get_rcode@Base 1.22.0
+ ares_dns_record_query_add@Base 1.22.0
+ ares_dns_record_query_cnt@Base 1.22.0
+ ares_dns_record_query_get@Base 1.22.0
+ ares_dns_record_rr_add@Base 1.22.0
+ ares_dns_record_rr_cnt@Base 1.22.0
+ ares_dns_record_rr_del@Base 1.22.0
+ ares_dns_record_rr_get@Base 1.22.0
+ ares_dns_rr_get_addr6@Base 1.22.0
+ ares_dns_rr_get_addr@Base 1.22.0
+ ares_dns_rr_get_bin@Base 1.22.0
+ ares_dns_rr_get_class@Base 1.22.0
+ ares_dns_rr_get_keys@Base 1.22.0
+ ares_dns_rr_get_name@Base 1.22.0
+ ares_dns_rr_get_opt@Base 1.22.0
+ ares_dns_rr_get_opt_byid@Base 1.22.0
+ ares_dns_rr_get_opt_cnt@Base 1.22.0
+ ares_dns_rr_get_str@Base 1.22.0
+ ares_dns_rr_get_ttl@Base 1.22.0
+ ares_dns_rr_get_type@Base 1.22.0
+ ares_dns_rr_get_u16@Base 1.22.0
+ ares_dns_rr_get_u32@Base 1.22.0
+ ares_dns_rr_get_u8@Base 1.22.0
+ ares_dns_rr_key_datatype@Base 1.22.0
+ ares_dns_rr_key_to_rec_type@Base 1.22.0
+ ares_dns_rr_key_tostr@Base 1.22.0
+ ares_dns_rr_set_addr6@Base 1.22.0
+ ares_dns_rr_set_addr@Base 1.22.0
+ ares_dns_rr_set_bin@Base 1.22.0
+ ares_dns_rr_set_opt@Base 1.22.0
+ ares_dns_rr_set_str@Base 1.22.0
+ ares_dns_rr_set_u16@Base 1.22.0
+ ares_dns_rr_set_u32@Base 1.22.0
+ ares_dns_rr_set_u8@Base 1.22.0
+ ares_dns_section_tostr@Base 1.22.0
+ ares_dns_write@Base 1.22.0
+ ares_dup@Base 1.7.0
+ ares_expand_name@Base 1.7.0
+ ares_expand_string@Base 1.7.0
+ ares_fds@Base 1.7.0
+ ares_free_data@Base 1.7.0
+ ares_free_hostent@Base 1.7.0
+ ares_free_string@Base 1.7.0
+ ares_freeaddrinfo@Base 1.16.0
+ ares_get_servers@Base 1.7.1
+ ares_get_servers_csv@Base 1.24.0
+ ares_get_servers_ports@Base 1.11.0~rc1
+ ares_getaddrinfo@Base 1.16.0
+ ares_gethostbyaddr@Base 1.7.0
+ ares_gethostbyname@Base 1.7.0
+ ares_gethostbyname_file@Base 1.7.0
+ ares_getnameinfo@Base 1.7.0
+ ares_getsock@Base 1.7.0
+ ares_inet_ntop@Base 1.10.0
+ ares_inet_pton@Base 1.10.0
+ ares_init@Base 1.7.0
+ ares_init_options@Base 1.7.0
+ ares_library_cleanup@Base 1.7.0
+ ares_library_init@Base 1.7.0
+ ares_library_init_mem@Base 1.11.0~rc1
+ ares_library_initialized@Base 1.11.0~rc1
+ ares_mkquery@Base 1.7.0
+ ares_parse_a_reply@Base 1.7.0
+ ares_parse_aaaa_reply@Base 1.7.0
+ ares_parse_caa_reply@Base 1.17.0
+ ares_parse_mx_reply@Base 1.7.3
+ ares_parse_naptr_reply@Base 1.8.0
+ ares_parse_ns_reply@Base 1.7.0
+ ares_parse_ptr_reply@Base 1.7.0
+ ares_parse_soa_reply@Base 1.9.1
+ ares_parse_srv_reply@Base 1.7.0
+ ares_parse_txt_reply@Base 1.7.0
+ ares_parse_txt_reply_ext@Base 1.11.0~rc1
+ ares_parse_uri_reply@Base 1.18.0
+ ares_process@Base 1.7.0
+ ares_process_fd@Base 1.7.0
+ ares_query@Base 1.7.0
+ ares_queue_active_queries@Base 1.27.0
+ ares_queue_wait_empty@Base 1.27.0
+ ares_reinit@Base 1.22.0
+ ares_save_options@Base 1.7.0
+ ares_search@Base 1.7.0
+ ares_send@Base 1.7.0
+ ares_set_local_dev@Base 1.7.4
+ ares_set_local_ip4@Base 1.7.4
+ ares_set_local_ip6@Base 1.7.4
+ ares_set_servers@Base 1.7.1
+ ares_set_servers_csv@Base 1.7.4
+ ares_set_servers_ports@Base 1.11.0~rc1
+ ares_set_servers_ports_csv@Base 1.11.0~rc1
+ ares_set_socket_callback@Base 1.7.0
+ ares_set_socket_configure_callback@Base 1.11.0~rc1
+ ares_set_socket_functions@Base 1.13.0
+ ares_set_sortlist@Base 1.11.0~rc1
+ ares_strerror@Base 1.7.0
+ ares_threadsafety@Base 1.23.0
+ ares_timeout@Base 1.7.0
+ ares_version@Base 1.7.0
signature.asc
Description: PGP signature
