Source: audit
Version: 1:3.1.2-2.1
Severity: serious
Justification: fails piuparts, blocks testing migration
Tags: patch
X-Debbugs-Cc: z...@debian.org
Hi,
I looked into why audit fails to migrate and noticed that it fails
piuparts as it leaves diversions behind after purge. The patch provided
by the /usr-move team failed to account for package removal and lacks
the postrm bit. I'm attaching a patch that fixes this problem. It also
removes the manual interpolation in favour of relying on dh_installdeb's
builtin interpolation. I'd appreciate a timely upload, because audit is
one of the last missing pieces moving forward with the /usr-move. Would
you mind a NMU?
Helmut
diff --minimal -Nru audit-3.1.2/debian/changelog audit-3.1.2/debian/changelog
--- audit-3.1.2/debian/changelog 2024-02-28 04:02:13.000000000 +0100
+++ audit-3.1.2/debian/changelog 2024-05-03 07:49:46.000000000 +0200
@@ -1,3 +1,10 @@
+audit (1:3.1.2-2.2) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix piuparts failure arising from /usr-move mitigation. (Closes: #-1)
+
+ -- Helmut Grohne <hel...@subdivi.de> Fri, 03 May 2024 07:49:46 +0200
+
audit (1:3.1.2-2.1) unstable; urgency=medium
* Non-maintainer upload.
diff --minimal -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 2024-02-28
03:58:37.000000000 +0100
+++ audit-3.1.2/debian/libauparse0t64.lintian-overrides 2024-05-03
07:49:46.000000000 +0200
@@ -1 +1,2 @@
libauparse0t64: package-name-doesnt-match-sonames libauparse0
+libauparse0t64: remove-of-unknown-diversion lib/* [postrm:*]
diff --minimal -Nru audit-3.1.2/debian/libauparse0t64.postrm
audit-3.1.2/debian/libauparse0t64.postrm
--- audit-3.1.2/debian/libauparse0t64.postrm 1970-01-01 01:00:00.000000000
+0100
+++ audit-3.1.2/debian/libauparse0t64.postrm 2024-05-03 07:49:40.000000000
+0200
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+set -e
+
+case $1 in
+ remove|disappear)
+ for file in libauparse.so.0 libauparse.so.0.0.0; do
+ dpkg-divert --package libauparse0t64 --no-rename \
+ --remove --divert \
+ "/lib/#DEB_HOST_MULTIARCH#/$file.usr-is-merged"
\
+ "/lib/#DEB_HOST_MULTIARCH#/$file"
+ done
+ ;;
+esac
+
+#DEBHELPER#
+
diff --minimal -Nru audit-3.1.2/debian/libauparse0t64.preinst
audit-3.1.2/debian/libauparse0t64.preinst
--- audit-3.1.2/debian/libauparse0t64.preinst 1970-01-01 01:00:00.000000000
+0100
+++ audit-3.1.2/debian/libauparse0t64.preinst 2024-05-03 07:49:46.000000000
+0200
@@ -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 \
+ --add --divert \
+ "/lib/#DEB_HOST_MULTIARCH#/$file.usr-is-merged"
\
+ "/lib/#DEB_HOST_MULTIARCH#/$file"
+ done
+ ;;
+esac
+
+#DEBHELPER#
+
diff --minimal -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 2024-02-28
04:02:11.000000000 +0100
+++ audit-3.1.2/debian/libauparse0t64.preinst.in 1970-01-01
01:00:00.000000000 +0100
@@ -1,17 +0,0 @@
-#!/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 --minimal -Nru audit-3.1.2/debian/rules audit-3.1.2/debian/rules
--- audit-3.1.2/debian/rules 2024-02-28 04:02:11.000000000 +0100
+++ audit-3.1.2/debian/rules 2024-05-03 07:47:04.000000000 +0200
@@ -109,11 +109,6 @@
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
