From d89db58f64bfde541627900b78660ab73cf524f2 Mon Sep 17 00:00:00 2001
From: Roberto Oliveira <robertoguimaraes8@gmail.com>
Date: Thu, 16 Nov 2017 15:20:05 +0000
Subject: main/snort: upgrade to 2.9.11, modernize and add basic check

---
 main/snort/APKBUILD | 36 ++++++++++++++----------------------
 1 file changed, 14 insertions(+), 22 deletions(-)

diff --git a/main/snort/APKBUILD b/main/snort/APKBUILD
index 9220bb921bb..19845e76bf0 100644
--- a/main/snort/APKBUILD
+++ b/main/snort/APKBUILD
@@ -2,13 +2,12 @@
 # Contributor: Leonardo Arena <rnalrd@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=snort
-pkgver=2.9.9.0
+pkgver=2.9.11
 pkgrel=0
 pkgdesc="An open source network intrusion prevention and detection system"
 url="http://www.snort.org/"
 arch="all"
 license="GPL"
-depends=
 makedepends="pcre-dev libpcap-dev libnet-dev libdnet-dev daq-dev
 	bison flex zlib-dev libtirpc-dev"
 install="$pkgname.pre-install"
@@ -20,15 +19,10 @@ source="https://www.snort.org/downloads/snort/snort-$pkgver.tar.gz
 pkgusers="snort"
 pkggroups="snort"
 
-_builddir="$srcdir/$pkgname-$pkgver"
+builddir="$srcdir/$pkgname-$pkgver"
 prepare() {
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-
+	default_prepare
+	cd "$builddir"
 	# fix parallel builds
 #	sed -i -e 's/^all-local:.*/all-local: $(LTLIBRARIES)/' \
 #		src/dynamic-preprocessors/*/Makefile.am || return 1
@@ -38,7 +32,7 @@ prepare() {
 }
 
 build() {
-        cd "$_builddir"
+        cd "$builddir"
 	export CFLAGS="$CFLAGS `pkgconf --cflags libtirpc`"
 	export LDFLAGS="$LDFLAGS `pkgconf --libs libtirpc`"
 	./configure \
@@ -50,13 +44,17 @@ build() {
 		--infodir=/usr/share/info \
 		--enable-ipv6 \
 		--enable-gre \
-		--enable-non-ether-decoders \
-		|| return 1
-        make || return 1
+		--enable-non-ether-decoders
+        make
+}
+
+check() {
+	cd "$builddir"
+	./src/snort --version > /dev/null
 }
 
 package() {
-        cd "$_builddir"
+        cd "$builddir"
         make -j1 DESTDIR="$pkgdir" install
 
         install -D -m 755 ../snort.initd "$pkgdir"/etc/init.d/snort
@@ -75,12 +73,6 @@ package() {
 	touch "$pkgdir"/var/lib/snort/rules/black_list.rules
 }
 
-md5sums="fd3012bf36710481d66b40ad046b231d  snort-2.9.9.0.tar.gz
-f163599315be80d682a51f8d22849ab5  snort.initd
-446f8d2b3435b8a6be738da978670605  snort.confd"
-sha256sums="71b147125e96390a12f3d55796ed5073df77206bd3563d84d3e5a1f19e7d7a56  snort-2.9.9.0.tar.gz
-d447f1481a49543878030d361c8c31a6538c41b2c57e1c0cffd858cc5f83f70b  snort.initd
-d504cb31ffcce9acc8fc7b68123a31a53b491444c52730339ea9a4e986521f71  snort.confd"
-sha512sums="2c17539c80484c90198a2e5d5efd1e70f26afb79ce7c28e745ded356b6f1a1f97763ff21fde986652af1768fa3bcdafbbcc3c82ee8ad6d2ef0471f360cfcab83  snort-2.9.9.0.tar.gz
+sha512sums="f254ca51f5eddf70ed007df1136748be58787f1e0c9652a2ab9cb5adfb694d625ed71bd867c0f6bec444eeaa39306522bf616f13bbf6ab8ae8bf321b67c4b986  snort-2.9.11.tar.gz
 c71d11f4cde4aba432641d3915faec8070e9fea5b33c71f6b2872b2208871180b3c7dbbadd2ddaebe5f3280adf7c5c9daf1585afd331fe552486a675ff676e52  snort.initd
 abc0846ea6e08029c772f24e213f211a39219701e6e2c8b3aa112632318479db7b21014c5f2c4987cb2981cafce0ea744549c3ce754e9145cba9ec5604ae66f3  snort.confd"
-- 
cgit v1.2.3