bump to v3.4 (requires nDPI from 2.2.2 branch); cleanup

6 files changed, 18 insertions, 36 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a88109b71a7d..c16ab05915e6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = ntopng
 	pkgdesc = The next generation version of the original ntop, a network traffic probe that shows the network usage
-	pkgver = 3.2
+	pkgver = 3.4
 	pkgrel = 1
 	url = http://www.ntop.org/
 	arch = x86_64
@@ -17,15 +17,13 @@ pkgbase = ntopng
 	depends = libmariadbclient
 	depends = libpcap
 	depends = sqlite
-	source = https://github.com/ntop/ntopng/archive/3.2.tar.gz
-	source = https://github.com/ntop/nDPI/archive/2.2.tar.gz
+	source = https://github.com/ntop/ntopng/archive/3.4.tar.gz
+	source = https://github.com/ntop/nDPI/archive/521afe7e1f340eff5d475b4f0bc6f91ea91c0601.zip
 	source = ntopng@.service
-	source = luajit.patch
 	validpgpkeys = EFD9413B17293AFDFE6EA6F1402A088DEDF104CB
-	sha512sums = 75c12d30e9253b6a33c8f464a40b5dc27ba8b9d623a73ba8fb6a02a8fbbd4091f30ab10f83d9538f1acc479dcb91ae66d3eba7e2f52187f1398c73336f4aa1b6
-	sha512sums = ee1e0a1cc87a3971408877bd5d3154f6bd5d4ddcd2437c8e03e5d8a5093da2b1cbfefad1e28e77145af4286eecbd341ef90f94aa5c7f36a98e3625e9948e96d6
+	sha512sums = 0fc6671b11412d8ecaef45cc3cdd57ab5970af7e08b78181d61657b74bea1a6fed717d00a5c951d2e47ad9c046839be998f39ae0fc5a7b616d5c569f044a12e9
+	sha512sums = fbaa20b0a043d0e39ba9149a5e445765d184892c4385640b445b91a456264ca8365d890eb4a83e76d8f5767b097a5405dc1f2c374adf7e9cfa1211bfc7fd7063
 	sha512sums = b3d9a2032cce91ee4faf81522a30a2877540b3fc7a0d43f8fe4f01c16efb0b8f6e73cfe26028b3a070296d7156abf511d3e11f93635ca2de8a4d67322b0ade60
-	sha512sums = ca3ddd814c2be339ed58a61e95002be3d03b1d425b3fb1cdc3b20c7f724038f9d18444537d564bb39543434bde3a8a79daf856837b75d3d6ea48447cd8796c64
 
 pkgname = ntopng
 
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..b25c15b81fae
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+*~
diff --git a/PKGBUILD b/PKGBUILD
index da43c9e43f23..4d56e070c28e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,8 +5,8 @@
 # Contributor: CRT <cirkit@kode.email>
 validpgpkeys=('EFD9413B17293AFDFE6EA6F1402A088DEDF104CB')
 pkgname=ntopng
-pkgver=3.2
-_ndpiver=2.2
+pkgver=3.4
+_ndpiver=521afe7e1f340eff5d475b4f0bc6f91ea91c0601
 pkgrel=1
 pkgdesc='The next generation version of the original ntop, a network traffic probe that shows the network usage'
 arch=('x86_64' 'i686')
@@ -15,19 +15,20 @@ license=('GPL3')
 depends=('redis' 'geoip' 'libmariadbclient' 'libpcap' 'sqlite')
 makedepends=('glib2' 'automake' 'libtool' 'wget' 'curl' 'libxml2')
 source=("https://github.com/ntop/$pkgname/archive/$pkgver.tar.gz"
-        "https://github.com/ntop/nDPI/archive/$_ndpiver.tar.gz"
-        "$pkgname@.service"
-        "luajit.patch")
+	"https://github.com/ntop/nDPI/archive/$_ndpiver.zip"
+	"$pkgname@.service")
 
-sha512sums=('75c12d30e9253b6a33c8f464a40b5dc27ba8b9d623a73ba8fb6a02a8fbbd4091f30ab10f83d9538f1acc479dcb91ae66d3eba7e2f52187f1398c73336f4aa1b6'
-'ee1e0a1cc87a3971408877bd5d3154f6bd5d4ddcd2437c8e03e5d8a5093da2b1cbfefad1e28e77145af4286eecbd341ef90f94aa5c7f36a98e3625e9948e96d6'
-'b3d9a2032cce91ee4faf81522a30a2877540b3fc7a0d43f8fe4f01c16efb0b8f6e73cfe26028b3a070296d7156abf511d3e11f93635ca2de8a4d67322b0ade60'
-'ca3ddd814c2be339ed58a61e95002be3d03b1d425b3fb1cdc3b20c7f724038f9d18444537d564bb39543434bde3a8a79daf856837b75d3d6ea48447cd8796c64')
+sha512sums=('0fc6671b11412d8ecaef45cc3cdd57ab5970af7e08b78181d61657b74bea1a6fed717d00a5c951d2e47ad9c046839be998f39ae0fc5a7b616d5c569f044a12e9'
+'fbaa20b0a043d0e39ba9149a5e445765d184892c4385640b445b91a456264ca8365d890eb4a83e76d8f5767b097a5405dc1f2c374adf7e9cfa1211bfc7fd7063'
+'b3d9a2032cce91ee4faf81522a30a2877540b3fc7a0d43f8fe4f01c16efb0b8f6e73cfe26028b3a070296d7156abf511d3e11f93635ca2de8a4d67322b0ade60')
 
 build() {
-  patch $srcdir/$pkgname-$pkgver/Makefile.in luajit.patch
+  cd $srcdir/nDPI-$_ndpiver
+  ./autogen.sh
+  ./configure
+  make
+  export NDPI_HOME=$srcdir/nDPI-$_ndpiver
   cd $srcdir/$pkgname-$pkgver
-  ln -sf ../nDPI-$_ndpiver nDPI
   ./autogen.sh
   ./configure --prefix=$pkgdir/usr --datadir=/usr/share
   make geoip
diff --git a/luajit.patch b/luajit.patch
deleted file mode 100644
index 08083dfb631d..000000000000
--- a/luajit.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- Makefile.in	2018-02-23 07:33:00.804174657 -0500
-+++ Makefile.in	2018-02-23 07:33:53.433167622 -0500
-@@ -34,15 +34,9 @@
- MONGOOSE_HOME=${PWD}/third-party/mongoose
- MONGOOSE_INC=-I$(MONGOOSE_HOME)
- ######
--HAS_LUAJIT=$(shell pkg-config --exists luajit; echo $$?)
--ifeq ($(HAS_LUAJIT), 0)
--	LUAJIT_INC = $(shell pkg-config --cflags luajit)
--	LUAJIT_LIB = $(shell pkg-config --libs luajit)
--else
- 	LUAJIT_HOME=${PWD}/third-party/LuaJIT-2.1.0-beta3
- 	LUAJIT_INC=-I$(LUAJIT_HOME)/src
- 	LUAJIT_LIB=$(LUAJIT_HOME)/src/libluajit.a
--endif
- ######
- LIBRRDTOOL_HOME=${PWD}/third-party/rrdtool-1.4.8
- HAS_LIBRRDTOOL=$(shell pkg-config --atleast-version=1.4.8 librrd; echo $$?)
diff --git a/ntopng-2.4-stable.tar.gz.sig b/ntopng-2.4-stable.tar.gz.sig
deleted file mode 100644
index 57e72ffc605b..000000000000
--- a/ntopng-2.4-stable.tar.gz.sig
+++ /dev/null
diff --git a/ntopng@.service.sig b/ntopng@.service.sig
deleted file mode 100644
index 1374bb5307d8..000000000000
--- a/ntopng@.service.sig
+++ /dev/null