Module Name: src
Committed By: agc
Date: Tue May 5 15:29:46 UTC 2009
Modified Files:
src/crypto/external/bsd/netpgp/dist: configure configure.ac
src/crypto/external/bsd/netpgp/dist/src/lib: config.h config.h.in
netpgp.c packet-parse.c validate.c
Log Message:
Don't bother searching for assert.h, it's not needed any more
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/netpgp/dist/configure \
src/crypto/external/bsd/netpgp/dist/configure.ac
cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/netpgp/dist/src/lib/config.h \
src/crypto/external/bsd/netpgp/dist/src/lib/config.h.in
cvs rdiff -u -r1.7 -r1.8 src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c
cvs rdiff -u -r1.6 -r1.7 \
src/crypto/external/bsd/netpgp/dist/src/lib/packet-parse.c
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/external/bsd/netpgp/dist/src/lib/validate.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/configure
diff -u src/crypto/external/bsd/netpgp/dist/configure:1.2 src/crypto/external/bsd/netpgp/dist/configure:1.3
--- src/crypto/external/bsd/netpgp/dist/configure:1.2 Sat Apr 25 01:29:14 2009
+++ src/crypto/external/bsd/netpgp/dist/configure Tue May 5 15:29:46 2009
@@ -2,7 +2,7 @@
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.63 for netpgp 20090423.
#
-# Report bugs to <"Alistair Crooks a...@netbsd.org c0596823">.
+# Report bugs to <Alistair Crooks <a...@netbsd.org> c0596823>.
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
@@ -598,7 +598,7 @@
PACKAGE_TARNAME='netpgp'
PACKAGE_VERSION='20090423'
PACKAGE_STRING='netpgp 20090423'
-PACKAGE_BUGREPORT='"Alistair Crooks a...@netbsd.org c0596823"'
+PACKAGE_BUGREPORT='Alistair Crooks <a...@netbsd.org> c0596823'
ac_unique_file="src/bin/netpgp.c"
# Factoring default headers for most tests.
@@ -1355,7 +1355,7 @@
Use these variables to override the choices made by `configure' or to help
it to find libraries and programs with nonstandard names/locations.
-Report bugs to <"Alistair Crooks a...@netbsd.org c0596823">.
+Report bugs to <Alistair Crooks <a...@netbsd.org> c0596823>.
_ACEOF
ac_status=$?
fi
@@ -3792,7 +3792,7 @@
$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
( cat <<\_ASBOX
## -------------------------------------------------------- ##
-## Report this to "Alistair Crooks a...@netbsd.org c0596823" ##
+## Report this to Alistair Crooks <a...@netbsd.org> c0596823 ##
## -------------------------------------------------------- ##
_ASBOX
) | sed "s/^/$as_me: WARNING: /" >&2
@@ -3827,8 +3827,7 @@
-
-for ac_header in assert.h bzlib.h dmalloc.h direct.h errno.h fcntl.h
+for ac_header in bzlib.h dmalloc.h direct.h errno.h fcntl.h
do
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
@@ -3948,7 +3947,7 @@
$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
( cat <<\_ASBOX
## -------------------------------------------------------- ##
-## Report this to "Alistair Crooks a...@netbsd.org c0596823" ##
+## Report this to Alistair Crooks <a...@netbsd.org> c0596823 ##
## -------------------------------------------------------- ##
_ASBOX
) | sed "s/^/$as_me: WARNING: /" >&2
@@ -4102,7 +4101,7 @@
$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
( cat <<\_ASBOX
## -------------------------------------------------------- ##
-## Report this to "Alistair Crooks a...@netbsd.org c0596823" ##
+## Report this to Alistair Crooks <a...@netbsd.org> c0596823 ##
## -------------------------------------------------------- ##
_ASBOX
) | sed "s/^/$as_me: WARNING: /" >&2
@@ -4254,7 +4253,7 @@
$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
( cat <<\_ASBOX
## -------------------------------------------------------- ##
-## Report this to "Alistair Crooks a...@netbsd.org c0596823" ##
+## Report this to Alistair Crooks <a...@netbsd.org> c0596823 ##
## -------------------------------------------------------- ##
_ASBOX
) | sed "s/^/$as_me: WARNING: /" >&2
@@ -4409,7 +4408,7 @@
$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
( cat <<\_ASBOX
## -------------------------------------------------------- ##
-## Report this to "Alistair Crooks a...@netbsd.org c0596823" ##
+## Report this to Alistair Crooks <a...@netbsd.org> c0596823 ##
## -------------------------------------------------------- ##
_ASBOX
) | sed "s/^/$as_me: WARNING: /" >&2
@@ -4565,7 +4564,7 @@
$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
( cat <<\_ASBOX
## -------------------------------------------------------- ##
-## Report this to "Alistair Crooks a...@netbsd.org c0596823" ##
+## Report this to Alistair Crooks <a...@netbsd.org> c0596823 ##
## -------------------------------------------------------- ##
_ASBOX
) | sed "s/^/$as_me: WARNING: /" >&2
@@ -4720,7 +4719,7 @@
$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
( cat <<\_ASBOX
## -------------------------------------------------------- ##
-## Report this to "Alistair Crooks a...@netbsd.org c0596823" ##
+## Report this to Alistair Crooks <a...@netbsd.org> c0596823 ##
## -------------------------------------------------------- ##
_ASBOX
) | sed "s/^/$as_me: WARNING: /" >&2
Index: src/crypto/external/bsd/netpgp/dist/configure.ac
diff -u src/crypto/external/bsd/netpgp/dist/configure.ac:1.2 src/crypto/external/bsd/netpgp/dist/configure.ac:1.3
--- src/crypto/external/bsd/netpgp/dist/configure.ac:1.2 Sat Apr 25 01:29:14 2009
+++ src/crypto/external/bsd/netpgp/dist/configure.ac Tue May 5 15:29:46 2009
@@ -1,4 +1,4 @@
-dnl $Id: configure.ac,v 1.2 2009/04/25 01:29:14 agc Exp $
+dnl $Id: configure.ac,v 1.3 2009/05/05 15:29:46 agc Exp $
dnl Process this file with autoconf to produce a configure script.
AC_PREREQ(2.57)
AC_INIT([netpgp],[20090423],[Alistair Crooks <a...@netbsd.org> c0596823])
@@ -25,7 +25,7 @@
dnl Checks for header files.
AC_HEADER_STDC
AC_CHECK_HEADERS([CommonCrypto/CommonDigest.h])
-AC_CHECK_HEADERS([assert.h bzlib.h dmalloc.h direct.h errno.h fcntl.h])
+AC_CHECK_HEADERS([bzlib.h dmalloc.h direct.h errno.h fcntl.h])
AC_CHECK_HEADERS([inttypes.h libgen.h limits.h malloc.h])
AC_CHECK_HEADERS([stdbool.h zlib.h])
AC_CHECK_HEADERS([openssl/aes.h openssl/bn.h openssl/cast.h openssl/des.h openssl/dsa.h])
Index: src/crypto/external/bsd/netpgp/dist/src/lib/config.h
diff -u src/crypto/external/bsd/netpgp/dist/src/lib/config.h:1.2 src/crypto/external/bsd/netpgp/dist/src/lib/config.h:1.3
--- src/crypto/external/bsd/netpgp/dist/src/lib/config.h:1.2 Sat Apr 25 01:29:15 2009
+++ src/crypto/external/bsd/netpgp/dist/src/lib/config.h Tue May 5 15:29:46 2009
@@ -1,9 +1,6 @@
/* src/lib/config.h. Generated from config.h.in by configure. */
/* src/lib/config.h.in. Generated from configure.ac by autoheader. */
-/* Define to 1 if you have the <assert.h> header file. */
-#define HAVE_ASSERT_H 1
-
/* Define to 1 if you have the <bzlib.h> header file. */
#define HAVE_BZLIB_H 1
@@ -122,7 +119,7 @@
#define HAVE_ZLIB_H 1
/* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT "Alistair Crooks a...@netbsd.org c0596823"
+#define PACKAGE_BUGREPORT "Alistair Crooks <a...@netbsd.org> c0596823"
/* Define to the full name of this package. */
#define PACKAGE_NAME "netpgp"
Index: src/crypto/external/bsd/netpgp/dist/src/lib/config.h.in
diff -u src/crypto/external/bsd/netpgp/dist/src/lib/config.h.in:1.2 src/crypto/external/bsd/netpgp/dist/src/lib/config.h.in:1.3
--- src/crypto/external/bsd/netpgp/dist/src/lib/config.h.in:1.2 Sat Apr 25 01:29:15 2009
+++ src/crypto/external/bsd/netpgp/dist/src/lib/config.h.in Tue May 5 15:29:46 2009
@@ -1,8 +1,5 @@
/* src/lib/config.h.in. Generated from configure.ac by autoheader. */
-/* Define to 1 if you have the <assert.h> header file. */
-#undef HAVE_ASSERT_H
-
/* Define to 1 if you have the <bzlib.h> header file. */
#undef HAVE_BZLIB_H
Index: src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c
diff -u src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c:1.7 src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c:1.8
--- src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c:1.7 Tue May 5 01:28:15 2009
+++ src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c Tue May 5 15:29:46 2009
@@ -52,10 +52,6 @@
#include "netpgpdefs.h"
#include "parse_local.h"
-#ifdef HAVE_ASSERT_H
-#include <assert.h>
-#endif
-
#ifdef HAVE_FCNTL_H
#include <fcntl.h>
#endif
Index: src/crypto/external/bsd/netpgp/dist/src/lib/packet-parse.c
diff -u src/crypto/external/bsd/netpgp/dist/src/lib/packet-parse.c:1.6 src/crypto/external/bsd/netpgp/dist/src/lib/packet-parse.c:1.7
--- src/crypto/external/bsd/netpgp/dist/src/lib/packet-parse.c:1.6 Tue May 5 15:25:27 2009
+++ src/crypto/external/bsd/netpgp/dist/src/lib/packet-parse.c Tue May 5 15:29:46 2009
@@ -39,10 +39,6 @@
#include "netpgpdefs.h"
#include "parse_local.h"
-#ifdef HAVE_ASSERT_H
-#include <assert.h>
-#endif
-
#include <stdarg.h>
#include <stdlib.h>
#include <string.h>
Index: src/crypto/external/bsd/netpgp/dist/src/lib/validate.c
diff -u src/crypto/external/bsd/netpgp/dist/src/lib/validate.c:1.4 src/crypto/external/bsd/netpgp/dist/src/lib/validate.c:1.5
--- src/crypto/external/bsd/netpgp/dist/src/lib/validate.c:1.4 Tue May 5 01:28:15 2009
+++ src/crypto/external/bsd/netpgp/dist/src/lib/validate.c Tue May 5 15:29:46 2009
@@ -37,10 +37,6 @@
#include <sys/param.h>
#include <sys/stat.h>
-#ifdef HAVE_ASSERT_H
-#include <assert.h>
-#endif
-
#include <string.h>
#include <stdio.h>
