diff options
| author | Guido Falsi <madpilot@FreeBSD.org> | 2017-05-22 18:05:09 +0000 |
|---|---|---|
| committer | Guido Falsi <madpilot@FreeBSD.org> | 2017-05-22 18:05:09 +0000 |
| commit | 334063d5f29ffa7a4aac8a1ebb790e689c342168 (patch) | |
| tree | e4ca939ca3cfdde21d10c0087a8b4ad02375961b /net/ntopng/files | |
| parent | 417c1dca2266b24c478ed81efbd535b6de2c596f (diff) | |
| download | ports-334063d5f29ffa7a4aac8a1ebb790e689c342168.tar.gz ports-334063d5f29ffa7a4aac8a1ebb790e689c342168.zip | |
- 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
Notes
Notes:
svn path=/head/; revision=441485
Diffstat (limited to 'net/ntopng/files')
| -rw-r--r-- | net/ntopng/files/ntopng-geoipupdate.sh.in | 4 | ||||
| -rw-r--r-- | net/ntopng/files/pkg-deinstall.in | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/net/ntopng/files/ntopng-geoipupdate.sh.in b/net/ntopng/files/ntopng-geoipupdate.sh.in index 02cbb9175e91..783bd81c68bc 100644 --- a/net/ntopng/files/ntopng-geoipupdate.sh.in +++ b/net/ntopng/files/ntopng-geoipupdate.sh.in @@ -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 diff --git a/net/ntopng/files/pkg-deinstall.in b/net/ntopng/files/pkg-deinstall.in index b8f59a3da311..2999b3847595 100644 --- a/net/ntopng/files/pkg-deinstall.in +++ b/net/ntopng/files/pkg-deinstall.in @@ -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 |