Module Name:    src
Committed By:   christos
Date:           Sat Dec  8 23:24:02 UTC 2018

Added Files:
        src/crypto/external/bsd/openssl/lib/engines: Makefile engines.mk
        src/crypto/external/bsd/openssl/lib/engines/capi: Makefile
        src/crypto/external/bsd/openssl/lib/engines/dasync: Makefile
        src/crypto/external/bsd/openssl/lib/engines/ossltest: Makefile
        src/crypto/external/bsd/openssl/lib/engines/padlock: Makefile

Log Message:
Add engines infrastructure, not hooked to the build:
1. sets needs to be fixed
2. need to decide if I am going to add engine.so.MAJOR or use engine.so
   like OpenSSL wants
3. padlock is MD (x86) needs asm to be added, and conditionally built


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/crypto/external/bsd/openssl/lib/engines/Makefile \
    src/crypto/external/bsd/openssl/lib/engines/engines.mk
cvs rdiff -u -r0 -r1.1 \
    src/crypto/external/bsd/openssl/lib/engines/capi/Makefile
cvs rdiff -u -r0 -r1.1 \
    src/crypto/external/bsd/openssl/lib/engines/dasync/Makefile
cvs rdiff -u -r0 -r1.1 \
    src/crypto/external/bsd/openssl/lib/engines/ossltest/Makefile
cvs rdiff -u -r0 -r1.1 \
    src/crypto/external/bsd/openssl/lib/engines/padlock/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Added files:

Index: src/crypto/external/bsd/openssl/lib/engines/Makefile
diff -u /dev/null src/crypto/external/bsd/openssl/lib/engines/Makefile:1.1
--- /dev/null	Sat Dec  8 18:24:02 2018
+++ src/crypto/external/bsd/openssl/lib/engines/Makefile	Sat Dec  8 18:24:01 2018
@@ -0,0 +1,8 @@
+#	$NetBSD: Makefile,v 1.1 2018/12/08 23:24:01 christos Exp $
+
+.include "bsd.own.mk"
+
+# OpenSSL engines.
+SUBDIR= capi dasync ossltest padlock
+
+.include <bsd.subdir.mk>
Index: src/crypto/external/bsd/openssl/lib/engines/engines.mk
diff -u /dev/null src/crypto/external/bsd/openssl/lib/engines/engines.mk:1.1
--- /dev/null	Sat Dec  8 18:24:02 2018
+++ src/crypto/external/bsd/openssl/lib/engines/engines.mk	Sat Dec  8 18:24:01 2018
@@ -0,0 +1,36 @@
+#	$NetBSD: engines.mk,v 1.1 2018/12/08 23:24:01 christos Exp $
+
+NOLINT=		# don't build a lint library
+NOPROFILE=	# don't build a profile library
+NOPICINSTALL=	# don't install _pic.a library
+
+.include <bsd.own.mk>
+
+SHLIB_MAJOR=0
+SHLIB_MINOR=0
+
+CRYPTODIST=     ${NETBSDSRCDIR}/crypto
+.include "${NETBSDSRCDIR}/crypto/Makefile.openssl"
+.PATH: ${OPENSSLSRC}/engines
+
+CPPFLAGS+= -I${OPENSSLSRC}/include -I${OPENSSLSRC}/../include
+ 
+.if defined(MLIBDIR)
+LIBDIR=/usr/lib/${MLIBDIR}/openssl
+.else
+LIBDIR=/usr/lib/openssl
+.endif
+
+.if ${MKPIC} != "no"
+.PRECIOUS: ${DESTDIR}${LIBDIR}/${LIB}.so
+libinstall:: ${DESTDIR}${LIBDIR}/${LIB}.so
+.else
+libinstall::
+.endif
+
+.include <bsd.lib.mk>
+
+${DESTDIR}${LIBDIR}/${LIB}.so: lib${LIB}.so.${SHLIB_FULLVERSION}
+	${_MKTARGET_INSTALL}
+	${INSTALL_FILE} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
+	    ${.ALLSRC} ${.TARGET}

Index: src/crypto/external/bsd/openssl/lib/engines/capi/Makefile
diff -u /dev/null src/crypto/external/bsd/openssl/lib/engines/capi/Makefile:1.1
--- /dev/null	Sat Dec  8 18:24:02 2018
+++ src/crypto/external/bsd/openssl/lib/engines/capi/Makefile	Sat Dec  8 18:24:01 2018
@@ -0,0 +1,6 @@
+#	$NetBSD: Makefile,v 1.1 2018/12/08 23:24:01 christos Exp $
+
+LIB=	capi
+SRCS=	e_capi.c e_capi_err.c
+
+.include "../engines.mk"

Index: src/crypto/external/bsd/openssl/lib/engines/dasync/Makefile
diff -u /dev/null src/crypto/external/bsd/openssl/lib/engines/dasync/Makefile:1.1
--- /dev/null	Sat Dec  8 18:24:02 2018
+++ src/crypto/external/bsd/openssl/lib/engines/dasync/Makefile	Sat Dec  8 18:24:01 2018
@@ -0,0 +1,6 @@
+#	$NetBSD: Makefile,v 1.1 2018/12/08 23:24:01 christos Exp $
+
+LIB=	dasync
+SRCS=	e_dasync.c e_dasync_err.c
+
+.include "../engines.mk"

Index: src/crypto/external/bsd/openssl/lib/engines/ossltest/Makefile
diff -u /dev/null src/crypto/external/bsd/openssl/lib/engines/ossltest/Makefile:1.1
--- /dev/null	Sat Dec  8 18:24:02 2018
+++ src/crypto/external/bsd/openssl/lib/engines/ossltest/Makefile	Sat Dec  8 18:24:02 2018
@@ -0,0 +1,6 @@
+#	$NetBSD: Makefile,v 1.1 2018/12/08 23:24:02 christos Exp $
+
+LIB=	ossltest
+SRCS=	e_ossltest.c e_ossltest_err.c
+
+.include "../engines.mk"

Index: src/crypto/external/bsd/openssl/lib/engines/padlock/Makefile
diff -u /dev/null src/crypto/external/bsd/openssl/lib/engines/padlock/Makefile:1.1
--- /dev/null	Sat Dec  8 18:24:02 2018
+++ src/crypto/external/bsd/openssl/lib/engines/padlock/Makefile	Sat Dec  8 18:24:02 2018
@@ -0,0 +1,6 @@
+#	$NetBSD: Makefile,v 1.1 2018/12/08 23:24:02 christos Exp $
+
+LIB=	padlock
+SRCS=	e_padlock.c
+
+.include "../engines.mk"

Reply via email to