svn commit: r509485 - in head/net/dshell: . files

[MANTANI Nobutaka]

Author: nobutaka
Date: Wed Aug 21 02:22:11 2019
New Revision: 509485
URL: https://svnweb.freebsd.org/changeset/ports/509485

Log:
  - Update to the latest snapshot on 2019-05-23.
  - Switch to use the GeoLite2 database.
  - Switch to use py-pycryptodome.

Modified:
  head/net/dshell/Makefile
  head/net/dshell/distinfo
  head/net/dshell/files/patch-Makefile
  head/net/dshell/pkg-message

Modified: head/net/dshell/Makefile
==============================================================================
--- head/net/dshell/Makefile	Wed Aug 21 02:01:15 2019	(r509484)
+++ head/net/dshell/Makefile	Wed Aug 21 02:22:11 2019	(r509485)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	dshell
-PORTVERSION=	3.0.20180914
+PORTVERSION=	3.0.${SNAPDATE}
 CATEGORIES=	net
 
 MAINTAINER=	nobutaka at FreeBSD.org
@@ -12,8 +12,8 @@ LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 BUILD_DEPENDS=	bash:shells/bash \
-		${PYTHON_PKGNAMEPREFIX}pygeoip>0:net/py-pygeoip@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pycrypto>0:security/py-pycrypto@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}GeoIP2>0:net/py-GeoIP2@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pycryptodome>0:security/py-pycryptodome@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dpkt>0:net/py-dpkt@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}ipy>0:net-mgmt/py-ipy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pypcap>0:net/py-pypcap@${PY_FLAVOR}
@@ -27,7 +27,8 @@ SHEBANG_FILES=	bin/*.py
 
 GH_ACCOUNT=	USArmyResearchLab
 GH_PROJECT=	Dshell
-GH_TAGNAME=	709d087
+GH_TAGNAME=	695c891
+SNAPDATE=	20190523
 
 OPTIONS_DEFINE=	DOCS
 

Modified: head/net/dshell/distinfo
==============================================================================
--- head/net/dshell/distinfo	Wed Aug 21 02:01:15 2019	(r509484)
+++ head/net/dshell/distinfo	Wed Aug 21 02:22:11 2019	(r509485)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1542435016
-SHA256 (USArmyResearchLab-Dshell-3.0.20180914-709d087_GH0.tar.gz) = c5ce6bafdd1b09cd70a3dfe1ab9fb3abc4e2204f8596bfbd5a2f7dfd3fb1a8bb
-SIZE (USArmyResearchLab-Dshell-3.0.20180914-709d087_GH0.tar.gz) = 716622
+TIMESTAMP = 1566010007
+SHA256 (USArmyResearchLab-Dshell-3.0.20190523-695c891_GH0.tar.gz) = 47f768b230432688fda44f290da62672cef8dbdb1b6b2ee6cac60c0e4d75a145
+SIZE (USArmyResearchLab-Dshell-3.0.20190523-695c891_GH0.tar.gz) = 717040

Modified: head/net/dshell/files/patch-Makefile
==============================================================================
--- head/net/dshell/files/patch-Makefile	Wed Aug 21 02:01:15 2019	(r509484)
+++ head/net/dshell/files/patch-Makefile	Wed Aug 21 02:22:11 2019	(r509485)
@@ -1,9 +1,9 @@
---- Makefile.orig	2018-09-13 18:19:05 UTC
+--- Makefile.orig	2019-05-22 22:16:29 UTC
 +++ Makefile
 @@ -6,7 +6,7 @@ dshell: rc initpy pydoc
  
  rc:
- 	# Generating .dshellrc and dshell files 
+ 	# Generating .dshellrc and dshell files
 -	python $(PWD)/bin/generate-dshellrc.py $(PWD)
 +	$(PYTHON_CMD) $(PWD)/bin/generate-dshellrc.py $(PWD)
  	chmod 755 $(PWD)/dshell
@@ -15,6 +15,6 @@
  
 -pydoc:
 +pydoc: rc
- 	(cd $(PWD)/doc && ./generate-doc.sh $(PWD) ) 
+ 	(cd $(PWD)/doc && ./generate-doc.sh $(PWD) )
  
- clean: clean_pyc 
+ clean: clean_pyc clean_ln

Modified: head/net/dshell/pkg-message
==============================================================================
--- head/net/dshell/pkg-message	Wed Aug 21 02:01:15 2019	(r509484)
+++ head/net/dshell/pkg-message	Wed Aug 21 02:22:11 2019	(r509485)
@@ -1,11 +1,12 @@
 [
 { type: install
   message: <<EOM
-To use the GeoIP Databases from DShell, please download GeoIP.dat,
-GeoIPv6.dat, GeoIPASNum.dat, GeoIPASNumv6.dat from the following URL
-and place them into ${PREFIX}/share/dshell/GeoIP.
+To use the GeoIP Databases from DShell, please download
+GeoLite2-Country.tar.gz and GeoLite2-ASN.tar.gz from the
+following URL and place GeoLite2-Country.mmdb and
+GeoLite2-ASN.mmdb into ${PREFIX}/share/dshell/GeoIP.
 
-http://dev.maxmind.com/geoip/legacy/geolite/
+https://dev.maxmind.com/geoip/geoip2/geolite2/
 EOM
 }
 ]