From 5a680f7689b01b4b7a0bfade1a6c1f659f8cbed4 Mon Sep 17 00:00:00 2001
From: root <root@rshg054.dnsready.net>
Date: Wed, 7 Mar 2012 00:01:25 +0000
Subject: Wed Mar  7 00:01:25 UTC 2012

---
 community/audit/PKGBUILD  | 20 ++++++++++----------
 community/audit/auditd.rc | 14 +++++---------
 2 files changed, 15 insertions(+), 19 deletions(-)

(limited to 'community/audit')

diff --git a/community/audit/PKGBUILD b/community/audit/PKGBUILD
index d5ee232b4..b4c2d8a56 100644
--- a/community/audit/PKGBUILD
+++ b/community/audit/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 57389 2011-10-26 20:55:52Z mtorromeo $
+# $Id: PKGBUILD 67260 2012-03-05 23:04:32Z mtorromeo $
 # Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com>
 # Contributor: Connor Behan <connor.behan@gmail.com>
 # Contributor: henning mueller <henning@orgizm.net>
 
 pkgname=audit
-pkgver=2.1.3
+pkgver=2.2
 pkgrel=1
 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)
-depends=(linux-headers python2 libldap)
-makedepends=(libldap swig)
+depends=(krb5 libcap-ng)
+makedepends=(libldap swig linux-headers python2)
 license=(GPL)
 options=(!libtool emptydirs)
 backup=(
@@ -30,11 +30,9 @@ source=(
 	auditd.rc
 	python2.patch
 )
-md5sums=(
-	abf26e3ac09f666905c5636dd24611fa
-	bd5574064e0c88748aebf0cd92ebcf0c
-	45a33c6bef84f8e1701cb0b5e187336b
-)
+md5sums=('b60366dbe0c3a7497bdd8b3f7065b266'
+         '5f86e87354d0c3b9b408a26daed7a906'
+         '45a33c6bef84f8e1701cb0b5e187336b')
 
 build() {
 	cd "$srcdir/$pkgname-$pkgver"
@@ -43,7 +41,9 @@ build() {
 		--prefix=/usr \
 		--sysconfdir=/etc \
 		--libexecdir=/usr/lib/audit \
-		--with-apparmor
+		--with-python=yes \
+		--enable-gssapi-krb5=yes \
+		--with-libcap-ng=yes #--with-apparmor=yes
 	make
 }
 
diff --git a/community/audit/auditd.rc b/community/audit/auditd.rc
index ea2e305ba..69764aa73 100755
--- a/community/audit/auditd.rc
+++ b/community/audit/auditd.rc
@@ -9,15 +9,11 @@ case "$1" in
 	start)
 		stat_busy "Starting auditd"
 		[ -z "$PID" ] && {
-			/sbin/auditctl -R /etc/audit/audit.rules >/dev/null
-			/sbin/auditd
+			/sbin/auditctl -R /etc/audit/audit.rules >/dev/null || stat_die
+			/sbin/auditd || stat_die
 		}
-		if [ $? -ne 0 ]; then
-			stat_fail
-		else
-			add_daemon auditd
-			stat_done
-		fi
+		add_daemon auditd
+		stat_done
 		;;
 
 	stop)
@@ -49,7 +45,7 @@ case "$1" in
 		;;
 
 	*)
-		echo "usage: $0 {start|stop|restart|reload}"  
+		echo "usage: $0 {start|stop|restart|reload}"
 esac
 
 exit 0
-- 
cgit v1.2.3-54-g00ecf