From 9adc4bd1703979c19ec57a785076ecf171473702 Mon Sep 17 00:00:00 2001 From: "deepin-community-bot[bot]" <156989552+deepin-community-bot[bot]@users.noreply.github.com> Date: Tue, 16 Apr 2024 22:58:32 -0400 Subject: [PATCH] feat: update audit to 1:3.1.2-2 --- debian/audispd-plugins.install | 4 ++-- debian/auditd.README.Debian | 2 +- debian/auditd.init | 6 +++--- debian/auditd.install | 18 ++++++++--------- debian/auditd.lintian-overrides | 8 ++++---- debian/changelog | 8 ++++++++ debian/libaudit1.install | 2 +- debian/libauparse0.install | 2 +- debian/not-installed | 4 ++-- debian/rules | 34 +++++---------------------------- 10 files changed, 36 insertions(+), 52 deletions(-) diff --git a/debian/audispd-plugins.install b/debian/audispd-plugins.install index 137b76c..887570e 100644 --- a/debian/audispd-plugins.install +++ b/debian/audispd-plugins.install @@ -2,8 +2,8 @@ etc/audit/audisp-remote.conf etc/audit/plugins.d/au-remote.conf etc/audit/plugins.d/audispd-zos-remote.conf etc/audit/zos-remote.conf -sbin/audisp-remote -sbin/audispd-zos-remote +usr/sbin/audisp-remote +usr/sbin/audispd-zos-remote usr/share/man/man5/audisp-remote.conf.5 usr/share/man/man5/zos-remote.conf.5 usr/share/man/man8/audisp-remote.8 diff --git a/debian/auditd.README.Debian b/debian/auditd.README.Debian index bcce7ca..d6979a0 100644 --- a/debian/auditd.README.Debian +++ b/debian/auditd.README.Debian @@ -13,7 +13,7 @@ specified content and then call "systemctl daemon-reload": /etc/systemd/system/auditd.service.d/augenrules.conf: [Service] ExecStartPost= - ExecStartPost=-/sbin/auditctl -R /etc/audit/audit.rules + ExecStartPost=-/usr/sbin/auditctl -R /etc/audit/audit.rules Check that the needed rules are present in /etc/audit/audit.rules before restarting the daemon. diff --git a/debian/auditd.init b/debian/auditd.init index 2ed7287..c6d9344 100644 --- a/debian/auditd.init +++ b/debian/auditd.init @@ -16,7 +16,7 @@ PATH=/sbin:/usr/sbin:/bin:/usr/bin DESC="audit daemon" NAME=auditd -DAEMON=/sbin/auditd +DAEMON=/usr/sbin/auditd PIDFILE=/var/run/"$NAME".pid SCRIPTNAME=/etc/init.d/"$NAME" @@ -46,11 +46,11 @@ do_start() # Call augenrules to compile audit rules. case "$USE_AUGENRULES" in no|NO) ;; - *) [ -d /etc/audit/rules.d ] && /sbin/augenrules >/dev/null ;; + *) [ -d /etc/audit/rules.d ] && /usr/sbin/augenrules >/dev/null ;; esac if [ -f /etc/audit/audit.rules ] then - /sbin/auditctl -R /etc/audit/audit.rules >/dev/null + /usr/sbin/auditctl -R /etc/audit/audit.rules >/dev/null fi } diff --git a/debian/auditd.install b/debian/auditd.install index ce67142..1fefff9 100644 --- a/debian/auditd.install +++ b/debian/auditd.install @@ -3,15 +3,15 @@ etc/audit/auditd.conf etc/audit/plugins.d/af_unix.conf etc/audit/plugins.d/syslog.conf etc/audit/rules.d/audit.rules -init.d/auditd.service lib/systemd/system -sbin/audisp-af_unix -sbin/audisp-syslog -sbin/auditctl -sbin/auditd -sbin/augenrules -sbin/aureport -sbin/ausearch -sbin/autrace +init.d/auditd.service usr/lib/systemd/system +usr/sbin/audisp-af_unix +usr/sbin/audisp-syslog +usr/sbin/auditctl +usr/sbin/auditd +usr/sbin/augenrules +usr/sbin/aureport +usr/sbin/ausearch +usr/sbin/autrace usr/bin/aulast usr/bin/aulastlog usr/bin/ausyscall diff --git a/debian/auditd.lintian-overrides b/debian/auditd.lintian-overrides index 1b10076..e67da0d 100644 --- a/debian/auditd.lintian-overrides +++ b/debian/auditd.lintian-overrides @@ -1,9 +1,9 @@ ## Only to be forked by auditd, which explicitly checks for 750 -#auditd: executable-is-not-world-readable sbin/audispd 0750 != 0755 +#auditd: executable-is-not-world-readable usr/sbin/audispd 0750 != 0755 ## Only root can run -#auditd: non-standard-executable-perm sbin/auditctl 0754 != 0755 -#auditd: non-standard-executable-perm sbin/auditd 0754 != 0755 -#auditd: non-standard-executable-perm sbin/autrace 0754 != 0755 +#auditd: non-standard-executable-perm usr/sbin/auditctl 0754 != 0755 +#auditd: non-standard-executable-perm usr/sbin/auditd 0754 != 0755 +#auditd: non-standard-executable-perm usr/sbin/autrace 0754 != 0755 #auditd: non-standard-executable-perm usr/bin/aulastlog 0754 != 0755 ## Normal users should not see what is being audited auditd: non-standard-dir-perm 0750 != 0755 [etc/audit/] diff --git a/debian/changelog b/debian/changelog index ac9e47a..62d9d12 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +audit (1:3.1.2-2) unstable; urgency=medium + + [ Chris Hofstaedtler ] + * Install aliased files into canonical locations in /usr. (DEP17 M2) + (Closes: #1060167) + + -- Laurent Bigonville Wed, 24 Jan 2024 16:05:18 +0100 + audit (1:3.1.2-1) unstable; urgency=medium [ Christian Göttsche ] diff --git a/debian/libaudit1.install b/debian/libaudit1.install index e785d62..3687392 100644 --- a/debian/libaudit1.install +++ b/debian/libaudit1.install @@ -1 +1 @@ -lib/*/libaudit.so.* +usr/lib/*/libaudit.so.* diff --git a/debian/libauparse0.install b/debian/libauparse0.install index 6814799..f1af9bc 100644 --- a/debian/libauparse0.install +++ b/debian/libauparse0.install @@ -1 +1 @@ -lib/*/libauparse.so.* +usr/lib/*/libauparse.so.* diff --git a/debian/not-installed b/debian/not-installed index 60fa047..ea14ca2 100644 --- a/debian/not-installed +++ b/debian/not-installed @@ -1,8 +1,8 @@ # These are already installed by dh_installexamples usr/share/audit/sample-rules/ # la files -lib/*/libaudit.la -lib/*/libauparse.la +usr/lib/*/libaudit.la +usr/lib/*/libauparse.la usr/lib/python*/*-packages/_audit.la usr/lib/python*/*-packages/auparse.la # python caches diff --git a/debian/rules b/debian/rules index 59dad8c..d7f4e04 100755 --- a/debian/rules +++ b/debian/rules @@ -39,8 +39,7 @@ debian/config-python-stamp: # We should also have "--with-golang" but it's not available in all arch and # the golang binding package is arch:all anyway. dh_auto_configure -- \ - --sbindir=/sbin \ - --libdir=/lib/${DEB_HOST_MULTIARCH} \ + --libdir=/usr/lib/${DEB_HOST_MULTIARCH} \ --enable-shared=audit \ --enable-gssapi-krb5 \ --with-apparmor \ @@ -86,33 +85,10 @@ override_dh_auto_install: debian/install-python-stamp $(PY3VERS:%=debian/install $(RM) debian/tmp/etc/rc.d/init.d/auditd $(RM) debian/tmp/etc/sysconfig/auditd - # Move the development library to /usr/lib - $(RM) debian/tmp/lib/${DEB_HOST_MULTIARCH}/libaudit.so - $(RM) debian/tmp/lib/${DEB_HOST_MULTIARCH}/libauparse.so - # Install the default configuration install -o root -g root -m 0750 -d debian/tmp/etc/audit/rules.d/ install -o root -g root -m 0640 rules/10-base-config.rules debian/tmp/etc/audit/rules.d/audit.rules - mkdir -p debian/tmp/usr/lib/${DEB_HOST_MULTIARCH}/ - - ln -s /lib/${DEB_HOST_MULTIARCH}/libaudit.so.1.0.0 \ - debian/tmp/usr/lib/${DEB_HOST_MULTIARCH}/libaudit.so - ln -s /lib/${DEB_HOST_MULTIARCH}/libauparse.so.0.0.0 \ - debian/tmp/usr/lib/${DEB_HOST_MULTIARCH}/libauparse.so - - mv debian/tmp/lib/${DEB_HOST_MULTIARCH}/libaudit.a \ - debian/tmp/usr/lib/${DEB_HOST_MULTIARCH}/libaudit.a - mv debian/tmp/lib/${DEB_HOST_MULTIARCH}/libauparse.a \ - debian/tmp/usr/lib/${DEB_HOST_MULTIARCH}/libauparse.a - - mkdir -p debian/tmp/usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/ - - mv debian/tmp/lib/${DEB_HOST_MULTIARCH}/pkgconfig/audit.pc \ - debian/tmp/usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/audit.pc - mv debian/tmp/lib/${DEB_HOST_MULTIARCH}/pkgconfig/auparse.pc \ - debian/tmp/usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/auparse.pc - override_dh_installexamples: dh_installexamples -XMakefile @@ -125,10 +101,10 @@ override_dh_installinit: override_dh_fixperms-arch: dh_fixperms -a #chmod o-wx debian/auditd/usr/bin/aulastlog - #chmod o-wx debian/auditd/sbin/auditctl - #chmod o-wx debian/auditd/sbin/auditd - #chmod o-wx debian/auditd/sbin/autrace - #chmod 750 debian/auditd/sbin/audispd + #chmod o-wx debian/auditd/usr/sbin/auditctl + #chmod o-wx debian/auditd/usr/sbin/auditd + #chmod o-wx debian/auditd/usr/sbin/autrace + #chmod 750 debian/auditd/usr/sbin/audispd chmod -R o-rwx debian/auditd/var/log/audit chgrp adm debian/auditd/var/log/audit chmod -R o-rwx debian/auditd/etc/audit debian/audispd-plugins/etc/audit