3 files changed, 16 insertions, 22 deletions
diff --git a/system/audit/audit.SlackBuild b/system/audit/audit.SlackBuild
index c18f98a8b8530..891db20302560 100644
--- a/system/audit/audit.SlackBuild
+++ b/system/audit/audit.SlackBuild
@@ -23,7 +23,7 @@
 #   SUCH DAMAGE.
 
 PRGNAM=audit
-VERSION=${VERSION:-2.3.6}
+VERSION=${VERSION:-3.0.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -81,6 +81,9 @@ CFLAGS="$SLKCFLAGS" \
   --program-suffix= \
   --sbindir=/sbin \
   --enable-static=no \
+  --enable-systemd=no \
+  --with-libcap-ng=yes \
+  --enable-gssapi-krb5=yes \
   --build=$ARCH-slackware-linux
 
 make
@@ -89,21 +92,15 @@ make DESTDIR=$PKG install
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-# audispd must be 0750 to run
-chmod 0750 $PKG/sbin/audispd
-
 mkdir -p $PKG/etc/rc.d
 mv $PKG/etc/sysconfig/auditd $PKG/etc/rc.d/rc.auditd.conf.new
 mv $PKG/etc/rc.d/init.d/auditd $PKG/etc/rc.d/rc.auditd.new
 rm -rf $PKG/etc/rc.d/init.d $PKG/etc/sysconfig
 
-# Change config files to .new:
-for i in $(find $PKG/etc -type f -name "*.rules" -o -name "*.conf") ; do mv $i $i.new; done
-
 mkdir -p $PKG/var/log/audit $PKG/var/lock/subsys
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING ChangeLog INSTALL NEWS README TODO contrib \
+cp -a AUTHORS COPYING ChangeLog INSTALL NEWS README contrib \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 cat $CWD/README.SLACKWARE > $PKG/usr/doc/$PRGNAM-$VERSION/README.SLACKWARE
@@ -115,7 +112,14 @@ for i in $(find $PKG/usr/man -type l -name "*.?") ; do ln -s $( readlink $i ).gz
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
+
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
+# Change config files to .new:
+( cd $PKG
+  for i in $(find etc -type f -name "*.rules" -o -name "*.conf") ; do
+    mv $i $i.new
+    echo "config $i.new" >> $PKG/install/doinst.sh
+  done )
 
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/audit/audit.info b/system/audit/audit.info
index 809f0561ebc6d..99fa5168ad7ba 100644
--- a/system/audit/audit.info
+++ b/system/audit/audit.info
@@ -1,8 +1,8 @@
 PRGNAM="audit"
-VERSION="2.3.6"
+VERSION="3.0.1"
 HOMEPAGE="http://people.redhat.com/sgrubb/audit/"
-DOWNLOAD="http://people.redhat.com/sgrubb/audit/audit-2.3.6.tar.gz"
-MD5SUM="ffe178196717f8d3fc5337559543f58a"
+DOWNLOAD="http://people.redhat.com/sgrubb/audit/audit-3.0.1.tar.gz"
+MD5SUM="6a3cfa0dcccb98a85685029236528177"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/audit/doinst.sh b/system/audit/doinst.sh
index 779bb9aa3264f..b6622d7fb31de 100644
--- a/system/audit/doinst.sh
+++ b/system/audit/doinst.sh
@@ -23,14 +23,4 @@ preserve_perms() {
 }
 
 preserve_perms etc/rc.d/rc.auditd.new
-preserve_perms etc/rc.d/rc.auditd.conf.new
-config etc/audit/rules.d/audit.rules.new
-config etc/audit/auditd.conf.new
-config etc/audisp/audispd.conf.new
-config etc/audisp/zos-remote.conf.new
-config etc/audisp/plugins.d/af_unix.conf.new
-config etc/audisp/plugins.d/au-remote.conf.new
-config etc/audisp/plugins.d/audispd-zos-remote.conf.new
-config etc/audisp/plugins.d/syslog.conf.new
-config etc/audisp/audisp-remote.conf.new
-config etc/libaudit.conf.new
+config etc/rc.d/rc.auditd.conf.new