upgpkg: ntopng 5.0-1

upstream release

new major version

2 files changed, 10 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c12f4502d6af..d189d1a72d41 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 = 4.2
+	pkgver = 5.0
 	pkgrel = 1
 	url = http://www.ntop.org/
 	install = ntopng.install
@@ -20,17 +20,16 @@ pkgbase = ntopng
 	depends = libmaxminddb
 	depends = zeromq
 	depends = rrdtool
-	source = ntopng-4.2.tar.gz::https://github.com/ntop/ntopng/archive/4.2.tar.gz
-	source = nDPI-3.4.tar.gz::https://github.com/ntop/nDPI/archive/3.4.tar.gz
+	source = ntopng-5.0.tar.gz::https://github.com/ntop/ntopng/archive/5.0.tar.gz
+	source = nDPI-46ebd7128fd38f3eac5289ba281f3f25bad1d899.tar.gz::https://github.com/ntop/nDPI/archive/46ebd7128fd38f3eac5289ba281f3f25bad1d899.tar.gz
 	source = ntopng@.service
 	source = ntopng.install
 	source = ntopng.sysusers
 	validpgpkeys = EFD9413B17293AFDFE6EA6F1402A088DEDF104CB
-	sha512sums = e89ec3f35644ae8bc570d9802ecfadbf0067145e23a589df2032e8781e9c954f4166d3abb650ddafc65e4fbad656730ee1abf9c5273d3e09f8173d423436b8ff
-	sha512sums = ed5a22b6ddc14ad707a18a0bd96746c1df489969faaa42016fa9aad8d414fc4ee303b96cac15c3ba86f484a80a0aaa2dd1be5f92be672912e0e0d30da4bdad4c
+	sha512sums = e157430d9c98871d0136d2f51af6c7fed3a95fa21f8d3a9447ee69ac2aaee3752b6eddfd584715e3ee36234fd0fdcf865b761b0ec1a08727f6d988bc115d21e6
+	sha512sums = 3f3cfe24e74898a59b307e85d912e01c707031e0dc1984766bb53fc5f30be1a458c3a2d3de1f3981dc79ee9dc1c07362ac5756a2b1840863421b9539cb8d276d
 	sha512sums = b3d9a2032cce91ee4faf81522a30a2877540b3fc7a0d43f8fe4f01c16efb0b8f6e73cfe26028b3a070296d7156abf511d3e11f93635ca2de8a4d67322b0ade60
 	sha512sums = 72749fbade0f14345481815355f42552bac3a9d053d86cf62caecd3cf7d304fadafd7ccf9a6a456ab7e5b8b0d36a3b92b1f4e1ecd0c40fa3d11e4a7d98cab39e
 	sha512sums = bb7f81a43e6bd1d58e41693dca1b5f03e507fb040bf036a5847a273f55bcfa665e8512220a54495c2926afb64e786d4e666556d7880be432cc7660de105e3ee4
 
 pkgname = ntopng
-
diff --git a/PKGBUILD b/PKGBUILD
index 562a7a53f1f2..4581bc8e8cd8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,5 +1,5 @@
 # Maintainer: Barry Smith <brrtsm at gmmal dot com>
-# Contributor: johnnybash <jb at wachenzell dot org> PGP D126E2910543DE2D
+# Contributor: johnnybash <georg at grgw dot de> PGP D126E2910543DE2D
 # Contributor: jrdemasi <jrdemasi@gmai.com>
 # Contributor: Fernando Manfredi <contact at acidhub.click>
 # Contributor: Evan Teitelman <teitelmanevan at gmail dot com>
@@ -7,8 +7,8 @@
 # Contributor: CRT <cirkit@kode.email>
 validpgpkeys=('EFD9413B17293AFDFE6EA6F1402A088DEDF104CB')
 pkgname=ntopng
-pkgver=4.2
-_ndpiver=3.4
+pkgver=5.0
+_ndpiver=46ebd7128fd38f3eac5289ba281f3f25bad1d899
 pkgrel=1
 pkgdesc='The next generation version of the original ntop, a network traffic probe that shows the network usage'
 arch=('x86_64' 'i686')
@@ -22,15 +22,13 @@ source=("$pkgname-$pkgver.tar.gz::https://github.com/ntop/$pkgname/archive/$pkgv
 	"$pkgname@.service"
 	"$pkgname.install"
 	"$pkgname.sysusers")
-sha512sums=('e89ec3f35644ae8bc570d9802ecfadbf0067145e23a589df2032e8781e9c954f4166d3abb650ddafc65e4fbad656730ee1abf9c5273d3e09f8173d423436b8ff'
-            'ed5a22b6ddc14ad707a18a0bd96746c1df489969faaa42016fa9aad8d414fc4ee303b96cac15c3ba86f484a80a0aaa2dd1be5f92be672912e0e0d30da4bdad4c'
+sha512sums=('e157430d9c98871d0136d2f51af6c7fed3a95fa21f8d3a9447ee69ac2aaee3752b6eddfd584715e3ee36234fd0fdcf865b761b0ec1a08727f6d988bc115d21e6'
+            '3f3cfe24e74898a59b307e85d912e01c707031e0dc1984766bb53fc5f30be1a458c3a2d3de1f3981dc79ee9dc1c07362ac5756a2b1840863421b9539cb8d276d'
             'b3d9a2032cce91ee4faf81522a30a2877540b3fc7a0d43f8fe4f01c16efb0b8f6e73cfe26028b3a070296d7156abf511d3e11f93635ca2de8a4d67322b0ade60'
             '72749fbade0f14345481815355f42552bac3a9d053d86cf62caecd3cf7d304fadafd7ccf9a6a456ab7e5b8b0d36a3b92b1f4e1ecd0c40fa3d11e4a7d98cab39e'
             'bb7f81a43e6bd1d58e41693dca1b5f03e507fb040bf036a5847a273f55bcfa665e8512220a54495c2926afb64e786d4e666556d7880be432cc7660de105e3ee4')
 
 build() {
-  # export cppflags to fix build error, see https://github.com/ntop/nDPI/issues/1115
-  export CPPFLAGS='-D_FORTIFY_SOURCE=2 -O2'
   cd $srcdir/nDPI-$_ndpiver
   ./autogen.sh
   ./configure