Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/etc/mtree Revert "openssl: Nix build goo for dynamically loa...
details: https://anonhg.NetBSD.org/src/rev/60ce3436aaad
branches: trunk
changeset: 376018:60ce3436aaad
user: riastradh <riastradh%NetBSD.org@localhost>
date: Fri May 26 22:26:10 2023 +0000
description:
Revert "openssl: Nix build goo for dynamically loaded engines."
Turns out there is a regression lurking here: the devcrypto engine
was made dynamic-only (https://github.com/openssl/openssl/pull/7859),
so to maintain that functionality, we need to build dynamic engines.
Will fix the aarch64 build issue and wire things up separately.
diffstat:
crypto/external/bsd/openssl/lib/engines/Makefile | 8 ++
crypto/external/bsd/openssl/lib/engines/capi/Makefile | 6 +
crypto/external/bsd/openssl/lib/engines/capi/capi.map | 6 +
crypto/external/bsd/openssl/lib/engines/dasync/Makefile | 6 +
crypto/external/bsd/openssl/lib/engines/dasync/dasync.map | 6 +
crypto/external/bsd/openssl/lib/engines/devcrypto/Makefile | 6 +
crypto/external/bsd/openssl/lib/engines/devcrypto/devcrypto.map | 6 +
crypto/external/bsd/openssl/lib/engines/engines.mk | 34 ++++++++++
crypto/external/bsd/openssl/lib/engines/loader_attic/Makefile | 6 +
crypto/external/bsd/openssl/lib/engines/loader_attic/loader_attic.map | 6 +
crypto/external/bsd/openssl/lib/engines/ossltest/Makefile | 6 +
crypto/external/bsd/openssl/lib/engines/ossltest/ossltest.map | 6 +
crypto/external/bsd/openssl/lib/engines/padlock/Makefile | 6 +
crypto/external/bsd/openssl/lib/engines/padlock/padlock.map | 6 +
distrib/sets/lists/base/ad.mips | 5 +-
distrib/sets/lists/base/ad.powerpc | 3 +-
distrib/sets/lists/base/ad.riscv | 3 +-
distrib/sets/lists/base/md.amd64 | 3 +-
distrib/sets/lists/base/md.sparc64 | 3 +-
distrib/sets/lists/base/mi | 3 +-
etc/mtree/NetBSD.dist.base | 3 +-
etc/mtree/NetBSD.dist.compat.in | 3 +-
22 files changed, 132 insertions(+), 8 deletions(-)
diffs (truncated from 311 to 300 lines):
diff -r cffe84b6d625 -r 60ce3436aaad crypto/external/bsd/openssl/lib/engines/Makefile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/crypto/external/bsd/openssl/lib/engines/Makefile Fri May 26 22:26:10 2023 +0000
@@ -0,0 +1,8 @@
+# $NetBSD: Makefile,v 1.4 2023/05/26 22:26:10 riastradh Exp $
+
+.include "bsd.own.mk"
+
+# OpenSSL engines.
+SUBDIR= capi dasync devcrypto loader_attic ossltest padlock
+
+.include <bsd.subdir.mk>
diff -r cffe84b6d625 -r 60ce3436aaad crypto/external/bsd/openssl/lib/engines/capi/Makefile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/crypto/external/bsd/openssl/lib/engines/capi/Makefile Fri May 26 22:26:10 2023 +0000
@@ -0,0 +1,6 @@
+# $NetBSD: Makefile,v 1.3 2023/05/26 22:26:10 riastradh Exp $
+
+LIB= capi
+SRCS= e_capi.c e_capi_err.c
+
+.include "../engines.mk"
diff -r cffe84b6d625 -r 60ce3436aaad crypto/external/bsd/openssl/lib/engines/capi/capi.map
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/crypto/external/bsd/openssl/lib/engines/capi/capi.map Fri May 26 22:26:10 2023 +0000
@@ -0,0 +1,6 @@
+{
+ global:
+ bind_engine;
+ v_check;
+ local: *;
+};
diff -r cffe84b6d625 -r 60ce3436aaad crypto/external/bsd/openssl/lib/engines/dasync/Makefile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/crypto/external/bsd/openssl/lib/engines/dasync/Makefile Fri May 26 22:26:10 2023 +0000
@@ -0,0 +1,6 @@
+# $NetBSD: Makefile,v 1.3 2023/05/26 22:26:10 riastradh Exp $
+
+LIB= dasync
+SRCS= e_dasync.c e_dasync_err.c
+
+.include "../engines.mk"
diff -r cffe84b6d625 -r 60ce3436aaad crypto/external/bsd/openssl/lib/engines/dasync/dasync.map
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/crypto/external/bsd/openssl/lib/engines/dasync/dasync.map Fri May 26 22:26:10 2023 +0000
@@ -0,0 +1,6 @@
+{
+ global:
+ bind_engine;
+ v_check;
+ local: *;
+};
diff -r cffe84b6d625 -r 60ce3436aaad crypto/external/bsd/openssl/lib/engines/devcrypto/Makefile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/crypto/external/bsd/openssl/lib/engines/devcrypto/Makefile Fri May 26 22:26:10 2023 +0000
@@ -0,0 +1,6 @@
+# $NetBSD: Makefile,v 1.3 2023/05/26 22:26:10 riastradh Exp $
+
+LIB= devcrypto
+SRCS= e_devcrypto.c
+
+.include "../engines.mk"
diff -r cffe84b6d625 -r 60ce3436aaad crypto/external/bsd/openssl/lib/engines/devcrypto/devcrypto.map
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/crypto/external/bsd/openssl/lib/engines/devcrypto/devcrypto.map Fri May 26 22:26:10 2023 +0000
@@ -0,0 +1,6 @@
+{
+ global:
+ bind_engine;
+ v_check;
+ local: *;
+};
diff -r cffe84b6d625 -r 60ce3436aaad crypto/external/bsd/openssl/lib/engines/engines.mk
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/crypto/external/bsd/openssl/lib/engines/engines.mk Fri May 26 22:26:10 2023 +0000
@@ -0,0 +1,34 @@
+# $NetBSD: engines.mk,v 1.5 2023/05/26 22:26:10 riastradh 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
+
+LIBDIR=${OSSL_ENGINESDIR}
+
+.if ${MKPIC} != "no"
+.PRECIOUS: ${DESTDIR}${LIBDIR}/${LIB}.so
+libinstall:: ${DESTDIR}${LIBDIR}/${LIB}.so
+.else
+libinstall::
+.endif
+
+LDFLAGS+=-Wl,--version-script=${.CURDIR}/${LIB}.map
+
+.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}
diff -r cffe84b6d625 -r 60ce3436aaad crypto/external/bsd/openssl/lib/engines/loader_attic/Makefile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/crypto/external/bsd/openssl/lib/engines/loader_attic/Makefile Fri May 26 22:26:10 2023 +0000
@@ -0,0 +1,6 @@
+# $NetBSD: Makefile,v 1.3 2023/05/26 22:26:10 riastradh Exp $
+
+LIB= loader_attic
+SRCS= e_loader_attic.c
+
+.include "../engines.mk"
diff -r cffe84b6d625 -r 60ce3436aaad crypto/external/bsd/openssl/lib/engines/loader_attic/loader_attic.map
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/crypto/external/bsd/openssl/lib/engines/loader_attic/loader_attic.map Fri May 26 22:26:10 2023 +0000
@@ -0,0 +1,6 @@
+{
+ global:
+ bind_engine;
+ v_check;
+ local: *;
+};
diff -r cffe84b6d625 -r 60ce3436aaad crypto/external/bsd/openssl/lib/engines/ossltest/Makefile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/crypto/external/bsd/openssl/lib/engines/ossltest/Makefile Fri May 26 22:26:10 2023 +0000
@@ -0,0 +1,6 @@
+# $NetBSD: Makefile,v 1.3 2023/05/26 22:26:10 riastradh Exp $
+
+LIB= ossltest
+SRCS= e_ossltest.c e_ossltest_err.c
+
+.include "../engines.mk"
diff -r cffe84b6d625 -r 60ce3436aaad crypto/external/bsd/openssl/lib/engines/ossltest/ossltest.map
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/crypto/external/bsd/openssl/lib/engines/ossltest/ossltest.map Fri May 26 22:26:10 2023 +0000
@@ -0,0 +1,6 @@
+{
+ global:
+ bind_engine;
+ v_check;
+ local: *;
+};
diff -r cffe84b6d625 -r 60ce3436aaad crypto/external/bsd/openssl/lib/engines/padlock/Makefile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/crypto/external/bsd/openssl/lib/engines/padlock/Makefile Fri May 26 22:26:10 2023 +0000
@@ -0,0 +1,6 @@
+# $NetBSD: Makefile,v 1.3 2023/05/26 22:26:10 riastradh Exp $
+
+LIB= padlock
+SRCS= e_padlock.c
+
+.include "../engines.mk"
diff -r cffe84b6d625 -r 60ce3436aaad crypto/external/bsd/openssl/lib/engines/padlock/padlock.map
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/crypto/external/bsd/openssl/lib/engines/padlock/padlock.map Fri May 26 22:26:10 2023 +0000
@@ -0,0 +1,6 @@
+{
+ global:
+ bind_engine;
+ v_check;
+ local: *;
+};
diff -r cffe84b6d625 -r 60ce3436aaad distrib/sets/lists/base/ad.mips
--- a/distrib/sets/lists/base/ad.mips Fri May 26 21:40:46 2023 +0000
+++ b/distrib/sets/lists/base/ad.mips Fri May 26 22:26:10 2023 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: ad.mips,v 1.85 2023/05/26 13:21:52 riastradh Exp $
+# $NetBSD: ad.mips,v 1.86 2023/05/26 22:26:11 riastradh Exp $
./lib/libc_fp.so base-sys-shlib dynamicroot,softfloat,arch64
./lib/libc_fp.so.0 base-sys-shlib dynamicroot,softfloat,arch64
./lib/libc_fp.so.0.0 base-sys-shlib dynamicroot,softfloat,arch64
@@ -9,6 +9,7 @@
./usr/lib/64/libc_fp.so.0 base-compat-shlib compat,pic,arch64,!machine_arch=mipsn64el,!machine_arch=mipsn64eb
./usr/lib/64/libc_fp.so.0.0 base-compat-shlib compat,pic,arch64,!machine_arch=mipsn64el,!machine_arch=mipsn64eb
./usr/lib/64/openssl base-compat-shlib compat,pic,arch64,!machine_arch=mipsn64el,!machine_arch=mipsn64eb
+./usr/lib/64/openssl/engines base-compat-shlib compat,pic,arch64,!machine_arch=mipsn64el,!machine_arch=mipsn64eb
./usr/lib/64/openssl/modules base-compat-shlib compat,pic,arch64,!machine_arch=mipsn64el,!machine_arch=mipsn64eb
./usr/lib/64/openssl/modules/legacy.so base-compat-shlib compat,pic,arch64,!machine_arch=mipsn64el,!machine_arch=mipsn64eb
./usr/lib/libc_fp.so base-sys-shlib softfloat,arch64
@@ -22,12 +23,14 @@
./usr/lib/o32/libgomp.so.2.0 base-compat-shlib compat,pic,arch64,gcc=10,obsolete
./usr/lib/o32/libgomp.so.2.1 base-compat-shlib compat,pic,arch64,gcc=10
./usr/lib/o32/openssl base-crypto-usr compat,pic,arch64
+./usr/lib/o32/openssl/engines base-crypto-usr compat,pic,arch64
./usr/lib/o32/openssl/modules base-crypto-usr compat,pic,arch64
./usr/lib/o32/openssl/modules/legacy.so base-crypto-usr compat,pic,arch64
./usr/lib/n32/libc_fp.so base-compat-shlib compat,pic,arch64,!machine_arch=mips64el,!machine_arch=mips64eb
./usr/lib/n32/libc_fp.so.0 base-compat-shlib compat,pic,arch64,!machine_arch=mips64el,!machine_arch=mips64eb
./usr/lib/n32/libc_fp.so.0.0 base-compat-shlib compat,pic,arch64,!machine_arch=mips64el,!machine_arch=mips64eb
./usr/lib/n32/openssl base-crypto-usr compat,pic,arch64,!machine_arch=mips64el,!machine_arch=mips64eb
+./usr/lib/n32/openssl/engines base-crypto-usr compat,pic,arch64,!machine_arch=mips64el,!machine_arch=mips64eb
./usr/lib/n32/openssl/modules base-crypto-usr compat,pic,arch64,!machine_arch=mips64el,!machine_arch=mips64eb
./usr/lib/n32/openssl/modules/legacy.so base-crypto-usr compat,pic,arch64,!machine_arch=mips64el,!machine_arch=mips64eb
./usr/libexec/ld.elf_so-64 base-compat-shlib compat,pic,arch64,!machine_arch=mipsn64el,!machine_arch=mipsn64eb
diff -r cffe84b6d625 -r 60ce3436aaad distrib/sets/lists/base/ad.powerpc
--- a/distrib/sets/lists/base/ad.powerpc Fri May 26 21:40:46 2023 +0000
+++ b/distrib/sets/lists/base/ad.powerpc Fri May 26 22:26:10 2023 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: ad.powerpc,v 1.43 2023/05/26 13:21:52 riastradh Exp $
+# $NetBSD: ad.powerpc,v 1.44 2023/05/26 22:26:11 riastradh Exp $
./libexec/ld.elf_so-powerpc base-sysutil-bin compat,pic
./usr/bin/fdformat base-util-bin
./usr/libexec/ld.elf_so-powerpc base-sysutil-bin compat,pic
./usr/lib/powerpc/openssl base-crypto-usr compat
+./usr/lib/powerpc/openssl/engines base-crypto-usr compat
./usr/lib/powerpc/openssl/modules base-crypto-usr compat
./usr/lib/powerpc/openssl/modules/legacy.so base-crypto-usr compat,pic,openssl=30
diff -r cffe84b6d625 -r 60ce3436aaad distrib/sets/lists/base/ad.riscv
--- a/distrib/sets/lists/base/ad.riscv Fri May 26 21:40:46 2023 +0000
+++ b/distrib/sets/lists/base/ad.riscv Fri May 26 22:26:10 2023 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: ad.riscv,v 1.26 2023/05/26 13:21:52 riastradh Exp $
+# $NetBSD: ad.riscv,v 1.27 2023/05/26 22:26:11 riastradh Exp $
./libexec/ld.elf_so-rv32 base-compat-shlib compat,pic,arch64
./usr/libexec/ld.elf_so-rv32 base-compat-shlib compat,pic,arch64
./usr/lib/rv32/openssl base-crypto-usr compat
+./usr/lib/rv32/openssl/engines base-crypto-usr compat
./usr/lib/rv32/openssl/modules base-crypto-usr compat
./usr/lib/rv32/openssl/modules/legacy.so base-crypto-usr compat,pic,openssl=30
./usr/mdec/bootriscv64.efi base-sysutil-bin uefi,arch64
diff -r cffe84b6d625 -r 60ce3436aaad distrib/sets/lists/base/md.amd64
--- a/distrib/sets/lists/base/md.amd64 Fri May 26 21:40:46 2023 +0000
+++ b/distrib/sets/lists/base/md.amd64 Fri May 26 22:26:10 2023 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.289 2023/05/26 13:21:52 riastradh Exp $
+# $NetBSD: md.amd64,v 1.290 2023/05/26 22:26:11 riastradh Exp $
./dev/lms0 base-obsolete obsolete
./dev/mms0 base-obsolete obsolete
./libexec/ld.elf_so-i386 base-sys-shlib compat,pic
@@ -12,6 +12,7 @@
./usr/lib/i386/librtld_db.so.0 base-compat-shlib compat,pic,dtrace
./usr/lib/i386/librtld_db.so.0.0 base-compat-shlib compat,pic,dtrace
./usr/lib/i386/openssl base-crypto-usr
+./usr/lib/i386/openssl/engines base-crypto-usr
./usr/lib/i386/openssl/modules base-crypto-usr
./usr/lib/i386/openssl/modules/legacy.so base-crypto-usr compat,pic,openssl=30
./usr/lib/libtsan.so base-sys-shlib cxx,gcc=9
diff -r cffe84b6d625 -r 60ce3436aaad distrib/sets/lists/base/md.sparc64
--- a/distrib/sets/lists/base/md.sparc64 Fri May 26 21:40:46 2023 +0000
+++ b/distrib/sets/lists/base/md.sparc64 Fri May 26 22:26:10 2023 +0000
@@ -1,9 +1,10 @@
-# $NetBSD: md.sparc64,v 1.259 2023/05/26 13:21:52 riastradh Exp $
+# $NetBSD: md.sparc64,v 1.260 2023/05/26 22:26:11 riastradh Exp $
./libexec/ld.elf_so-sparc base-sysutil-bin compat,pic
./sbin/edlabel base-obsolete obsolete
./usr/bin/fdformat base-util-bin
./usr/libexec/ld.elf_so-sparc base-sysutil-bin compat,pic
./usr/lib/sparc/openssl base-crypto-usr
+./usr/lib/sparc/openssl/engines base-crypto-usr
./usr/lib/sparc/openssl/modules base-crypto-usr
./usr/lib/sparc/openssl/modules/legacy.so base-crypto-usr compat,pic,openssl=30
./usr/lkm/compat_netbsd32.o base-obsolete obsolete
diff -r cffe84b6d625 -r 60ce3436aaad distrib/sets/lists/base/mi
--- a/distrib/sets/lists/base/mi Fri May 26 21:40:46 2023 +0000
+++ b/distrib/sets/lists/base/mi Fri May 26 22:26:10 2023 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1320 2023/05/26 13:21:52 riastradh Exp $
+# $NetBSD: mi,v 1.1321 2023/05/26 22:26:11 riastradh Exp $
#
# Note: Don't delete entries from here - mark them as "obsolete" instead,
# unless otherwise stated below.
@@ -1211,6 +1211,7 @@
./usr/lib/named base-sys-usr
./usr/lib/npf base-obsolete obsolete
./usr/lib/openssl base-crypto-usr
+./usr/lib/openssl/engines base-crypto-usr
./usr/lib/openssl/modules base-crypto-usr
./usr/lib/openssl/modules/legacy.so base-crypto-usr pic,openssl=30
./usr/lib/postfix base-postfix-usr
diff -r cffe84b6d625 -r 60ce3436aaad etc/mtree/NetBSD.dist.base
--- a/etc/mtree/NetBSD.dist.base Fri May 26 21:40:46 2023 +0000
+++ b/etc/mtree/NetBSD.dist.base Fri May 26 22:26:10 2023 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: NetBSD.dist.base,v 1.249 2023/05/26 13:21:52 riastradh Exp $
+# $NetBSD: NetBSD.dist.base,v 1.250 2023/05/26 22:26:11 riastradh Exp $
# @(#)4.4BSD.dist 8.1 (Berkeley) 6/13/93
# Do not customize this file as it may be overwritten on upgrades.
@@ -356,6 +356,7 @@
./usr/lib/lua/5.4
./usr/lib/named
./usr/lib/openssl
+./usr/lib/openssl/engines
./usr/lib/openssl/modules
./usr/lib/pkgconfig
./usr/lib/postfix
diff -r cffe84b6d625 -r 60ce3436aaad etc/mtree/NetBSD.dist.compat.in
--- a/etc/mtree/NetBSD.dist.compat.in Fri May 26 21:40:46 2023 +0000
+++ b/etc/mtree/NetBSD.dist.compat.in Fri May 26 22:26:10 2023 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: NetBSD.dist.compat.in,v 1.5 2023/05/26 13:21:52 riastradh Exp $
+# $NetBSD: NetBSD.dist.compat.in,v 1.6 2023/05/26 22:26:11 riastradh Exp $
Home |
Main Index |
Thread Index |
Old Index