- Update net/ndpi to 2.2.2 snapshot

- Update net/ntopng to 3.4 snapshot
- Change versioning scheme to conform to porter's handbook best
  practices
- Bump PORTEPOCH to avoid version number going backwards
- Remove patches included upstream
- Remove unneeded USE_LDCONFIG in ntopng

1 files changed, 19 insertions, 31 deletions

diff --git a/net/ntopng/files/patch-configure.seed b/net/ntopng/files/patch-configure.seed
index 4311d91ce342..4fb5cd42d7cf 100644
--- a/net/ntopng/files/patch-configure.seed
+++ b/net/ntopng/files/patch-configure.seed
@@ -1,6 +1,6 @@
---- configure.seed.orig	2018-01-12 09:48:20 UTC
+--- configure.seed.orig	2018-06-04 09:56:33 UTC
 +++ configure.seed
-@@ -29,26 +29,8 @@ fi
+@@ -27,33 +27,8 @@ fi
  # On CentOS 6 `git rev-list HEAD --count` does not work
  #
  #
@@ -25,38 +25,26 @@
 -  LDFLAGS="${LDFLAGS} -L/opt/local/lib"
 -fi
 -
- if [ test -f /usr/bin/lsb_release ]; then
-    CODENAME=`/usr/bin/lsb_release -c|cut -f 2`
-    if [[ $CODENAME == "wheezy" ]]; then :
-@@ -64,26 +46,7 @@ GIT_BRANCH="@GIT_BRANCH@"
- PRO_GIT_RELEASE="@PRO_GIT_RELEASE@"
- PRO_GIT_DATE="@PRO_GIT_DATE@"
- 
--AC_MSG_CHECKING(for nDPI)
--NDPI_HOME=./nDPI
--if test -d "$NDPI_HOME" ; then :
--   AC_MSG_RESULT(found in $NDPI_HOME)
--else
--   NDPI_HOME=../nDPI
--   if test -d "$NDPI_HOME"; then :
--      AC_MSG_RESULT(found in $NDPI_HOME)
--   else
--      NDPI_HOME=$HOME/nDPI
--      if test -d "$NDPI_HOME"; then :
--        AC_MSG_RESULT(found in $NDPI_HOME)
--      else
--        AC_MSG_RESULT(not found)
--        echo "Please do cd ..; git clone https://github.com/ntop/nDPI.git; cd nDPI; ./autogen.sh; make; cd ../ntopng"
--        echo " and try again"
--        exit
--      fi
+-if [ test -f /usr/bin/lsb_release ]; then
+-   CODENAME=`/usr/bin/lsb_release -c|cut -f 2`
+-   if [[ $CODENAME == "wheezy" ]]; then :
+-     CPPFLAGS="${CPPFLAGS} -DOLD_NETFILTER_INTERFACE=1"
 -   fi
 -fi
-+NDPI_HOME=%%LOCALBASE%%
+-
+ SHORT_MACHINE=`uname -m | cut -b1-3`
  
- if test -d "/usr/include/openssl"; then :
-  AC_DEFINE_UNQUOTED(NO_SSL_DL, 1, [has openssl])
-@@ -438,18 +401,6 @@ GMAKE=`which gmake`
+ GIT_RELEASE="@GIT_RELEASE@"
+@@ -94,7 +69,7 @@ AC_ARG_WITH(ndpi-includes,
+ PKG_CHECK_MODULES([NDPI], [libndpi >= 2.0], [
+    NDPI_INC=`echo $NDPI_CFLAGS | sed -e "s/[ ]*$//"`/libndpi
+    # Use static libndpi library as building against the dynamic library fails
+-   NDPI_LIB="-Wl,-Bstatic $NDPI_LIBS -Wl,-Bdynamic"
++   NDPI_LIB="$NDPI_LIBS"
+    NDPI_LIB_DEP=
+    ], [
+       AC_MSG_CHECKING(for nDPI source)
+@@ -505,18 +480,6 @@ GMAKE=`which gmake`
  if test x$GMAKE = x
  then
  	GMAKE="make"