From owner-svn-ports-all@freebsd.org Sat Dec 22 21:05:04 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C4F3D133BD22; Sat, 22 Dec 2018 21:05:03 +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 67EF3718D0; Sat, 22 Dec 2018 21:05:03 +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 5D2F52857; Sat, 22 Dec 2018 21:05:03 +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 wBML53Hs094369; Sat, 22 Dec 2018 21:05:03 GMT (envelope-from madpilot@FreeBSD.org) Received: (from madpilot@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wBML51Ma094362; Sat, 22 Dec 2018 21:05:01 GMT (envelope-from madpilot@FreeBSD.org) Message-Id: <201812222105.wBML51Ma094362@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: madpilot set sender to madpilot@FreeBSD.org using -f From: Guido Falsi Date: Sat, 22 Dec 2018 21:05:01 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r488131 - in head: . net/ntopng net/ntopng/files X-SVN-Group: ports-head X-SVN-Commit-Author: madpilot X-SVN-Commit-Paths: in head: . net/ntopng net/ntopng/files X-SVN-Commit-Revision: 488131 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 67EF3718D0 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.98)[-0.977,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-0.998,0] 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: Sat, 22 Dec 2018 21:05:04 -0000 Author: madpilot Date: Sat Dec 22 21:05:01 2018 New Revision: 488131 URL: https://svnweb.freebsd.org/changeset/ports/488131 Log: Modify ntopng to use /var/db/ntopng as a data directory by default, instead of /var/lib/ntopng. Updated UPDATING entry text accordingly. Reported by: pi Added: head/net/ntopng/files/patch-httpdocs_misc_ntopng-utils-manage-config.in (contents, props changed) head/net/ntopng/files/patch-include_ntop__defines.h (contents, props changed) head/net/ntopng/files/patch-ntopng.8 (contents, props changed) head/net/ntopng/files/patch-scripts_lua_examples_sqlite.lua (contents, props changed) Modified: head/UPDATING head/net/ntopng/Makefile head/net/ntopng/pkg-plist Modified: head/UPDATING ============================================================================== --- head/UPDATING Sat Dec 22 20:59:07 2018 (r488130) +++ head/UPDATING Sat Dec 22 21:05:01 2018 (r488131) @@ -10,7 +10,7 @@ you update your ports collection, before attempting an AUTHOR: madpilot@FreeBSD.org Since ntopng 3.7, for security reasons, the default setting for - the data directory has been changed to "/var/lib/ntopng", and the + the data directory has been changed to "/var/db/ntopng", and the default user has been changed to "ntopng". This new directory is created automatically by the port/package with correct permissions. @@ -21,8 +21,8 @@ you update your ports collection, before attempting an the new settings, unless you are already using a custom directory: # service ntopng stop - # mv /var/tmp/ntopng/* /var/lib/ntopng/ - # chown -R ntopng:ntopng /var/lib/ntopng + # mv /var/tmp/ntopng/* /var/db/ntopng/ + # chown -R ntopng:ntopng /var/db/ntopng # service ntopng start Please check hte upstream FAQ for reference: Modified: head/net/ntopng/Makefile ============================================================================== --- head/net/ntopng/Makefile Sat Dec 22 20:59:07 2018 (r488130) +++ head/net/ntopng/Makefile Sat Dec 22 21:05:01 2018 (r488131) @@ -3,6 +3,7 @@ PORTNAME= ntopng PORTVERSION= 3.8.d20181221 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= net @@ -58,7 +59,7 @@ post-patch: post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/ntopng - ${MKDIR} ${STAGEDIR}/var/lib/ntopng + ${MKDIR} ${STAGEDIR}/var/db/ntopng post-install-GEOIP-on: ${INSTALL_SCRIPT} ${WRKDIR}/ntopng-geoipupdate.sh ${STAGEDIR}${PREFIX}/bin Added: head/net/ntopng/files/patch-httpdocs_misc_ntopng-utils-manage-config.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/ntopng/files/patch-httpdocs_misc_ntopng-utils-manage-config.in Sat Dec 22 21:05:01 2018 (r488131) @@ -0,0 +1,11 @@ +--- httpdocs/misc/ntopng-utils-manage-config.in.orig 2018-12-21 18:58:17 UTC ++++ httpdocs/misc/ntopng-utils-manage-config.in +@@ -2,7 +2,7 @@ + + DEFAULT_CONF_FILE="/etc/ntopng/ntopng.conf" + +-DEFAULT_DATADIR="/var/lib/ntopng" ++DEFAULT_DATADIR="/var/db/ntopng" + OLD_DEFAULT_DATADIR="/var/tmp/ntopng" + if [ -d "${OLD_DEFAULT_DATADIR}" ]; then + DEFAULT_DATADIR="${OLD_DEFAULT_DATADIR}" Added: head/net/ntopng/files/patch-include_ntop__defines.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/ntopng/files/patch-include_ntop__defines.h Sat Dec 22 21:05:01 2018 (r488131) @@ -0,0 +1,11 @@ +--- include/ntop_defines.h.orig 2018-12-21 18:58:17 UTC ++++ include/ntop_defines.h +@@ -416,7 +416,7 @@ + #define NTOPNG_NDPI_OS_PROTO_ID (NDPI_LAST_IMPLEMENTED_PROTOCOL+NDPI_MAX_NUM_CUSTOM_PROTOCOLS-2) + #define CONST_DEFAULT_HOME_NET "192.168.1.0/24" + #define CONST_OLD_DEFAULT_DATA_DIR "/var/tmp/ntopng" +-#define CONST_DEFAULT_DATA_DIR "/var/lib/ntopng" ++#define CONST_DEFAULT_DATA_DIR "/var/db/ntopng" + #define CONST_DEFAULT_MAX_UI_STRLEN 24 + #define CONST_DEFAULT_IS_AUTOLOGOUT_ENABLED 1 + #define CONST_DEFAULT_IS_IDLE_LOCAL_HOSTS_CACHE_ENABLED 1 Added: head/net/ntopng/files/patch-ntopng.8 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/ntopng/files/patch-ntopng.8 Sat Dec 22 21:05:01 2018 (r488131) @@ -0,0 +1,11 @@ +--- ntopng.8.orig 2018-12-21 18:58:17 UTC ++++ ntopng.8 +@@ -186,7 +186,7 @@ can be instructed to act as a publisher delivering flo + Finally using \-i dummy it is possible to create a dummy interface that generates a large number of flows/hosts in order to saturate ntopng resources. This way ntopng can be tested for performance issues as well proper handling of low-memory situations. + + .It \-d|\-\-data\-dir\ +-Specifies the data directory (it must be writable). Default directory is /var/lib/ntopng ++Specifies the data directory (it must be writable). Default directory is /var/db/ntopng + + .It \-t|\-\-install\-dir\ + Specifies the installation directory. Default directory is retrieved from common install paths. Added: head/net/ntopng/files/patch-scripts_lua_examples_sqlite.lua ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/ntopng/files/patch-scripts_lua_examples_sqlite.lua Sat Dec 22 21:05:01 2018 (r488131) @@ -0,0 +1,11 @@ +--- scripts/lua/examples/sqlite.lua.orig 2018-12-21 18:58:17 UTC ++++ scripts/lua/examples/sqlite.lua +@@ -26,7 +26,7 @@ if (query == nil) then + + ]] + Modified: head/net/ntopng/pkg-plist ============================================================================== --- head/net/ntopng/pkg-plist Sat Dec 22 20:59:07 2018 (r488130) +++ head/net/ntopng/pkg-plist Sat Dec 22 21:05:01 2018 (r488131) @@ -514,5 +514,4 @@ man/man8/ntopng.8.gz %%DATADIR%%/scripts/lua/username_details.lua %%DATADIR%%/scripts/lua/vlan_details.lua %%DATADIR%%/scripts/lua/vlan_stats.lua -@dir(%%NTOPNGUSER%%,%%NTOPNGGROUP%%,750) /var/lib/ntopng -@dir /var/lib +@dir(%%NTOPNGUSER%%,%%NTOPNGGROUP%%,750) /var/db/ntopng