Module Name: src
Committed By: agc
Date: Wed Apr 14 06:31:23 UTC 2010
Modified Files:
src/crypto/external/bsd/netpgp/dist: TODO configure configure.ac
src/crypto/external/bsd/netpgp/dist/src/lib: version.h
src/crypto/external/bsd/netpgp/dist/src/netpgp: Makefile
src/crypto/external/bsd/netpgp/dist/src/netpgpverify: Makefile verify.c
Log Message:
Update netpgp to version 3.99.1
Changes to 3.99.1/20100413
+ bump major command versions to be compatible with shlib major
+ fixed a number of bugs in (RSA) key generation
+ modified netpgpkeys(1) to take an optional argument to --generate-key
if the argument is provided, it is used as the equivalent of the gecos
field for the newly-generated key.
To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 src/crypto/external/bsd/netpgp/dist/TODO
cvs rdiff -u -r1.28 -r1.29 src/crypto/external/bsd/netpgp/dist/configure
cvs rdiff -u -r1.29 -r1.30 src/crypto/external/bsd/netpgp/dist/configure.ac
cvs rdiff -u -r1.31 -r1.32 \
src/crypto/external/bsd/netpgp/dist/src/lib/version.h
cvs rdiff -u -r1.12 -r1.13 \
src/crypto/external/bsd/netpgp/dist/src/netpgp/Makefile
cvs rdiff -u -r1.11 -r1.12 \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile
cvs rdiff -u -r1.8 -r1.9 \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/verify.c
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/TODO
diff -u src/crypto/external/bsd/netpgp/dist/TODO:1.36 src/crypto/external/bsd/netpgp/dist/TODO:1.37
--- src/crypto/external/bsd/netpgp/dist/TODO:1.36 Tue Mar 16 04:14:29 2010
+++ src/crypto/external/bsd/netpgp/dist/TODO Wed Apr 14 06:31:23 2010
@@ -2,7 +2,6 @@
=====
agent
agentctl
-make netpgpkeys work - add, import, commit, update, sign, passphrase
convert to and from ascii armored sigs
gpgme compat lib
return userids from successful verify, and then print id out if required
@@ -94,3 +93,4 @@
add revocation information to public key display
--list-sigs - these come out in __ops_check_subkey_sig()
hkp to include sigs too
+make netpgpkeys work - add, import, commit, update, sign, passphrase
Index: src/crypto/external/bsd/netpgp/dist/configure
diff -u src/crypto/external/bsd/netpgp/dist/configure:1.28 src/crypto/external/bsd/netpgp/dist/configure:1.29
--- src/crypto/external/bsd/netpgp/dist/configure:1.28 Tue Mar 16 04:14:29 2010
+++ src/crypto/external/bsd/netpgp/dist/configure Wed Apr 14 06:31:23 2010
@@ -1,7 +1,7 @@
#! /bin/sh
-# From configure.ac Revision: 1.28 .
+# From configure.ac Revision: 1.29 .
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63 for netpgp 20100315.
+# Generated by GNU Autoconf 2.63 for netpgp 20100413.
#
# Report bugs to <Alistair Crooks <a...@netbsd.org> c0596823>.
#
@@ -751,8 +751,8 @@
# Identity of this package.
PACKAGE_NAME='netpgp'
PACKAGE_TARNAME='netpgp'
-PACKAGE_VERSION='20100315'
-PACKAGE_STRING='netpgp 20100315'
+PACKAGE_VERSION='20100413'
+PACKAGE_STRING='netpgp 20100413'
PACKAGE_BUGREPORT='Alistair Crooks <a...@netbsd.org> c0596823'
ac_unique_file="src/netpgp/netpgp.c"
@@ -1483,7 +1483,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures netpgp 20100315 to adapt to many kinds of systems.
+\`configure' configures netpgp 20100413 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1553,7 +1553,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of netpgp 20100315:";;
+ short | recursive ) echo "Configuration of netpgp 20100413:";;
esac
cat <<\_ACEOF
@@ -1660,7 +1660,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-netpgp configure 20100315
+netpgp configure 20100413
generated by GNU Autoconf 2.63
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1674,7 +1674,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by netpgp $as_me 20100315, which was
+It was created by netpgp $as_me 20100413, which was
generated by GNU Autoconf 2.63. Invocation command line was
$ $0 $@
@@ -2561,7 +2561,7 @@
# Define the identity of the package.
PACKAGE='netpgp'
- VERSION='20100315'
+ VERSION='20100413'
cat >>confdefs.h <<_ACEOF
@@ -22306,7 +22306,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by netpgp $as_me 20100315, which was
+This file was extended by netpgp $as_me 20100413, which was
generated by GNU Autoconf 2.63. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -22369,7 +22369,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_version="\\
-netpgp config.status 20100315
+netpgp config.status 20100413
configured by $0, generated by GNU Autoconf 2.63,
with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
Index: src/crypto/external/bsd/netpgp/dist/configure.ac
diff -u src/crypto/external/bsd/netpgp/dist/configure.ac:1.29 src/crypto/external/bsd/netpgp/dist/configure.ac:1.30
--- src/crypto/external/bsd/netpgp/dist/configure.ac:1.29 Tue Mar 16 04:14:29 2010
+++ src/crypto/external/bsd/netpgp/dist/configure.ac Wed Apr 14 06:31:23 2010
@@ -1,10 +1,10 @@
-# $NetBSD: configure.ac,v 1.29 2010/03/16 04:14:29 agc Exp $
+# $NetBSD: configure.ac,v 1.30 2010/04/14 06:31:23 agc Exp $
#
# Process this file with autoconf to produce a configure script.
-AC_INIT([netpgp],[20100315],[Alistair Crooks <a...@netbsd.org> c0596823])
+AC_INIT([netpgp],[20100413],[Alistair Crooks <a...@netbsd.org> c0596823])
AC_PREREQ(2.63)
-AC_REVISION([$Revision: 1.29 $])
+AC_REVISION([$Revision: 1.30 $])
AS_SHELL_SANITIZE
Index: src/crypto/external/bsd/netpgp/dist/src/lib/version.h
diff -u src/crypto/external/bsd/netpgp/dist/src/lib/version.h:1.31 src/crypto/external/bsd/netpgp/dist/src/lib/version.h:1.32
--- src/crypto/external/bsd/netpgp/dist/src/lib/version.h:1.31 Tue Mar 16 04:14:29 2010
+++ src/crypto/external/bsd/netpgp/dist/src/lib/version.h Wed Apr 14 06:31:23 2010
@@ -58,7 +58,7 @@
#endif
/* development versions have .99 suffix */
-#define NETPGP_BASE_VERSION "2.99.2"
+#define NETPGP_BASE_VERSION "3.99.1"
#define NETPGP_VERSION_CAT(a, b) "NetPGP portable " a "/[" b "]"
#define NETPGP_VERSION_STRING \
Index: src/crypto/external/bsd/netpgp/dist/src/netpgp/Makefile
diff -u src/crypto/external/bsd/netpgp/dist/src/netpgp/Makefile:1.12 src/crypto/external/bsd/netpgp/dist/src/netpgp/Makefile:1.13
--- src/crypto/external/bsd/netpgp/dist/src/netpgp/Makefile:1.12 Sat Mar 13 23:30:41 2010
+++ src/crypto/external/bsd/netpgp/dist/src/netpgp/Makefile Wed Apr 14 06:31:23 2010
@@ -30,8 +30,8 @@
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-build_triplet = i386-unknown-netbsdelf5.99.20
-host_triplet = i386-unknown-netbsdelf5.99.20
+build_triplet = i386-unknown-netbsdelf5.99.26
+host_triplet = i386-unknown-netbsdelf5.99.26
bin_PROGRAMS = netpgp$(EXEEXT)
subdir = src/netpgp
DIST_COMMON = $(dist_man_MANS) $(srcdir)/Makefile.am \
@@ -76,8 +76,8 @@
AUTOHEADER = ${SHELL} /usr/src/crypto/external/bsd/netpgp/dist/buildaux/missing --run autoheader
AUTOM4TE = ${SHELL} /usr/src/crypto/external/bsd/netpgp/dist/buildaux/missing --run autom4te
AUTOMAKE = ${SHELL} /usr/src/crypto/external/bsd/netpgp/dist/buildaux/missing --run automake-1.10
-AWK = awk
-CANONICAL_HOST = i386-unknown-netbsdelf5.99.20
+AWK = mawk
+CANONICAL_HOST = i386-unknown-netbsdelf5.99.26
CC = gcc
CCDEPMODE = depmode=gcc3
CFLAGS = -g -O2
@@ -117,16 +117,16 @@
PACKAGE = netpgp
PACKAGE_BUGREPORT = Alistair Crooks <a...@netbsd.org> c0596823
PACKAGE_NAME = netpgp
-PACKAGE_STRING = netpgp 20100313
+PACKAGE_STRING = netpgp 20100413
PACKAGE_TARNAME = netpgp
-PACKAGE_VERSION = 20100313
+PACKAGE_VERSION = 20100413
PATH_SEPARATOR = :
RANLIB = ranlib
SED = /usr/bin/sed
SET_MAKE =
SHELL = /bin/ksh
STRIP = strip
-VERSION = 20100313
+VERSION = 20100413
WARNCFLAGS = -Werror -Wall -Wpointer-arith
abs_builddir = /usr/src/crypto/external/bsd/netpgp/dist/src/netpgp
abs_srcdir = /usr/src/crypto/external/bsd/netpgp/dist/src/netpgp
@@ -141,10 +141,10 @@
am__tar = ${AMTAR} chof - "$$tardir"
am__untar = ${AMTAR} xf -
bindir = ${exec_prefix}/bin
-build = i386-unknown-netbsdelf5.99.20
+build = i386-unknown-netbsdelf5.99.26
build_alias =
build_cpu = i386
-build_os = netbsdelf5.99.20
+build_os = netbsdelf5.99.26
build_vendor = unknown
builddir = .
datadir = ${datarootdir}
@@ -152,10 +152,10 @@
docdir = ${datarootdir}/doc/${PACKAGE_TARNAME}
dvidir = ${docdir}
exec_prefix = ${prefix}
-host = i386-unknown-netbsdelf5.99.20
+host = i386-unknown-netbsdelf5.99.26
host_alias =
host_cpu = i386
-host_os = netbsdelf5.99.20
+host_os = netbsdelf5.99.26
host_vendor = unknown
htmldir = ${docdir}
includedir = ${prefix}/include
Index: src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile
diff -u src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile:1.11 src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile:1.12
--- src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile:1.11 Sat Mar 13 23:30:41 2010
+++ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile Wed Apr 14 06:31:23 2010
@@ -30,8 +30,8 @@
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-build_triplet = i386-unknown-netbsdelf5.99.20
-host_triplet = i386-unknown-netbsdelf5.99.20
+build_triplet = i386-unknown-netbsdelf5.99.26
+host_triplet = i386-unknown-netbsdelf5.99.26
bin_PROGRAMS = netpgpverify$(EXEEXT)
subdir = src/netpgpverify
DIST_COMMON = $(dist_man_MANS) $(srcdir)/Makefile.am \
@@ -76,8 +76,8 @@
AUTOHEADER = ${SHELL} /usr/src/crypto/external/bsd/netpgp/dist/buildaux/missing --run autoheader
AUTOM4TE = ${SHELL} /usr/src/crypto/external/bsd/netpgp/dist/buildaux/missing --run autom4te
AUTOMAKE = ${SHELL} /usr/src/crypto/external/bsd/netpgp/dist/buildaux/missing --run automake-1.10
-AWK = awk
-CANONICAL_HOST = i386-unknown-netbsdelf5.99.20
+AWK = mawk
+CANONICAL_HOST = i386-unknown-netbsdelf5.99.26
CC = gcc
CCDEPMODE = depmode=gcc3
CFLAGS = -g -O2
@@ -117,16 +117,16 @@
PACKAGE = netpgp
PACKAGE_BUGREPORT = Alistair Crooks <a...@netbsd.org> c0596823
PACKAGE_NAME = netpgp
-PACKAGE_STRING = netpgp 20100313
+PACKAGE_STRING = netpgp 20100413
PACKAGE_TARNAME = netpgp
-PACKAGE_VERSION = 20100313
+PACKAGE_VERSION = 20100413
PATH_SEPARATOR = :
RANLIB = ranlib
SED = /usr/bin/sed
SET_MAKE =
SHELL = /bin/ksh
STRIP = strip
-VERSION = 20100313
+VERSION = 20100413
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
@@ -141,10 +141,10 @@
am__tar = ${AMTAR} chof - "$$tardir"
am__untar = ${AMTAR} xf -
bindir = ${exec_prefix}/bin
-build = i386-unknown-netbsdelf5.99.20
+build = i386-unknown-netbsdelf5.99.26
build_alias =
build_cpu = i386
-build_os = netbsdelf5.99.20
+build_os = netbsdelf5.99.26
build_vendor = unknown
builddir = .
datadir = ${datarootdir}
@@ -152,10 +152,10 @@
docdir = ${datarootdir}/doc/${PACKAGE_TARNAME}
dvidir = ${docdir}
exec_prefix = ${prefix}
-host = i386-unknown-netbsdelf5.99.20
+host = i386-unknown-netbsdelf5.99.26
host_alias =
host_cpu = i386
-host_os = netbsdelf5.99.20
+host_os = netbsdelf5.99.26
host_vendor = unknown
htmldir = ${docdir}
includedir = ${prefix}/include
Index: src/crypto/external/bsd/netpgp/dist/src/netpgpverify/verify.c
diff -u src/crypto/external/bsd/netpgp/dist/src/netpgpverify/verify.c:1.8 src/crypto/external/bsd/netpgp/dist/src/netpgpverify/verify.c:1.9
--- src/crypto/external/bsd/netpgp/dist/src/netpgpverify/verify.c:1.8 Tue Mar 16 04:14:30 2010
+++ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/verify.c Wed Apr 14 06:31:23 2010
@@ -55,7 +55,7 @@
#if defined(__NetBSD__)
__COPYRIGHT("@(#) Copyright (c) 2009 The NetBSD Foundation, Inc. All rights reserved.");
-__RCSID("$NetBSD: verify.c,v 1.8 2010/03/16 04:14:30 agc Exp $");
+__RCSID("$NetBSD: verify.c,v 1.9 2010/04/14 06:31:23 agc Exp $");
#endif
#include <sys/types.h>
@@ -161,7 +161,7 @@
#undef USE_SHA384
/* development versions have .99 suffix */
-#define NETPGP_BASE_VERSION "2.99.2"
+#define NETPGP_BASE_VERSION "3.99.1"
#define NETPGP_VERSION_CAT(a, b) "NetPGP portable " a "/[" b "]"
#define NETPGP_VERSION_STRING \
