[pkgsrc/trunk]: pkgsrc/security/pius Add missing gnupg{, 2} dependencies, and ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/b2a670ef343d
branches:  trunk
changeset: 408942:b2a670ef343d
user:      schmonz <schmonz%pkgsrc.org@localhost>
date:      Mon Jan 13 20:52:04 2020 +0000

description:
Add missing gnupg{,2} dependencies, and patch some paths. Ride
recent import.

diffstat:

 security/pius/Makefile                             |  10 ++++++--
 security/pius/distinfo                             |   7 +++++-
 security/pius/patches/patch-doc_pius-keyring-mgr.1 |  24 ++++++++++++++++++++++
 security/pius/patches/patch-doc_pius-report.1      |  15 +++++++++++++
 security/pius/patches/patch-doc_pius.1             |  15 +++++++++++++
 security/pius/patches/patch-libpius_constants.py   |  15 +++++++++++++
 security/pius/patches/patch-pius-keyring-mgr       |  15 +++++++++++++
 7 files changed, 97 insertions(+), 4 deletions(-)

diffs (149 lines):

diff -r 3ec64af9aeb8 -r b2a670ef343d security/pius/Makefile
--- a/security/pius/Makefile    Mon Jan 13 20:40:29 2020 +0000
+++ b/security/pius/Makefile    Mon Jan 13 20:52:04 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2020/01/13 20:39:29 schmonz Exp $
+# $NetBSD: Makefile,v 1.2 2020/01/13 20:52:04 schmonz Exp $
 
 DISTNAME=              pius-3.0.0
 PKGNAME=               ${PYPKGPREFIX}-${DISTNAME}
@@ -11,12 +11,16 @@
 COMMENT=               PGP Individual User Signer
 LICENSE=               gnu-gpl-v2
 
+DEPENDS+=              gnupg-[0-9]*:../../security/gnupg
+DEPENDS+=              gnupg2-[0-9]*:../../security/gnupg2
+
 USE_LANGUAGES=         # none
 
 SUBST_CLASSES+=                paths
 SUBST_STAGE.paths=     do-configure
-SUBST_FILES.paths=     setup.py
-SUBST_VARS.paths=      PKGMANDIR
+SUBST_FILES.paths=     setup.py pius-keyring-mgr libpius/constants.py
+SUBST_FILES.paths+=    doc/pius.1 doc/pius-keyring-mgr.1 doc/pius-report.1
+SUBST_VARS.paths=      PREFIX PKGMANDIR
 
 .include "../../lang/python/egg.mk"
 .include "../../lang/python/application.mk"
diff -r 3ec64af9aeb8 -r b2a670ef343d security/pius/distinfo
--- a/security/pius/distinfo    Mon Jan 13 20:40:29 2020 +0000
+++ b/security/pius/distinfo    Mon Jan 13 20:52:04 2020 +0000
@@ -1,7 +1,12 @@
-$NetBSD: distinfo,v 1.1 2020/01/13 20:39:29 schmonz Exp $
+$NetBSD: distinfo,v 1.2 2020/01/13 20:52:04 schmonz Exp $
 
 SHA1 (pius-3.0.0.tar.bz2) = 1a08e086057a601fcb6a5b8be2aacb001a9f4133
 RMD160 (pius-3.0.0.tar.bz2) = c8ddc1a1abc3033e41f049fccd099c951c37e061
 SHA512 (pius-3.0.0.tar.bz2) = 0c906574ac703f45e3318ae3e7994fe6580fd172849b2956d9084033d6fbfd69fec942b95bc2edadadc223fa0685ff0b9799ad03570b712b9cdb09d69491cc91
 Size (pius-3.0.0.tar.bz2) = 46643 bytes
+SHA1 (patch-doc_pius-keyring-mgr.1) = bd9e0d56258689538f3c750857d20202cc8f5173
+SHA1 (patch-doc_pius-report.1) = 7dabda6a2689e4edee4c94ebf2e5b67a42ef7bd1
+SHA1 (patch-doc_pius.1) = 61c296cf09d5e3e2b4b7cc04453c41cc2a830e11
+SHA1 (patch-libpius_constants.py) = 05fd45974c0a9a3d25ed9d258626ff76cfc3b077
+SHA1 (patch-pius-keyring-mgr) = f57bc0b7fd489c387e6aa192e0be9bf18052171d
 SHA1 (patch-setup.py) = 310344a8278e8e8274a1223bb77ab753470f1298
diff -r 3ec64af9aeb8 -r b2a670ef343d security/pius/patches/patch-doc_pius-keyring-mgr.1
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/security/pius/patches/patch-doc_pius-keyring-mgr.1        Mon Jan 13 20:52:04 2020 +0000
@@ -0,0 +1,24 @@
+$NetBSD: patch-doc_pius-keyring-mgr.1,v 1.1 2020/01/13 20:52:04 schmonz Exp $
+
+Use pkgsrc paths.
+
+--- doc/pius-keyring-mgr.1.orig        2019-07-05 21:11:13.000000000 +0000
++++ doc/pius-keyring-mgr.1
+@@ -14,7 +14,7 @@ must be the first argument, with options
+ .IP "\fB\-d\fP, \fB\-\-debug\fP"
+ Enable debugging output.
+ .IP "\fB\-g\fP \fIPATH\fP, \fB\-\-gpg\-path=\fP\fIPATH\fP"
+-Path to gpg binary. [default: \fI/usr/bin/gpg2\fP]
++Path to gpg binary. [default: \fI@PREFIX@/bin/gpg2\fP]
+ .IP "\fB\-r\fP \fIKEYRING\fP, \fB\-\-keyring=\fP\fIKEYRING\fP"
+ Use this keyring.
+ .IP "\fB\-v\fP, \fB\-\-verbose\fP"
+@@ -78,7 +78,7 @@ Scan a CSV file and an MBOX for emails a
+ found, using you%company.com@localhost as sender:
+ .PP
+ .nf
+-/usr/bin/pius\-keyring\-mgr build \-\-csv\-file /tmp/report \-\-mbox\-file
++@PREFIX@/bin/pius\-keyring\-mgr build \-\-csv\-file /tmp/report \-\-mbox\-file
+ /tmp/mbox \-\-mail you%company.com@localhost
+ .fi
+ .PP
diff -r 3ec64af9aeb8 -r b2a670ef343d security/pius/patches/patch-doc_pius-report.1
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/security/pius/patches/patch-doc_pius-report.1     Mon Jan 13 20:52:04 2020 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-doc_pius-report.1,v 1.1 2020/01/13 20:52:04 schmonz Exp $
+
+Use pkgsrc paths.
+
+--- doc/pius-report.1.orig     2019-07-05 21:11:13.000000000 +0000
++++ doc/pius-report.1
+@@ -12,7 +12,7 @@ out what they still need to do. The remi
+ .IP "\fB\-h\fP, \fB\-\-help\fP"
+ show this help message and exit
+ .IP "\fB\-b\fP \fIPATH\fP, \fB\-\-gpg\-path=\fP\fIPATH\fP"
+-Path to gpg binary. [default: \fI/usr/bin/gpg\fP]
++Path to gpg binary. [default: \fI@PREFIX@/bin/gpg\fP]
+ .IP "\fB\-d\fP, \fB\-\-debug\fP"
+ Enable debugging output.
+ .IP "\fB\-s\fP \fIKEYID\fP, \fB\-\-signer=\fP\fIKEYID\fP"
diff -r 3ec64af9aeb8 -r b2a670ef343d security/pius/patches/patch-doc_pius.1
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/security/pius/patches/patch-doc_pius.1    Mon Jan 13 20:52:04 2020 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-doc_pius.1,v 1.1 2020/01/13 20:52:04 schmonz Exp $
+
+Use pkgsrc paths.
+
+--- doc/pius.1.orig    2019-07-05 21:11:13.000000000 +0000
++++ doc/pius.1
+@@ -36,7 +36,7 @@ Sign all keys on the keyring. Requires \
+ .IP "\fB\-d\fP, \fB\-\-debug\fP"
+ Enable debugging output.
+ .IP "\fB\-b\fP \fIPATH\fP, \fB\-\-gpg\-path=\fP\fIPATH\fP"
+-Path to gpg binary. [default: \fI/usr/bin/gpg2\fP]
++Path to gpg binary. [default: \fI@PREFIX@/bin/gpg2\fP]
+ .IP "\fB\-e\fP, \fB\-\-encrypt\-outfiles\fP"
+ Encrypt output files with respective keys.
+ .IP "\fB\-H\fP \fIHOSTNAME\fP, \fB\-\-mail\-host=\fP\fIHOSTNAME\fP"
diff -r 3ec64af9aeb8 -r b2a670ef343d security/pius/patches/patch-libpius_constants.py
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/security/pius/patches/patch-libpius_constants.py  Mon Jan 13 20:52:04 2020 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-libpius_constants.py,v 1.1 2020/01/13 20:52:04 schmonz Exp $
+
+Use pkgsrc paths.
+
+--- libpius/constants.py.orig  2019-07-05 21:11:13.000000000 +0000
++++ libpius/constants.py
+@@ -7,7 +7,7 @@ VERSION = "3.0.0"
+ 
+ HOME = os.environ.get("HOME")
+ GNUPGHOME = os.environ.get("GNUPGHOME", os.path.join(HOME, ".gnupg"))
+-DEFAULT_GPG_PATH = "/usr/bin/gpg2"
++DEFAULT_GPG_PATH = "@PREFIX@/bin/gpg2"
+ DEFAULT_KEYRING = os.path.join(GNUPGHOME, "pubring.gpg")
+ DEFAULT_TMP_DIR = "/tmp/pius_tmp"
+ DEFAULT_OUT_DIR = "/tmp/pius_out"
diff -r 3ec64af9aeb8 -r b2a670ef343d security/pius/patches/patch-pius-keyring-mgr
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/security/pius/patches/patch-pius-keyring-mgr      Mon Jan 13 20:52:04 2020 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-pius-keyring-mgr,v 1.1 2020/01/13 20:52:04 schmonz Exp $
+
+Use pkgsrc paths.
+
+--- pius-keyring-mgr.orig      2019-07-05 21:11:13.000000000 +0000
++++ pius-keyring-mgr
+@@ -37,7 +37,7 @@ DEFAULT_KEYSERVERS = [
+     "pgp.mit.edu",
+     "keys.gnupg.net",
+ ]
+-DEFAULT_GPG_PATH = "/usr/bin/gpg"
++DEFAULT_GPG_PATH = "@PREFIX@/bin/gpg"
+ DEFAULT_CSV_DELIMITER = ","
+ DEFAULT_CSV_NAME_FIELD = 2
+ DEFAULT_CSV_EMAIL_FIELD = 3