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-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 audit-3.1.2/debian/changelog audit-3.1.2/debian/changelog
--- audit-3.1.2/debian/changelog 2024-01-24 15:05:18.000000000 +0000
+++ audit-3.1.2/debian/changelog 2024-02-28 03:02:13.000000000 +0000
@@ -1,3 +1,10 @@
+audit (1:3.1.2-2.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Rename libraries for 64-bit time_t transition. Closes: #1061926
+
+ -- Steve Langasek <vor...@debian.org> Wed, 28 Feb 2024 03:02:13 +0000
+
audit (1:3.1.2-2) unstable; urgency=medium
[ Chris Hofstaedtler ]
diff -Nru audit-3.1.2/debian/clean audit-3.1.2/debian/clean
--- audit-3.1.2/debian/clean 1970-01-01 00:00:00.000000000 +0000
+++ audit-3.1.2/debian/clean 2024-02-28 03:02:11.000000000 +0000
@@ -0,0 +1 @@
+debian/libauparse0t64.preinst
diff -Nru audit-3.1.2/debian/control audit-3.1.2/debian/control
--- audit-3.1.2/debian/control 2024-01-24 15:05:18.000000000 +0000
+++ audit-3.1.2/debian/control 2024-02-28 03:02:13.000000000 +0000
@@ -1,7 +1,7 @@
Source: audit
Priority: optional
Maintainer: Laurent Bigonville <bi...@debian.org>
-Build-Depends: debhelper-compat (= 13),
+Build-Depends: dpkg-dev (>= 1.22.5), debhelper-compat (= 13),
dh-python <!nopython>,
# dh-golang,
dpkg-dev (>= 1.16.1~),
@@ -27,7 +27,7 @@
Section: admin
Architecture: linux-any
Depends: libaudit1 (= ${binary:Version}),
- libauparse0 (= ${binary:Version}),
+ libauparse0t64 (= ${binary:Version}),
mawk | gawk,
${misc:Depends},
${shlibs:Depends}
@@ -41,7 +41,10 @@
.
Also contains the audit dispatcher "audisp".
-Package: libauparse0
+Package: libauparse0t64
+Provides: ${t64:Provides}
+Replaces: libauparse0
+Breaks: libauparse0 (<< ${source:Version})
Architecture: linux-any
Pre-Depends: ${misc:Pre-Depends}
Depends: libaudit1 (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
@@ -51,14 +54,14 @@
applications to use the audit framework. It is used to monitor systems for
security related events.
.
- This package contains the libauparse0 library.
+ This package contains the libauparse0t64 library.
Package: libauparse-dev
Section: libdevel
Architecture: linux-any
-Depends: libauparse0 (= ${binary:Version}), ${misc:Depends}
+Depends: libauparse0t64 (= ${binary:Version}), ${misc:Depends}
Multi-Arch: same
-Description: Header files and static library for the libauparse0 library
+Description: Header files and static library for the libauparse0t64 library
The audit-libs parse package contains the dynamic libraries needed for
applications to use the audit framework. It is used to monitor systems for
security related events.
@@ -101,7 +104,7 @@
Section: python
Architecture: linux-any
Depends: libaudit1 (= ${binary:Version}),
- libauparse0 (= ${binary:Version}),
+ libauparse0t64 (= ${binary:Version}),
${misc:Depends},
${python3:Depends},
${shlibs:Depends}
@@ -127,7 +130,7 @@
Section: admin
Architecture: linux-any
Depends: auditd (= ${binary:Version}),
- libauparse0 (= ${binary:Version}),
+ libauparse0t64 (= ${binary:Version}),
${misc:Depends},
${shlibs:Depends}
Build-Profiles: <!pkg.audit.noldap>
diff -Nru audit-3.1.2/debian/libauparse0.install
audit-3.1.2/debian/libauparse0.install
--- audit-3.1.2/debian/libauparse0.install 2024-01-24 15:05:18.000000000
+0000
+++ audit-3.1.2/debian/libauparse0.install 1970-01-01 00:00:00.000000000
+0000
@@ -1 +0,0 @@
-usr/lib/*/libauparse.so.*
diff -Nru audit-3.1.2/debian/libauparse0.symbols
audit-3.1.2/debian/libauparse0.symbols
--- audit-3.1.2/debian/libauparse0.symbols 2024-01-24 15:05:18.000000000
+0000
+++ audit-3.1.2/debian/libauparse0.symbols 1970-01-01 00:00:00.000000000
+0000
@@ -1,84 +0,0 @@
-libauparse.so.0 libauparse0 #MINVER#
-* Build-Depends-Package: libauparse-dev
- _auparse_flush_caches@Base 1:3.0.5
- _auparse_free_interpretations@Base 1:2.6
- _auparse_load_interpretations@Base 1:2.6
- _auparse_lookup_interpretation@Base 1:2.6.1
- auparse_add_callback@Base 1:2.2.1
- auparse_destroy@Base 1:2.2.1
- auparse_destroy_ext@Base 1:2.7.7
- auparse_do_interpretation@Base 1:2.3.1
- auparse_feed@Base 1:2.2.1
- auparse_feed_age_events@Base 1:2.5.1
- auparse_feed_has_data@Base 1:2.2.2
- auparse_feed_has_ready_event@Base 1:3.0.5
- auparse_find_field@Base 1:2.2.1
- auparse_find_field_next@Base 1:2.2.1
- auparse_first_field@Base 1:2.2.1
- auparse_first_record@Base 1:2.2.1
- auparse_flush_feed@Base 1:2.2.1
- auparse_get_field_int@Base 1:2.2.1
- auparse_get_field_name@Base 1:2.2.1
- auparse_get_field_num@Base 1:2.7.7
- auparse_get_field_str@Base 1:2.2.1
- auparse_get_field_type@Base 1:2.2.1
- auparse_get_filename@Base 1:2.2.1
- auparse_get_line_number@Base 1:2.2.1
- auparse_get_milli@Base 1:2.2.1
- auparse_get_node@Base 1:2.2.1
- auparse_get_num_fields@Base 1:2.2.1
- auparse_get_num_records@Base 1:2.2.1
- auparse_get_record_interpretations@Base 1:2.6
- auparse_get_record_num@Base 1:2.7.7
- auparse_get_record_text@Base 1:2.2.1
- auparse_get_serial@Base 1:2.2.1
- auparse_get_time@Base 1:2.2.1
- auparse_get_timestamp@Base 1:2.2.1
- auparse_get_type@Base 1:2.2.1
- auparse_get_type_name@Base 1:2.3.4
- auparse_goto_field_num@Base 1:2.7.7
- auparse_goto_record_num@Base 1:2.2.1
- auparse_init@Base 1:2.2.1
- auparse_interp_adjust_type@Base 1:2.3.1
- auparse_interpret_field@Base 1:2.2.1
- auparse_interpret_realpath@Base 1:2.7.8
- auparse_interpret_sock_address@Base 1:2.8
- auparse_interpret_sock_family@Base 1:2.8
- auparse_interpret_sock_port@Base 1:2.8
- auparse_new_buffer@Base 1:3.0.5
- auparse_next_event@Base 1:2.2.1
- auparse_next_field@Base 1:2.2.1
- auparse_next_record@Base 1:2.2.1
- auparse_node_compare@Base 1:2.2.1
- auparse_normalize@Base 1:2.7.7
- auparse_normalize_get_action@Base 1:2.7.7
- auparse_normalize_get_event_kind@Base 1:2.7.7
- auparse_normalize_get_results@Base 1:2.7.7
- auparse_normalize_how@Base 1:2.7.7
- auparse_normalize_key@Base 1:2.7.7
- auparse_normalize_object_first_attribute@Base 1:2.7.7
- auparse_normalize_object_kind@Base 1:2.7.7
- auparse_normalize_object_next_attribute@Base 1:2.7.7
- auparse_normalize_object_primary2@Base 1:2.8
- auparse_normalize_object_primary@Base 1:2.7.7
- auparse_normalize_object_secondary@Base 1:2.7.7
- auparse_normalize_session@Base 1:2.7.7
- auparse_normalize_subject_first_attribute@Base 1:2.7.7
- auparse_normalize_subject_kind@Base 1:2.7.7
- auparse_normalize_subject_next_attribute@Base 1:2.7.7
- auparse_normalize_subject_primary@Base 1:2.7.7
- auparse_normalize_subject_secondary@Base 1:2.7.7
- auparse_reset@Base 1:2.2.1
- auparse_set_eoe_timeout@Base 1:3.0.5
- auparse_set_escape_mode@Base 1:2.4.4
- auparse_timestamp_compare@Base 1:2.2.1
- ausearch_add_expression@Base 1:2.2.1
- ausearch_add_interpreted_item@Base 1:2.2.1
- ausearch_add_item@Base 1:2.2.1
- ausearch_add_regex@Base 1:2.2.1
- ausearch_add_timestamp_item@Base 1:2.2.1
- ausearch_add_timestamp_item_ex@Base 1:2.4
- ausearch_clear@Base 1:2.2.1
- ausearch_next_event@Base 1:2.2.1
- ausearch_set_stop@Base 1:2.2.1
- find_config_change_object@Base 1:3.0.5
diff -Nru audit-3.1.2/debian/libauparse0t64.install
audit-3.1.2/debian/libauparse0t64.install
--- audit-3.1.2/debian/libauparse0t64.install 1970-01-01 00:00:00.000000000
+0000
+++ audit-3.1.2/debian/libauparse0t64.install 2024-01-24 15:05:18.000000000
+0000
@@ -0,0 +1 @@
+usr/lib/*/libauparse.so.*
diff -Nru audit-3.1.2/debian/libauparse0t64.lintian-overrides
audit-3.1.2/debian/libauparse0t64.lintian-overrides
--- audit-3.1.2/debian/libauparse0t64.lintian-overrides 1970-01-01
00:00:00.000000000 +0000
+++ audit-3.1.2/debian/libauparse0t64.lintian-overrides 2024-02-28
02:58:37.000000000 +0000
@@ -0,0 +1 @@
+libauparse0t64: package-name-doesnt-match-sonames libauparse0
diff -Nru audit-3.1.2/debian/libauparse0t64.preinst.in
audit-3.1.2/debian/libauparse0t64.preinst.in
--- audit-3.1.2/debian/libauparse0t64.preinst.in 1970-01-01
00:00:00.000000000 +0000
+++ audit-3.1.2/debian/libauparse0t64.preinst.in 2024-02-28
03:02:11.000000000 +0000
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+set -e
+
+case $1 in
+ install)
+ for file in libauparse.so.0 libauparse.so.0.0.0; do
+ dpkg-divert --package libauparse0t64 --no-rename \
+ --divert \
+ /lib/#DEB_HOST_MULTIARCH#/$file.usr-is-merged \
+ /lib/#DEB_HOST_MULTIARCH#/$file
+ done
+ ;;
+esac
+
+#DEBHELPER#
+
diff -Nru audit-3.1.2/debian/libauparse0t64.symbols
audit-3.1.2/debian/libauparse0t64.symbols
--- audit-3.1.2/debian/libauparse0t64.symbols 1970-01-01 00:00:00.000000000
+0000
+++ audit-3.1.2/debian/libauparse0t64.symbols 2024-02-28 02:58:37.000000000
+0000
@@ -0,0 +1,84 @@
+libauparse.so.0 libauparse0t64 #MINVER#
+* Build-Depends-Package: libauparse-dev
+ _auparse_flush_caches@Base 1:3.0.5
+ _auparse_free_interpretations@Base 1:2.6
+ _auparse_load_interpretations@Base 1:2.6
+ _auparse_lookup_interpretation@Base 1:2.6.1
+ auparse_add_callback@Base 1:2.2.1
+ auparse_destroy@Base 1:2.2.1
+ auparse_destroy_ext@Base 1:2.7.7
+ auparse_do_interpretation@Base 1:2.3.1
+ auparse_feed@Base 1:2.2.1
+ auparse_feed_age_events@Base 1:2.5.1
+ auparse_feed_has_data@Base 1:2.2.2
+ auparse_feed_has_ready_event@Base 1:3.0.5
+ auparse_find_field@Base 1:2.2.1
+ auparse_find_field_next@Base 1:2.2.1
+ auparse_first_field@Base 1:2.2.1
+ auparse_first_record@Base 1:2.2.1
+ auparse_flush_feed@Base 1:2.2.1
+ auparse_get_field_int@Base 1:2.2.1
+ auparse_get_field_name@Base 1:2.2.1
+ auparse_get_field_num@Base 1:2.7.7
+ auparse_get_field_str@Base 1:2.2.1
+ auparse_get_field_type@Base 1:2.2.1
+ auparse_get_filename@Base 1:2.2.1
+ auparse_get_line_number@Base 1:2.2.1
+ auparse_get_milli@Base 1:2.2.1
+ auparse_get_node@Base 1:2.2.1
+ auparse_get_num_fields@Base 1:2.2.1
+ auparse_get_num_records@Base 1:2.2.1
+ auparse_get_record_interpretations@Base 1:2.6
+ auparse_get_record_num@Base 1:2.7.7
+ auparse_get_record_text@Base 1:2.2.1
+ auparse_get_serial@Base 1:2.2.1
+ auparse_get_time@Base 1:2.2.1
+ auparse_get_timestamp@Base 1:2.2.1
+ auparse_get_type@Base 1:2.2.1
+ auparse_get_type_name@Base 1:2.3.4
+ auparse_goto_field_num@Base 1:2.7.7
+ auparse_goto_record_num@Base 1:2.2.1
+ auparse_init@Base 1:2.2.1
+ auparse_interp_adjust_type@Base 1:2.3.1
+ auparse_interpret_field@Base 1:2.2.1
+ auparse_interpret_realpath@Base 1:2.7.8
+ auparse_interpret_sock_address@Base 1:2.8
+ auparse_interpret_sock_family@Base 1:2.8
+ auparse_interpret_sock_port@Base 1:2.8
+ auparse_new_buffer@Base 1:3.0.5
+ auparse_next_event@Base 1:2.2.1
+ auparse_next_field@Base 1:2.2.1
+ auparse_next_record@Base 1:2.2.1
+ auparse_node_compare@Base 1:2.2.1
+ auparse_normalize@Base 1:2.7.7
+ auparse_normalize_get_action@Base 1:2.7.7
+ auparse_normalize_get_event_kind@Base 1:2.7.7
+ auparse_normalize_get_results@Base 1:2.7.7
+ auparse_normalize_how@Base 1:2.7.7
+ auparse_normalize_key@Base 1:2.7.7
+ auparse_normalize_object_first_attribute@Base 1:2.7.7
+ auparse_normalize_object_kind@Base 1:2.7.7
+ auparse_normalize_object_next_attribute@Base 1:2.7.7
+ auparse_normalize_object_primary2@Base 1:2.8
+ auparse_normalize_object_primary@Base 1:2.7.7
+ auparse_normalize_object_secondary@Base 1:2.7.7
+ auparse_normalize_session@Base 1:2.7.7
+ auparse_normalize_subject_first_attribute@Base 1:2.7.7
+ auparse_normalize_subject_kind@Base 1:2.7.7
+ auparse_normalize_subject_next_attribute@Base 1:2.7.7
+ auparse_normalize_subject_primary@Base 1:2.7.7
+ auparse_normalize_subject_secondary@Base 1:2.7.7
+ auparse_reset@Base 1:2.2.1
+ auparse_set_eoe_timeout@Base 1:3.0.5
+ auparse_set_escape_mode@Base 1:2.4.4
+ auparse_timestamp_compare@Base 1:2.2.1
+ ausearch_add_expression@Base 1:2.2.1
+ ausearch_add_interpreted_item@Base 1:2.2.1
+ ausearch_add_item@Base 1:2.2.1
+ ausearch_add_regex@Base 1:2.2.1
+ ausearch_add_timestamp_item@Base 1:2.2.1
+ ausearch_add_timestamp_item_ex@Base 1:2.4
+ ausearch_clear@Base 1:2.2.1
+ ausearch_next_event@Base 1:2.2.1
+ ausearch_set_stop@Base 1:2.2.1
+ find_config_change_object@Base 1:3.0.5
diff -Nru audit-3.1.2/debian/rules audit-3.1.2/debian/rules
--- audit-3.1.2/debian/rules 2024-01-24 15:05:18.000000000 +0000
+++ audit-3.1.2/debian/rules 2024-02-28 03:02:11.000000000 +0000
@@ -109,6 +109,11 @@
chgrp adm debian/auditd/var/log/audit
chmod -R o-rwx debian/auditd/etc/audit debian/audispd-plugins/etc/audit
+override_dh_installdeb:
+ sed -e"s/#DEB_HOST_MULTIARCH#/$(DEB_HOST_MULTIARCH)/" \
+ debian/libauparse0t64.preinst.in > debian/libauparse0t64.preinst
+ dh_installdeb
+
get-orig-source:
-uscan --upstream-version 0
