[src/trunk]: src/crypto/external/bsd/netpgp set up the netpgp lib directory h...

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/trunk]: src/crypto/external/bsd/netpgp set up the netpgp lib directory h...
From: agc <agc%NetBSD.org@localhost>
Date: Tue, 31 Jul 2018 19:03:59 +0000
details:   https://anonhg.NetBSD.org/src/rev/e4e53b92c17b
branches:  trunk
changeset: 334747:e4e53b92c17b
user:      agc <agc%NetBSD.org@localhost>
date:      Fri Dec 05 04:52:01 2014 +0000

description:
set up the netpgp lib directory hierarchy a bit more logically

+ move libnetpgp to the same level as libnetpgpverify

+ fix up all paths to the new directory structure

diffstat:

 crypto/external/bsd/netpgp/Makefile                 |    3 +-
 crypto/external/bsd/netpgp/bin/hkpc/Makefile        |    4 +-
 crypto/external/bsd/netpgp/bin/hkpd/Makefile        |    4 +-
 crypto/external/bsd/netpgp/bin/netpgp/Makefile      |    4 +-
 crypto/external/bsd/netpgp/bin/netpgpkeys/Makefile  |    4 +-
 crypto/external/bsd/netpgp/lib/Makefile             |   31 +---
 crypto/external/bsd/netpgp/lib/netpgp/Makefile      |   29 +++
 crypto/external/bsd/netpgp/lib/netpgp/config.h      |  177 ++++++++++++++++++++
 crypto/external/bsd/netpgp/lib/netpgp/shlib_version |    2 +
 9 files changed, 221 insertions(+), 37 deletions(-)

diffs (truncated from 341 to 300 lines):

diff -r 3d29f7422ff1 -r e4e53b92c17b crypto/external/bsd/netpgp/Makefile
--- a/crypto/external/bsd/netpgp/Makefile       Fri Dec 05 04:42:36 2014 +0000
+++ b/crypto/external/bsd/netpgp/Makefile       Fri Dec 05 04:52:01 2014 +0000
@@ -1,7 +1,6 @@
-#      $NetBSD: Makefile,v 1.8 2014/03/09 00:39:31 agc Exp $
+#      $NetBSD: Makefile,v 1.9 2014/12/05 04:52:01 agc Exp $
 
 SUBDIR+=       libmj .WAIT
-SUBDIR+=       lib/verify .WAIT
 SUBDIR+=       lib .WAIT
 SUBDIR+=       bin
 
diff -r 3d29f7422ff1 -r e4e53b92c17b crypto/external/bsd/netpgp/bin/hkpc/Makefile
--- a/crypto/external/bsd/netpgp/bin/hkpc/Makefile      Fri Dec 05 04:42:36 2014 +0000
+++ b/crypto/external/bsd/netpgp/bin/hkpc/Makefile      Fri Dec 05 04:52:01 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2014/03/09 00:39:31 agc Exp $
+# $NetBSD: Makefile,v 1.3 2014/12/05 04:52:01 agc Exp $
 
 .include <bsd.own.mk>
 
@@ -6,7 +6,7 @@
 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 -r 3d29f7422ff1 -r e4e53b92c17b crypto/external/bsd/netpgp/bin/hkpd/Makefile
--- a/crypto/external/bsd/netpgp/bin/hkpd/Makefile      Fri Dec 05 04:42:36 2014 +0000
+++ b/crypto/external/bsd/netpgp/bin/hkpd/Makefile      Fri Dec 05 04:52:01 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2014/03/09 00:40:30 agc Exp $
+# $NetBSD: Makefile,v 1.3 2014/12/05 04:52:01 agc Exp $
 
 .include <bsd.own.mk>
 
@@ -6,7 +6,7 @@
 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 -r 3d29f7422ff1 -r e4e53b92c17b crypto/external/bsd/netpgp/bin/netpgp/Makefile
--- a/crypto/external/bsd/netpgp/bin/netpgp/Makefile    Fri Dec 05 04:42:36 2014 +0000
+++ b/crypto/external/bsd/netpgp/bin/netpgp/Makefile    Fri Dec 05 04:52:01 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.2 2014/03/09 00:24:47 agc Exp $
+#      $NetBSD: Makefile,v 1.3 2014/12/05 04:52:01 agc Exp $
 
 .include <bsd.own.mk>
 
@@ -7,7 +7,7 @@
 
 CPPFLAGS+=     -I${EXTDIST}/include
 
-LIBNETPGPDIR!= cd ${.CURDIR}/../../lib && ${PRINTOBJDIR}
+LIBNETPGPDIR!= cd ${.CURDIR}/../../lib/netpgp && ${PRINTOBJDIR}
 LDADD+=                -L${LIBNETPGPDIR} -lnetpgp
 DPADD+=                ${LIBNETPGPDIR}/libnetpgp.a
 
diff -r 3d29f7422ff1 -r e4e53b92c17b crypto/external/bsd/netpgp/bin/netpgpkeys/Makefile
--- a/crypto/external/bsd/netpgp/bin/netpgpkeys/Makefile        Fri Dec 05 04:42:36 2014 +0000
+++ b/crypto/external/bsd/netpgp/bin/netpgpkeys/Makefile        Fri Dec 05 04:52:01 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.2 2014/03/09 00:33:50 agc Exp $
+#      $NetBSD: Makefile,v 1.3 2014/12/05 04:52:02 agc Exp $
 
 .include <bsd.own.mk>
 
@@ -6,7 +6,7 @@
 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 -r 3d29f7422ff1 -r e4e53b92c17b crypto/external/bsd/netpgp/lib/Makefile
--- a/crypto/external/bsd/netpgp/lib/Makefile   Fri Dec 05 04:42:36 2014 +0000
+++ b/crypto/external/bsd/netpgp/lib/Makefile   Fri Dec 05 04:52:01 2014 +0000
@@ -1,29 +1,6 @@
-# $NetBSD: Makefile,v 1.16 2014/03/09 00:33:50 agc Exp $
-
-.include <bsd.own.mk>
-
-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
+#      $NetBSD: Makefile,v 1.17 2014/12/05 04:52:02 agc Exp $
 
-EXTDIST=${.CURDIR}/../dist
-
-.PATH: ${EXTDIST}/include ${EXTDIST}/src/lib
-
-INCS+= netpgp.h
-INCSDIR=/usr/include
+SUBDIR+=       netpgp .WAIT
+SUBDIR+=       verify
 
-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 <bsd.lib.mk>
+.include <bsd.subdir.mk>
diff -r 3d29f7422ff1 -r e4e53b92c17b crypto/external/bsd/netpgp/lib/netpgp/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/crypto/external/bsd/netpgp/lib/netpgp/Makefile    Fri Dec 05 04:52:01 2014 +0000
@@ -0,0 +1,29 @@
+# $NetBSD: Makefile,v 1.2 2014/12/05 04:52:02 agc Exp $
+
+.include <bsd.own.mk>
+
+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 <bsd.lib.mk>
diff -r 3d29f7422ff1 -r e4e53b92c17b crypto/external/bsd/netpgp/lib/netpgp/config.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/crypto/external/bsd/netpgp/lib/netpgp/config.h    Fri Dec 05 04:52:01 2014 +0000
@@ -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 <bzlib.h> header file. */
+#define HAVE_BZLIB_H 1
+
+/* Define to 1 if you have the <CommonCrypto/CommonDigest.h> header file. */
+/* #undef HAVE_COMMONCRYPTO_COMMONDIGEST_H */
+
+/* Define to 1 if you have the <direct.h> header file. */
+/* #undef HAVE_DIRECT_H */
+
+/* Define to 1 if you have the <dlfcn.h> header file. */
+#define HAVE_DLFCN_H 1
+
+/* Define to 1 if you have the <dmalloc.h> header file. */
+/* #undef HAVE_DMALLOC_H */
+
+/* Define to 1 if you have the <errno.h> header file. */
+#define HAVE_ERRNO_H 1
+
+/* Define to 1 if you have the <fcntl.h> header file. */
+#define HAVE_FCNTL_H 1
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#define HAVE_INTTYPES_H 1
+
+/* Define to 1 if you have the <limits.h> 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 <malloc.h> header file. */
+#define HAVE_MALLOC_H 1
+
+/* Define to 1 if you have the <memory.h> header file. */
+#define HAVE_MEMORY_H 1
+
+/* Define to 1 if you have the <openssl/aes.h> header file. */
+#define HAVE_OPENSSL_AES_H 1
+
+/* Define to 1 if you have the <openssl/bn.h> header file. */
+#define HAVE_OPENSSL_BN_H 1
+
+/* Define to 1 if you have the <openssl/camellia.h> header file. */
+#define HAVE_OPENSSL_CAMELLIA_H 1
+
+/* Define to 1 if you have the <openssl/cast.h> header file. */
+#define HAVE_OPENSSL_CAST_H 1
+
+/* Define to 1 if you have the <openssl/des.h> header file. */
+#define HAVE_OPENSSL_DES_H 1
+
+/* Define to 1 if you have the <openssl/dsa.h> header file. */
+#define HAVE_OPENSSL_DSA_H 1
+
+/* Define to 1 if you have the <openssl/err.h> header file. */
+#define HAVE_OPENSSL_ERR_H 1
+
+/* Define to 1 if you have the <openssl/idea.h> header file. */
+#define HAVE_OPENSSL_IDEA_H 1
+
+/* Define to 1 if you have the <openssl/md5.h> header file. */
+#define HAVE_OPENSSL_MD5_H 1
+
+/* Define to 1 if you have the <openssl/rand.h> header file. */
+#define HAVE_OPENSSL_RAND_H 1
+
+/* Define to 1 if you have the <openssl/rsa.h> header file. */
+#define HAVE_OPENSSL_RSA_H 1
+
+/* Define to 1 if you have the <openssl/sha.h> 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 <stdint.h> header file. */
+#define HAVE_STDINT_H 1
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#define HAVE_STDLIB_H 1
+
+/* Define to 1 if you have the <strings.h> header file. */
+#define HAVE_STRINGS_H 1
+
+/* Define to 1 if you have the <string.h> header file. */
+#define HAVE_STRING_H 1
+
+/* Define to 1 if you have the <sys/cdefs.h> header file. */
+#define HAVE_SYS_CDEFS_H 1
+
+/* Define to 1 if you have the <sys/file.h> header file. */
+#define HAVE_SYS_FILE_H 1
+
+/* Define to 1 if you have the <sys/mman.h> header file. */
+#define HAVE_SYS_MMAN_H 1
+
+/* Define to 1 if you have the <sys/param.h> header file. */
+#define HAVE_SYS_PARAM_H 1
+
+/* Define to 1 if you have the <sys/resource.h> header file. */
+#define HAVE_SYS_RESOURCE_H 1
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#define HAVE_SYS_STAT_H 1
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#define HAVE_SYS_TYPES_H 1
+
+/* Define to 1 if you have the <sys/uio.h> header file. */
+#define HAVE_SYS_UIO_H 1
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#define HAVE_UNISTD_H 1
+
+/* Define to 1 if you have the <zlib.h> 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 <agc%netbsd.org@localhost> 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 */
Prev by Date: [src/trunk]: src/external/cddl/osnet/dist/uts/common/fs/zfs Change zfs to vca...
Next by Date: [src/trunk]: src/sys/arch/sparc64 Use GETVER_CPU_* macros.
Previous by Thread: [src/trunk]: src/external/cddl/osnet/dist/uts/common/fs/zfs Change zfs to vca...
Next by Thread: [src/trunk]: src/sys/arch/sparc64 Use GETVER_CPU_* macros.
Indexes:
Home | Main Index | Thread Index | Old Index