From 1d45c75fd8f6fcc03274b712071abb5e914fef2a Mon Sep 17 00:00:00 2001
From: Stuart Cardall <developer@it-offshore.co.uk>
Date: Sun, 7 May 2017 15:26:44 +0000
Subject: community/fwsnort: update to 1.6.7 / add check()

---
 community/fwsnort/APKBUILD | 36 +++++++++++++++---------------------
 1 file changed, 15 insertions(+), 21 deletions(-)

(limited to 'community/fwsnort/APKBUILD')

diff --git a/community/fwsnort/APKBUILD b/community/fwsnort/APKBUILD
index 9f4c127731..7c70ca74df 100644
--- a/community/fwsnort/APKBUILD
+++ b/community/fwsnort/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Stuart Cardall <developer@it-offshore.co.uk>
 # Maintainer: Stuart Cardall <developer@it-offshore.co.uk>
 pkgname=fwsnort
-pkgver=1.6.6
+pkgver=1.6.7
 pkgrel=0
 pkgdesc="Application layer IDS/IPS by translating snort rules into iptables"
 url="http://www.cipherdyne.org/fwsnort/"
@@ -13,7 +13,7 @@ source="http://www.cipherdyne.org/$pkgname/download/$pkgname-nodeps-$pkgver.tar.
 	fwsnort.up
 	fwsnort.update
 	periodic.daily"
-builddir="$srcdir/$pkgname-$pkgver"
+builddir="$srcdir/$pkgname-nodeps-$pkgver"
 
 build() {
 	cd "$builddir"
@@ -40,39 +40,33 @@ package() {
 	cd "$builddir"
 
 	mkdir -p "$pkgdir"/etc "$pkgdir"/usr
-	cp -rf "$srcdir"/fwsnort-$pkgver/test/fwsnort-install/* "$pkgdir"/ || return 1
-
-	# Delete references to $pkgdir made by the installer.
-	cp -f "$srcdir"/fwsnort-$pkgver/fwsnort.conf \
-		"$pkgdir"/etc/fwsnort/fwsnort.conf || return 1
+	cp -rf test/fwsnort-install/* "$pkgdir"/
+	cp -f fwsnort.conf "$pkgdir"/etc/fwsnort/fwsnort.conf
 
 	# Fix permissions.
-	chmod 0500 "$pkgdir"/etc/fwsnort "$pkgdir"/etc/fwsnort/snort_rules || return 1
-	chmod 0500 "$pkgdir"/usr/sbin/fwsnort || return 1
-	chmod 0600 "$pkgdir"/etc/fwsnort/fwsnort.conf || return 1
+	chmod 0500 "$pkgdir"/etc/fwsnort "$pkgdir"/etc/fwsnort/snort_rules
+	chmod 0500 "$pkgdir"/usr/sbin/fwsnort
+	chmod 0600 "$pkgdir"/etc/fwsnort/fwsnort.conf
 
 	# Install rule / signature update script.
 	install -Dm755 "$srcdir"/fwsnort.update \
-		"$pkgdir"/usr/bin/update-fwsnort || return 1
+		"$pkgdir"/usr/bin/update-fwsnort
 
 	# Install iptables rule splicing script.
 	install -Dm755 "$srcdir"/fwsnort.up \
-		"$pkgdir"/etc/network/if-pre-up.d/fwsnort || return 1
+		"$pkgdir"/etc/network/if-pre-up.d/fwsnort
 
 	# Install daily cron.
 	install -Dm755 "$srcdir"/periodic.daily \
 		"$pkgdir"/etc/periodic/daily/fwsnort
 }
 
-md5sums="7c34730c93c6ef42f79c478538c499e9  fwsnort-nodeps-1.6.6.tar.gz
-442039bc04d553c7c5f9d3fc4269cc71  fwsnort.up
-ab969dd4b3154f8ce663e51473eda6c7  fwsnort.update
-80bd0a7b0c1392e8a279d95e06120ca4  periodic.daily"
-sha256sums="910a770305932b903229315332cbbcdb853a2d1f3828982303693ea162b99c03  fwsnort-nodeps-1.6.6.tar.gz
-8caf113ff779a02fe97288d545f029111151fac9f342be9b40aa9f80e49dd359  fwsnort.up
-a015a512ba9c7b3de7a8da42b33fd1eace25544b4d8b25c3a5f465c8d765a384  fwsnort.update
-f080f4cb0b8e915a5d3af798b46b13fee0d2258d9c8c9dffafa4ecc0b9e1bbe6  periodic.daily"
-sha512sums="ee3152c555f59dd09c1068af6fafb7afc28ce02d38f81df5645c50b1e6829876469a9fccdc184303ad45e7be5d4bd21a4777f6989d3c972a5aec64cbc6ea6765  fwsnort-nodeps-1.6.6.tar.gz
+check() {
+	cd "$builddir/test"
+	perl test-fwsnort.pl
+}
+
+sha512sums="c2a4eae71c0c4e6ea0960d0bb5a43ad299624bbbdac21690b8e01eba83c979be260338fea940f5f294e6cd6eb1984576854c43d38c86c3a9548aeec60f9f2dae  fwsnort-nodeps-1.6.7.tar.gz
 3c97b5f4bb922086acd62305baae4ba1d91e6e627d063f131f98e08da3f57b607b35558eae2cf292b3997d25f09147039f95123161f8f29c5b97b71c80811e9f  fwsnort.up
 2a1e7ca6dc1c4a6e59907175c3483736f0efe1dcd8035dae2b903cd22fe953d29333939ad9e0a6f446480eda55370f4b11a77016932bef73e769b5e5401e92c0  fwsnort.update
 763b459d43319e9b6678a5addd96b3542c629379f9f11095bc158b1ef08b039cd776ceedd6207953ab01000804d7580a3a8223b352b407d3cc6a05c27d96fcb0  periodic.daily"
-- 
cgit v1.2.3