[src/trunk]: src/crypto/external/bsd/netpgp/dist/src Escape hyphens properly ...

[agc <agc%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/24a56b40897d
branches:  trunk
changeset: 758353:24a56b40897d
user:      agc <agc%NetBSD.org@localhost>
date:      Wed Nov 03 02:36:12 2010 +0000

description:
Escape hyphens properly in manual pages, so that groff can handle them.

Patch from Peter Pentchev in PR 44026.

diffstat:

 crypto/external/bsd/netpgp/dist/src/libpaa/server.c             |   2 +-
 crypto/external/bsd/netpgp/dist/src/netpgp/netpgp.1             |  22 ++--
 crypto/external/bsd/netpgp/dist/src/netpgpkeys/netpgpkeys.1     |  42 +++++-----
 crypto/external/bsd/netpgp/dist/src/netpgpverify/netpgpverify.1 |   4 +-
 4 files changed, 35 insertions(+), 35 deletions(-)

diffs (236 lines):

diff -r 3c1d2626f6b2 -r 24a56b40897d crypto/external/bsd/netpgp/dist/src/libpaa/server.c
--- a/crypto/external/bsd/netpgp/dist/src/libpaa/server.c       Wed Nov 03 02:27:56 2010 +0000
+++ b/crypto/external/bsd/netpgp/dist/src/libpaa/server.c       Wed Nov 03 02:36:12 2010 +0000
@@ -94,7 +94,7 @@
        /* write challenge to temp file */
        paa_write_file("challenge", buf, cc);
        /* get the client to authenticate via paa, writing to temp response file */
-       system("clnt/paaclient -r authentication%bigco.com@localhost < challenge > response");
+       system("client/paaclient -r authentication%bigco.com@localhost < challenge > response");
        /* read in response */
        cc = paa_read_file("response", buf, sizeof(buf));
        if (!paa_check_response(&challenge, &id, &netpgp, buf)) {
diff -r 3c1d2626f6b2 -r 24a56b40897d crypto/external/bsd/netpgp/dist/src/netpgp/netpgp.1
--- a/crypto/external/bsd/netpgp/dist/src/netpgp/netpgp.1       Wed Nov 03 02:27:56 2010 +0000
+++ b/crypto/external/bsd/netpgp/dist/src/netpgp/netpgp.1       Wed Nov 03 02:36:12 2010 +0000
@@ -1,4 +1,4 @@
-.\" $NetBSD: netpgp.1,v 1.14 2010/08/13 18:29:41 agc Exp $
+.\" $NetBSD: netpgp.1,v 1.15 2010/11/03 02:36:12 agc Exp $
 .\"
 .\" Copyright (c) 2009 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -42,7 +42,7 @@
 .Nm
 .Fl Fl decrypt
 .Op Fl Fl output Ns = Ns Ar filename
-.Op Fl Fl pass-fd Ns = Ns Ar fd
+.Op Fl Fl pass\-fd Ns = Ns Ar fd
 .Op options
 .Ar file ...
 .Pp
@@ -52,7 +52,7 @@
 .Op Fl Fl detach
 .Op Fl Fl hash Ns = Ns Ar algorithm
 .Op Fl Fl output Ns = Ns Ar filename
-.Op Fl Fl pass-fd Ns = Ns Ar fd
+.Op Fl Fl pass\-fd Ns = Ns Ar fd
 .Op Fl Fl from Ns = Ns Ar sig-valid-from
 .Op Fl Fl duration Ns = Ns Ar sig-valid-duration
 .Op options
@@ -69,12 +69,12 @@
 .Nm
 .Fl Fl clearsign
 .Op Fl Fl output Ns = Ns Ar filename
-.Op Fl Fl pass-fd Ns = Ns Ar fd
+.Op Fl Fl pass\-fd Ns = Ns Ar fd
 .Op options
 .Ar file ...
 .Nm
-.Fl Fl list-packets
-.Op Fl Fl pass-fd Ns = Ns Ar fd
+.Fl Fl list\-packets
+.Op Fl Fl pass\-fd Ns = Ns Ar fd
 .Ar file ...
 .Nm
 .Fl Fl version
@@ -93,7 +93,7 @@
 .br
 .Op Fl Fl results Ns = Ns Ar filename
 .br
-.Op Fl Fl ssh-keys
+.Op Fl Fl ssh\-keys
 .br
 .Op Fl Fl userid Ns = Ns Ar userid
 .br
@@ -142,7 +142,7 @@
 and imported (i.e. users who have signed our public key).
 .Pp
 The
-.Fl Fl list-packets
+.Fl Fl list\-packets
 command can be used for debugging purposes.
 .Pp
 The following commands are used to sign and verify signatures:
@@ -181,7 +181,7 @@
 .Xr getpass 3 .
 .It Fl Fl encrypt
 Use the user's public key to encrypt the files named on the command line.
-.It Fl Fl list-packets
+.It Fl Fl list\-packets
 List all the
 .Dq packets
 in an encrypted or signed file.
@@ -237,7 +237,7 @@
 specifies a filename to which the results of the operation
 should be sent.
 The default is to send the results to stderr.
-.It Fl Fl ssh-keys
+.It Fl Fl ssh\-keys
 specifies that the public and private keys should be taken
 from the
 .Xr ssh 1
@@ -258,7 +258,7 @@
 The trust for a signed key is given by the other signers of that key.
 The 16 hexadecimal digit user identity should be used when specifying
 user identities - email addresses and names are provided as aliases.
-.It Fl Fl pass-fd Ns = Ns Ar fd
+.It Fl Fl pass\-fd Ns = Ns Ar fd
 This option is intended for the use of external programs which may
 like to use the
 .Xr libnetpgp 3
diff -r 3c1d2626f6b2 -r 24a56b40897d crypto/external/bsd/netpgp/dist/src/netpgpkeys/netpgpkeys.1
--- a/crypto/external/bsd/netpgp/dist/src/netpgpkeys/netpgpkeys.1       Wed Nov 03 02:27:56 2010 +0000
+++ b/crypto/external/bsd/netpgp/dist/src/netpgpkeys/netpgpkeys.1       Wed Nov 03 02:36:12 2010 +0000
@@ -1,4 +1,4 @@
-.\" $NetBSD: netpgpkeys.1,v 1.14 2010/08/13 18:29:41 agc Exp $
+.\" $NetBSD: netpgpkeys.1,v 1.15 2010/11/03 02:36:13 agc Exp $
 .\"
 .\" Copyright (c) 2009, 2010 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -35,27 +35,27 @@
 .Nd PGP key management utility
 .Sh SYNOPSIS
 .Nm
-.Fl Fl export-key
+.Fl Fl export\-key
 .Op options
 .Ar file ...
 .Nm
-.Fl Fl find-key
+.Fl Fl find\-key
 .Op options
 .Ar file ...
 .Nm
-.Fl Fl generate-key
+.Fl Fl generate\-key
 .Op options
 .Ar file ...
 .Nm
-.Fl Fl import-key
+.Fl Fl import\-key
 .Op options
 .Ar file ...
 .Nm
-.Fl Fl list-keys
+.Fl Fl list\-keys
 .Op options
 .Ar file ...
 .Nm
-.Fl Fl list-sigs
+.Fl Fl list\-sigs
 .Op options
 .Ar file ...
 .Nm
@@ -137,12 +137,12 @@
 .Nm
 is to maintain keyrings.
 Key and keyring management commands available are:
-.Fl Fl export-key ,
-.Fl Fl find-key ,
-.Fl Fl generate-key ,
-.Fl Fl import-key ,
+.Fl Fl export\-key ,
+.Fl Fl find\-key ,
+.Fl Fl generate\-key ,
+.Fl Fl import\-key ,
 and
-.Fl Fl list-keys .
+.Fl Fl list\-keys .
 Keyrings are collections of public keys belonging to other users.
 By using other means of identification, it is possible to establish
 the bona fides of other users.
@@ -157,14 +157,14 @@
 Key and keyring management can be done with the
 following commands:
 .Bl -tag -width Ar
-.It Fl Fl export-key
+.It Fl Fl export\-key
 Display the current public key in a format suitable for export.
 This can be used to place the keyring on one of the
 public key servers, for example.
-.It Fl Fl find-key
+.It Fl Fl find\-key
 Find the appropriate public key from the current keyring.
 If no keyring is provided, the user's public keyring is used.
-.It Fl Fl generate-key
+.It Fl Fl generate\-key
 This command is used to generate a new public and private key pair.
 If provided on the command line, the argument will be given to the
 key generation routine to be used as the identity of the key.
@@ -176,14 +176,14 @@
 At present, only RSA keys can be generated.
 The hash algorithm and keysize can be specified on the command
 line.
-.It Fl Fl import-key
+.It Fl Fl import\-key
 Import a public key as retrieved from one of the public key servers.
 This is in the form of a file which has previously been
 retrieved from elsewhere.
-.It Fl Fl list-keys
+.It Fl Fl list\-keys
 List all the public keys in the current keyring.
 If no keyring is provided, the user's public keyring is used.
-.It Fl Fl list-sigs
+.It Fl Fl list\-sigs
 List all the public keys in the current keyring, along with
 the sub-key signatures which provide the key with trust.
 If no keyring is provided, the user's public keyring is used.
@@ -280,9 +280,9 @@
 .Nm
 .Dq fingerprint .
 This can be found in the output from normal
-.Fl Fl list-keys
+.Fl Fl list\-keys
 and
-.Fl Fl list-sigs
+.Fl Fl list\-sigs
 commands.
 .Sh PASS PHRASES
 The pass phrase cannot be changed by
@@ -330,7 +330,7 @@
 .Pp
 The following is an example of RSA key generation:
 .Bd -literal
-% netpgpkeys --generate-key
+% netpgpkeys --generate\-key
 netpgp: default key set to "C0596823"
 pub 2048/RSA (Encrypt or Sign) 5bc707d1b495aaf2 2010-04-14
 Key fingerprint: 08cb 4867 eeed 454c ce30 610d 5bc7 07d1 b495 aaf2
diff -r 3c1d2626f6b2 -r 24a56b40897d crypto/external/bsd/netpgp/dist/src/netpgpverify/netpgpverify.1
--- a/crypto/external/bsd/netpgp/dist/src/netpgpverify/netpgpverify.1   Wed Nov 03 02:27:56 2010 +0000
+++ b/crypto/external/bsd/netpgp/dist/src/netpgpverify/netpgpverify.1   Wed Nov 03 02:36:12 2010 +0000
@@ -1,4 +1,4 @@
-.\" $NetBSD: netpgpverify.1,v 1.2 2010/05/14 17:27:35 joerg Exp $
+.\" $NetBSD: netpgpverify.1,v 1.3 2010/11/03 02:36:13 agc Exp $
 .\"
 .\" Copyright (c) 2009 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -92,7 +92,7 @@
 may be redirected.
 The default is to send the verified output to stdout,
 and this may also be specified using the
-.Dq -
+.Dq \-
 value.
 .It Fl Fl verbose
 This option can be used to view information during