[arch-commits] Commit in audit/trunk (PKGBUILD auditd.service)

[Massimiliano Torromeo]

    Date: Monday, June 10, 2013 @ 12:29:32
  Author: mtorromeo
Revision: 92643

upgpkg: audit 2.2.3-3

Use bundled systemd service file

Modified:
  audit/trunk/PKGBUILD
Deleted:
  audit/trunk/auditd.service

----------------+
 PKGBUILD       |   14 +++++++-------
 auditd.service |   10 ----------
 2 files changed, 7 insertions(+), 17 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-06-10 10:15:53 UTC (rev 92642)
+++ PKGBUILD	2013-06-10 10:29:32 UTC (rev 92643)
@@ -5,7 +5,7 @@
 
 pkgname=audit
 pkgver=2.2.3
-pkgrel=2
+pkgrel=3
 pkgdesc='User space utilities for storing and searching the audit records generated by the audit subsystem in the Linux kernel.'
 url=http://people.redhat.com/sgrubb/$pkgname
 arch=(i686 x86_64)
@@ -27,7 +27,6 @@
 )
 source=(
 	$url/$pkgname-$pkgver.tar.gz
-	auditd.service
 	python2.patch
 )
 
@@ -41,6 +40,7 @@
 		--libexecdir=/usr/lib/audit \
 		--with-python=yes \
 		--enable-gssapi-krb5=yes \
+		--enable-systemd=yes \
 		--with-libcap-ng=yes #--with-apparmor=yes
 	make
 }
@@ -49,15 +49,15 @@
 	cd "$srcdir/$pkgname-$pkgver"
 	make DESTDIR="$pkgdir" install
 
-	install -Dm755 "$srcdir/auditd.service" "$pkgdir/usr/lib/systemd/system/auditd.service"
-
 	cd "$pkgdir"
 	install -d var/log/audit
-	rm -rf etc/rc.d/init.d etc/sysconfig
+	rm -rf etc/rc.d etc/sysconfig
 
-	sed -ri 's| /sbin| /usr/bin|' etc/audit/*.conf etc/audisp/plugins.d/*.conf
+	sed -ri 's|/sbin|/usr/bin|' \
+		etc/audit/*.conf \
+		etc/audisp/plugins.d/*.conf \
+		usr/lib/systemd/system/auditd.service
 }
 
 sha256sums=('2fc8f97020121593f516dc011ef61f39043c4cea9b2cb9ab3849bf9e41dedf02'
-            '83ebda69bbc2d4058d7baddbf91ab8a2aafd70e64ceb2137d9c9335f8d8d4b83'
             '6adadb405bebe99bb6a50e80e7c1a356996626e135d566283448fe4019fff3a4')

Deleted: auditd.service
===================================================================
--- auditd.service	2013-06-10 10:15:53 UTC (rev 92642)
+++ auditd.service	2013-06-10 10:29:32 UTC (rev 92643)
@@ -1,10 +0,0 @@
-[Unit]
-Description=Security Auditing Service
-After=syslog.target
-
-[Service]
-ExecStart=/usr/bin/auditd -n
-ExecStartPost=/usr/bin/auditctl -R /etc/audit/audit.rules
-
-[Install]
-WantedBy=multi-user.target
\ No newline at end of file