CVS commit: pkgsrc/security/p5-GnuPG-Interface

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Mon Jun  8 14:18:15 UTC 2020

Modified Files:
        pkgsrc/security/p5-GnuPG-Interface: Makefile distinfo options.mk
        pkgsrc/security/p5-GnuPG-Interface/patches: patch-Makefile.PL

Log Message:
p5-GnuPG-Interface: update to 1.00.

1.0 - 2020-05-13
 - Limit support to GnuPG 2.2+ and 1.4
 - Additional information from keys when using GnuPG 2.2 or higher
 - Add support for use of agent/pinentry
 - Updated options to add ignore_mdc_error and logging
 - Improvements to tests
 - Update pubkey_data documentation
 - Special thanks to dkg on Github for a large PR with updates for GnuPG 2
 - Thanks also to ntyni on Github for a pointer to test updates also dealing
   with version changes


To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 pkgsrc/security/p5-GnuPG-Interface/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/security/p5-GnuPG-Interface/distinfo
cvs rdiff -u -r1.5 -r1.6 pkgsrc/security/p5-GnuPG-Interface/options.mk
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/security/p5-GnuPG-Interface/patches/patch-Makefile.PL

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

Modified files:

Index: pkgsrc/security/p5-GnuPG-Interface/Makefile
diff -u pkgsrc/security/p5-GnuPG-Interface/Makefile:1.32 pkgsrc/security/p5-GnuPG-Interface/Makefile:1.33
--- pkgsrc/security/p5-GnuPG-Interface/Makefile:1.32    Sun Aug 11 13:22:57 2019
+++ pkgsrc/security/p5-GnuPG-Interface/Makefile Mon Jun  8 14:18:15 2020
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.32 2019/08/11 13:22:57 wiz Exp $
+# $NetBSD: Makefile,v 1.33 2020/06/08 14:18:15 wiz Exp $
 
-DISTNAME=              GnuPG-Interface-0.52
+DISTNAME=              GnuPG-Interface-1.00
 PKGNAME=               p5-${DISTNAME}
-PKGREVISION=           7
 CATEGORIES=            security perl5
 MASTER_SITES=          ${MASTER_SITE_PERL_CPAN:=GnuPG/}
 
@@ -13,8 +12,11 @@ COMMENT=             Perl interface to GnuPG
 LICENSE=               ${PERL5_LICENSE}
 
 DEPENDS+=              p5-Moo-[0-9]*:../../devel/p5-Moo
-DEPENDS+=              p5-MooX-late-[0-9]*:../../devel/p5-MooX-late
+DEPENDS+=              p5-MooX-late>=0.100nb1:../../devel/p5-MooX-late
 DEPENDS+=              p5-MooX-HandlesVia-[0-9]*:../../devel/p5-MooX-HandlesVia
+# This should not be a direct dependency, but I didn't find which DEPENDS
+# should pull this in instead.
+DEPENDS+=              p5-Class-Tiny-[0-9]*:../../devel/p5-Class-Tiny
 
 PERL5_PACKLIST=                auto/GnuPG/Interface/.packlist
 

Index: pkgsrc/security/p5-GnuPG-Interface/distinfo
diff -u pkgsrc/security/p5-GnuPG-Interface/distinfo:1.13 pkgsrc/security/p5-GnuPG-Interface/distinfo:1.14
--- pkgsrc/security/p5-GnuPG-Interface/distinfo:1.13    Wed Jun  7 14:56:57 2017
+++ pkgsrc/security/p5-GnuPG-Interface/distinfo Mon Jun  8 14:18:15 2020
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.13 2017/06/07 14:56:57 ryoon Exp $
+$NetBSD: distinfo,v 1.14 2020/06/08 14:18:15 wiz Exp $
 
-SHA1 (GnuPG-Interface-0.52.tar.gz) = cb3ae8479edf668d88d7dd90c08036ceb79bbfa7
-RMD160 (GnuPG-Interface-0.52.tar.gz) = 1fc947172288205893642bace958fad3e6c34c6f
-SHA512 (GnuPG-Interface-0.52.tar.gz) = 911f47a3b52249e8b39133d4040b86147793d9dd6a78d2b279674d6bba0cd38de5c919bf12b241b0e977790575502531afab6b1d2c05739d050c16d05d52fc49
-Size (GnuPG-Interface-0.52.tar.gz) = 63733 bytes
-SHA1 (patch-Makefile.PL) = 9cae74eb206ec89c6ef92a096d9a3132659992f0
+SHA1 (GnuPG-Interface-1.00.tar.gz) = f64a6cba3f5402967332a7d91ba95b603e5a3e91
+RMD160 (GnuPG-Interface-1.00.tar.gz) = 5461c92f2557175bf202c92e39dd8bd3c6ffcee1
+SHA512 (GnuPG-Interface-1.00.tar.gz) = 82436543cc3fff19c10fce2be70db5c056e1e186c283127e4e197aa213dc70b5d6d5b61ccd66b577c411a822aef8f2c02057c996e561d5b192fcc2d96a677f07
+Size (GnuPG-Interface-1.00.tar.gz) = 75108 bytes
+SHA1 (patch-Makefile.PL) = db48ace347c859d561b4bb4f4ab0a7af82b15e41

Index: pkgsrc/security/p5-GnuPG-Interface/options.mk
diff -u pkgsrc/security/p5-GnuPG-Interface/options.mk:1.5 pkgsrc/security/p5-GnuPG-Interface/options.mk:1.6
--- pkgsrc/security/p5-GnuPG-Interface/options.mk:1.5   Tue Jan  9 10:22:47 2018
+++ pkgsrc/security/p5-GnuPG-Interface/options.mk       Mon Jun  8 14:18:15 2020
@@ -1,16 +1,29 @@
-# $NetBSD: options.mk,v 1.5 2018/01/09 10:22:47 wiz Exp $
+# $NetBSD: options.mk,v 1.6 2020/06/08 14:18:15 wiz Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.p5_GnuPG_Interface
 PKG_OPTIONS_REQUIRED_GROUPS=   gnupg
-PKG_OPTIONS_GROUP.gnupg=       gnupg1 # gnupg2
-PKG_SUGGESTED_OPTIONS=         gnupg1
+PKG_OPTIONS_GROUP.gnupg=       gnupg1 gnupg2
+PKG_SUGGESTED_OPTIONS=         gnupg2
 
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mgnupg2)
-# patch available at
-# https://github.com/bestpractical/gnupg-interface/pull/1
-DEPENDS+=              gnupg2-[0-9]*:../../security/gnupg2
-.else
+DEPENDS+=              gnupg2>=2.2:../../security/gnupg2
+
+SUBST_CLASSES+=                gpg
+SUBST_SED.gpg+=                -e "s,'gpg','gpg2',g"
+SUBST_FILES.gpg+=      lib/GnuPG/Interface.pm
+SUBST_FILES.gpg+=      t/Interface.t
+SUBST_STAGE.gpg=       pre-configure
+SUBST_MESSAGE.gpg=     Fixing path to gnupg binary.
+
+SUBST_CLASSES+=                gpg2
+SUBST_SED.gpg2+=       -e "s,gpg,gpg2,g"
+SUBST_FILES.gpg2+=     Makefile.PL
+SUBST_STAGE.gpg2=      pre-configure
+SUBST_MESSAGE.gpg2=    Fixing path to gnupg binary.
+.endif
+
+.if !empty(PKG_OPTIONS:Mgnupg1)
 DEPENDS+=              gnupg>=1.4.2:../../security/gnupg
 .endif

Index: pkgsrc/security/p5-GnuPG-Interface/patches/patch-Makefile.PL
diff -u pkgsrc/security/p5-GnuPG-Interface/patches/patch-Makefile.PL:1.1 pkgsrc/security/p5-GnuPG-Interface/patches/patch-Makefile.PL:1.2
--- pkgsrc/security/p5-GnuPG-Interface/patches/patch-Makefile.PL:1.1    Wed Jun  7 14:56:57 2017
+++ pkgsrc/security/p5-GnuPG-Interface/patches/patch-Makefile.PL        Mon Jun  8 14:18:15 2020
@@ -1,14 +1,16 @@
-$NetBSD: patch-Makefile.PL,v 1.1 2017/06/07 14:56:57 ryoon Exp $
+$NetBSD: patch-Makefile.PL,v 1.2 2020/06/08 14:18:15 wiz Exp $
 
-* Fix build with Perl 5.26.0
+pkgsrc takes care the right version is installed.
 
---- Makefile.PL.orig   2015-02-17 00:57:03.000000000 +0000
+--- Makefile.PL.orig   2020-05-13 19:57:03.000000000 +0000
 +++ Makefile.PL
-@@ -1,5 +1,7 @@
- use strict;
- use warnings;
-+use FindBin;
-+use lib $FindBin::Bin;
- use inc::Module::Install;
+@@ -8,9 +8,6 @@ system("which", "gpg");
+ die "gpg (GnuPG) not found" if ( $? != 0 );
  
- print "which gpg ... ";
+ my $output = `gpg --version`;
+-die "Can't determine gpg version"
+-    unless $output =~ /^gpg \(GnuPG.*?\) (\d+\.\d+)/;
+-die "gpg (GnuPG) 1.4 or later is required" unless $1 >= 1.4;
+ 
+ 
+ author 'BPS';