From 9361b9b21d7aa1e1be3bec8c9bc08d307cc817fb Mon Sep 17 00:00:00 2001
From: Stuart Cardall <developer@it-offshore.co.uk>
Date: Mon, 6 Aug 2018 21:23:40 +0000
Subject: community/psad: upgrade to 2.4.6

https://github.com/mrash/psad/blob/master/ChangeLog
---
 community/psad/APKBUILD | 44 +++++++++++++++++++++-----------------------
 1 file changed, 21 insertions(+), 23 deletions(-)

(limited to 'community/psad')

diff --git a/community/psad/APKBUILD b/community/psad/APKBUILD
index b3c6a54afd..6caaa829ff 100644
--- a/community/psad/APKBUILD
+++ b/community/psad/APKBUILD
@@ -1,20 +1,21 @@
 # Contributor: Stuart Cardall <developer@it-offshore.co.uk>
 # Maintainer: Stuart Cardall <developer@it-offshore.co.uk>
 pkgname=psad
-pkgver=2.4.3
-pkgrel=1
+pkgver=2.4.6
+pkgrel=0
 pkgdesc="3 lightweight system daemons that analyze iptables log messages to detect port scans and other suspicious traffic"
 url="http://cipherdyne.org/psad/"
 arch="all"
 license="GPL"
+options="!check" # tests require a built pkg
 depends="perl iptables ip6tables ssmtp mailx psmisc perl-bit-vector
 	perl-date-calc perl-iptables-chainmgr perl-iptables-parse perl-net-ipv4addr
 	perl-unix-syslog net-tools whois"
-subpackages="$pkgname-doc"
+subpackages="$pkgname-doc $pkgname-openrc"
 source="http://cipherdyne.org/psad/download/$pkgname-nodeps-$pkgver.tar.gz
 	psad.initd
 	psad.confd"
-builddir="$srcdir/$pkgname-nodeps-$pkgver"
+builddir="$srcdir/$pkgname-$pkgver"
 
 build() {
 	cd "$builddir"
@@ -23,7 +24,7 @@ build() {
 	sed -e "s|'/usr/sbin'|'$pkgdir/usr/sbin'|" \
 		-e "s|'/usr/bin'|'$pkgdir/usr/bin'|" \
 		-e "s|my \$mpath = \"/usr/share/man/man\$section\";|my \$mpath = \"$pkgdir/usr/share/man/man\$section\";|" \
-		-i ./install.pl || return 1
+		-i ./install.pl
 
 	# /usr/sbin/psadwatchd set with last cmd
 	sed -e "s|/var/log/psad|$pkgdir&|" \
@@ -35,16 +36,19 @@ build() {
 		-e "s|/usr/sbin/fwcheck_psad|$pkgdir&|" \
 		-e "s|/usr/sbin/kmsgsd|$pkgdir&|" \
 		-e "s|/usr/sbin/psad|$pkgdir&|" \
-		-i ./psad.conf || return 1
+		-i ./psad.conf
 
 	# Set mail command to mailx.
-	sed -e 's|/bin/mail;|/usr/bin/mail;|g' -i ./psad.conf || return 1
+	sed -e 's|/bin/mail;|/usr/bin/mail;|g' -i ./psad.conf
 
 	# Disable install of generic init script & setting numeric run level.
 	local start=$(sed -n '/if ($init_dir and &is_root()) {/=' ./install.pl)
-	local end=$(expr $start + 7)
-	# Busybox sed does not support +7d.
-	sed ''$start','$end'd' ./install.pl -i || return 1
+	local end=$(expr $start + 11)
+	# Busybox sed does not support +11d.
+	sed ''$start','$end'd' ./install.pl -i
+
+	# fix for building on Travis
+	sed -i "s|^my \$is_systemd =.*|my \$is_systemd = 0;|" ./install.pl
 
 	# Populate install.answers so build does not wait for them.
 	cat >./install.answers <<-EOF
@@ -78,10 +82,10 @@ package() {
 		"$pkgdir"/var/log/psad
 
 	# Add dummy whois so build completes.
-	ln -s /bin/busybox "$pkgdir"/usr/bin/whois || return 1
+	ln -s /bin/busybox "$pkgdir"/usr/bin/whois
 
 	# Dummy runlevel 1 / skip perl module installation.
-	./install.pl --runlevel 1 --Use-answers --Skip-mod-install || return 1
+	./install.pl --runlevel 1 --Use-answers --Skip-mod-install
 	rm -Rf "$pkgdir"/var/run
 
 	# Set correct permissions.
@@ -93,22 +97,16 @@ package() {
 	rm -f "$pkgdir"/usr/bin/whois
 
 	# Fix the config.
-	sed "s|$pkgdir||" -i "$pkgdir"/etc/psad/psad.conf || return 1
-	sed "s|$pkgdir||" -i "$pkgdir"/var/log/psad/install.log || return 1
+	sed "s|$pkgdir||" -i "$pkgdir"/etc/psad/psad.conf
+	sed "s|$pkgdir||" -i "$pkgdir"/var/log/psad/install.log
 
 	# Install init script & config defaults.
 	install -m755 -D "$srcdir"/$pkgname.initd \
-		"$pkgdir"/etc/init.d/$pkgname || return 1
+		"$pkgdir"/etc/init.d/$pkgname
 	install -m644 -D "$srcdir"/$pkgname.confd \
-		"$pkgdir"/etc/conf.d/$pkgname || return 1
+		"$pkgdir"/etc/conf.d/$pkgname
 }
 
-md5sums="644e6094c5142f54cdca6e7429825307  psad-nodeps-2.4.3.tar.gz
-1b061d02d75d09537ef25e588c09583f  psad.initd
-bc07efebb41cc23c4be129bbbacc874b  psad.confd"
-sha256sums="c5a90f4c284c0eda3b24c5fcd9d0fd0e464ad8bf0fe7559ac6ecc41bb81e0b65  psad-nodeps-2.4.3.tar.gz
-872152efdd6b5774ed0a11a44156ca5c4707af31ac4e998cfd20a3f47a81fefa  psad.initd
-74c72225fa37c367a458321b737050cacaf262f32b0cc13babc54468ff1988b9  psad.confd"
-sha512sums="9234a2ed534f571fb46d7566313802813076b9a3f2011695288b7b1a5c4f3f22cefc6ea99e087cbeb1072d61c278c11a28b5aaa4e4024d8bb459dda4873840d2  psad-nodeps-2.4.3.tar.gz
+sha512sums="95ddd18da2b9c6703b0d156873622740517cad62fda8d69ddb0686c43c4e306155dd646965cd52081dbd0d6c235bd3c794f6b004e3ee3bfa3e6150eb5f617c56  psad-nodeps-2.4.6.tar.gz
 ec709b1ba1df36dad5c1c2cfb5fc45765ac4ccdd6fc7a3e2f23c972c7dfb8e5910aeb1ba42437abd0d2c766bb99bcb790301c7b8ba3ee7e6593dcae13e9efc3a  psad.initd
 a80666f59356cc6157a9f5dca132991d4f1e0afda8f673d602de2557219d5521bec9ae148330e98d9483175d14d96e4cc2ccd11541d8b187b0e47f44ba4ada54  psad.confd"
-- 
cgit v1.2.3