CVS commit: pkgsrc/security/netpgp

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

Module Name:    pkgsrc
Committed By:   khorben
Date:           Thu Mar 15 20:21:52 UTC 2018

Modified Files:
        pkgsrc/security/netpgp: Makefile distinfo
Added Files:
        pkgsrc/security/netpgp/patches: patch-src_lib_signature.c

Log Message:
Output signatures to the standard output for "-"

This is to reflect the behaviour documented in netpgp(1).

Originally submitted on tech-pkg@ as:
[PATCH 09/11] Output signatures to the standard output for "-"

Only modified for consistency with the coding style; as also applied in
NetBSD's src repository.


To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 pkgsrc/security/netpgp/Makefile
cvs rdiff -u -r1.22 -r1.23 pkgsrc/security/netpgp/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/security/netpgp/patches/patch-src_lib_signature.c

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

Modified files:

Index: pkgsrc/security/netpgp/Makefile
diff -u pkgsrc/security/netpgp/Makefile:1.28 pkgsrc/security/netpgp/Makefile:1.29
--- pkgsrc/security/netpgp/Makefile:1.28        Thu Mar 15 20:14:14 2018
+++ pkgsrc/security/netpgp/Makefile     Thu Mar 15 20:21:52 2018
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.28 2018/03/15 20:14:14 khorben Exp $
+# $NetBSD: Makefile,v 1.29 2018/03/15 20:21:52 khorben Exp $
 
 DISTNAME=              netpgp-20140220
-PKGREVISION=           6
+PKGREVISION=           7
 CATEGORIES=            security
 MASTER_SITES=          ${MASTER_SITE_LOCAL}
 

Index: pkgsrc/security/netpgp/distinfo
diff -u pkgsrc/security/netpgp/distinfo:1.22 pkgsrc/security/netpgp/distinfo:1.23
--- pkgsrc/security/netpgp/distinfo:1.22        Thu Mar 15 20:14:14 2018
+++ pkgsrc/security/netpgp/distinfo     Thu Mar 15 20:21:52 2018
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.22 2018/03/15 20:14:14 khorben Exp $
+$NetBSD: distinfo,v 1.23 2018/03/15 20:21:52 khorben Exp $
 
 SHA1 (netpgp-20140220.tar.gz) = 815418cbae5d02a1385cd7947618303e5aa06d5c
 RMD160 (netpgp-20140220.tar.gz) = 970f55292852d5dbfde3eb17a5fefd6a7c820c4e
@@ -6,4 +6,5 @@ SHA512 (netpgp-20140220.tar.gz) = ec6cfa
 Size (netpgp-20140220.tar.gz) = 1521820 bytes
 SHA1 (patch-src_lib_keyring.c) = b924af4877aaab98e542425b5d9427830ddd5b75
 SHA1 (patch-src_lib_reader.c) = 2ebaddebbc2f6f42f7391933ebfef39e3a73a367
+SHA1 (patch-src_lib_signature.c) = 7e1c71b5df48bba1d5213ec5ea946db9ed1ba8d4
 SHA1 (patch-src_netpgp_netpgp.1) = a9b2345ced1d80ee14a4e100181fa34121543509

Added files:

Index: pkgsrc/security/netpgp/patches/patch-src_lib_signature.c
diff -u /dev/null pkgsrc/security/netpgp/patches/patch-src_lib_signature.c:1.1
--- /dev/null   Thu Mar 15 20:21:52 2018
+++ pkgsrc/security/netpgp/patches/patch-src_lib_signature.c    Thu Mar 15 20:21:52 2018
@@ -0,0 +1,19 @@
+$NetBSD: patch-src_lib_signature.c,v 1.1 2018/03/15 20:21:52 khorben Exp $
+
+Output signatures to the standard output for "-".
+
+--- src/lib/signature.c.orig   2012-03-05 02:20:18.000000000 +0000
++++ src/lib/signature.c
+@@ -903,7 +903,11 @@ open_output_file(pgp_output_t **output,
+ 
+       /* setup output file */
+       if (outname) {
+-              fd = pgp_setup_file_write(output, outname, overwrite);
++              if (strcmp(outname, "-") == 0) {
++                      fd = pgp_setup_file_write(output, NULL, overwrite);
++              } else {
++                      fd = pgp_setup_file_write(output, outname, overwrite);
++              }
+       } else {
+               unsigned        flen = (unsigned)(strlen(inname) + 4 + 1);
+               char           *f = NULL;