CVS commit: pkgsrc/security/sshfp

["Pierre Pronchery" <khorben%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   khorben
Date:           Tue May 26 21:18:15 UTC 2020

Modified Files:
        pkgsrc/security/sshfp: Makefile PLIST distinfo
        pkgsrc/security/sshfp/patches: patch-aa
Removed Files:
        pkgsrc/security/sshfp/patches: patch-ab

Log Message:
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]


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 pkgsrc/security/sshfp/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/security/sshfp/PLIST
cvs rdiff -u -r1.3 -r1.4 pkgsrc/security/sshfp/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/security/sshfp/patches/patch-aa
cvs rdiff -u -r1.1 -r0 pkgsrc/security/sshfp/patches/patch-ab

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/security/sshfp/Makefile
diff -u pkgsrc/security/sshfp/Makefile:1.15 pkgsrc/security/sshfp/Makefile:1.16
--- pkgsrc/security/sshfp/Makefile:1.15 Mon Nov  4 21:13:03 2019
+++ pkgsrc/security/sshfp/Makefile      Tue May 26 21:18:14 2020
@@ -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"

Index: pkgsrc/security/sshfp/PLIST
diff -u pkgsrc/security/sshfp/PLIST:1.2 pkgsrc/security/sshfp/PLIST:1.3
--- pkgsrc/security/sshfp/PLIST:1.2     Mon Jan  1 18:33:33 2018
+++ pkgsrc/security/sshfp/PLIST Tue May 26 21:18:14 2020
@@ -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

Index: pkgsrc/security/sshfp/distinfo
diff -u pkgsrc/security/sshfp/distinfo:1.3 pkgsrc/security/sshfp/distinfo:1.4
--- pkgsrc/security/sshfp/distinfo:1.3  Wed Nov  4 01:18:10 2015
+++ pkgsrc/security/sshfp/distinfo      Tue May 26 21:18:14 2020
@@ -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

Index: pkgsrc/security/sshfp/patches/patch-aa
diff -u pkgsrc/security/sshfp/patches/patch-aa:1.2 pkgsrc/security/sshfp/patches/patch-aa:1.3
--- pkgsrc/security/sshfp/patches/patch-aa:1.2  Tue Nov 17 12:23:01 2009
+++ pkgsrc/security/sshfp/patches/patch-aa      Tue May 26 21:18:14 2020
@@ -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