[pkgsrc/trunk]: pkgsrc/security/sshfp sshfp: update to 1.2.2

[khorben <khorben%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/cc84f7929f7c
branches:  trunk
changeset: 432897:cc84f7929f7c
user:      khorben <khorben%pkgsrc.org@localhost>
date:      Tue May 26 21:18:14 2020 +0000

description:
sshfp: update to 1.2.2

I believe this makes this package somewhat usable again, as it seems to require
Python 2.7 in order to work. At the moment "sshfp -s hostname" works. The new
dane(1) utility requires additional dependencies to work, which are not in
pkgsrc yet. I have imported a new Python package required for sshfp(1) though.

v1.2.2:
- Fix -4 / -6 flags [Chris]
- Throw errors on stderr to improve pipe usage [Ludwig Nusse]
- openSUSE package information on import error [Ludwig Nusse]
- Fix nameserver by IP address (ldns workaround [Chris]
- Fix case where AAAA is found but no IPv6 is available [Paul]

v1.2.1:
- Fix copyright information to clearly make it is all GPLv2+ [Paul]

v1.2.0:
- dane : Added the dane command (See IETF DANE working group) [Paul]
- sshfp: Fix quiet for external commands [James Brown]
- sshfp: Merged in subprocess changes [James Brown]
- sshfp: Use optparse, some code refactoring [James Brown]
- sshfp: Added -U UDP option [James Brown]
- sshfp: Rename of some functions [James Brown]
- sshfp: doclifted man page, generate when needed using xmlto [Paul]

v1.1.6:
- Fix quiet for external commands [James Brown]
- Merged in subprocess changes [James Brown]
- Use optparse, some code refactoring [James Brown]
- Added -U UDP option [James Brown]
- Rename of some functions [James Brown]
- doclifted man page, generate when needed using xmlto [Paul]

v1.1.5
- Fixes for https://bugs.launchpad.net/ubuntu/+source/sshfp/+bug/355886
- Fix for sha Deprecation warning [Martin Jackson]
- Fix for use of os.popen3 [Martin Jackson]
- Sync debian/ with Debian (thanks)
- Various small pylint fixes [Simon Deziel]

v1.1.4
- Fixes to man page [Maximiliano Curia]
- Fixes to Makefile for Debian [Maximiliano Curia]

diffstat:

 security/sshfp/Makefile         |  15 ++++++-----
 security/sshfp/PLIST            |   6 +++-
 security/sshfp/distinfo         |  13 +++++-----
 security/sshfp/patches/patch-aa |  16 ++++++------
 security/sshfp/patches/patch-ab |  49 -----------------------------------------
 5 files changed, 26 insertions(+), 73 deletions(-)

diffs (141 lines):

diff -r 929c63143cb8 -r cc84f7929f7c security/sshfp/Makefile
--- a/security/sshfp/Makefile   Tue May 26 20:53:28 2020 +0000
+++ b/security/sshfp/Makefile   Tue May 26 21:18:14 2020 +0000
@@ -1,20 +1,21 @@
-# $NetBSD: Makefile,v 1.15 2019/11/04 21:13:03 rillig Exp $
+# $NetBSD: Makefile,v 1.16 2020/05/26 21:18:14 khorben Exp $
 
-DISTNAME=      sshfp-1.1.3
-PKGREVISION=   5
+DISTNAME=      sshfp-1.2.2
 CATEGORIES=    security net
-#MASTER_SITES= https://www.xelerance.com/software/sshfp/
+MASTER_SITES=  ${MASTER_SITE_GITHUB:=xelerance/}
 
 MAINTAINER=    agc%NetBSD.org@localhost
-#HOMEPAGE=     https://www.xelerance.com/software/sshfp/
+HOMEPAGE=      ${MASTER_SITE_GITHUB:=xelerange/sshfp/}
 COMMENT=       Print ssh host key fingerprint resource records
 LICENSE=       gnu-gpl-v2
 
-DEPENDS+=      ${PYPKGPREFIX}-dns-[0-9]*:../../net/py-dns
+DEPENDS+=      ${PYPKGPREFIX}-argparse-[0-9]*:../../devel/py-argparse
+DEPENDS+=      ${PYPKGPREFIX}-dnspython-[0-9]*:../../net/py-dnspython
 
 MANCOMPRESSED= yes
 NO_BUILD=      yes
-REPLACE_PYTHON=        sshfp
+PYTHON_VERSIONS_ACCEPTED=      27
+REPLACE_PYTHON=        dane sshfp
 
 .include "../../lang/python/application.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 929c63143cb8 -r cc84f7929f7c security/sshfp/PLIST
--- a/security/sshfp/PLIST      Tue May 26 20:53:28 2020 +0000
+++ b/security/sshfp/PLIST      Tue May 26 21:18:14 2020 +0000
@@ -1,3 +1,5 @@
-@comment $NetBSD: PLIST,v 1.2 2018/01/01 18:33:33 rillig Exp $
+@comment $NetBSD: PLIST,v 1.3 2020/05/26 21:18:14 khorben Exp $
+bin/dane
 bin/sshfp
-man/man1/sshfp.1.gz
+man/man1/dane.1
+man/man1/sshfp.1
diff -r 929c63143cb8 -r cc84f7929f7c security/sshfp/distinfo
--- a/security/sshfp/distinfo   Tue May 26 20:53:28 2020 +0000
+++ b/security/sshfp/distinfo   Tue May 26 21:18:14 2020 +0000
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.3 2015/11/04 01:18:10 agc Exp $
+$NetBSD: distinfo,v 1.4 2020/05/26 21:18:14 khorben Exp $
 
-SHA1 (sshfp-1.1.3.tar.gz) = bf42c956a992ac9442e9bbaa4af8f5599f321c2b
-RMD160 (sshfp-1.1.3.tar.gz) = 9b325ed30e75e0f485eea11676a420932f5c9b1e
-SHA512 (sshfp-1.1.3.tar.gz) = 6852399e96994025e85538f0ab0e55c78ebd43effb8c8b4a3cfe1f40c7170c40cf18b87a59cfc81a6823055055abfab5cf4b46a88a07cd89d19ef26f18b0ba18
-Size (sshfp-1.1.3.tar.gz) = 15477 bytes
-SHA1 (patch-aa) = c6a00eb486790e9d489a4f476785986209a1c11e
-SHA1 (patch-ab) = b91c5a45302960c39f00e82b945eaac0e7304cf0
+SHA1 (sshfp-1.2.2.tar.gz) = 090cc250a2ce93e8ddedb4ccdf38553c15f99d33
+RMD160 (sshfp-1.2.2.tar.gz) = 760ce696df3415e3fa162925b6290fa1119ce2bb
+SHA512 (sshfp-1.2.2.tar.gz) = b93f0b5027a66f314abcd3a83b4957c665e9be1db0a17e27a9ed1735ac505b653256a9b9842e77db8fa03620015ebf5c438dc9aab0fa7b0b51b6e2c6ea684368
+Size (sshfp-1.2.2.tar.gz) = 34690 bytes
+SHA1 (patch-aa) = 4cc77adf2f2e1f7f874ec66d79594167dbf45a4c
diff -r 929c63143cb8 -r cc84f7929f7c security/sshfp/patches/patch-aa
--- a/security/sshfp/patches/patch-aa   Tue May 26 20:53:28 2020 +0000
+++ b/security/sshfp/patches/patch-aa   Tue May 26 21:18:14 2020 +0000
@@ -1,15 +1,15 @@
-$NetBSD: patch-aa,v 1.2 2009/11/17 12:23:01 tron Exp $
+$NetBSD: patch-aa,v 1.3 2020/05/26 21:18:14 khorben Exp $
 
---- Makefile   2008/07/31 09:38:52     1.1
-+++ Makefile   2008/07/31 09:37:43
-@@ -4,8 +4,8 @@
- #
+--- Makefile.orig      2011-09-07 01:58:25.000000000 +0000
++++ Makefile
+@@ -2,8 +2,8 @@
+ # A basic Makefile for sshfp
  #
  
 -BIN     = $(DESTDIR)/usr/bin
 -MAN     = $(DESTDIR)/usr/share/man/man1
-+BIN     = $(DESTDIR)${PREFIX}/bin
-+MAN     = $(DESTDIR)${PREFIX}/${PKGMANDIR}/man1
++BIN     = $(DESTDIR)$(PREFIX)/bin
++MAN     = $(DESTDIR)$(PREFIX)/$(PKGMANDIR)/man1
  
- all: man-page
+ all: man daneldnsx
        
diff -r 929c63143cb8 -r cc84f7929f7c security/sshfp/patches/patch-ab
--- a/security/sshfp/patches/patch-ab   Tue May 26 20:53:28 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2009/11/17 12:23:01 tron Exp $
-
-Fix deprecation warnings under Python 2.6.
-
---- sshfp.orig 2007-05-15 22:10:26.000000000 +0100
-+++ sshfp      2009-11-17 11:54:50.000000000 +0000
-@@ -8,9 +8,17 @@
- import sys
- import getopt
- import base64
--import sha
-+
-+try:
-+    import hashlib
-+    SHA1_CLASS = hashlib.sha1
-+except ImportError:
-+    import sha
-+    SHA1_CLASS = sha.sha
-+
- import commands
- import time
-+import subprocess
- # www.dnspython.org
- try:
-       import dns.resolver
-@@ -58,7 +66,9 @@
-       except TypeError:
-               print "FAILED on hostname "+hostname+" with keyblob "+keyblob
-               return "ERROR"
--      fpsha1 = sha.new(rawkey).hexdigest()
-+        sha1 = SHA1_CLASS()
-+        sha1.update(rawkey)
-+        fpsha1 = sha1.hexdigest()
-       # check for Reverse entries
-       reverse = 1
-       parts = hostname.split(".",3)
-@@ -183,7 +193,11 @@
-       cmd = "ssh-keyscan -p %s -T %s -t %s %s" % (port, timeout, algo, hosts)
-       if quiet:
-               cmd = cmd + " 2>/dev/null"
--      tochild, fromchild, childerror = os.popen3(cmd, 'r')
-+        cmd_pipe = subprocess.Popen(cmd, shell = True, stdin = subprocess.PIPE,
-+          stdout = subprocess.PIPE, stderr = subprocess.PIPE, close_fds = True)
-+        tochild = cmd_pipe.stdin
-+        fromchild = cmd_pipe.stdout
-+        childerror = cmd_pipe.stderr
-         err = childerror.readlines()
-         khdns = "\n".join(fromchild.readlines())
-         for e in err: