Module Name: src
Committed By: agc
Date: Fri Mar 5 19:58:39 UTC 2010
Modified Files:
src/crypto/external/bsd/netpgp/dist: TODO configure configure.ac
src/crypto/external/bsd/netpgp/dist/src/lib: fastctype.h types.h
version.h
src/crypto/external/bsd/netpgp/dist/src/netpgp: Makefile
src/crypto/external/bsd/netpgp/dist/src/netpgpverify: Makefile verify.c
Log Message:
Changes to 1.99.21/20100305
+ clean up some lint
+ the obligatory ''build on mac os x fixes'' - <inttypes.h> header file
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/crypto/external/bsd/netpgp/dist/TODO
cvs rdiff -u -r1.24 -r1.25 src/crypto/external/bsd/netpgp/dist/configure
cvs rdiff -u -r1.25 -r1.26 src/crypto/external/bsd/netpgp/dist/configure.ac
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/netpgp/dist/src/lib/fastctype.h
cvs rdiff -u -r1.8 -r1.9 src/crypto/external/bsd/netpgp/dist/src/lib/types.h
cvs rdiff -u -r1.27 -r1.28 \
src/crypto/external/bsd/netpgp/dist/src/lib/version.h
cvs rdiff -u -r1.9 -r1.10 \
src/crypto/external/bsd/netpgp/dist/src/netpgp/Makefile
cvs rdiff -u -r1.8 -r1.9 \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile
cvs rdiff -u -r1.4 -r1.5 \
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.32 src/crypto/external/bsd/netpgp/dist/TODO:1.33
--- src/crypto/external/bsd/netpgp/dist/TODO:1.32 Fri Mar 5 16:01:09 2010
+++ src/crypto/external/bsd/netpgp/dist/TODO Fri Mar 5 19:58:38 2010
@@ -3,10 +3,10 @@
agent
agentctl
trust subpackets
+make netpgpkeys work - add, import, commit, update, sign, passphrase
convert to and from ascii armored sigs
gpgme compat lib
--list-sigs - these come out in __ops_check_subkey_sig()
-make netpgpkeys work - add, import, commit, update, sign, passphrase
return userids from successful verify, and then print id out if required
is get_passphrase_cb needed?
error logging
Index: src/crypto/external/bsd/netpgp/dist/configure
diff -u src/crypto/external/bsd/netpgp/dist/configure:1.24 src/crypto/external/bsd/netpgp/dist/configure:1.25
--- src/crypto/external/bsd/netpgp/dist/configure:1.24 Fri Mar 5 16:01:09 2010
+++ src/crypto/external/bsd/netpgp/dist/configure Fri Mar 5 19:58:38 2010
@@ -1,7 +1,7 @@
#! /bin/sh
-# From configure.ac Revision: 1.24 .
+# From configure.ac Revision: 1.25 .
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63 for netpgp 20100304.
+# Generated by GNU Autoconf 2.63 for netpgp 20100305.
#
# Report bugs to <Alistair Crooks <[email protected]> c0596823>.
#
@@ -751,8 +751,8 @@
# Identity of this package.
PACKAGE_NAME='netpgp'
PACKAGE_TARNAME='netpgp'
-PACKAGE_VERSION='20100304'
-PACKAGE_STRING='netpgp 20100304'
+PACKAGE_VERSION='20100305'
+PACKAGE_STRING='netpgp 20100305'
PACKAGE_BUGREPORT='Alistair Crooks <[email protected]> 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 20100304 to adapt to many kinds of systems.
+\`configure' configures netpgp 20100305 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 20100304:";;
+ short | recursive ) echo "Configuration of netpgp 20100305:";;
esac
cat <<\_ACEOF
@@ -1660,7 +1660,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-netpgp configure 20100304
+netpgp configure 20100305
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 20100304, which was
+It was created by netpgp $as_me 20100305, 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='20100304'
+ VERSION='20100305'
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 20100304, which was
+This file was extended by netpgp $as_me 20100305, 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 20100304
+netpgp config.status 20100305
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.25 src/crypto/external/bsd/netpgp/dist/configure.ac:1.26
--- src/crypto/external/bsd/netpgp/dist/configure.ac:1.25 Fri Mar 5 16:01:09 2010
+++ src/crypto/external/bsd/netpgp/dist/configure.ac Fri Mar 5 19:58:38 2010
@@ -1,10 +1,10 @@
-# $NetBSD: configure.ac,v 1.25 2010/03/05 16:01:09 agc Exp $
+# $NetBSD: configure.ac,v 1.26 2010/03/05 19:58:38 agc Exp $
#
# Process this file with autoconf to produce a configure script.
-AC_INIT([netpgp],[20100304],[Alistair Crooks <[email protected]> c0596823])
+AC_INIT([netpgp],[20100305],[Alistair Crooks <[email protected]> c0596823])
AC_PREREQ(2.63)
-AC_REVISION([$Revision: 1.25 $])
+AC_REVISION([$Revision: 1.26 $])
AS_SHELL_SANITIZE
Index: src/crypto/external/bsd/netpgp/dist/src/lib/fastctype.h
diff -u src/crypto/external/bsd/netpgp/dist/src/lib/fastctype.h:1.2 src/crypto/external/bsd/netpgp/dist/src/lib/fastctype.h:1.3
--- src/crypto/external/bsd/netpgp/dist/src/lib/fastctype.h:1.2 Fri Mar 5 16:01:09 2010
+++ src/crypto/external/bsd/netpgp/dist/src/lib/fastctype.h Fri Mar 5 19:58:38 2010
@@ -29,6 +29,10 @@
#ifndef FASTCTYPE_H_
#define FASTCTYPE_H_
+#ifdef HAVE_INTTYPES_H
+#include <inttypes.h>
+#endif
+
int fast_isalnum(uint8_t);
int fast_isalpha(uint8_t);
int fast_isascii(uint8_t);
Index: src/crypto/external/bsd/netpgp/dist/src/lib/types.h
diff -u src/crypto/external/bsd/netpgp/dist/src/lib/types.h:1.8 src/crypto/external/bsd/netpgp/dist/src/lib/types.h:1.9
--- src/crypto/external/bsd/netpgp/dist/src/lib/types.h:1.8 Fri Mar 5 16:01:10 2010
+++ src/crypto/external/bsd/netpgp/dist/src/lib/types.h Fri Mar 5 19:58:38 2010
@@ -46,10 +46,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
#ifndef TYPES_H_
#define TYPES_H_
+#ifdef HAVE_INTTYPES_H
+#include <inttypes.h>
+#endif
+
typedef struct __ops_io_t {
void *outs; /* output file stream */
void *errs; /* file stream to put error messages */
Index: src/crypto/external/bsd/netpgp/dist/src/lib/version.h
diff -u src/crypto/external/bsd/netpgp/dist/src/lib/version.h:1.27 src/crypto/external/bsd/netpgp/dist/src/lib/version.h:1.28
--- src/crypto/external/bsd/netpgp/dist/src/lib/version.h:1.27 Fri Mar 5 16:01:10 2010
+++ src/crypto/external/bsd/netpgp/dist/src/lib/version.h Fri Mar 5 19:58:38 2010
@@ -58,7 +58,7 @@
#endif
/* development versions have .99 suffix */
-#define NETPGP_BASE_VERSION "1.99.20"
+#define NETPGP_BASE_VERSION "1.99.21"
#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.9 src/crypto/external/bsd/netpgp/dist/src/netpgp/Makefile:1.10
--- src/crypto/external/bsd/netpgp/dist/src/netpgp/Makefile:1.9 Fri Mar 5 16:01:10 2010
+++ src/crypto/external/bsd/netpgp/dist/src/netpgp/Makefile Fri Mar 5 19:58:39 2010
@@ -117,16 +117,16 @@
PACKAGE = netpgp
PACKAGE_BUGREPORT = Alistair Crooks <[email protected]> c0596823
PACKAGE_NAME = netpgp
-PACKAGE_STRING = netpgp 20100304
+PACKAGE_STRING = netpgp 20100305
PACKAGE_TARNAME = netpgp
-PACKAGE_VERSION = 20100304
+PACKAGE_VERSION = 20100305
PATH_SEPARATOR = :
RANLIB = ranlib
SED = /usr/bin/sed
SET_MAKE =
SHELL = /bin/ksh
STRIP = strip
-VERSION = 20100304
+VERSION = 20100305
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
Index: src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile
diff -u src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile:1.8 src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile:1.9
--- src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile:1.8 Fri Mar 5 16:01:10 2010
+++ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile Fri Mar 5 19:58:39 2010
@@ -117,16 +117,16 @@
PACKAGE = netpgp
PACKAGE_BUGREPORT = Alistair Crooks <[email protected]> c0596823
PACKAGE_NAME = netpgp
-PACKAGE_STRING = netpgp 20100304
+PACKAGE_STRING = netpgp 20100305
PACKAGE_TARNAME = netpgp
-PACKAGE_VERSION = 20100304
+PACKAGE_VERSION = 20100305
PATH_SEPARATOR = :
RANLIB = ranlib
SED = /usr/bin/sed
SET_MAKE =
SHELL = /bin/ksh
STRIP = strip
-VERSION = 20100304
+VERSION = 20100305
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
Index: src/crypto/external/bsd/netpgp/dist/src/netpgpverify/verify.c
diff -u src/crypto/external/bsd/netpgp/dist/src/netpgpverify/verify.c:1.4 src/crypto/external/bsd/netpgp/dist/src/netpgpverify/verify.c:1.5
--- src/crypto/external/bsd/netpgp/dist/src/netpgpverify/verify.c:1.4 Fri Mar 5 16:01:10 2010
+++ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/verify.c Fri Mar 5 19:58:39 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.4 2010/03/05 16:01:10 agc Exp $");
+__RCSID("$NetBSD: verify.c,v 1.5 2010/03/05 19:58:39 agc Exp $");
#endif
#include <sys/types.h>
@@ -161,7 +161,7 @@
#undef USE_SHA384
/* development versions have .99 suffix */
-#define NETPGP_BASE_VERSION "1.99.20"
+#define NETPGP_BASE_VERSION "1.99.21"
#define NETPGP_VERSION_CAT(a, b) "NetPGP portable " a "/[" b "]"
#define NETPGP_VERSION_STRING \
