- Update nDPI to latest upstream stable snapshot
- Update ntopng to latest upsstream snapshot of new 4.2 stable version
This commit is contained in:
Guido Falsi
+2
-2
@@ -2,7 +2,7 @@
|
||||
# $FreeBSD$
|
||||
|
||||
PORTNAME= ndpi
|
||||
PORTVERSION= 3.4.d20201019
|
||||
PORTVERSION= 3.4.d20201101
|
||||
PORTEPOCH= 1
|
||||
CATEGORIES= net
|
||||
|
||||
@@ -28,7 +28,7 @@ INSTALL_TARGET= install-strip
|
||||
USE_GITHUB= yes
|
||||
GH_ACCOUNT= ntop
|
||||
GH_PROJECT= nDPI
|
||||
GH_TAGNAME= 64929a7
|
||||
GH_TAGNAME= d22bcc9
|
||||
|
||||
PLIST_SUB= MAJOR_VER=${PORTVERSION:R:R} VER=${PORTVERSION:R}
|
||||
|
||||
|
||||
+3
-3
@@ -1,3 +1,3 @@
|
||||
TIMESTAMP = 1603197678
|
||||
SHA256 (ntop-nDPI-3.4.d20201019-64929a7_GH0.tar.gz) = 5a1d5a010c68c767deee008dabeca943a5b9897a0f936b2a68c30f6e1d9d6810
|
||||
SIZE (ntop-nDPI-3.4.d20201019-64929a7_GH0.tar.gz) = 37976447
|
||||
TIMESTAMP = 1604395517
|
||||
SHA256 (ntop-nDPI-3.4.d20201101-d22bcc9_GH0.tar.gz) = f9206fe31e443d91da75d1d1e22fe6ae1c32e29ab352d2f272bb1420e4ce3378
|
||||
SIZE (ntop-nDPI-3.4.d20201101-d22bcc9_GH0.tar.gz) = 37976104
|
||||
|
||||
+5
-5
@@ -2,7 +2,7 @@
|
||||
# $FreeBSD$
|
||||
|
||||
PORTNAME= ntopng
|
||||
PORTVERSION= 4.0.d20201019
|
||||
PORTVERSION= 4.2.d20201102
|
||||
PORTEPOCH= 1
|
||||
CATEGORIES= net
|
||||
|
||||
@@ -18,7 +18,9 @@ LIB_DEPENDS= librrd.so:databases/rrdtool \
|
||||
libndpi.so:net/ndpi \
|
||||
libjson-c.so:devel/json-c \
|
||||
libsodium.so:security/libsodium \
|
||||
libmaxminddb.so:net/libmaxminddb
|
||||
libmaxminddb.so:net/libmaxminddb \
|
||||
libexpat.so:textproc/expat2 \
|
||||
libzstd.so:archivers/zstd
|
||||
BUILD_DEPENDS= bash:shells/bash
|
||||
|
||||
USES= autoreconf compiler:c++11-lang cpe gmake libtool localbase \
|
||||
@@ -36,7 +38,7 @@ PLIST_SUB= NTOPNGUSER="${USERS}" NTOPNGROUP="${GROUPS}"
|
||||
|
||||
USE_GITHUB= yes
|
||||
GH_ACCOUNT= ntop
|
||||
GH_TAGNAME= 882b255
|
||||
GH_TAGNAME= 5e649a2
|
||||
|
||||
CPE_VENDOR= ntop
|
||||
|
||||
@@ -49,8 +51,6 @@ NLS_USES= gettext
|
||||
USE_RC_SUBR= ntopng
|
||||
|
||||
post-patch:
|
||||
@${REINPLACE_CMD} -e 's/bind(/::bind(/' \
|
||||
${WRKSRC}/src/SyslogCollectorInterface.cpp
|
||||
cd ${WRKSRC} && ${SH} autogen.sh
|
||||
|
||||
post-install:
|
||||
|
||||
+3
-3
@@ -1,3 +1,3 @@
|
||||
TIMESTAMP = 1603197726
|
||||
SHA256 (ntop-ntopng-4.0.d20201019-882b255_GH0.tar.gz) = 2fdd1eeb3b7cb67be71e4410e8b8ec8062fc873fdf34a53bb8886fb0e3a43b6b
|
||||
SIZE (ntop-ntopng-4.0.d20201019-882b255_GH0.tar.gz) = 43417332
|
||||
TIMESTAMP = 1604395621
|
||||
SHA256 (ntop-ntopng-4.2.d20201102-5e649a2_GH0.tar.gz) = 18b5c28385346acbfd89e223a03c3b008d65abe8e67d8aaacba99f170b84d3fa
|
||||
SIZE (ntop-ntopng-4.2.d20201102-5e649a2_GH0.tar.gz) = 57559775
|
||||
|
||||
@@ -1,6 +1,38 @@
|
||||
--- autogen.sh.orig 2018-06-04 09:56:33 UTC
|
||||
--- autogen.sh.orig 2020-11-02 21:27:19 UTC
|
||||
+++ autogen.sh
|
||||
@@ -38,8 +38,3 @@ cat configure.seed | sed \
|
||||
@@ -8,31 +8,6 @@ LIBTOOLIZE=$(command -v libtoolize)
|
||||
AUTORECONF=$(command -v autoreconf)
|
||||
PKG_CONFIG=$(command -v pkg-config)
|
||||
|
||||
-if test -z $AUTOCONF; then
|
||||
- echo "autoconf is missing: please install it and try again"
|
||||
- exit
|
||||
-fi
|
||||
-
|
||||
-if test -z $AUTOMAKE; then
|
||||
- echo "automake is missing: please install it and try again"
|
||||
- exit
|
||||
-fi
|
||||
-
|
||||
-if test -z $LIBTOOL && test -z $LIBTOOLIZE ; then
|
||||
- echo "libtool and libtoolize is missing: please install it and try again"
|
||||
- exit
|
||||
-fi
|
||||
-
|
||||
-if test -z $AUTORECONF; then
|
||||
- echo "autoreconf is missing: please install it and try again"
|
||||
- exit
|
||||
-fi
|
||||
-
|
||||
-if test -z $PKG_CONFIG; then
|
||||
- echo "pkg-config is missing: please install it (apt-get install pkg-config) and try again"
|
||||
- exit
|
||||
-fi
|
||||
-
|
||||
##########################################
|
||||
|
||||
TODAY=`date +%y%m%d`
|
||||
@@ -73,8 +48,3 @@ cat configure.seed | sed \
|
||||
> configure.ac
|
||||
|
||||
rm -f config.h config.h.in *~ #*
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- configure.seed.orig 2020-04-14 13:42:12 UTC
|
||||
--- configure.seed.orig 2020-11-02 21:27:19 UTC
|
||||
+++ configure.seed
|
||||
@@ -67,33 +67,8 @@ fi
|
||||
@@ -77,33 +77,8 @@ fi
|
||||
# On CentOS 6 `git rev-list HEAD --count` does not work
|
||||
#
|
||||
#
|
||||
@@ -35,19 +35,7 @@
|
||||
SHORT_MACHINE=`uname -m | cut -b1-3`
|
||||
|
||||
GIT_RELEASE="@GIT_RELEASE@"
|
||||
@@ -201,6 +176,11 @@ else
|
||||
AC_DEFINE_UNQUOTED(NO_SSL_DL, 1, [has openssl])
|
||||
SSL_INC="-I/usr/local/opt/openssl/include"
|
||||
SSL_LIB="-L/usr/local/opt/openssl/lib -lssl"
|
||||
+ dnl Workaround for FreeBSD
|
||||
+ elif test -f "/usr/lib/libssl.so"; then
|
||||
+ AC_DEFINE_UNQUOTED(NO_SSL_DL, 1, [has openssl])
|
||||
+ SSL_INC="-I/usr/include"
|
||||
+ SSL_LIB="-L/usr/lib -lssl -lcrypto"
|
||||
else
|
||||
echo "Please install openssl-dev(el) package prerequisite"
|
||||
exit -1
|
||||
@@ -602,16 +582,6 @@ AC_DEFINE_UNQUOTED(_CRT_SECURE_NO_WARNINGS, 1, [Disabl
|
||||
@@ -678,16 +653,6 @@ AC_DEFINE_UNQUOTED(_CRT_SECURE_NO_WARNINGS, 1, [Disabl
|
||||
GMAKE=`which gmake`
|
||||
if test x$GMAKE = x; then
|
||||
GMAKE="make"
|
||||
|
||||
+556
-218
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user