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

[Massimiliano Torromeo]

    Date: Sunday, May 12, 2013 @ 23:17:56
  Author: mtorromeo
Revision: 90471

upgpkg: audit 2.2.3-2

Removed rc.d script and moved /usr/sbin to /usr/bin

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

----------------+
 PKGBUILD       |   10 ++++------
 auditd.rc      |   51 ---------------------------------------------------
 auditd.service |    4 ++--
 3 files changed, 6 insertions(+), 59 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-05-12 20:57:31 UTC (rev 90470)
+++ PKGBUILD	2013-05-12 21:17:56 UTC (rev 90471)
@@ -5,7 +5,7 @@
 
 pkgname=audit
 pkgver=2.2.3
-pkgrel=1
+pkgrel=2
 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.rc
 	auditd.service
 	python2.patch
 )
@@ -37,6 +36,7 @@
 	patch -p0 -i "$srcdir/python2.patch"
 	./configure \
 		--prefix=/usr \
+		--sbindir=/usr/bin \
 		--sysconfdir=/etc \
 		--libexecdir=/usr/lib/audit \
 		--with-python=yes \
@@ -52,14 +52,12 @@
 	install -Dm755 "$srcdir/auditd.service" "$pkgdir/usr/lib/systemd/system/auditd.service"
 
 	cd "$pkgdir"
-	install -m755 "$srcdir/auditd.rc" etc/rc.d/auditd
 	install -d var/log/audit
 	rm -rf etc/rc.d/init.d etc/sysconfig
 
-	sed -ri 's| /sbin| /usr/sbin|' etc/audit/*.conf etc/audisp/plugins.d/*.conf
+	sed -ri 's| /sbin| /usr/bin|' etc/audit/*.conf etc/audisp/plugins.d/*.conf
 }
 
 sha256sums=('2fc8f97020121593f516dc011ef61f39043c4cea9b2cb9ab3849bf9e41dedf02'
-            '1e374ff164667b6a11f84c825a39996b449dc712d573996907cd47f063bf0dd5'
-            '3c7179f40216b594675f26bb73884406c8ac91577b609dd1ab9837f889954007'
+            '83ebda69bbc2d4058d7baddbf91ab8a2aafd70e64ceb2137d9c9335f8d8d4b83'
             '6adadb405bebe99bb6a50e80e7c1a356996626e135d566283448fe4019fff3a4')

Deleted: auditd.rc
===================================================================
--- auditd.rc	2013-05-12 20:57:31 UTC (rev 90470)
+++ auditd.rc	2013-05-12 21:17:56 UTC (rev 90471)
@@ -1,51 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID auditd`
-
-case "$1" in
-	start)
-		stat_busy "Starting auditd"
-		[ -z "$PID" ] && {
-			/usr/sbin/auditctl -R /etc/audit/audit.rules >/dev/null || stat_die
-			/usr/sbin/auditd || stat_die
-		}
-		add_daemon auditd
-		stat_done
-		;;
-
-	stop)
-		stat_busy "Stopping auditd"
-		[ ! -z "$PID" ] && kill $PID &> /dev/null
-		if [ $? -gt 0 ]; then
-			stat_fail
-		else
-			rm_daemon auditd
-			stat_done
-		fi
-		;;
-
-	restart)
-		$0 stop
-		sleep 1
-		$0 start
-		;;
-
-	reload)
-		stat_busy "Reloading auditd"
-		[ ! -z "$PID" ] && kill -HUP $PID &> /dev/null
-		if [ $? -gt 0 ]; then
-			stat_fail
-		else
-			rm_daemon auditd
-			stat_done
-		fi
-		;;
-
-	*)
-		echo "usage: $0 {start|stop|restart|reload}"
-esac
-
-exit 0

Modified: auditd.service
===================================================================
--- auditd.service	2013-05-12 20:57:31 UTC (rev 90470)
+++ auditd.service	2013-05-12 21:17:56 UTC (rev 90471)
@@ -3,8 +3,8 @@
 After=syslog.target
 
 [Service]
-ExecStart=/usr/sbin/auditd -n
-ExecStartPost=/usr/sbin/auditctl -R /etc/audit/audit.rules
+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