- Fix with python2.7
- Use shebangfix macro instead of manual shebang patching
This commit is contained in:
parent
239d20d3f7
commit
87600702f5
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=406832
@ -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/__init__.py:${PORTSDIR}/dns/py-dnspython
|
||||
${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}
|
||||
|
29
dns/sshfp/files/patch-sshfp
Normal file
29
dns/sshfp/files/patch-sshfp
Normal file
@ -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:
|
Loading…
Reference in New Issue
Block a user