Module Name: src
Committed By: agc
Date: Thu Nov 11 04:51:18 UTC 2010
Modified Files:
src/crypto/external/bsd/netpgp/dist/src/netpgpverify: Makefile
netpgpverify.1
Log Message:
Bring the netpgpverify(1) manual page into line with current output, etc.
With thanks to Jeremy Reed for the fixes.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/netpgpverify.1
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile
diff -u src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile:1.18 src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile:1.19
--- src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile:1.18 Thu Nov 4 07:01:53 2010
+++ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile Thu Nov 11 04:51:18 2010
@@ -49,8 +49,7 @@
PROGRAMS = $(bin_PROGRAMS)
am_netpgpverify_OBJECTS = netpgpverify-verify.$(OBJEXT)
netpgpverify_OBJECTS = $(am_netpgpverify_OBJECTS)
-netpgpverify_DEPENDENCIES = ../lib/libnetpgp.la
-netpgpverify_LDADD = ../lib/libnetpgp.la
+netpgpverify_DEPENDENCIES = ../lib/libnetpgp.la ../libmj/libmj.la
DEFAULT_INCLUDES = -I. -I$(top_builddir)/src/lib
depcomp = $(SHELL) $(top_srcdir)/buildaux/depcomp
am__depfiles_maybe = depfiles
@@ -67,7 +66,7 @@
DIST_SOURCES = $(netpgpverify_SOURCES)
man1dir = $(mandir)/man1
NROFF = nroff
-MANS = $(dist_man_MANS) $(man1_MANS)
+MANS = $(dist_man_MANS)
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -82,59 +81,52 @@
CANONICAL_HOST = i386-unknown-netbsdelf5.99.26
CC = gcc
CCDEPMODE = depmode=gcc3
-CFLAGS = -g -O2 -I/usr/include
+CFLAGS = -g -O2
CPP = gcc -E
-CPPFLAGS = -I/usr/include
-CXX = g++
-CXXCPP = g++ -E
-CXXDEPMODE = depmode=gcc3
-CXXFLAGS = -g -O2
+CPPFLAGS =
CYGPATH_W = echo
DEFS = -DHAVE_CONFIG_H
DEPDIR = .deps
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO = /bin/echo
+DSYMUTIL =
+DUMPBIN =
ECHO_C =
ECHO_N = -n
ECHO_T =
EGREP = /usr/bin/grep -E
EXEEXT =
-F77 =
-FFLAGS =
-FGREP = @FGREP@
+FGREP = /usr/bin/grep -F
GREP = /usr/bin/grep
INSTALL = /usr/bin/install -c
INSTALL_DATA = ${INSTALL} -m 644
INSTALL_PROGRAM = ${INSTALL}
INSTALL_SCRIPT = ${INSTALL}
INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
-LD = @LD@
-LDFLAGS = -L/usr/lib
+LD = /usr/bin/ld
+LDFLAGS =
LIBOBJS =
-LIBS = -lcrypto -lbz2 -lz -lssl -lcrypto
+LIBS = -lcrypto -lbz2 -lz
LIBTOOL = $(SHELL) $(top_builddir)/libtool
-LIPO = @LIPO@
+LIPO =
LN_S = ln -s
LTLIBOBJS =
MAINT = #
MAKEINFO = ${SHELL} /usr/src/crypto/external/bsd/netpgp/dist/buildaux/missing --run makeinfo
MKDIR_P = ../../buildaux/install-sh -c -d
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
+NM = /usr/bin/nm -B
+NMEDIT =
+OBJDUMP = objdump
OBJEXT = o
OPENSSL_INCLUDES = -I/usr/include
OPENSSL_LDFLAGS = -L/usr/lib
OPENSSL_LIBS = -lssl -lcrypto
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
+OTOOL =
+OTOOL64 =
PACKAGE = netpgp
PACKAGE_BUGREPORT = Alistair Crooks <[email protected]> c0596823
PACKAGE_NAME = netpgp
-PACKAGE_STRING = netpgp 20101103
+PACKAGE_STRING = netpgp 20101107
PACKAGE_TARNAME = netpgp
-PACKAGE_VERSION = 20101103
+PACKAGE_VERSION = 20101107
PATH_SEPARATOR = :
PKG_CONFIG = /usr/pkg/bin/pkg-config
RANLIB = ranlib
@@ -142,16 +134,14 @@
SET_MAKE =
SHELL = /bin/ksh
STRIP = strip
-VERSION = 20101103
+VERSION = 20101107
WARNCFLAGS = -Werror -Wall -Wpointer-arith
abs_builddir = /usr/src/crypto/external/bsd/netpgp/dist/src/netpgpverify
abs_srcdir = /usr/src/crypto/external/bsd/netpgp/dist/src/netpgpverify
abs_top_builddir = /usr/src/crypto/external/bsd/netpgp/dist
abs_top_srcdir = /usr/src/crypto/external/bsd/netpgp/dist
ac_ct_CC = gcc
-ac_ct_CXX = g++
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-ac_ct_F77 =
+ac_ct_DUMPBIN =
am__include = include
am__leading_dot = .
am__quote =
@@ -182,7 +172,7 @@
libexecdir = ${exec_prefix}/libexec
localedir = ${datarootdir}/locale
localstatedir = ${prefix}/var
-lt_ECHO = @lt_ECHO@
+lt_ECHO = /bin/echo
mandir = ${datarootdir}/man
mkdir_p = $(top_builddir)/buildaux/install-sh -c -d
oldincludedir = /usr/include
@@ -201,8 +191,7 @@
AM_CFLAGS = $(WARNCFLAGS)
netpgpverify_SOURCES = verify.c
netpgpverify_CPPFLAGS = -I$(top_srcdir)/include
-netpgpverify_LDADD = ../lib/libnetpgp.la
-man1_MANS = netpgpverify.1
+netpgpverify_LDADD = ../lib/libnetpgp.la ../libmj/libmj.la
dist_man_MANS = netpgpverify.1
all: all-am
Index: src/crypto/external/bsd/netpgp/dist/src/netpgpverify/netpgpverify.1
diff -u src/crypto/external/bsd/netpgp/dist/src/netpgpverify/netpgpverify.1:1.3 src/crypto/external/bsd/netpgp/dist/src/netpgpverify/netpgpverify.1:1.4
--- src/crypto/external/bsd/netpgp/dist/src/netpgpverify/netpgpverify.1:1.3 Wed Nov 3 02:36:13 2010
+++ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/netpgpverify.1 Thu Nov 11 04:51:18 2010
@@ -1,4 +1,4 @@
-.\" $NetBSD: netpgpverify.1,v 1.3 2010/11/03 02:36:13 agc Exp $
+.\" $NetBSD: netpgpverify.1,v 1.4 2010/11/11 04:51:18 agc Exp $
.\"
.\" Copyright (c) 2009 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -27,7 +27,7 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd June 6, 2009
+.Dd November 10, 2010
.Dt NETPGPVERIFY 1
.Os
.Sh NAME
@@ -63,7 +63,7 @@
is such a common operation that a single, much smaller,
standalone program can be used.
.Pp
-The following commands are used to sign and verify signatures:
+The following commands are used to verify signatures:
.Bl -tag -width Ar
.It Fl Fl coredumps
In normal processing,
@@ -101,25 +101,29 @@
requests.
.El
.Sh SIGNING AND VERIFICATION
-Signing and verification of a file is best viewed using the following example:
+Verification of a file's signature is best viewed using the following example:
.Bd -literal
% netpgp --sign [email protected] a
-pub 2048/RSA (Encrypt or Sign) 1b68dcfcc0596823 2004-01-12
-Key fingerprint: d415 9deb 336d e4cc cdfa 00cd 1b68 dcfc c059 6823
-uid Alistair Crooks \*[lt][email protected]\*[gt]
-uid Alistair Crooks \*[lt][email protected]\*[gt]
-uid Alistair Crooks \*[lt][email protected]\*[gt]
-uid Alistair Crooks \*[lt][email protected]\*[gt]
+signature 2048/RSA (Encrypt or Sign) 1b68dcfcc0596823 2004-01-12
+Key fingerprint: d415 9deb 336d e4cc cdfa 00cd 1b68 dcfc c059 6823
+uid Alistair Crooks \*[lt][email protected]\*[gt]
+uid Alistair Crooks \*[lt][email protected]\*[gt]
+uid Alistair Crooks \*[lt][email protected]\*[gt]
+uid Alistair Crooks \*[lt][email protected]\*[gt]
+uid Alistair Crooks (Yahoo!) \*[lt][email protected]\*[gt]
+encryption 2048/RSA (Encrypt or Sign) 79deb61e488eee74 2004-01-12
netpgp passphrase:
% netpgpverify a.gpg
Good signature for a.gpg made Thu Jan 29 03:06:00 2009
using RSA (Encrypt or Sign) key 1B68DCFCC0596823
-pub 2048/RSA (Encrypt or Sign) 1b68dcfcc0596823 2004-01-12
-Key fingerprint: d415 9deb 336d e4cc cdfa 00cd 1b68 dcfc c059 6823
-uid Alistair Crooks \*[lt][email protected]\*[gt]
-uid Alistair Crooks \*[lt][email protected]\*[gt]
-uid Alistair Crooks \*[lt][email protected]\*[gt]
-uid Alistair Crooks \*[lt][email protected]\*[gt]
+signature 2048/RSA (Encrypt or Sign) 1b68dcfcc0596823 2004-01-12
+Key fingerprint: d415 9deb 336d e4cc cdfa 00cd 1b68 dcfc c059 6823
+uid Alistair Crooks \*[lt][email protected]\*[gt]
+uid Alistair Crooks \*[lt][email protected]\*[gt]
+uid Alistair Crooks \*[lt][email protected]\*[gt]
+uid Alistair Crooks \*[lt][email protected]\*[gt]
+uid Alistair Crooks (Yahoo!) \*[lt][email protected]\*[gt]
+encryption 2048/RSA (Encrypt or Sign) 79deb61e488eee74 2004-01-12
%
.Ed
.Pp
