From owner-svn-ports-all@freebsd.org Wed Apr 15 11:11:28 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 2756E2B27D0; Wed, 15 Apr 2020 11:11:28 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 492KRh0BsTz4fFv; Wed, 15 Apr 2020 11:11:28 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 0212E1DF1C; Wed, 15 Apr 2020 11:11:28 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 03FBBRC9051306; Wed, 15 Apr 2020 11:11:27 GMT (envelope-from madpilot@FreeBSD.org) Received: (from madpilot@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 03FBBQ7s049862; Wed, 15 Apr 2020 11:11:26 GMT (envelope-from madpilot@FreeBSD.org) Message-Id: <202004151111.03FBBQ7s049862@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: madpilot set sender to madpilot@FreeBSD.org using -f From: Guido Falsi Date: Wed, 15 Apr 2020 11:11:26 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r531757 - in head/net: ndpi ntopng ntopng/files X-SVN-Group: ports-head X-SVN-Commit-Author: madpilot X-SVN-Commit-Paths: in head/net: ndpi ntopng ntopng/files X-SVN-Commit-Revision: 531757 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Apr 2020 11:11:28 -0000 Author: madpilot Date: Wed Apr 15 11:11:26 2020 New Revision: 531757 URL: https://svnweb.freebsd.org/changeset/ports/531757 Log: Update nDPI and ntopng to latest upstream snapshot versions. Modified: head/net/ndpi/Makefile head/net/ndpi/distinfo head/net/ntopng/Makefile head/net/ntopng/distinfo head/net/ntopng/files/patch-configure.seed head/net/ntopng/pkg-plist Modified: head/net/ndpi/Makefile ============================================================================== --- head/net/ndpi/Makefile Wed Apr 15 10:19:00 2020 (r531756) +++ head/net/ndpi/Makefile Wed Apr 15 11:11:26 2020 (r531757) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= ndpi -PORTVERSION= 3.2.d20200324 +PORTVERSION= 3.2.d20200403 PORTEPOCH= 1 CATEGORIES= net @@ -28,7 +28,7 @@ INSTALL_TARGET= install-strip USE_GITHUB= yes GH_ACCOUNT= ntop GH_PROJECT= nDPI -GH_TAGNAME= cd4f805 +GH_TAGNAME= 60e3ac6 PLIST_SUB= MAJOR_VER=${PORTVERSION:R:R} VER=${PORTVERSION:R} Modified: head/net/ndpi/distinfo ============================================================================== --- head/net/ndpi/distinfo Wed Apr 15 10:19:00 2020 (r531756) +++ head/net/ndpi/distinfo Wed Apr 15 11:11:26 2020 (r531757) @@ -1,3 +1,3 @@ -TIMESTAMP = 1585258208 -SHA256 (ntop-nDPI-3.2.d20200324-cd4f805_GH0.tar.gz) = 049e30ae3e8ad2be860cf52f1e76ba42852fe156d99b2e7252bd98c903b75d6f -SIZE (ntop-nDPI-3.2.d20200324-cd4f805_GH0.tar.gz) = 29586575 +TIMESTAMP = 1586891830 +SHA256 (ntop-nDPI-3.2.d20200403-60e3ac6_GH0.tar.gz) = d7a1b6df9b5ddc2a653218a9c9185cf3b3009f7ddfeea0807ad747c020b13359 +SIZE (ntop-nDPI-3.2.d20200403-60e3ac6_GH0.tar.gz) = 29586002 Modified: head/net/ntopng/Makefile ============================================================================== --- head/net/ntopng/Makefile Wed Apr 15 10:19:00 2020 (r531756) +++ head/net/ntopng/Makefile Wed Apr 15 11:11:26 2020 (r531757) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= ntopng -PORTVERSION= 4.0.d20200326 -PORTREVISION= 1 +PORTVERSION= 4.0.d20200414 PORTEPOCH= 1 CATEGORIES= net @@ -37,7 +36,7 @@ PLIST_SUB= NTOPNGUSER="${USERS}" NTOPNGROUP="${GROUPS} USE_GITHUB= yes GH_ACCOUNT= ntop -GH_TAGNAME= 6d3ebbc +GH_TAGNAME= e7f6b4a CPE_VENDOR= ntop @@ -50,8 +49,6 @@ NLS_USES= gettext USE_RC_SUBR= ntopng post-patch: - @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ - ${WRKSRC}/configure.seed @${REINPLACE_CMD} -e 's/bind(/::bind(/' \ ${WRKSRC}/src/SyslogCollectorInterface.cpp cd ${WRKSRC} && ${SH} autogen.sh @@ -60,6 +57,7 @@ post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/ntopng ${MKDIR} ${STAGEDIR}/var/db/ntopng ${INSTALL_SCRIPT} ${WRKDIR}/ntopng-geoip2update.sh ${STAGEDIR}${PREFIX}/bin - ${RM} ${STAGEDIR}${DATADIR}/httpdocs/misc/ntopng-utils-manage-updates + ${RM} ${STAGEDIR}${DATADIR}/httpdocs/misc/ntopng-utils-manage-updates \ + ${STAGEDIR}${DATADIR}/httpdocs/misc/ntopng-utils-manage-updates.in .include Modified: head/net/ntopng/distinfo ============================================================================== --- head/net/ntopng/distinfo Wed Apr 15 10:19:00 2020 (r531756) +++ head/net/ntopng/distinfo Wed Apr 15 11:11:26 2020 (r531757) @@ -1,3 +1,3 @@ -TIMESTAMP = 1585258827 -SHA256 (ntop-ntopng-4.0.d20200326-6d3ebbc_GH0.tar.gz) = a3239e08fbbe4493a0c95c05210a7e454d2192a17acfe1f3944c0bb07e2e2d64 -SIZE (ntop-ntopng-4.0.d20200326-6d3ebbc_GH0.tar.gz) = 43233771 +TIMESTAMP = 1586892413 +SHA256 (ntop-ntopng-4.0.d20200414-e7f6b4a_GH0.tar.gz) = 1fa0daf4442fe9ef48fa81267c5d60bff2dec05dc67d3cde59227963d3a53391 +SIZE (ntop-ntopng-4.0.d20200414-e7f6b4a_GH0.tar.gz) = 43234438 Modified: head/net/ntopng/files/patch-configure.seed ============================================================================== --- head/net/ntopng/files/patch-configure.seed Wed Apr 15 10:19:00 2020 (r531756) +++ head/net/ntopng/files/patch-configure.seed Wed Apr 15 11:11:26 2020 (r531757) @@ -1,4 +1,4 @@ ---- configure.seed.orig 2020-03-26 13:52:23 UTC +--- configure.seed.orig 2020-04-14 13:42:12 UTC +++ configure.seed @@ -67,33 +67,8 @@ fi # On CentOS 6 `git rev-list HEAD --count` does not work @@ -8,17 +8,17 @@ +#REVISION=`git log --pretty=oneline | wc -l` -if test -d "/usr/local/include"; then --CFLAGS="${CFLAGS} -I/usr/local/include" --CPPFLAGS="${CPPFLAGS} -I/usr/local/include" +- CFLAGS="${CFLAGS} -I/usr/local/include" +- CPPFLAGS="${CPPFLAGS} -I/usr/local/include" -fi - -if test -d "/usr/local/lib"; then --LDFLAGS="${LDFLAGS} -L/usr/local/lib" +- LDFLAGS="${LDFLAGS} -L/usr/local/lib" -fi - -if test -d /opt/local/include; then : -- CFLAGS="${CFLAGS} -I/opt/local/include" -- CPPFLAGS="${CPPFLAGS} -I/opt/local/include" +- CFLAGS="${CFLAGS} -I/opt/local/include" +- CPPFLAGS="${CPPFLAGS} -I/opt/local/include" -fi - -if test -d /opt/local/lib; then : @@ -26,58 +26,41 @@ -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 +- CODENAME=`/usr/bin/lsb_release -c|cut -f 2` +- if [[ $CODENAME == "wheezy" ]]; then : +- CPPFLAGS="${CPPFLAGS} -DOLD_NETFILTER_INTERFACE=1" +- fi -fi - SHORT_MACHINE=`uname -m | cut -b1-3` GIT_RELEASE="@GIT_RELEASE@" -@@ -134,7 +109,7 @@ AC_ARG_WITH(ndpi-includes, - PKG_CHECK_MODULES([NDPI], [libndpi >= 2.0], [ - NDPI_INC=`echo $NDPI_CFLAGS | sed -e "s/[ ]*$//"` - # 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) -@@ -202,8 +177,15 @@ else - SSL_INC="-I/usr/local/opt/openssl/include" - SSL_LIB="-L/usr/local/opt/openssl/lib -lssl" - else -- echo "Please install openssl-dev(el) package prerequisite" -- exit -1 +@@ -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 -+ if test -f "/usr/lib/libssl.so"; then ++ 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" -+ else -+ echo "Please install openssl-dev(el) package prerequisite" -+ exit -1 -+ fi - fi - fi - -@@ -607,18 +589,6 @@ GMAKE=`which gmake` - if test x$GMAKE = x - then - GMAKE="make" + else + echo "Please install openssl-dev(el) package prerequisite" + exit -1 +@@ -602,16 +582,6 @@ AC_DEFINE_UNQUOTED(_CRT_SECURE_NO_WARNINGS, 1, [Disabl + GMAKE=`which gmake` + if test x$GMAKE = x; then + GMAKE="make" -fi - -GIT=`which git` --if test x$GIT = x --then -- AC_MSG_RESULT(FATAL ERROR: git is not installed on your host) +-if test x$GIT = x; then +- AC_MSG_RESULT(FATAL ERROR: git is not installed on your host) -fi - -WGET=`which wget` --if test x$WGET = x --then -- AC_MSG_RESULT(ERROR. wget is not installed on your host: you cannot download GeoIP data) +-if test x$WGET = x; then +- AC_MSG_RESULT(ERROR. wget is not installed on your host: you cannot download GeoIP data) fi umask 002 Modified: head/net/ntopng/pkg-plist ============================================================================== --- head/net/ntopng/pkg-plist Wed Apr 15 10:19:00 2020 (r531756) +++ head/net/ntopng/pkg-plist Wed Apr 15 11:11:26 2020 (r531757) @@ -1962,6 +1962,7 @@ man/man8/ntopng.8.gz %%DATADIR%%/scripts/lua/captive_portal.lua %%DATADIR%%/scripts/lua/change_password.lua %%DATADIR%%/scripts/lua/check_recording_data.lua +%%DATADIR%%/scripts/lua/check_major_release.lua %%DATADIR%%/scripts/lua/check_update.lua %%DATADIR%%/scripts/lua/code_viewer.lua %%DATADIR%%/scripts/lua/container_details.lua @@ -2029,7 +2030,6 @@ man/man8/ntopng.8.gz %%DATADIR%%/scripts/lua/get_macs_data.lua %%DATADIR%%/scripts/lua/get_network_data.lua %%DATADIR%%/scripts/lua/get_networks_data.lua -%%DATADIR%%/scripts/lua/get_new_blog_posts.lua %%DATADIR%%/scripts/lua/get_num_alerts.lua %%DATADIR%%/scripts/lua/get_pods_data.lua %%DATADIR%%/scripts/lua/get_pool_data.lua @@ -2060,7 +2060,6 @@ man/man8/ntopng.8.gz %%DATADIR%%/scripts/lua/hosts_comparison_sankey.lua %%DATADIR%%/scripts/lua/hosts_geomap.lua %%DATADIR%%/scripts/lua/hosts_stats.lua -%%DATADIR%%/scripts/lua/hosts_treemap.lua %%DATADIR%%/scripts/lua/hotspot-detect.lua %%DATADIR%%/scripts/lua/http_servers_stats.lua %%DATADIR%%/scripts/lua/if_pkt_distro.lua @@ -2275,6 +2274,7 @@ man/man8/ntopng.8.gz %%DATADIR%%/scripts/lua/traffic_extraction_data.lua %%DATADIR%%/scripts/lua/traffic_recording_config.lua %%DATADIR%%/scripts/lua/unknown_devices.lua +%%DATADIR%%/scripts/lua/update_blog_posts.lua %%DATADIR%%/scripts/lua/update_prefs.lua %%DATADIR%%/scripts/lua/user_script_details.lua %%DATADIR%%/scripts/lua/user_scripts_overview.lua