Module Name: src
Committed By: christos
Date: Sun May 7 16:21:20 UTC 2023
Modified Files:
src/crypto/external/bsd/openssl/lib/engines: Makefile engines.mk
Added Files:
src/crypto/external/bsd/openssl/lib/engines/capi: capi.map
src/crypto/external/bsd/openssl/lib/engines/dasync: dasync.map
src/crypto/external/bsd/openssl/lib/engines/devcrypto: Makefile
devcrypto.map
src/crypto/external/bsd/openssl/lib/engines/loader_attic: Makefile
loader_attic.map
src/crypto/external/bsd/openssl/lib/engines/ossltest: ossltest.map
src/crypto/external/bsd/openssl/lib/engines/padlock: padlock.map
Log Message:
more engines and maps for them
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 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/capi.map
cvs rdiff -u -r0 -r1.1 \
src/crypto/external/bsd/openssl/lib/engines/dasync/dasync.map
cvs rdiff -u -r0 -r1.1 \
src/crypto/external/bsd/openssl/lib/engines/devcrypto/Makefile \
src/crypto/external/bsd/openssl/lib/engines/devcrypto/devcrypto.map
cvs rdiff -u -r0 -r1.1 \
src/crypto/external/bsd/openssl/lib/engines/loader_attic/Makefile \
src/crypto/external/bsd/openssl/lib/engines/loader_attic/loader_attic.map
cvs rdiff -u -r0 -r1.1 \
src/crypto/external/bsd/openssl/lib/engines/ossltest/ossltest.map
cvs rdiff -u -r0 -r1.1 \
src/crypto/external/bsd/openssl/lib/engines/padlock/padlock.map
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/openssl/lib/engines/Makefile
diff -u src/crypto/external/bsd/openssl/lib/engines/Makefile:1.1 src/crypto/external/bsd/openssl/lib/engines/Makefile:1.2
--- src/crypto/external/bsd/openssl/lib/engines/Makefile:1.1 Sat Dec 8 18:24:01 2018
+++ src/crypto/external/bsd/openssl/lib/engines/Makefile Sun May 7 12:21:19 2023
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.1 2018/12/08 23:24:01 christos Exp $
+# $NetBSD: Makefile,v 1.2 2023/05/07 16:21:19 christos Exp $
.include "bsd.own.mk"
# OpenSSL engines.
-SUBDIR= capi dasync ossltest padlock
+SUBDIR= capi dasync devcrypto loader_attic ossltest padlock
.include <bsd.subdir.mk>
Index: src/crypto/external/bsd/openssl/lib/engines/engines.mk
diff -u src/crypto/external/bsd/openssl/lib/engines/engines.mk:1.1 src/crypto/external/bsd/openssl/lib/engines/engines.mk:1.2
--- src/crypto/external/bsd/openssl/lib/engines/engines.mk:1.1 Sat Dec 8 18:24:01 2018
+++ src/crypto/external/bsd/openssl/lib/engines/engines.mk Sun May 7 12:21:19 2023
@@ -1,4 +1,4 @@
-# $NetBSD: engines.mk,v 1.1 2018/12/08 23:24:01 christos Exp $
+# $NetBSD: engines.mk,v 1.2 2023/05/07 16:21:19 christos Exp $
NOLINT= # don't build a lint library
NOPROFILE= # don't build a profile library
@@ -15,11 +15,7 @@ CRYPTODIST= ${NETBSDSRCDIR}/crypto
CPPFLAGS+= -I${OPENSSLSRC}/include -I${OPENSSLSRC}/../include
-.if defined(MLIBDIR)
-LIBDIR=/usr/lib/${MLIBDIR}/openssl
-.else
-LIBDIR=/usr/lib/openssl
-.endif
+LIBDIR=${OSSL_ENGINESDIR}
.if ${MKPIC} != "no"
.PRECIOUS: ${DESTDIR}${LIBDIR}/${LIB}.so
@@ -28,6 +24,8 @@ libinstall:: ${DESTDIR}${LIBDIR}/${LIB}.
libinstall::
.endif
+LDFLAGS+=-Wl,--version-script=${.CURDIR}/${LIB}.map
+
.include <bsd.lib.mk>
${DESTDIR}${LIBDIR}/${LIB}.so: lib${LIB}.so.${SHLIB_FULLVERSION}
Added files:
Index: src/crypto/external/bsd/openssl/lib/engines/capi/capi.map
diff -u /dev/null src/crypto/external/bsd/openssl/lib/engines/capi/capi.map:1.1
--- /dev/null Sun May 7 12:21:20 2023
+++ src/crypto/external/bsd/openssl/lib/engines/capi/capi.map Sun May 7 12:21:19 2023
@@ -0,0 +1,6 @@
+{
+ global:
+ bind_engine;
+ v_check;
+ local: *;
+};
Index: src/crypto/external/bsd/openssl/lib/engines/dasync/dasync.map
diff -u /dev/null src/crypto/external/bsd/openssl/lib/engines/dasync/dasync.map:1.1
--- /dev/null Sun May 7 12:21:20 2023
+++ src/crypto/external/bsd/openssl/lib/engines/dasync/dasync.map Sun May 7 12:21:19 2023
@@ -0,0 +1,6 @@
+{
+ global:
+ bind_engine;
+ v_check;
+ local: *;
+};
Index: src/crypto/external/bsd/openssl/lib/engines/devcrypto/Makefile
diff -u /dev/null src/crypto/external/bsd/openssl/lib/engines/devcrypto/Makefile:1.1
--- /dev/null Sun May 7 12:21:20 2023
+++ src/crypto/external/bsd/openssl/lib/engines/devcrypto/Makefile Sun May 7 12:21:19 2023
@@ -0,0 +1,6 @@
+# $NetBSD: Makefile,v 1.1 2023/05/07 16:21:19 christos Exp $
+
+LIB= devcrypto
+SRCS= e_devcrypto.c
+
+.include "../engines.mk"
Index: src/crypto/external/bsd/openssl/lib/engines/devcrypto/devcrypto.map
diff -u /dev/null src/crypto/external/bsd/openssl/lib/engines/devcrypto/devcrypto.map:1.1
--- /dev/null Sun May 7 12:21:20 2023
+++ src/crypto/external/bsd/openssl/lib/engines/devcrypto/devcrypto.map Sun May 7 12:21:19 2023
@@ -0,0 +1,6 @@
+{
+ global:
+ bind_engine;
+ v_check;
+ local: *;
+};
Index: src/crypto/external/bsd/openssl/lib/engines/loader_attic/Makefile
diff -u /dev/null src/crypto/external/bsd/openssl/lib/engines/loader_attic/Makefile:1.1
--- /dev/null Sun May 7 12:21:20 2023
+++ src/crypto/external/bsd/openssl/lib/engines/loader_attic/Makefile Sun May 7 12:21:19 2023
@@ -0,0 +1,6 @@
+# $NetBSD: Makefile,v 1.1 2023/05/07 16:21:19 christos Exp $
+
+LIB= loader_attic
+SRCS= e_loader_attic.c
+
+.include "../engines.mk"
Index: src/crypto/external/bsd/openssl/lib/engines/loader_attic/loader_attic.map
diff -u /dev/null src/crypto/external/bsd/openssl/lib/engines/loader_attic/loader_attic.map:1.1
--- /dev/null Sun May 7 12:21:20 2023
+++ src/crypto/external/bsd/openssl/lib/engines/loader_attic/loader_attic.map Sun May 7 12:21:19 2023
@@ -0,0 +1,6 @@
+{
+ global:
+ bind_engine;
+ v_check;
+ local: *;
+};
Index: src/crypto/external/bsd/openssl/lib/engines/ossltest/ossltest.map
diff -u /dev/null src/crypto/external/bsd/openssl/lib/engines/ossltest/ossltest.map:1.1
--- /dev/null Sun May 7 12:21:20 2023
+++ src/crypto/external/bsd/openssl/lib/engines/ossltest/ossltest.map Sun May 7 12:21:19 2023
@@ -0,0 +1,6 @@
+{
+ global:
+ bind_engine;
+ v_check;
+ local: *;
+};
Index: src/crypto/external/bsd/openssl/lib/engines/padlock/padlock.map
diff -u /dev/null src/crypto/external/bsd/openssl/lib/engines/padlock/padlock.map:1.1
--- /dev/null Sun May 7 12:21:20 2023
+++ src/crypto/external/bsd/openssl/lib/engines/padlock/padlock.map Sun May 7 12:21:19 2023
@@ -0,0 +1,6 @@
+{
+ global:
+ bind_engine;
+ v_check;
+ local: *;
+};
