summaryrefslogtreecommitdiff
path: root/community/audit
diff options
context:
space:
mode:
authorroot <root@rshg054.dnsready.net>2013-05-13 01:16:28 -0700
committerroot <root@rshg054.dnsready.net>2013-05-13 01:16:28 -0700
commit66cb4a487ad73063c6b000279a5d5558fb7603f5 (patch)
treeee73bbc414ba8aec6b9a578578ceaabd38fff01e /community/audit
parent5b9e0d821dd428792bd51ed03af2b800924ce69d (diff)
Mon May 13 01:16:27 PDT 2013
Diffstat (limited to 'community/audit')
-rw-r--r--community/audit/PKGBUILD12
-rw-r--r--community/audit/auditd.rc51
-rw-r--r--community/audit/auditd.service4
3 files changed, 7 insertions, 60 deletions
diff --git a/community/audit/PKGBUILD b/community/audit/PKGBUILD
index b2160ddb0..e6de95ded 100644
--- a/community/audit/PKGBUILD
+++ b/community/audit/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 88732 2013-04-22 07:51:09Z mtorromeo $
+# $Id: PKGBUILD 90472 2013-05-12 21:18:29Z 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.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 @@ backup=(
)
source=(
$url/$pkgname-$pkgver.tar.gz
- auditd.rc
auditd.service
python2.patch
)
@@ -37,6 +36,7 @@ build() {
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 @@ package() {
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')
diff --git a/community/audit/auditd.rc b/community/audit/auditd.rc
deleted file mode 100644
index 13976341c..000000000
--- a/community/audit/auditd.rc
+++ /dev/null
@@ -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
diff --git a/community/audit/auditd.service b/community/audit/auditd.service
index 208b5c38e..959dcc112 100644
--- a/community/audit/auditd.service
+++ b/community/audit/auditd.service
@@ -3,8 +3,8 @@ Description=Security Auditing Service
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