From 2e4540e77ed6e1014398f26997cbf4c56f86cacd Mon Sep 17 00:00:00 2001
From: Giovanni Harting <539@idlegandalf.com>
Date: Fri, 14 Jun 2019 17:55:57 +0200
Subject: [PATCH] ntopng 3.8-2

---
 ntopng/PKGBUILD       |  6 ++----
 ntopng/mongoose.patch | 22 ----------------------
 2 files changed, 2 insertions(+), 26 deletions(-)
 delete mode 100644 ntopng/mongoose.patch

diff --git a/ntopng/PKGBUILD b/ntopng/PKGBUILD
index 0a05cc6..402fa37 100644
--- a/ntopng/PKGBUILD
+++ b/ntopng/PKGBUILD
@@ -9,7 +9,7 @@ validpgpkeys=('EFD9413B17293AFDFE6EA6F1402A088DEDF104CB')
 pkgname=ntopng
 pkgver=3.8
 _ndpiver=2.6
-pkgrel=1
+pkgrel=2
 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/'
@@ -19,8 +19,7 @@ makedepends=('automake' 'libtool' 'wget' 'libxml2')
 source=("https://github.com/ntop/$pkgname/archive/$pkgver.tar.gz"
 	"https://github.com/ntop/nDPI/archive/$_ndpiver.tar.gz"
 	"$pkgname.service"
-        "ntopng"
-        "mongoose.patch")
+        "ntopng")
 
 sha512sums=('2236f9931fc606e4d0a6da379c480a48bacd441cf199a310ea690a03d74d08f369825ea02e3c13828a10f716a5531d4e6774876f253ab348a52bcf8bd8d5107f'
             '5b82786741c3e160a7519f800a52802a39dad198a89fa61fbf45beffeab911c2c25bec4319c7f93011d0cacb6b734ded8637abc0ae3cbd7dd3686a6e2ebb78a2'
@@ -38,7 +37,6 @@ build() {
 
   # build ntopng
   cd $srcdir/$pkgname-$pkgver
-  patch -Np1 -i "${srcdir}/mongoose.patch"
   ./autogen.sh
   ./configure --prefix=/usr --datadir=/usr/share
   make geoip
diff --git a/ntopng/mongoose.patch b/ntopng/mongoose.patch
deleted file mode 100644
index 069cded..0000000
--- a/ntopng/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