Index: branches/2016Q1/dns/sshfp/Makefile =================================================================== --- branches/2016Q1/dns/sshfp/Makefile (revision 406974) +++ branches/2016Q1/dns/sshfp/Makefile (revision 406975) @@ -1,38 +1,35 @@ # Created by: Emanuel Haupt # $FreeBSD$ PORTNAME= sshfp PORTVERSION= 1.2.2 +PORTREVISION= 1 CATEGORIES= dns security MAINTAINER= ehaupt@FreeBSD.org COMMENT= Generate SSHFP DNS records from knownhosts files or ssh-keyscan LICENSE= GPLv2 RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/dns/__init__.py:${PORTSDIR}/dns/py-dnspython \ ${PYTHON_PKGNAMEPREFIX}argparse>=0.8.0:${PORTSDIR}/devel/py-argparse \ ${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} ${INSTALL_SCRIPT} ${WRKSRC}/${f} ${STAGEDIR}${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/${f}.1 ${STAGEDIR}${MANPREFIX}/man/man1 .endfor @${MKDIR} ${STAGEDIR}${PYTHON_SITELIBDIR} ${INSTALL_SCRIPT} ${WRKSRC}/daneldnsx.py ${STAGEDIR}${PYTHON_SITELIBDIR} .include Index: branches/2016Q1/dns/sshfp/files/patch-sshfp =================================================================== --- branches/2016Q1/dns/sshfp/files/patch-sshfp (nonexistent) +++ branches/2016Q1/dns/sshfp/files/patch-sshfp (revision 406975) @@ -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: Property changes on: branches/2016Q1/dns/sshfp/files/patch-sshfp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property