svn commit: r406975 - in branches/2016Q1/dns/sshfp: . files

[Emanuel Haupt]

Author: ehaupt
Date: Sat Jan 23 13:05:18 2016
New Revision: 406975
URL: https://svnweb.freebsd.org/changeset/ports/406975

Log:
  - Fix with python2.7
  - Use shebangfix macro instead of manual shebang patching
  
  Approved by:	portmgr (miwi)

Added:
  branches/2016Q1/dns/sshfp/files/
  branches/2016Q1/dns/sshfp/files/patch-sshfp   (contents, props changed)
Modified:
  branches/2016Q1/dns/sshfp/Makefile

Modified: branches/2016Q1/dns/sshfp/Makefile
==============================================================================
--- branches/2016Q1/dns/sshfp/Makefile	Sat Jan 23 13:03:45 2016	(r406974)
+++ branches/2016Q1/dns/sshfp/Makefile	Sat Jan 23 13:05:18 2016	(r406975)
@@ -3,6 +3,7 @@
 
 PORTNAME=	sshfp
 PORTVERSION=	1.2.2
+PORTREVISION=	1
 CATEGORIES=	dns security
 
 MAINTAINER=	ehaupt at FreeBSD.org
@@ -15,17 +16,13 @@ RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/dns/_
 		${PYTHON_PKGNAMEPREFIX}ipcalc>=0.6:${PORTSDIR}/net-mgmt/py-ipcalc \
 		${PYTHON_SITELIBDIR}/ldns.py:${PORTSDIR}/dns/py-ldns
 
-USES=		python
+USES=		python shebangfix
 NO_BUILD=	yes
 USE_GITHUB=	yes
 GH_ACCOUNT=	xelerance
 
 PY_FILES=	sshfp dane
-
-post-patch:
-.for f in ${PY_FILES} daneldnsx.py
-	@${REINPLACE_CMD} -e '1s|.*|#!${PYTHON_CMD}|' ${WRKSRC}/${f}
-.endfor
+SHEBANG_FILES=	daneldnsx.py ${PY_FILES}
 
 do-install:
 .for f in ${PY_FILES}

Added: branches/2016Q1/dns/sshfp/files/patch-sshfp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2016Q1/dns/sshfp/files/patch-sshfp	Sat Jan 23 13:05:18 2016	(r406975)
@@ -0,0 +1,29 @@
+--- sshfp.orig	2016-01-21 09:01:28 UTC
++++ sshfp
+@@ -129,7 +129,7 @@ def sshfp_from_file(khfile, wantedHosts)
+ 		fingerprints.append(process_records(data, wantedHosts))
+ 	return "\n".join(fingerprints)
+ 
+-def check_keytype(keytype):
++def check_keytype(keytype, hostname):
+ 	global algos
+ 	for algo in algos:
+ 		if "ssh-%s" % algo[:-1] == keytype[:-1]:
+@@ -141,7 +141,7 @@ def check_keytype(keytype):
+ def process_record(record, hostname):
+ 	(host, keytype, key) = record.split(" ")
+ 	key = key.rstrip()
+-	if check_keytype(keytype):
++	if check_keytype(keytype, hostname):
+ 		record = create_sshfp(hostname, keytype, key)
+ 		return record
+ 	return ""
+@@ -168,7 +168,7 @@ def process_records(data, hostnames):
+ 		if "," in host:
+ 			host = host.split(",")[0]
+ 		if all_hosts or host in hostnames or host == hostnames:
+-			if not check_keytype(keytype):
++			if not check_keytype(keytype, host):
+ 				continue
+ 			all_records.append(create_sshfp(host, keytype, key))
+ 	if all_records: