Module Name: pkgsrc
Committed By: wiz
Date: Mon Aug 14 20:48:02 UTC 2017
Modified Files:
pkgsrc/security/caff: Makefile distinfo
pkgsrc/security/caff/patches: patch-Makefile
Log Message:
Updated caff to 2.6.
Bugfixes.
To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.45 pkgsrc/security/caff/Makefile
cvs rdiff -u -r1.30 -r1.31 pkgsrc/security/caff/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/security/caff/patches/patch-Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/security/caff/Makefile
diff -u pkgsrc/security/caff/Makefile:1.44 pkgsrc/security/caff/Makefile:1.45
--- pkgsrc/security/caff/Makefile:1.44 Tue Jun 6 20:37:15 2017
+++ pkgsrc/security/caff/Makefile Mon Aug 14 20:48:02 2017
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.44 2017/06/06 20:37:15 wiz Exp $
+# $NetBSD: Makefile,v 1.45 2017/08/14 20:48:02 wiz Exp $
-VERSION= 2.5
+VERSION= 2.6
DISTNAME= signing-party_${VERSION}.orig
PKGNAME= caff-${VERSION}
-PKGREVISION= 1
CATEGORIES= security
MASTER_SITES= ${MASTER_SITE_DEBIAN:=pool/main/s/signing-party/}
@@ -15,7 +14,7 @@ LICENSE= gnu-gpl-v2 AND modified-bsd
#WRKSRC= ${WRKDIR}/${DISTNAME:S/_/-/:S/.orig//}
WRKSRC= ${WRKDIR}
-USE_TOOLS+= gmake pod2man
+USE_TOOLS+= autoconf automake gmake pod2man
USE_TOOLS+= perl:run
DEPENDS+= p5-Text-Template-[0-9]*:../../textproc/p5-Text-Template
Index: pkgsrc/security/caff/distinfo
diff -u pkgsrc/security/caff/distinfo:1.30 pkgsrc/security/caff/distinfo:1.31
--- pkgsrc/security/caff/distinfo:1.30 Sun Oct 9 20:57:05 2016
+++ pkgsrc/security/caff/distinfo Mon Aug 14 20:48:02 2017
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.30 2016/10/09 20:57:05 wiz Exp $
+$NetBSD: distinfo,v 1.31 2017/08/14 20:48:02 wiz Exp $
-SHA1 (signing-party_2.5.orig.tar.gz) = 5163847c3a957bfa305ec69cf4326351ad065429
-RMD160 (signing-party_2.5.orig.tar.gz) = a6685f376e816d870efb681e6561dbf1ce5ad73f
-SHA512 (signing-party_2.5.orig.tar.gz) = a04875bfaef791a6505134dd2530148d5e6baaa8aa5610e75d42fbf59e884fafffb5de2486425bb53e6464ff3fd35b974684d8bc85291750e4a7bd8bb82b0da3
-Size (signing-party_2.5.orig.tar.gz) = 198105 bytes
-SHA1 (patch-Makefile) = 728bb40fa8be2f0ac63254f2e86b37ee9fa1199f
+SHA1 (signing-party_2.6.orig.tar.gz) = 1c7be323c8fb27563713ee13feab39951a0749f9
+RMD160 (signing-party_2.6.orig.tar.gz) = 1d700c835449e8cbe350c032f0ad4d9a26afaa17
+SHA512 (signing-party_2.6.orig.tar.gz) = 094af9b354d958d382bf99a1f10a9f12585f85769686e3bc9b9b813016f68232775e4002c0a7accbc894c946f7532b32ee7f9b3e23d467b973041c092ba4efb9
+Size (signing-party_2.6.orig.tar.gz) = 201210 bytes
+SHA1 (patch-Makefile) = 8ec25bd7aa0ec6aea0efafb673a359d0dcbc01c8
Index: pkgsrc/security/caff/patches/patch-Makefile
diff -u pkgsrc/security/caff/patches/patch-Makefile:1.1 pkgsrc/security/caff/patches/patch-Makefile:1.2
--- pkgsrc/security/caff/patches/patch-Makefile:1.1 Thu May 5 20:07:37 2016
+++ pkgsrc/security/caff/patches/patch-Makefile Mon Aug 14 20:48:02 2017
@@ -1,14 +1,14 @@
-$NetBSD: patch-Makefile,v 1.1 2016/05/05 20:07:37 tron Exp $
+$NetBSD: patch-Makefile,v 1.2 2017/08/14 20:48:02 wiz Exp $
Don't attempt to build "keyanalyze" and related utilties. They don't build
on systems without SHA1 hash functions in the system library and we don't
install them in the first place.
---- Makefile.orig 2016-04-25 23:06:10.000000000 +0100
-+++ Makefile 2016-05-05 21:02:55.000000000 +0100
+--- Makefile.orig 2017-07-07 15:06:13.000000000 +0000
++++ Makefile
@@ -1,4 +1,4 @@
--DIRS=caff gpg-key2ps gpg-mailkeys gpgsigs gpglist gpgparticipants keyanalyze keylookup \
+--include /usr/share/dpkg/pkg-info.mk
+DIRS=caff gpg-key2ps gpg-mailkeys gpgsigs gpglist gpgparticipants keylookup \
+
+ DIRS=caff gpg-key2ps gpg-mailkeys gpgsigs gpglist gpgparticipants keyanalyze keylookup \
sig2dot springgraph gpgwrap gpgdir keyart gpg-key2latex
- VERSION=$(shell dpkg-parsechangelog 2>&1 | perl -ne 'print $$1 if /^Version: ([^-]*)/')
- DEBVERSION=$(shell dpkg-parsechangelog 2>&1 | perl -ne 'print $$1 if /^Version: (.*)/')