Date: Mon, 4 Jun 2018 17:01:36 +0000 (UTC) From: Guido Falsi <madpilot@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r471572 - in head/net: ndpi ndpi/files ntopng ntopng/files Message-ID: <201806041701.w54H1aYX028610@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: madpilot Date: Mon Jun 4 17:01:36 2018 New Revision: 471572 URL: https://svnweb.freebsd.org/changeset/ports/471572 Log: - 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 Deleted: head/net/ndpi/files/patch-fix-libcache.h head/net/ndpi/files/patch-libndpi.sym head/net/ntopng/files/patch-src_DivertInterface.cpp head/net/ntopng/files/patch-src_Utils.cpp head/net/ntopng/files/patch-third-party_mongoose_mongoose.c head/net/ntopng/files/patch-third-party_snmp_net.c Modified: head/net/ndpi/Makefile head/net/ndpi/distinfo head/net/ndpi/files/patch-autogen.sh head/net/ndpi/pkg-plist head/net/ntopng/Makefile head/net/ntopng/distinfo head/net/ntopng/files/patch-autogen.sh head/net/ntopng/files/patch-configure.seed head/net/ntopng/pkg-plist Modified: head/net/ndpi/Makefile ============================================================================== --- head/net/ndpi/Makefile Mon Jun 4 16:33:22 2018 (r471571) +++ head/net/ndpi/Makefile Mon Jun 4 17:01:36 2018 (r471572) @@ -2,7 +2,8 @@ # $FreeBSD$ PORTNAME= ndpi -PORTVERSION= 2.2.2018.01.31 +PORTVERSION= 2.2.2.d20180406 +PORTEPOCH= 1 CATEGORIES= net MAINTAINER= madpilot@FreeBSD.org @@ -25,11 +26,18 @@ INSTALL_TARGET= install-strip USE_GITHUB= yes GH_ACCOUNT= ntop GH_PROJECT= nDPI -GH_TAGNAME= cf06823 +GH_TAGNAME= 0e11abc -PLIST_SUB= MAJOR_VER=${PORTVERSION:C/([[:digit:]])+\.([[:digit:]])+.*/\1.\2/}.0 +PLIST_SUB= MAJOR_VER=${PORTVERSION:R} post-patch: + @${REINPLACE_CMD} '/ndpi_config\.h/d' \ + ${WRKSRC}/src/include/ndpi_main.h cd ${WRKSRC} && ${SH} autogen.sh + +post-configure: + @${REINPLACE_CMD} -e 's/#define PACKAGE/#define NDPI_PACKAGE/g' \ + -e 's/#define VERSION/#define NDPI_VERSION/g' \ + ${WRKSRC}/configure .include <bsd.port.mk> Modified: head/net/ndpi/distinfo ============================================================================== --- head/net/ndpi/distinfo Mon Jun 4 16:33:22 2018 (r471571) +++ head/net/ndpi/distinfo Mon Jun 4 17:01:36 2018 (r471572) @@ -1,3 +1,3 @@ -TIMESTAMP = 1521102931 -SHA256 (ntop-nDPI-2.2.2018.01.31-cf06823_GH0.tar.gz) = 8fd272ec7d65daa636dd63762b15b65fe062115e51560dd73f94a9fc55ff5a57 -SIZE (ntop-nDPI-2.2.2018.01.31-cf06823_GH0.tar.gz) = 19938657 +TIMESTAMP = 1528128978 +SHA256 (ntop-nDPI-2.2.2.d20180406-0e11abc_GH0.tar.gz) = f59b8b4d960fb6fe3bbf8d67785c6798c34165e12c217105de3860d8fac5c372 +SIZE (ntop-nDPI-2.2.2.d20180406-0e11abc_GH0.tar.gz) = 20449092 Modified: head/net/ndpi/files/patch-autogen.sh ============================================================================== --- head/net/ndpi/files/patch-autogen.sh Mon Jun 4 16:33:22 2018 (r471571) +++ head/net/ndpi/files/patch-autogen.sh Mon Jun 4 17:01:36 2018 (r471572) @@ -1,16 +1,16 @@ ---- autogen.sh.orig 2017-12-03 18:07:29 UTC +--- autogen.sh.orig 2018-04-06 15:23:12 UTC +++ autogen.sh -@@ -5,34 +5,4 @@ NDPI_MINOR="2" - NDPI_PATCH="0" +@@ -5,44 +5,9 @@ NDPI_MINOR="2" + NDPI_PATCH="2" NDPI_VERSION_SHORT="$NDPI_MAJOR.$NDPI_MINOR.$NDPI_PATCH" --/bin/rm -f configure config.h config.h.in src/lib/Makefile.in +-rm -f configure config.h config.h.in src/lib/Makefile.in - --AUTOCONF=$(which autoconf) --AUTOMAKE=$(which automake) --LIBTOOL=$(which libtool) --LIBTOOLIZE=$(which libtoolize) --AUTORECONF=$(which autoreconf) +-AUTOCONF=$(command -v autoconf) +-AUTOMAKE=$(command -v automake) +-LIBTOOL=$(command -v libtool) +-LIBTOOLIZE=$(command -v libtoolize) +-AUTORECONF=$(command -v autoreconf) - -if test -z $AUTOCONF; then - echo "autoconf is missing: please install it and try again" @@ -32,6 +32,16 @@ - exit -fi - - cat configure.seed | sed "s/@NDPI_MAJOR@/$NDPI_MAJOR/g" | sed "s/@NDPI_MINOR@/$NDPI_MINOR/g" | sed "s/@NDPI_PATCH@/$NDPI_PATCH/g" | sed "s/@NDPI_VERSION_SHORT@/$NDPI_VERSION_SHORT/g" > configure.ac + cat configure.seed | sed \ + -e "s/@NDPI_MAJOR@/$NDPI_MAJOR/g" \ + -e "s/@NDPI_MINOR@/$NDPI_MINOR/g" \ + -e "s/@NDPI_PATCH@/$NDPI_PATCH/g" \ + -e "s/@NDPI_VERSION_SHORT@/$NDPI_VERSION_SHORT/g" \ + > configure.ac +- -autoreconf -ivf +-cat configure | sed "s/#define PACKAGE/#define NDPI_PACKAGE/g" | sed "s/#define VERSION/#define NDPI_VERSION/g" > configure.tmp +-cat configure.tmp > configure +- +-chmod +x configure -./configure $* Modified: head/net/ndpi/pkg-plist ============================================================================== --- head/net/ndpi/pkg-plist Mon Jun 4 16:33:22 2018 (r471571) +++ head/net/ndpi/pkg-plist Mon Jun 4 17:01:36 2018 (r471572) @@ -1,6 +1,7 @@ bin/ndpiReader include/libndpi-%%MAJOR_VER%%/libndpi/libcache.h include/libndpi-%%MAJOR_VER%%/libndpi/ndpi_api.h +include/libndpi-%%MAJOR_VER%%/libndpi/ndpi_config.h include/libndpi-%%MAJOR_VER%%/libndpi/ndpi_define.h include/libndpi-%%MAJOR_VER%%/libndpi/ndpi_includes.h include/libndpi-%%MAJOR_VER%%/libndpi/ndpi_main.h Modified: head/net/ntopng/Makefile ============================================================================== --- head/net/ntopng/Makefile Mon Jun 4 16:33:22 2018 (r471571) +++ head/net/ntopng/Makefile Mon Jun 4 17:01:36 2018 (r471572) @@ -2,7 +2,8 @@ # $FreeBSD$ PORTNAME= ntopng -PORTVERSION= 3.2.2018.03.13 +PORTVERSION= 3.4.d20180604 +PORTEPOCH= 1 CATEGORIES= net MAINTAINER= madpilot@FreeBSD.org @@ -24,14 +25,13 @@ USES= autoreconf cpe gmake libtool localbase mysql pa SUB_FILES= ntopng-geoipupdate.sh pkg-deinstall SHEBANG_FILES= httpdocs/misc/ntopng-add-user.sh GNU_CONFIGURE= yes -USE_LDCONFIG= yes USERS= ntopng GROUPS= ntopng USE_GITHUB= yes GH_ACCOUNT= ntop -GH_TAGNAME= a7d7655 +GH_TAGNAME= 468d1eb CPE_VENDOR= ntop Modified: head/net/ntopng/distinfo ============================================================================== --- head/net/ntopng/distinfo Mon Jun 4 16:33:22 2018 (r471571) +++ head/net/ntopng/distinfo Mon Jun 4 17:01:36 2018 (r471572) @@ -1,3 +1,3 @@ -TIMESTAMP = 1521103085 -SHA256 (ntop-ntopng-3.2.2018.03.13-a7d7655_GH0.tar.gz) = 36d9fbd9135a7519d7eef85c6b9780387721c9253b9f29f97b4bcfb78e26a7f7 -SIZE (ntop-ntopng-3.2.2018.03.13-a7d7655_GH0.tar.gz) = 24195839 +TIMESTAMP = 1528128970 +SHA256 (ntop-ntopng-3.4.d20180604-468d1eb_GH0.tar.gz) = b021d7d97c2215997559bc164efca801ea889f00247ea3a16f3decf6bb2587d2 +SIZE (ntop-ntopng-3.4.d20180604-468d1eb_GH0.tar.gz) = 30715124 Modified: head/net/ntopng/files/patch-autogen.sh ============================================================================== --- head/net/ntopng/files/patch-autogen.sh Mon Jun 4 16:33:22 2018 (r471571) +++ head/net/ntopng/files/patch-autogen.sh Mon Jun 4 17:01:36 2018 (r471572) @@ -1,9 +1,9 @@ ---- autogen.sh.orig 2016-05-05 13:23:53 UTC +--- autogen.sh.orig 2018-06-04 09:56:33 UTC +++ autogen.sh -@@ -30,8 +30,3 @@ fi - cat configure.seed | sed "s/@VERSION@/$VERSION/g" | sed "s/@SHORT_VERSION@/$SHORT_VERSION/g" | sed "s/@GIT_TAG@/$GIT_TAG/g" | sed "s/@GIT_DATE@/$GIT_DATE/g" | sed "s/@GIT_RELEASE@/$GIT_RELEASE/g" | sed "s/@GIT_BRANCH@/$GIT_BRANCH/g" | sed "s/@PRO_GIT_RELEASE@/$PRO_GIT_RELEASE/g" | sed "s/@PRO_GIT_DATE@/$PRO_GIT_DATE/g" > configure.ac +@@ -38,8 +38,3 @@ cat configure.seed | sed \ + > configure.ac - /bin/rm -f config.h config.h.in *~ #* + rm -f config.h config.h.in *~ #* - -echo "Wait please..." -autoreconf -if Modified: head/net/ntopng/files/patch-configure.seed ============================================================================== --- head/net/ntopng/files/patch-configure.seed Mon Jun 4 16:33:22 2018 (r471571) +++ head/net/ntopng/files/patch-configure.seed Mon Jun 4 17:01:36 2018 (r471572) @@ -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" Modified: head/net/ntopng/pkg-plist ============================================================================== --- head/net/ntopng/pkg-plist Mon Jun 4 16:33:22 2018 (r471571) +++ head/net/ntopng/pkg-plist Mon Jun 4 17:01:36 2018 (r471572) @@ -21,6 +21,7 @@ man/man8/ntopng.8.gz %%DATADIR%%/httpdocs/css/bubble-chart.css %%DATADIR%%/httpdocs/css/cal-heatmap.css %%DATADIR%%/httpdocs/css/cubism.css +%%DATADIR%%/httpdocs/css/custom_theme.css %%DATADIR%%/httpdocs/css/datepicker.css %%DATADIR%%/httpdocs/css/dc.css %%DATADIR%%/httpdocs/css/flags.css @@ -185,9 +186,11 @@ man/man8/ntopng.8.gz %%DATADIR%%/httpdocs/js/ntop.min.js %%DATADIR%%/httpdocs/js/ntop.min.js.map %%DATADIR%%/httpdocs/js/ntopng_utils.js +%%DATADIR%%/httpdocs/js/ntopng_validators.js %%DATADIR%%/httpdocs/js/nv.d3.js %%DATADIR%%/httpdocs/js/pdfmake.js %%DATADIR%%/httpdocs/js/pie-chart.js +%%DATADIR%%/httpdocs/js/quotas_utils.js %%DATADIR%%/httpdocs/js/rickshaw.js %%DATADIR%%/httpdocs/js/ripe_widget_api.js %%DATADIR%%/httpdocs/js/sankey.js @@ -200,6 +203,7 @@ man/man8/ntopng.8.gz %%DATADIR%%/httpdocs/misc/ntopng-add-user.sh %%DATADIR%%/httpdocs/misc/ntopng_template_elk.json %%DATADIR%%/httpdocs/other/EtherOUI.txt +%%DATADIR%%/httpdocs/other/TimeZones.txt %%DATADIR%%/httpdocs/other/trackers.txt %%DATADIR%%/httpdocs/ssl/README %%DATADIR%%/httpdocs/ssl/ntopng-cert.pem.dummy @@ -218,6 +222,7 @@ man/man8/ntopng.8.gz %%DATADIR%%/scripts/callbacks/system/discover.lua %%DATADIR%%/scripts/callbacks/system/housekeeping.lua %%DATADIR%%/scripts/callbacks/system/minute.lua +%%DATADIR%%/scripts/callbacks/system/pinger.lua %%DATADIR%%/scripts/callbacks/system/second.lua %%DATADIR%%/scripts/callbacks/system/shutdown.lua %%DATADIR%%/scripts/callbacks/system/startup.lua @@ -225,7 +230,6 @@ man/man8/ntopng.8.gz %%DATADIR%%/scripts/callbacks/user_scripts/loader.lua %%DATADIR%%/scripts/callbacks/user_scripts/periodic/default.lua %%DATADIR%%/scripts/locales/en.lua -%%DATADIR%%/scripts/locales/it.lua %%DATADIR%%/scripts/lua/API.lua %%DATADIR%%/scripts/lua/about.lua %%DATADIR%%/scripts/lua/admin/add_user.lua @@ -247,6 +251,7 @@ man/man8/ntopng.8.gz %%DATADIR%%/scripts/lua/captive_portal.lua %%DATADIR%%/scripts/lua/change_password.lua %%DATADIR%%/scripts/lua/check_update.lua +%%DATADIR%%/scripts/lua/country_details.lua %%DATADIR%%/scripts/lua/country_stats.lua %%DATADIR%%/scripts/lua/discover.lua %%DATADIR%%/scripts/lua/do_export_data.lua @@ -257,6 +262,7 @@ man/man8/ntopng.8.gz %%DATADIR%%/scripts/lua/examples/sqlite.lua %%DATADIR%%/scripts/lua/export_data.lua %%DATADIR%%/scripts/lua/find_app.lua +%%DATADIR%%/scripts/lua/find_category.lua %%DATADIR%%/scripts/lua/find_host.lua %%DATADIR%%/scripts/lua/find_member.lua %%DATADIR%%/scripts/lua/find_prefs.lua @@ -291,6 +297,7 @@ man/man8/ntopng.8.gz %%DATADIR%%/scripts/lua/get_process_info.lua %%DATADIR%%/scripts/lua/get_processes_data.lua %%DATADIR%%/scripts/lua/get_system_hosts_interaction.lua +%%DATADIR%%/scripts/lua/get_top_realtime.lua %%DATADIR%%/scripts/lua/get_top_talkers.lua %%DATADIR%%/scripts/lua/get_treemap.lua %%DATADIR%%/scripts/lua/get_unknown_devices_data.lua @@ -343,19 +350,27 @@ man/man8/ntopng.8.gz %%DATADIR%%/scripts/lua/login.lua %%DATADIR%%/scripts/lua/logout.lua %%DATADIR%%/scripts/lua/mac_details.lua +%%DATADIR%%/scripts/lua/mac_pkt_distro.lua %%DATADIR%%/scripts/lua/mac_stats.lua %%DATADIR%%/scripts/lua/macs_stats.lua -%%DATADIR%%/scripts/lua/modules/alert_api.lua +%%DATADIR%%/scripts/lua/metrics.lua +%%DATADIR%%/scripts/lua/modules/alert_consts.lua +%%DATADIR%%/scripts/lua/modules/alert_endpoints/email.lua +%%DATADIR%%/scripts/lua/modules/alert_endpoints/nagios.lua +%%DATADIR%%/scripts/lua/modules/alert_endpoints/slack.lua %%DATADIR%%/scripts/lua/modules/alert_state_utils.lua %%DATADIR%%/scripts/lua/modules/alert_utils.lua %%DATADIR%%/scripts/lua/modules/as_utils.lua +%%DATADIR%%/scripts/lua/modules/base64.lua %%DATADIR%%/scripts/lua/modules/blacklist_utils.lua %%DATADIR%%/scripts/lua/modules/callback_utils.lua %%DATADIR%%/scripts/lua/modules/db_utils.lua %%DATADIR%%/scripts/lua/modules/discover_utils.lua %%DATADIR%%/scripts/lua/modules/dkjson.lua +%%DATADIR%%/scripts/lua/modules/doa_ox.lua %%DATADIR%%/scripts/lua/modules/flow_aggregation_utils.lua %%DATADIR%%/scripts/lua/modules/flow_utils.lua +%%DATADIR%%/scripts/lua/modules/format_utils.lua %%DATADIR%%/scripts/lua/modules/grafana/index.lua %%DATADIR%%/scripts/lua/modules/grafana/query.lua %%DATADIR%%/scripts/lua/modules/grafana/search.lua @@ -387,17 +402,18 @@ man/man8/ntopng.8.gz %%DATADIR%%/scripts/lua/modules/rrd_5min_dump_utils.lua %%DATADIR%%/scripts/lua/modules/rrd_min_dump_utils.lua %%DATADIR%%/scripts/lua/modules/rrd_utils.lua -%%DATADIR%%/scripts/lua/modules/slack_utils.lua %%DATADIR%%/scripts/lua/modules/sqlite_utils.lua %%DATADIR%%/scripts/lua/modules/template.lua %%DATADIR%%/scripts/lua/modules/template_utils.lua %%DATADIR%%/scripts/lua/modules/top_talkers_utils.lua +%%DATADIR%%/scripts/lua/modules/tz_utils.lua %%DATADIR%%/scripts/lua/modules/vlan_utils.lua %%DATADIR%%/scripts/lua/modules/voip_utils.lua %%DATADIR%%/scripts/lua/modules/xmlSimple.lua %%DATADIR%%/scripts/lua/network_details.lua %%DATADIR%%/scripts/lua/network_load.lua %%DATADIR%%/scripts/lua/network_stats.lua +%%DATADIR%%/scripts/lua/nindex.lua %%DATADIR%%/scripts/lua/os_stats.lua %%DATADIR%%/scripts/lua/page_not_found.lua %%DATADIR%%/scripts/lua/pid_stats.lua
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201806041701.w54H1aYX028610>