Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/crypto/external/bsd/netpgp move the functions to parse the J...
details: https://anonhg.NetBSD.org/src/rev/824771bacedd
branches: trunk
changeset: 757527:824771bacedd
user: agc <agc%NetBSD.org@localhost>
date: Thu Sep 02 06:00:11 2010 +0000
description:
move the functions to parse the JSON from netpgpkeys(1) into libnetpgp(3)
update the version number for recent changes.
update the date for recent changes.
regenerate the autoconf files.
diffstat:
crypto/external/bsd/netpgp/Makefile | 3 +-
crypto/external/bsd/netpgp/dist/configure | 407 ++++++++++-
crypto/external/bsd/netpgp/dist/configure.ac | 6 +-
crypto/external/bsd/netpgp/dist/include/netpgp.h | 1 +
crypto/external/bsd/netpgp/dist/src/lib/netpgp.c | 181 +++++-
crypto/external/bsd/netpgp/dist/src/lib/version.h | 2 +-
crypto/external/bsd/netpgp/dist/src/netpgp/Makefile | 37 +-
crypto/external/bsd/netpgp/dist/src/netpgpkeys/netpgpkeys.c | 167 +----
crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile | 38 +-
crypto/external/bsd/netpgp/netpgpkeys/Makefile | 5 +-
10 files changed, 618 insertions(+), 229 deletions(-)
diffs (truncated from 1329 to 300 lines):
diff -r b8492536db56 -r 824771bacedd crypto/external/bsd/netpgp/Makefile
--- a/crypto/external/bsd/netpgp/Makefile Thu Sep 02 05:58:00 2010 +0000
+++ b/crypto/external/bsd/netpgp/Makefile Thu Sep 02 06:00:11 2010 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2010/08/07 04:34:03 agc Exp $
+# $NetBSD: Makefile,v 1.5 2010/09/02 06:00:11 agc Exp $
SUBDIR= libmj .WAIT
SUBDIR+= lib .WAIT
SUBDIR+= netpgp netpgpkeys netpgpverify
+#SUBDIR+= hkpc hkpd
.include <bsd.subdir.mk>
diff -r b8492536db56 -r 824771bacedd crypto/external/bsd/netpgp/dist/configure
--- a/crypto/external/bsd/netpgp/dist/configure Thu Sep 02 05:58:00 2010 +0000
+++ b/crypto/external/bsd/netpgp/dist/configure Thu Sep 02 06:00:11 2010 +0000
@@ -1,7 +1,7 @@
#! /bin/sh
-# From configure.ac Revision: 1.32 .
+# From configure.ac Revision: 1.34 .
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63 for netpgp 20100707.
+# Generated by GNU Autoconf 2.63 for netpgp 20100901.
#
# Report bugs to <Alistair Crooks <agc%netbsd.org@localhost> c0596823>.
#
@@ -751,8 +751,8 @@
# Identity of this package.
PACKAGE_NAME='netpgp'
PACKAGE_TARNAME='netpgp'
-PACKAGE_VERSION='20100707'
-PACKAGE_STRING='netpgp 20100707'
+PACKAGE_VERSION='20100901'
+PACKAGE_STRING='netpgp 20100901'
PACKAGE_BUGREPORT='Alistair Crooks <agc%netbsd.org@localhost> c0596823'
ac_unique_file="src/netpgp/netpgp.c"
@@ -795,6 +795,10 @@
ac_subst_vars='LTLIBOBJS
LIBOBJS
AUTOM4TE
+OPENSSL_LDFLAGS
+OPENSSL_LIBS
+OPENSSL_INCLUDES
+PKG_CONFIG
WARNCFLAGS
LIBTOOL
ac_ct_F77
@@ -915,6 +919,7 @@
enable_libtool_lock
with_pic
with_tags
+with_openssl
'
ac_precious_vars='build_alias
host_alias
@@ -1483,7 +1488,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 20100707 to adapt to many kinds of systems.
+\`configure' configures netpgp 20100901 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1553,7 +1558,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of netpgp 20100707:";;
+ short | recursive ) echo "Configuration of netpgp 20100901:";;
esac
cat <<\_ACEOF
@@ -1578,6 +1583,7 @@
--with-pic try to use only PIC/non-PIC objects [default=use
both]
--with-tags[=TAGS] include additional configurations [automatic]
+ --with-openssl=DIR root of the OpenSSL directory
Some influential environment variables:
CC C compiler command
@@ -1660,7 +1666,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-netpgp configure 20100707
+netpgp configure 20100901
generated by GNU Autoconf 2.63
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1674,7 +1680,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 20100707, which was
+It was created by netpgp $as_me 20100901, which was
generated by GNU Autoconf 2.63. Invocation command line was
$ $0 $@
@@ -2561,7 +2567,7 @@
# Define the identity of the package.
PACKAGE='netpgp'
- VERSION='20100707'
+ VERSION='20100901'
cat >>confdefs.h <<_ACEOF
@@ -4780,7 +4786,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 4783 "configure"' > conftest.$ac_ext
+ echo '#line 4789 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -7554,11 +7560,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7557: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7563: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7561: \$? = $ac_status" >&5
+ echo "$as_me:7567: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -7844,11 +7850,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7847: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7853: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7851: \$? = $ac_status" >&5
+ echo "$as_me:7857: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -7948,11 +7954,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7951: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7957: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:7955: \$? = $ac_status" >&5
+ echo "$as_me:7961: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -10333,7 +10339,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 10336 "configure"
+#line 10342 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -10433,7 +10439,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 10436 "configure"
+#line 10442 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -12861,11 +12867,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:12864: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:12870: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:12868: \$? = $ac_status" >&5
+ echo "$as_me:12874: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -12965,11 +12971,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:12968: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:12974: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:12972: \$? = $ac_status" >&5
+ echo "$as_me:12978: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -14527,11 +14533,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14530: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:14536: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:14534: \$? = $ac_status" >&5
+ echo "$as_me:14540: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -14631,11 +14637,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14634: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:14640: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:14638: \$? = $ac_status" >&5
+ echo "$as_me:14644: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -16826,11 +16832,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16829: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16835: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:16833: \$? = $ac_status" >&5
+ echo "$as_me:16839: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -17116,11 +17122,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:17119: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:17125: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:17123: \$? = $ac_status" >&5
+ echo "$as_me:17129: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -17220,11 +17226,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:17223: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:17229: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:17227: \$? = $ac_status" >&5
+ echo "$as_me:17233: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -19908,6 +19914,95 @@
+# try to see if we need to link with -ldl
+{ $as_echo "$as_me:$LINENO: checking for library containing dlopen" >&5
+$as_echo_n "checking for library containing dlopen... " >&6; }
+if test "${ac_cv_search_dlopen+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ ac_func_search_save_LIBS=$LIBS
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
Home |
Main Index |
Thread Index |
Old Index