From 8efdab0fd7b96d1750be6a78282fb59a0e4723fa Mon Sep 17 00:00:00 2001
From: Carlo Landmeter <clandmeter@gmail.com>
Date: Sat, 27 Aug 2016 23:56:32 +0000
Subject: testing/ntopng: upgrade to 2.4

---
 testing/ntopng/APKBUILD                  | 28 ++++++++++++----------------
 testing/ntopng/include-sys-types.h.patch | 11 -----------
 2 files changed, 12 insertions(+), 27 deletions(-)
 delete mode 100644 testing/ntopng/include-sys-types.h.patch

diff --git a/testing/ntopng/APKBUILD b/testing/ntopng/APKBUILD
index e92cd901b..7b4364022 100644
--- a/testing/ntopng/APKBUILD
+++ b/testing/ntopng/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=ntopng
-pkgver=2.0
-pkgrel=3
+pkgver=2.4
+pkgrel=0
 pkgdesc="ntop next-generation"
 url="http://www.ntop.org"
 arch="all"
@@ -12,18 +12,17 @@ pkggroups="ntop"
 makedepends="autoconf automake curl-dev geoip-dev glib-dev hiredis-dev
 	libpcap-dev libtool libxml2-dev lua-dev luajit-dev lua-redis openssl-dev
 	paxmark rrdtool-dev sqlite-dev wget zeromq-dev zlib-dev
-	linux-headers"
+	linux-headers mariadb-dev"
 install="$pkgname.pre-install"
-subpackages="$pkgname-doc"
-source="http://downloads.sourceforge.net/project/ntop/$pkgname/$pkgname-$pkgver.tar.gz
+#subpackages="$pkgname-doc"
+source="http://downloads.sourceforge.net/project/ntop/$pkgname/$pkgname-$pkgver-stable.tar.gz
 	$pkgname.initd
 	$pkgname.confd
 	ntopng-update-geoip-db
 
-	include-sys-types.h.patch
 	"
 
-_builddir="$srcdir"/$pkgname-$pkgver
+_builddir="$srcdir"/$pkgname-$pkgver-stable
 
 prepare() {
 	cd "$_builddir"
@@ -60,18 +59,15 @@ package() {
 	paxmark -m "$pkgdir"/usr/bin/$pkgname || return 1
 }
 
-md5sums="f8a20b91372d5daf17ecc6225759010e  ntopng-2.0.tar.gz
+md5sums="37dfe5806cbcf0fb1dbb74e0e341e5bb  ntopng-2.4-stable.tar.gz
 5136fbdd47fcaa104ad3b5475587d46a  ntopng.initd
 6739b2c52d83c79a57c847191a64e69a  ntopng.confd
-a222808fb21e06dbd7e226f137686c3f  ntopng-update-geoip-db
-86dd28e89f09c5d9675d016cb3f880bd  include-sys-types.h.patch"
-sha256sums="3cbfd6de1bc44d65f7c7f0de282d122d11f493f1261ba137c3b5b202e08e0251  ntopng-2.0.tar.gz
+a222808fb21e06dbd7e226f137686c3f  ntopng-update-geoip-db"
+sha256sums="f44e2faf3cb712d75106fc9c594139fbfd437edf4a7e6e9ed65134e1f47ad355  ntopng-2.4-stable.tar.gz
 a38f34572efd8b006ee1b6c381f6f0f20e8c28a2e3ede7fcff3e7f6f6da86487  ntopng.initd
 4dd1379f68be1daf7bafe0520ba6a508b550f0b0606ef63eb2bc69b8fbf4dbc9  ntopng.confd
-904c7bb855e19b40d2caee076cbd855f96226b9ef681ac440c442094e25acfeb  ntopng-update-geoip-db
-fdb8e063a6596b7d851b429d1d25e3f994882a9233b73e8044836d9b9110bf7f  include-sys-types.h.patch"
-sha512sums="2208623cdc843b8e4ec285930d1ea74ac50c576888fce20f6fc4363e747e0dbef7f1808e7b77ae9b7f5316bca55a3e003a9926785c847bbea2c321d7f7e56d13  ntopng-2.0.tar.gz
+904c7bb855e19b40d2caee076cbd855f96226b9ef681ac440c442094e25acfeb  ntopng-update-geoip-db"
+sha512sums="515dd7889ae3aaf2482371bb2c55ab7300cf4207fe07f37029b7529bfb710379c19a54f58cf6df87e42454c0c99d15291af334adff676252301d9edd0acf3c7a  ntopng-2.4-stable.tar.gz
 b7924953953470971e67e463260514c30a4a3038ecbb642aec1ad66d12b5af76bdda56c99de675a1fbb106664fa0e3779a4f35fdeedc94d65af486053b7650e1  ntopng.initd
 bbe7a15e0aec59f12264f39bf33abb67a12b76adac3a6554fcf1e21849aea06fce1e0c0d9831836bd46105a5cc4b3eb780866934d8711386e1cb1218dbdbbe8b  ntopng.confd
-de509706c36e895159b4e57b5fe53f1fa8f32167416aad5fa391ac107f0e7e1a06fa5ce6d92816ef7cb13bf98bb74cb99fa482d03f77a6beb38eafe1d53d2deb  ntopng-update-geoip-db
-1f7c7001adafc6bb2e4bfa5e39421fba0da6df57872af1041616dc58b3cdae817a6f2cf7648d009e47a302c981ab1407987a5f2e37527dc23623343bab34275a  include-sys-types.h.patch"
+de509706c36e895159b4e57b5fe53f1fa8f32167416aad5fa391ac107f0e7e1a06fa5ce6d92816ef7cb13bf98bb74cb99fa482d03f77a6beb38eafe1d53d2deb  ntopng-update-geoip-db"
diff --git a/testing/ntopng/include-sys-types.h.patch b/testing/ntopng/include-sys-types.h.patch
deleted file mode 100644
index 25a37736d..000000000
--- a/testing/ntopng/include-sys-types.h.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/nDPI/src/include/linux_compat.h
-+++ b/nDPI/src/include/linux_compat.h
-@@ -42,6 +42,8 @@
- #endif
- #endif
- 
-+#include <sys/types.h>
-+
- #pragma pack(push, 1)  /* push current alignment to stack */
- #pragma pack(1)     /* set alignment to 1 byte boundary */
- 
-- 
cgit v1.2.3