samhain update

3 files changed, 11 insertions, 6 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 359544b80681..7c5dc6d0ac96 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = samhain
 	pkgdesc = file integrity / intrusion detection system
-	pkgver = 4.1.5
+	pkgver = 4.2.0
 	pkgrel = 1
 	url = http://www.la-samhna.de/
 	arch = i686
@@ -9,12 +9,13 @@ pkgbase = samhain
 	makedepends = gcc
 	makedepends = openssl
 	makedepends = procps-ng
+	options = !emptydirs
 	source = http://www.la-samhna.de/samhain/samhain-current.tar.gz
 	source = PKGBUILD.sig
 	source = PKGBUILD
 	validpgpkeys = CB6E213A349B8DF9E96B622AC3F4FFCF3EAE8697
 	validpgpkeys = EF6CEF54701A0AFDB86AF4C31AAD26C80F571F6C
-	sha512sums = d71517890ca24eaf27053760b35bd06e566b18b14b7439f81067ff1ec6f1fcad0a7f4eb2d6d1fd2f30f198b3ce6638a1a2fda462b5a13bf6e532606cbf765ad1
+	sha512sums = bacb82f87d7e6c7bad49f99454279e19c6d1cfa2e353de4f2346cee78f9761173aed5fc26dd956f1c88928d28d25e98c07bc8f74f2984bddae64f96ad1e6b4b2
 	sha512sums = SKIP
 	sha512sums = SKIP
 
diff --git a/PKGBUILD b/PKGBUILD
index e57e3527a909..ab246b77249b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Luke R. <g4jc@openmailbox.org> GPG: rsa4096/3EAE8697
 
 pkgname=samhain
-pkgver=4.1.5
+pkgver=4.2.0
 pkgrel=1
 pkgdesc="file integrity / intrusion detection system"
 arch=(i686 x86_64)
@@ -11,9 +11,13 @@ makedepends=('gcc' 'openssl' 'procps-ng')
 source=("http://www.la-samhna.de/samhain/${pkgname}-current.tar.gz" 
 'PKGBUILD.sig'
 'PKGBUILD')
+options=(!emptydirs)
 validpgpkeys=('CB6E213A349B8DF9E96B622AC3F4FFCF3EAE8697' # PKGBUILD Maintainer's key
 'EF6CEF54701A0AFDB86AF4C31AAD26C80F571F6C') # Rainer Wichmann
-sha512sums=('d71517890ca24eaf27053760b35bd06e566b18b14b7439f81067ff1ec6f1fcad0a7f4eb2d6d1fd2f30f198b3ce6638a1a2fda462b5a13bf6e532606cbf765ad1'
+sha512sums=('bacb82f87d7e6c7bad49f99454279e19c6d1cfa2e353de4f2346cee78f9761173aed5fc26dd956f1c88928d28d25e98c07bc8f74f2984bddae64f96ad1e6b4b2'
+            'SKIP'
+            'SKIP')
+whirlpoolsums=('909c9861233f31b4fcf4cfc006f81bc5173c2bf8d7b91adf0ef4489f43427fe9cf8dbb7a077a92faa7ce73eb752d02c3d13e393d70a761ff4c4eb9e785491fbb'
             'SKIP'
             'SKIP')
 
@@ -24,8 +28,6 @@ tar -ztvf samhain-current.tar.gz | head -n1 | awk '{print $6}' | sed "s/samhain-
 build() {
   gpg --verify PKGBUILD.sig PKGBUILD
   echo "Note: If the GPG verification fails, import the PKGBUILD maintainer's GPG key. See: https://wiki.parabola.nu/GnuPG#Import_key"
-  whirlpoolsum=('2860728405365baee040d9f4ed9fa2967a8f3402ccf3e2b0c3e8b6a0c1fe58189cb658e93a864474234e018300e2db166adc13c6df3dfcb9d514c3b029634d16')
-  [[ "$(openssl dgst -r -whirlpool samhain-current.tar.gz | awk '{print $1}')" = ${whirlpoolsum} ]] && echo "Whirlpool checksum passed." || { echo "Whirlpool checksum failed!!" ;  exit 1; } # This is an added security layer. If SHA512 for some unlikely reason fails, whirlpool will check and abort if it too fails to match.
   gpg --verify samhain-${pkgver}.tar.gz.asc samhain-${pkgver}.tar.gz
   echo "Note: If the GPG verification fails, import the Samhain GPG key: http://www.la-samhna.de/samhain/s_rkey.html"
   tar -zxvf "${srcdir}/${pkgname}-current.tar.gz" -C "${srcdir}"/.
@@ -40,4 +42,6 @@ package() {
   cd "${pkgname}-${pkgver}"
   make || return 1
   make DESTDIR="$pkgdir/" install
+  chmod 755 $pkgdir/usr/bin/samhain
+  chmod 644 $pkgdir/etc/samhainrc
 }
diff --git a/PKGBUILD.sig b/PKGBUILD.sig
index e248a3b67888..b0495029a2b4 100644
--- a/PKGBUILD.sig
+++ b/PKGBUILD.sig