From owner-svn-ports-all@freebsd.org Mon May 22 18:05:10 2017 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D3307D78B71; Mon, 22 May 2017 18:05:10 +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 mx1.freebsd.org (Postfix) with ESMTPS id B03C11C49; Mon, 22 May 2017 18:05:10 +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 v4MI59r0035216; Mon, 22 May 2017 18:05:09 GMT (envelope-from madpilot@FreeBSD.org) Received: (from madpilot@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v4MI59gI035212; Mon, 22 May 2017 18:05:09 GMT (envelope-from madpilot@FreeBSD.org) Message-Id: <201705221805.v4MI59gI035212@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: madpilot set sender to madpilot@FreeBSD.org using -f From: Guido Falsi Date: Mon, 22 May 2017 18:05:09 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r441485 - in head/net/ntopng: . files X-SVN-Group: ports-head 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.23 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: Mon, 22 May 2017 18:05:10 -0000 Author: madpilot Date: Mon May 22 18:05:09 2017 New Revision: 441485 URL: https://svnweb.freebsd.org/changeset/ports/441485 Log: - Update net/ntopng to latest upstream stable snapshot - Install GetIP data files in correct location [1] PR: 219447 [1] Submitted by: freebsd-bugzilla@thismonkey.com Modified: head/net/ntopng/Makefile head/net/ntopng/distinfo head/net/ntopng/files/ntopng-geoipupdate.sh.in head/net/ntopng/files/pkg-deinstall.in Modified: head/net/ntopng/Makefile ============================================================================== --- head/net/ntopng/Makefile Mon May 22 18:03:04 2017 (r441484) +++ head/net/ntopng/Makefile Mon May 22 18:05:09 2017 (r441485) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= ntopng -PORTVERSION= 2.4.2017.01.20 -PORTREVISION= 1 +PORTVERSION= 2.4.2017.05.12 CATEGORIES= net MAINTAINER= madpilot@FreeBSD.org @@ -29,7 +28,7 @@ GROUPS= ntopng USE_GITHUB= yes GH_ACCOUNT= ntop -GH_TAGNAME= 2d9a513 +GH_TAGNAME= 00c19bd CPE_VENDOR= ntop Modified: head/net/ntopng/distinfo ============================================================================== --- head/net/ntopng/distinfo Mon May 22 18:03:04 2017 (r441484) +++ head/net/ntopng/distinfo Mon May 22 18:05:09 2017 (r441485) @@ -1,3 +1,3 @@ -TIMESTAMP = 1485958691 -SHA256 (ntop-ntopng-2.4.2017.01.20-2d9a513_GH0.tar.gz) = de58a197ff3424a9eaf9ab6fad4178bbefd1eef568b4e9a53080e6e43c0b473d -SIZE (ntop-ntopng-2.4.2017.01.20-2d9a513_GH0.tar.gz) = 21819824 +TIMESTAMP = 1495439609 +SHA256 (ntop-ntopng-2.4.2017.05.12-00c19bd_GH0.tar.gz) = 4800530c7029c9cd00aa7cd6e67d75efc7a70ffed3b609aec248a6bda7a2a014 +SIZE (ntop-ntopng-2.4.2017.05.12-00c19bd_GH0.tar.gz) = 21819806 Modified: head/net/ntopng/files/ntopng-geoipupdate.sh.in ============================================================================== --- head/net/ntopng/files/ntopng-geoipupdate.sh.in Mon May 22 18:03:04 2017 (r441484) +++ head/net/ntopng/files/ntopng-geoipupdate.sh.in Mon May 22 18:05:09 2017 (r441485) @@ -13,8 +13,8 @@ _fetch() { trap 'rc=$? ; set +e ; rm -f "'"$TEMPFILE"'" ; exit $rc' 0 if fetch -o - "$url" | gunzip >> "$TEMPFILE" ; then chmod 444 "$TEMPFILE" - if ! mv -f "$TEMPFILE" "%%DATADIR%%/$2" ; then - echo "Unable to replace %%DATADIR%%/$2" + if ! mv -f "$TEMPFILE" "%%DATADIR%%/httpdocs/geoip/$2" ; then + echo "Unable to replace %%DATADIR%%/httpdocs/geoip/$2" return 2 fi else Modified: head/net/ntopng/files/pkg-deinstall.in ============================================================================== --- head/net/ntopng/files/pkg-deinstall.in Mon May 22 18:03:04 2017 (r441484) +++ head/net/ntopng/files/pkg-deinstall.in Mon May 22 18:05:09 2017 (r441485) @@ -4,8 +4,8 @@ [ "$2" != "DEINSTALL" ] && exit 0 -[ -f "%%DATADIR%%/GeoLiteCity.dat" ] && /bin/rm "%%DATADIR%%/GeoLiteCity.dat" -[ -f "%%DATADIR%%/GeoLiteCityv6.dat" ] && /bin/rm "%%DATADIR%%/GeoLiteCityv6.dat" -[ -f "%%DATADIR%%/GeoIPASNum.dat.gz" ] && /bin/rm "%%DATADIR%%/GeoIPASNum.dat.gz" -[ -f "%%DATADIR%%/GeoIPASNumv6.dat.gz" ] && /bin/rm "%%DATADIR%%/GeoIPASNumv6.dat.gz" +[ -f "%%DATADIR%%/httpdocs/geoip/GeoLiteCity.dat" ] && /bin/rm "%%DATADIR%%/httpdocs/geoip/GeoLiteCity.dat" +[ -f "%%DATADIR%%/httpdocs/geoip/GeoLiteCityv6.dat" ] && /bin/rm "%%DATADIR%%/httpdocs/geoip/GeoLiteCityv6.dat" +[ -f "%%DATADIR%%/httpdocs/geoip/GeoIPASNum.dat.gz" ] && /bin/rm "%%DATADIR%%/httpdocs/geoip/GeoIPASNum.dat.gz" +[ -f "%%DATADIR%%/httpdocs/geoip/GeoIPASNumv6.dat.gz" ] && /bin/rm "%%DATADIR%%/httpdocs/geoip/GeoIPASNumv6.dat.gz" [ -d "%%DATADIR%%/httpdocs/geoip" ] && /usr/bin/find "%%DATADIR%%/httpdocs/geoip" -type d -empty -delete