Update ports in the s* categores to not use GH_COMMIT.

With minor cleanups to make things simpler.

With hat:	portmgr
Sponsored by:	Absolight

18 files changed, 24 insertions, 39 deletions

diff --git a/security/kqoauth/Makefile b/security/kqoauth/Makefile
index c43c17bef368..c835f2ed7f79 100644
--- a/security/kqoauth/Makefile
+++ b/security/kqoauth/Makefile
@@ -4,7 +4,6 @@
 PORTNAME=	kqoauth
 PORTVERSION=	0.98
 CATEGORIES=	security
-MASTER_SITES=	GHL
 
 MAINTAINER=	vg@FreeBSD.org
 COMMENT=	Implimentation of OAuth 1.0 in C++ for Qt
@@ -19,7 +18,6 @@ QMAKE_SOURCE_PATH=	${PORTNAME}.pro
 USE_GITHUB=	yes
 GH_ACCOUNT=	kypeli
 GH_PROJECT=	kQOAuth
-GH_COMMIT=	677339c
 
 pre-configure:
 	${REINPLACE_CMD} -e 's|$${target.path}/pkgconfig|$${INSTALL_PREFIX}/libdata/pkgconfig|g' \
diff --git a/security/kqoauth/distinfo b/security/kqoauth/distinfo
index a824dc2106df..60fa44b266c8 100644
--- a/security/kqoauth/distinfo
+++ b/security/kqoauth/distinfo
@@ -1,2 +1,2 @@
-SHA256 (kqoauth-0.98.tar.gz) = de2c4a81c80092f8e5b773306f8acb048876e116b66942236b27e439dbd6f78d
-SIZE (kqoauth-0.98.tar.gz) = 37061
+SHA256 (kypeli-kQOAuth-0.98_GH0.tar.gz) = 9d6c43d98bda559cf4fbb055843a46479e08381527a317edcd9823f2b4990671
+SIZE (kypeli-kQOAuth-0.98_GH0.tar.gz) = 37059
diff --git a/security/libscrypt/Makefile b/security/libscrypt/Makefile
index e13f2dbcbb78..ba45a5185d34 100644
--- a/security/libscrypt/Makefile
+++ b/security/libscrypt/Makefile
@@ -14,8 +14,7 @@ USES=		compiler
 USE_LDCONFIG=	yes
 USE_GITHUB=	yes
 GH_ACCOUNT=	technion
-GH_TAGNAME=	${GH_COMMIT}
-GH_COMMIT=	457ff86
+GH_TAGNAME=	457ff86
 
 MAKE_ARGS+=	CC="${CC}" LIBDIR=${PREFIX}/lib
 
diff --git a/security/libscrypt/distinfo b/security/libscrypt/distinfo
index d96fbcea36cd..487dcc0e05cb 100644
--- a/security/libscrypt/distinfo
+++ b/security/libscrypt/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libscrypt-1.19.tar.gz) = e581705340da23778c9e2c576bff5b49bbca4eb05b0a6015e5b5cc33bfacbd89
-SIZE (libscrypt-1.19.tar.gz) = 18220
+SHA256 (technion-libscrypt-1.19-457ff86_GH0.tar.gz) = 402ddeee71ed0a068ff03a370dbbb93bd87d5e0ebd05a285dab89a9bac098280
+SIZE (technion-libscrypt-1.19-457ff86_GH0.tar.gz) = 18208
diff --git a/security/obfsclient/Makefile b/security/obfsclient/Makefile
index cbeb4d50cd58..744b069505be 100644
--- a/security/obfsclient/Makefile
+++ b/security/obfsclient/Makefile
@@ -5,7 +5,6 @@ PORTNAME=	obfsclient
 PORTVERSION=	0.0.2
 PORTREVISION=	1
 CATEGORIES=	security
-DISTNAME=	g-${GH_ACCOUNT}-${GH_PROJECT}-${PORTVERSION}-${GH_COMMIT}
 
 MAINTAINER=	fk@fabiankeil.de
 COMMENT=	Tor-managed pluggable transport client
@@ -15,8 +14,7 @@ LIB_DEPENDS=	liballium-1.0.so:${PORTSDIR}/devel/liballium \
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	Yawning
-GH_COMMIT=	3c551c5
-GH_TAGNAME=	${GH_COMMIT}
+GH_TAGNAME=	3c551c5
 
 GNU_CONFIGURE=	yes
 USES=		autoreconf compiler:c++11-lib pkgconfig tar:bzip2
diff --git a/security/obfsclient/distinfo b/security/obfsclient/distinfo
index a2057a449807..e3ff69d771d1 100644
--- a/security/obfsclient/distinfo
+++ b/security/obfsclient/distinfo
@@ -1,2 +1,2 @@
-SHA256 (g-Yawning-obfsclient-0.0.2-3c551c5.tar.bz2) = 02bf73b5845ee5e514d26f8dd2fba0d2fc0e44a8b76ad7b444361f40391f684d
-SIZE (g-Yawning-obfsclient-0.0.2-3c551c5.tar.bz2) = 374687
+SHA256 (Yawning-obfsclient-0.0.2-3c551c5_GH0.tar.bz2) = 4f43d34f91111d513c22a21b5564b5fefd710f0bc2d79665d7204943c3f8889a
+SIZE (Yawning-obfsclient-0.0.2-3c551c5_GH0.tar.bz2) = 374664
diff --git a/security/pam_ocra/Makefile b/security/pam_ocra/Makefile
index 9e2b76872268..e5756951b815 100644
--- a/security/pam_ocra/Makefile
+++ b/security/pam_ocra/Makefile
@@ -15,8 +15,6 @@ USES=		uidfix
 USE_GITHUB=	yes
 
 GH_ACCOUNT=	sg2342
-GH_PROJECT=	pam_ocra
-GH_COMMIT=	0e47902
 
 PLIST_FILES=	lib/pam_ocra.so \
 		lib/pam_ocra.so.0 \
diff --git a/security/pam_ocra/distinfo b/security/pam_ocra/distinfo
index 4a54864af5a7..a23bf958b0c5 100644
--- a/security/pam_ocra/distinfo
+++ b/security/pam_ocra/distinfo
@@ -1,2 +1,2 @@
-SHA256 (pam_ocra-1.2.tar.gz) = f94aa1d75c659beff14744ce35a2860bb4379d92f93053cae6102477db455fe5
-SIZE (pam_ocra-1.2.tar.gz) = 14422
+SHA256 (sg2342-pam_ocra-1.2_GH0.tar.gz) = 617a688134806fef8164faa3b628dd69aa95352c7a8c4681c906f19c98a9f266
+SIZE (sg2342-pam_ocra-1.2_GH0.tar.gz) = 14420
diff --git a/security/py-fail2ban/Makefile b/security/py-fail2ban/Makefile
index 1d63d2d40c70..3309387ba8cb 100644
--- a/security/py-fail2ban/Makefile
+++ b/security/py-fail2ban/Makefile
@@ -13,9 +13,6 @@ LICENSE=	GPLv2
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3
 
 USE_GITHUB=	yes
-GH_ACCOUNT=	${PORTNAME}
-GH_PROJECT=	${PORTNAME}
-GH_TAGNAME=	${PORTVERSION}
 
 USES=		python
 USE_PYTHON=	distutils py3kplist
diff --git a/security/py-fail2ban/distinfo b/security/py-fail2ban/distinfo
index e41614c6d547..4af47998bb63 100644
--- a/security/py-fail2ban/distinfo
+++ b/security/py-fail2ban/distinfo
@@ -1,2 +1,2 @@
-SHA256 (fail2ban-fail2ban-0.9.2-0.9.2_GH0.tar.gz) = 476687098303bdee8d6b69e05f190ab150e39e64d56ce158d29bbc5924b06f89
-SIZE (fail2ban-fail2ban-0.9.2-0.9.2_GH0.tar.gz) = 314902
+SHA256 (fail2ban-fail2ban-0.9.2_GH0.tar.gz) = 476687098303bdee8d6b69e05f190ab150e39e64d56ce158d29bbc5924b06f89
+SIZE (fail2ban-fail2ban-0.9.2_GH0.tar.gz) = 314902
diff --git a/security/py-yara/Makefile b/security/py-yara/Makefile
index 264912172365..1a23f04c1af9 100644
--- a/security/py-yara/Makefile
+++ b/security/py-yara/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	yara
 PORTVERSION=	3.3.0
+DISTVERSIONPREFIX=	v
 CATEGORIES=	security
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
@@ -10,8 +11,6 @@ COMMENT=	Python bindings for yara
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	plusvic
-GH_TAGNAME=	v3.3.0
-GH_COMMIT=	85e913e
 
 LIB_DEPENDS=	libyara.so:${PORTSDIR}/security/yara
 
diff --git a/security/py-yara/distinfo b/security/py-yara/distinfo
index 91fabbda9fac..3643b3f9cd1a 100644
--- a/security/py-yara/distinfo
+++ b/security/py-yara/distinfo
@@ -1,2 +1,2 @@
-SHA256 (yara-3.3.0.tar.gz) = c2cd05deeedd36489f1d464e8cb86e0de261483cd2fcb5278bada7cdc0e4238f
-SIZE (yara-3.3.0.tar.gz) = 7634925
+SHA256 (plusvic-yara-v3.3.0_GH0.tar.gz) = e5f4359082e35ff00ee94af9ee897bb0ab18abf49a2c4fe45968d7a848e5bd83
+SIZE (plusvic-yara-v3.3.0_GH0.tar.gz) = 7634474
diff --git a/security/sguil/Makefile b/security/sguil/Makefile
index 031ded3a1357..84157ce9a813 100644
--- a/security/sguil/Makefile
+++ b/security/sguil/Makefile
@@ -16,9 +16,7 @@ RUN_DEPENDS=	tcltls>=0:${PORTSDIR}/devel/tcltls \
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	bammv
-GH_PROJECT=	${USERS}
-GH_TAGNAME=	${GH_COMMIT}
-GH_COMMIT=	0b16167
+GH_TAGNAME=	0b16167
 
 OPTIONS_DEFINE=		DOCS
 OPTIONS_DEFAULT=	SERVER CLIENT SENSOR
diff --git a/security/sguil/distinfo b/security/sguil/distinfo
index 1da289d4afb8..598365562495 100644
--- a/security/sguil/distinfo
+++ b/security/sguil/distinfo
@@ -1,2 +1,2 @@
-SHA256 (sguil-0.9.0.tar.gz) = e83f664673a6c44efec8b0a765a41b00a00830ba02a058d4c0663c915f95c8ee
-SIZE (sguil-0.9.0.tar.gz) = 464313
+SHA256 (bammv-sguil-0.9.0-0b16167_GH0.tar.gz) = ee1f1e99019dd82a01d8d48ad3b027aa4fb3c2494381b84d0de9f12a28beed35
+SIZE (bammv-sguil-0.9.0-0b16167_GH0.tar.gz) = 464215
diff --git a/security/spass/Makefile b/security/spass/Makefile
index 9030cc0bd85a..b1e49318a077 100644
--- a/security/spass/Makefile
+++ b/security/spass/Makefile
@@ -17,7 +17,6 @@ LIB_DEPENDS=	libasound.so:${PORTSDIR}/audio/alsa-lib \
 USE_GITHUB=	yes
 GH_ACCOUNT=	guyru
 GH_TAGNAME=	cb0de64
-GH_COMMIT=	cb0de64
 
 USES=		cmake
 CFLAGS+=	-I${LOCALBASE}/include
diff --git a/security/spass/distinfo b/security/spass/distinfo
index eb598dddd91a..b1af8e9082f1 100644
--- a/security/spass/distinfo
+++ b/security/spass/distinfo
@@ -1,2 +1,2 @@
-SHA256 (spass-3.0.tar.gz) = 5f1e32274ecf38210c08d2cec919352e157a55546b646224eba4a1497bf64976
-SIZE (spass-3.0.tar.gz) = 47746
+SHA256 (guyru-spass-3.0-cb0de64_GH0.tar.gz) = 3b3bd505f03645838125377d9db5e2a3bac339c2aba2ed36ff5d95aec1d525ca
+SIZE (guyru-spass-3.0-cb0de64_GH0.tar.gz) = 47733
diff --git a/security/tcpcrypt/Makefile b/security/tcpcrypt/Makefile
index 41de10f6f63c..93184a669a76 100644
--- a/security/tcpcrypt/Makefile
+++ b/security/tcpcrypt/Makefile
@@ -2,7 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	tcpcrypt
-DISTVERSION=	0.3.rc1
+DISTVERSIONPREFIX=	v
+DISTVERSION=	0.3-rc1
 CATEGORIES=	security net
 
 MAINTAINER=	jmg@FreeBSD.org
@@ -12,8 +13,6 @@ LICENSE=	BSD2CLAUSE
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	scslab
-GH_TAGNAME=	v0.3-rc1
-GH_COMMIT=	b110e7e
 
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
diff --git a/security/tcpcrypt/distinfo b/security/tcpcrypt/distinfo
index 9a7559141ea8..4c0a4d011f72 100644
--- a/security/tcpcrypt/distinfo
+++ b/security/tcpcrypt/distinfo
@@ -1,2 +1,2 @@
-SHA256 (tcpcrypt-0.3.rc1.tar.gz) = da184da7b702cadeaec670f09e34af8d41be84d81ad253f4d977aaaa576da865
-SIZE (tcpcrypt-0.3.rc1.tar.gz) = 183047
+SHA256 (scslab-tcpcrypt-v0.3-rc1_GH0.tar.gz) = 4a139da6a8768ca0ab24968a546dfea23c63e8d3d566b342f27e9674a3ebe9cc
+SIZE (scslab-tcpcrypt-v0.3-rc1_GH0.tar.gz) = 183008