update to ntopng 3.8

3 files changed, 14 insertions, 43 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4500d597712c..3d033ea51d4a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = ntopng
 	pkgdesc = The next generation version of the original ntop, a network traffic probe that shows the network usage
-	pkgver = 3.4
-	pkgrel = 2
+	pkgver = 3.8
+	pkgrel = 1
 	url = http://www.ntop.org/
 	arch = x86_64
 	arch = i686
@@ -17,15 +17,13 @@ pkgbase = ntopng
 	depends = libmariadbclient
 	depends = libpcap
 	depends = sqlite
-	source = https://github.com/ntop/ntopng/archive/3.4.tar.gz
-	source = https://github.com/ntop/nDPI/archive/521afe7e1f340eff5d475b4f0bc6f91ea91c0601.zip
+	source = https://github.com/ntop/ntopng/archive/3.8.tar.gz
+	source = https://github.com/ntop/nDPI/archive/2.6.tar.gz
 	source = ntopng@.service
-	source = fix-mongoose.patch
 	validpgpkeys = EFD9413B17293AFDFE6EA6F1402A088DEDF104CB
-	sha512sums = 0fc6671b11412d8ecaef45cc3cdd57ab5970af7e08b78181d61657b74bea1a6fed717d00a5c951d2e47ad9c046839be998f39ae0fc5a7b616d5c569f044a12e9
-	sha512sums = fbaa20b0a043d0e39ba9149a5e445765d184892c4385640b445b91a456264ca8365d890eb4a83e76d8f5767b097a5405dc1f2c374adf7e9cfa1211bfc7fd7063
+	sha512sums = 2236f9931fc606e4d0a6da379c480a48bacd441cf199a310ea690a03d74d08f369825ea02e3c13828a10f716a5531d4e6774876f253ab348a52bcf8bd8d5107f
+	sha512sums = 5b82786741c3e160a7519f800a52802a39dad198a89fa61fbf45beffeab911c2c25bec4319c7f93011d0cacb6b734ded8637abc0ae3cbd7dd3686a6e2ebb78a2
 	sha512sums = b3d9a2032cce91ee4faf81522a30a2877540b3fc7a0d43f8fe4f01c16efb0b8f6e73cfe26028b3a070296d7156abf511d3e11f93635ca2de8a4d67322b0ade60
-	sha512sums = 3652880a2b1899950a8d534d57ffded396e4aa3238831993481d29a527a518ca1210c13c20330281d59c9b1c0287aed1a0312b152dc82e7f75aaaf284310a880
 
 pkgname = ntopng
 
diff --git a/PKGBUILD b/PKGBUILD
index a7414f46940a..ff35c239b160 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,9 +5,9 @@
 # Contributor: CRT <cirkit@kode.email>
 validpgpkeys=('EFD9413B17293AFDFE6EA6F1402A088DEDF104CB')
 pkgname=ntopng
-pkgver=3.4
-_ndpiver=521afe7e1f340eff5d475b4f0bc6f91ea91c0601
-pkgrel=2
+pkgver=3.8
+_ndpiver=2.6
+pkgrel=1
 pkgdesc='The next generation version of the original ntop, a network traffic probe that shows the network usage'
 arch=('x86_64' 'i686')
 url='http://www.ntop.org/'
@@ -15,19 +15,14 @@ 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.zip"
-	"$pkgname@.service" 
-	"fix-mongoose.patch")
+	"https://github.com/ntop/nDPI/archive/$_ndpiver.tar.gz"
+	"$pkgname@.service" )
 
-sha512sums=('0fc6671b11412d8ecaef45cc3cdd57ab5970af7e08b78181d61657b74bea1a6fed717d00a5c951d2e47ad9c046839be998f39ae0fc5a7b616d5c569f044a12e9'
-'fbaa20b0a043d0e39ba9149a5e445765d184892c4385640b445b91a456264ca8365d890eb4a83e76d8f5767b097a5405dc1f2c374adf7e9cfa1211bfc7fd7063'
-'b3d9a2032cce91ee4faf81522a30a2877540b3fc7a0d43f8fe4f01c16efb0b8f6e73cfe26028b3a070296d7156abf511d3e11f93635ca2de8a4d67322b0ade60'
-'3652880a2b1899950a8d534d57ffded396e4aa3238831993481d29a527a518ca1210c13c20330281d59c9b1c0287aed1a0312b152dc82e7f75aaaf284310a880'
-)
+sha512sums=('2236f9931fc606e4d0a6da379c480a48bacd441cf199a310ea690a03d74d08f369825ea02e3c13828a10f716a5531d4e6774876f253ab348a52bcf8bd8d5107f'
+'5b82786741c3e160a7519f800a52802a39dad198a89fa61fbf45beffeab911c2c25bec4319c7f93011d0cacb6b734ded8637abc0ae3cbd7dd3686a6e2ebb78a2'
+'b3d9a2032cce91ee4faf81522a30a2877540b3fc7a0d43f8fe4f01c16efb0b8f6e73cfe26028b3a070296d7156abf511d3e11f93635ca2de8a4d67322b0ade60')
 
 build() {
-  cd $srcdir	
-  patch -p0 < fix-mongoose.patch
   cd $srcdir/nDPI-$_ndpiver
   ./autogen.sh
   ./configure
diff --git a/fix-mongoose.patch b/fix-mongoose.patch
deleted file mode 100644
index 069cded41df8..000000000000
--- a/fix-mongoose.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- ntopng-3.4-old/third-party/mongoose/mongoose.c	2018-06-17 15:30:25.000000000 +0200
-+++ ntopng-3.4/third-party/mongoose/mongoose.c	2018-08-26 07:32:27.632828581 +0200
-@@ -247,7 +247,9 @@
- #define mg_rename(x, y) rename(x, y)
- #define mg_sleep(x) usleep((x) * 1000)
- #define ERRNO errno
-+#ifndef INVALID_SOCKET
- #define INVALID_SOCKET (-1)
-+#endif
- 
- /* ntop */
- #if ((ULONG_MAX) == (UINT_MAX))
-@@ -270,7 +272,9 @@
- #endif
- 
- //#define INT64_FMT PRId64
-+#ifndef SOCKET
- typedef int SOCKET;
-+#endif
- #define WINCDECL
- 
- #endif // End of Windows and UNIX specific includes