Date: Thu, 21 Jan 2016 09:08:29 +0000 (UTC) From: Emanuel Haupt <ehaupt@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r406832 - in head/dns/sshfp: . files Message-ID: <201601210908.u0L98TUF045207@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ehaupt Date: Thu Jan 21 09:08:28 2016 New Revision: 406832 URL: https://svnweb.freebsd.org/changeset/ports/406832 Log: - Fix with python2.7 - Use shebangfix macro instead of manual shebang patching Added: head/dns/sshfp/files/ head/dns/sshfp/files/patch-sshfp (contents, props changed) Modified: head/dns/sshfp/Makefile Modified: head/dns/sshfp/Makefile ============================================================================== --- head/dns/sshfp/Makefile Thu Jan 21 09:08:07 2016 (r406831) +++ head/dns/sshfp/Makefile Thu Jan 21 09:08:28 2016 (r406832) @@ -3,6 +3,7 @@ PORTNAME= sshfp PORTVERSION= 1.2.2 +PORTREVISION= 1 CATEGORIES= dns security MAINTAINER= ehaupt@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: head/dns/sshfp/files/patch-sshfp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/dns/sshfp/files/patch-sshfp Thu Jan 21 09:08:28 2016 (r406832) @@ -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:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201601210908.u0L98TUF045207>