psad-2.2.3-1: updating version

1 files changed, 35 insertions, 28 deletions

diff --git a/pcr/psad/PKGBUILD b/pcr/psad/PKGBUILD
index 221e7d05a..df1c85ff5 100644
--- a/pcr/psad/PKGBUILD
+++ b/pcr/psad/PKGBUILD
@@ -1,35 +1,28 @@
-# Maintainer (Arch): Artur Wojcik <xartii at gmail dot com>
+# Maintainer: Artur Wojcik <xartii at gmail dot com>
 # Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.IO>
 
 pkgname=psad
-pkgver=2.2
-pkgrel=2
+pkgver=2.2.3
+pkgrel=1
 pkgdesc="A collection of three lightweight system daemons (two main daemons and one helper daemon) that run on Linux machines and analyze iptables log messages to detect port scans and other suspicious traffic"
-arch=('i686 x86_64')
+arch=(i686 x86_64)
 url="http://cipherdyne.org/psad/"
 license=('GPL')
 depends=('perl-bit-vector' 'perl-date-calc' 'perl-iptables-chainmgr' 'perl-iptables-parse' 'perl-net-ipv4addr' 'perl-storable' 'perl-unix-syslog' 'net-tools')
-source=("http://cipherdyne.org/psad/download/$pkgname-$pkgver.tar.gz" "responses" "psad-sysvinit.archlinux" "psad-systemdinit.archlinux" "psad.patch1")
+makedepends=('psmisc' 'systemd-sysvcompat' 'iproute2' 'procps-ng')
+source=("http://cipherdyne.org/psad/download/$pkgname-$pkgver.tar.gz" "responses" "psad-systemdinit.archlinux" "psad.patch1")
+md5sums=('4a944618c270c45df98540727b358859'
+         '2425986f9eaa44d983128ebea6c8baf4'
+         '29324f5fb0ccf69b443710c7d4c075fd'
+         'f97cabd3c91e5037faf9a843206ba608')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
-  cp $srcdir/psad-sysvinit.archlinux init-scripts/psad-init.archlinux
   if [ ! -e responses ]; then 
     ln $srcdir/responses responses -s; 
   fi
   patch -p1 -i $srcdir/psad.patch1
 
-  #Create the dirs it will need to make the program
-  mkdir -p $pkgdir/etc/psad \
-           $pkgdir/etc/rc.d \
-           $pkgdir/usr/bin \
-           $pkgdir/usr/sbin \
-           $pkgdir/usr/share/man/man8 \
-           $pkgdir/var/lib/psad \
-           $pkgdir/var/log/psad \
-           $pkgdir/var/run/psad \
-           $pkgdir/usr/lib/psad \
-           $pkgdir/usr/lib/systemd/system 
   #Set the config dirs
   sed -e "s|'/usr/sbin'|'$pkgdir/usr/sbin'|" \
       -e "s|'/usr/bin'|'$pkgdir/usr/bin'|" \
@@ -47,20 +40,34 @@ build() {
       -e "s|/usr/sbin/psad|$pkgdir&|" \
         ./psad.conf -i
 
-  #hope that things work
-  ./install.pl --init-dir "$pkgdir/etc/rc.d/" < responses
-
-  #add the systemd service file
-  cp $srcdir/psad-systemdinit.archlinux $pkgdir/usr/lib/systemd/system/psad.service
 
-  # Fix the config
-  sed -e "s|$pkgdir||" $pkgdir/etc/psad/psad.conf -i
-  sed -e "s|$pkgdir||" $pkgdir/var/log/psad/install.log -i
+}
+package () {
+  cd "$srcdir/$pkgname-$pkgver"
+  #hope that things work
+  mkdir -p $pkgdir/etc/psad \
+           $pkgdir/etc/rc.d \
+           $pkgdir/usr/bin \
+           $pkgdir/usr/sbin \
+           $pkgdir/usr/share/man/man8 \
+           $pkgdir/var/lib/psad \
+           $pkgdir/var/log/psad \
+           $pkgdir/var/run/psad \
+           $pkgdir/usr/lib/psad \
+           $pkgdir/usr/lib/systemd/system
+ ./install.pl --init-dir "$pkgdir/etc/rc.d/" < responses
+ 
+ #Set correct permissions
+ chmod -R o+r $pkgdir/etc/psad
+ chmod -R o+r $pkgdir/usr/sbin/*
+ chmod 0700 $pkgdir/var/lib/psad
 
-  #Set correct permissions  
-  chmod 0700 $pkgdir/var/lib/psad
-   
+ #add the systemd service file
+ cp $srcdir/psad-systemdinit.archlinux $pkgdir/usr/lib/systemd/system/psad.service
 
+ # Fix the config
+ sed -e "s|$pkgdir||" $pkgdir/etc/psad/psad.conf -i
+ sed -e "s|$pkgdir||" $pkgdir/var/log/psad/install.log -i
 }
 
 # vim:set ts=2 sw=2 et: