summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkhorben <khorben@pkgsrc.org>2018-03-15 20:14:14 +0000
committerkhorben <khorben@pkgsrc.org>2018-03-15 20:14:14 +0000
commit4e7b670036fa3a9dd819c9bdedc54fcdc83665af (patch)
treecef2d926ff566196348280070c5ee52f9be6317a
parentbfa8be7f97b9161baa21dc889179e097aa581c80 (diff)
downloadpkgsrc-4e7b670036fa3a9dd819c9bdedc54fcdc83665af.tar.gz
Correct option "--armor" and document alternate option "--detach"
Originally submitted on tech-pkg@ as: [PATCH 07/11] Correct option "--armor" [PATCH 08/11] Also document alternate option "--detach" As also applied in NetBSD's src repository.
-rw-r--r--security/netpgp/Makefile4
-rw-r--r--security/netpgp/distinfo3
-rw-r--r--security/netpgp/patches/patch-src_netpgp_netpgp.125
3 files changed, 29 insertions, 3 deletions
diff --git a/security/netpgp/Makefile b/security/netpgp/Makefile
index c8c78f0049b..0ccfde5778a 100644
--- a/security/netpgp/Makefile
+++ b/security/netpgp/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.27 2018/03/15 20:00:43 khorben Exp $
+# $NetBSD: Makefile,v 1.28 2018/03/15 20:14:14 khorben Exp $
DISTNAME= netpgp-20140220
-PKGREVISION= 5
+PKGREVISION= 6
CATEGORIES= security
MASTER_SITES= ${MASTER_SITE_LOCAL}
diff --git a/security/netpgp/distinfo b/security/netpgp/distinfo
index f2b12cbb69e..43ce9d6f0cf 100644
--- a/security/netpgp/distinfo
+++ b/security/netpgp/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.21 2018/03/15 20:00:43 khorben Exp $
+$NetBSD: distinfo,v 1.22 2018/03/15 20:14:14 khorben Exp $
SHA1 (netpgp-20140220.tar.gz) = 815418cbae5d02a1385cd7947618303e5aa06d5c
RMD160 (netpgp-20140220.tar.gz) = 970f55292852d5dbfde3eb17a5fefd6a7c820c4e
@@ -6,3 +6,4 @@ SHA512 (netpgp-20140220.tar.gz) = ec6cfa0131cd50aee273b81cd64f448258121d7e9c8d49
Size (netpgp-20140220.tar.gz) = 1521820 bytes
SHA1 (patch-src_lib_keyring.c) = b924af4877aaab98e542425b5d9427830ddd5b75
SHA1 (patch-src_lib_reader.c) = 2ebaddebbc2f6f42f7391933ebfef39e3a73a367
+SHA1 (patch-src_netpgp_netpgp.1) = a9b2345ced1d80ee14a4e100181fa34121543509
diff --git a/security/netpgp/patches/patch-src_netpgp_netpgp.1 b/security/netpgp/patches/patch-src_netpgp_netpgp.1
new file mode 100644
index 00000000000..ed990504fc3
--- /dev/null
+++ b/security/netpgp/patches/patch-src_netpgp_netpgp.1
@@ -0,0 +1,25 @@
+$NetBSD: patch-src_netpgp_netpgp.1,v 1.1 2018/03/15 20:14:14 khorben Exp $
+
+Correct option "--armor".
+Also document alternate option "--detach".
+
+--- src/netpgp/netpgp.1.orig 2014-02-17 07:23:18.000000000 +0000
++++ src/netpgp/netpgp.1
+@@ -203,7 +203,7 @@ library.
+ In addition to one of the preceding commands, a number of qualifiers
+ or options may be given.
+ .Bl -tag -width Ar
+-.It Fl Fl armour , Fl armor
++.It Fl Fl armour , Fl Fl armor
+ This option, however it is spelled, wraps the signature as an
+ ASCII-encoded piece of text, for ease of use.
+ .It Fl Fl cipher Ar ciphername
+@@ -216,7 +216,7 @@ access to the cipher used.
+ The default cipher algorithm is the
+ .Dq CAST5
+ algorithm.
+-.It Fl Fl detached
++.It Fl Fl detach , Fl Fl detached
+ When signing a file, place the resulting signature in a separate
+ file from the one being signed.
+ .It Fl Fl hash-alg Ar hash-algorithm