diff --git a/crypto/external/bsd/netpgp/Makefile b/crypto/external/bsd/netpgp/Makefile index 841b03dbb434..4b71b5331215 100644 --- a/crypto/external/bsd/netpgp/Makefile +++ b/crypto/external/bsd/netpgp/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.8 2014/03/09 00:39:31 agc Exp $ +# $NetBSD: Makefile,v 1.8.4.1 2014/12/08 20:54:52 martin Exp $ SUBDIR+= libmj .WAIT -SUBDIR+= lib/verify .WAIT SUBDIR+= lib .WAIT SUBDIR+= bin diff --git a/crypto/external/bsd/netpgp/bin/hkpc/Makefile b/crypto/external/bsd/netpgp/bin/hkpc/Makefile index e57617d25c07..9ba101e70edc 100644 --- a/crypto/external/bsd/netpgp/bin/hkpc/Makefile +++ b/crypto/external/bsd/netpgp/bin/hkpc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2014/03/09 00:39:31 agc Exp $ +# $NetBSD: Makefile,v 1.2.6.1 2014/12/08 20:54:52 martin Exp $ .include @@ -6,7 +6,7 @@ PROG=hkpc BINDIR=/usr/bin SRCS=hkpc.c main.c -LIBNETPGPDIR!= cd ${.CURDIR}/../../lib && ${PRINTOBJDIR} +LIBNETPGPDIR!= cd ${.CURDIR}/../../lib/netpgp && ${PRINTOBJDIR} LDADD+= -L${LIBNETPGPDIR} -lnetpgp DPADD+= ${LIBNETPGPDIR}/libnetpgp.a diff --git a/crypto/external/bsd/netpgp/bin/hkpd/Makefile b/crypto/external/bsd/netpgp/bin/hkpd/Makefile index 0baff1c7c6a2..50776a91bedc 100644 --- a/crypto/external/bsd/netpgp/bin/hkpd/Makefile +++ b/crypto/external/bsd/netpgp/bin/hkpd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2014/03/09 00:40:30 agc Exp $ +# $NetBSD: Makefile,v 1.2.6.1 2014/12/08 20:54:52 martin Exp $ .include @@ -6,7 +6,7 @@ PROG=hkpd BINDIR=/usr/sbin SRCS=hkpd.c main.c -LIBNETPGPDIR!= cd ${.CURDIR}/../../lib && ${PRINTOBJDIR} +LIBNETPGPDIR!= cd ${.CURDIR}/../../lib/netpgp && ${PRINTOBJDIR} LDADD+= -L${LIBNETPGPDIR} -lnetpgp DPADD+= ${LIBNETPGPDIR}/libnetpgp.a diff --git a/crypto/external/bsd/netpgp/bin/netpgp/Makefile b/crypto/external/bsd/netpgp/bin/netpgp/Makefile index 2bd29478b886..cfdd66a5987d 100644 --- a/crypto/external/bsd/netpgp/bin/netpgp/Makefile +++ b/crypto/external/bsd/netpgp/bin/netpgp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2014/03/09 00:24:47 agc Exp $ +# $NetBSD: Makefile,v 1.2.6.1 2014/12/08 20:54:52 martin Exp $ .include @@ -7,7 +7,7 @@ BINDIR= /usr/bin CPPFLAGS+= -I${EXTDIST}/include -LIBNETPGPDIR!= cd ${.CURDIR}/../../lib && ${PRINTOBJDIR} +LIBNETPGPDIR!= cd ${.CURDIR}/../../lib/netpgp && ${PRINTOBJDIR} LDADD+= -L${LIBNETPGPDIR} -lnetpgp DPADD+= ${LIBNETPGPDIR}/libnetpgp.a diff --git a/crypto/external/bsd/netpgp/bin/netpgpkeys/Makefile b/crypto/external/bsd/netpgp/bin/netpgpkeys/Makefile index e980dcaf4526..7ce7c134ad35 100644 --- a/crypto/external/bsd/netpgp/bin/netpgpkeys/Makefile +++ b/crypto/external/bsd/netpgp/bin/netpgpkeys/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2014/03/09 00:33:50 agc Exp $ +# $NetBSD: Makefile,v 1.2.6.1 2014/12/08 20:54:52 martin Exp $ .include @@ -6,7 +6,7 @@ PROG= netpgpkeys SRCS= netpgpkeys.c BINDIR= /usr/bin -LIBNETPGPDIR!= cd ${.CURDIR}/../../lib && ${PRINTOBJDIR} +LIBNETPGPDIR!= cd ${.CURDIR}/../../lib/netpgp && ${PRINTOBJDIR} LDADD+= -L${LIBNETPGPDIR} -lnetpgp DPADD+= ${LIBNETPGPDIR}/libnetpgp.a diff --git a/crypto/external/bsd/netpgp/lib/Makefile b/crypto/external/bsd/netpgp/lib/Makefile index 6d8d22e704f1..efe808ed3554 100644 --- a/crypto/external/bsd/netpgp/lib/Makefile +++ b/crypto/external/bsd/netpgp/lib/Makefile @@ -1,29 +1,6 @@ -# $NetBSD: Makefile,v 1.16 2014/03/09 00:33:50 agc Exp $ +# $NetBSD: Makefile,v 1.16.4.1 2014/12/08 20:54:52 martin Exp $ -.include +SUBDIR+= netpgp .WAIT +SUBDIR+= verify -USE_FORT?= yes - -LIB= netpgp -SRCS+= compress.c create.c crypto.c -SRCS+= keyring.c misc.c netpgp.c openssl_crypto.c packet-parse.c -SRCS+= packet-print.c packet-show.c reader.c signature.c -SRCS+= symmetric.c validate.c writer.c -SRCS+= ssh2pgp.c bufgap.c -CPPFLAGS+= -I${.CURDIR} -I${EXTDIST}/include -MAN= libnetpgp.3 - -EXTDIST=${.CURDIR}/../dist - -.PATH: ${EXTDIST}/include ${EXTDIST}/src/lib - -INCS+= netpgp.h -INCSDIR=/usr/include - -OPENSSL=${NETBSDSRCDIR}/crypto/external/bsd/openssl -LIBDPLIBS+= mj ${.CURDIR}/../libmj -LIBDPLIBS+= crypto ${OPENSSL}/lib/libcrypto -LIBDPLIBS+= z ${NETBSDSRCDIR}/lib/libz -LIBDPLIBS+= bz2 ${NETBSDSRCDIR}/lib/libbz2 - -.include +.include diff --git a/crypto/external/bsd/netpgp/lib/netpgp/Makefile b/crypto/external/bsd/netpgp/lib/netpgp/Makefile new file mode 100644 index 000000000000..3a32564995d5 --- /dev/null +++ b/crypto/external/bsd/netpgp/lib/netpgp/Makefile @@ -0,0 +1,29 @@ +# $NetBSD: Makefile,v 1.2.2.2 2014/12/08 20:54:52 martin Exp $ + +.include + +USE_FORT?= yes + +LIB= netpgp +SRCS+= compress.c create.c crypto.c +SRCS+= keyring.c misc.c netpgp.c openssl_crypto.c packet-parse.c +SRCS+= packet-print.c packet-show.c reader.c signature.c +SRCS+= symmetric.c validate.c writer.c +SRCS+= ssh2pgp.c bufgap.c +CPPFLAGS+= -I${.CURDIR} -I${EXTDIST}/include +MAN= libnetpgp.3 + +EXTDIST=${.CURDIR}/../../dist + +.PATH: ${EXTDIST}/include ${EXTDIST}/src/lib + +INCS+= netpgp.h +INCSDIR=/usr/include + +OPENSSL=${NETBSDSRCDIR}/crypto/external/bsd/openssl +LIBDPLIBS+= mj ${.CURDIR}/../../libmj +LIBDPLIBS+= crypto ${OPENSSL}/lib/libcrypto +LIBDPLIBS+= z ${NETBSDSRCDIR}/lib/libz +LIBDPLIBS+= bz2 ${NETBSDSRCDIR}/lib/libbz2 + +.include diff --git a/crypto/external/bsd/netpgp/lib/netpgp/config.h b/crypto/external/bsd/netpgp/lib/netpgp/config.h new file mode 100644 index 000000000000..b8f86cac548d --- /dev/null +++ b/crypto/external/bsd/netpgp/lib/netpgp/config.h @@ -0,0 +1,177 @@ +/* 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 header file. */ +#define HAVE_BZLIB_H 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_COMMONCRYPTO_COMMONDIGEST_H */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_DIRECT_H */ + +/* Define to 1 if you have the header file. */ +#define HAVE_DLFCN_H 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_DMALLOC_H */ + +/* Define to 1 if you have the header file. */ +#define HAVE_ERRNO_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_FCNTL_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_INTTYPES_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_LIMITS_H 1 + +/* Define to 1 if the system has the type `long long int'. */ +#define HAVE_LONG_LONG_INT 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_MALLOC_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_MEMORY_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_OPENSSL_AES_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_OPENSSL_BN_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_OPENSSL_CAMELLIA_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_OPENSSL_CAST_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_OPENSSL_DES_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_OPENSSL_DSA_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_OPENSSL_ERR_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_OPENSSL_IDEA_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_OPENSSL_MD5_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_OPENSSL_RAND_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_OPENSSL_RSA_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_OPENSSL_SHA_H 1 + +/* Define to 1 if the system has the type `SHA256_CTX'. */ +#define HAVE_SHA256_CTX 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDINT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDLIB_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRINGS_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRING_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_CDEFS_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_FILE_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_MMAN_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_PARAM_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_RESOURCE_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_STAT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_UIO_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_UNISTD_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_ZLIB_H 1 + +/* Name of package */ +#define PACKAGE "netpgp" + +/* Define to the address where bug reports for this package should be sent. */ +#define PACKAGE_BUGREPORT "Alistair Crooks c0596823" + +/* Define to the full name of this package. */ +#define PACKAGE_NAME "netpgp" + +/* Define to the full name and version of this package. */ +#define PACKAGE_STRING "netpgp 20101103" + +/* Define to the one symbol short name of this package. */ +#define PACKAGE_TARNAME "netpgp" + +/* Define to the version of this package. */ +#define PACKAGE_VERSION "20101103" + +/* Define to 1 if you have the ANSI C header files. */ +#define STDC_HEADERS 1 + +/* Version number of package */ +#define VERSION "20101103" + +/* Define for Solaris 2.5.1 so the uint32_t typedef from , + , or is not used. If the typedef were allowed, the + #define below would cause a syntax error. */ +/* #undef _UINT32_T */ + +/* Define for Solaris 2.5.1 so the uint64_t typedef from , + , or is not used. If the typedef were allowed, the + #define below would cause a syntax error. */ +/* #undef _UINT64_T */ + +/* Define for Solaris 2.5.1 so the uint8_t typedef from , + , or is not used. If the typedef were allowed, the + #define below would cause a syntax error. */ +/* #undef _UINT8_T */ + +/* Define to `unsigned int' if does not define. */ +/* #undef size_t */ + +/* Define to the type of an unsigned integer type of width exactly 16 bits if + such a type exists and the standard includes do not define it. */ +/* #undef uint16_t */ + +/* Define to the type of an unsigned integer type of width exactly 32 bits if + such a type exists and the standard includes do not define it. */ +/* #undef uint32_t */ + +/* Define to the type of an unsigned integer type of width exactly 64 bits if + such a type exists and the standard includes do not define it. */ +/* #undef uint64_t */ + +/* Define to the type of an unsigned integer type of width exactly 8 bits if + such a type exists and the standard includes do not define it. */ +/* #undef uint8_t */ diff --git a/crypto/external/bsd/netpgp/lib/netpgp/shlib_version b/crypto/external/bsd/netpgp/lib/netpgp/shlib_version new file mode 100644 index 000000000000..012c14171d3a --- /dev/null +++ b/crypto/external/bsd/netpgp/lib/netpgp/shlib_version @@ -0,0 +1,2 @@ +major=3 +minor=0