Module Name: src Committed By: riastradh Date: Fri May 26 22:26:11 UTC 2023
Modified Files: src/distrib/sets/lists/base: ad.mips ad.powerpc ad.riscv md.amd64 md.sparc64 mi src/etc/mtree: NetBSD.dist.base NetBSD.dist.compat.in Added Files: src/crypto/external/bsd/openssl/lib/engines: Makefile engines.mk src/crypto/external/bsd/openssl/lib/engines/capi: Makefile capi.map src/crypto/external/bsd/openssl/lib/engines/dasync: Makefile 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: Makefile ossltest.map src/crypto/external/bsd/openssl/lib/engines/padlock: Makefile padlock.map Log Message: 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. To generate a diff of this commit: cvs rdiff -u -r0 -r1.4 src/crypto/external/bsd/openssl/lib/engines/Makefile cvs rdiff -u -r0 -r1.5 src/crypto/external/bsd/openssl/lib/engines/engines.mk cvs rdiff -u -r0 -r1.3 \ src/crypto/external/bsd/openssl/lib/engines/capi/Makefile \ src/crypto/external/bsd/openssl/lib/engines/capi/capi.map cvs rdiff -u -r0 -r1.3 \ src/crypto/external/bsd/openssl/lib/engines/dasync/Makefile \ src/crypto/external/bsd/openssl/lib/engines/dasync/dasync.map cvs rdiff -u -r0 -r1.3 \ src/crypto/external/bsd/openssl/lib/engines/devcrypto/Makefile \ src/crypto/external/bsd/openssl/lib/engines/devcrypto/devcrypto.map cvs rdiff -u -r0 -r1.3 \ 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.3 \ src/crypto/external/bsd/openssl/lib/engines/ossltest/Makefile \ src/crypto/external/bsd/openssl/lib/engines/ossltest/ossltest.map cvs rdiff -u -r0 -r1.3 \ src/crypto/external/bsd/openssl/lib/engines/padlock/Makefile \ src/crypto/external/bsd/openssl/lib/engines/padlock/padlock.map cvs rdiff -u -r1.85 -r1.86 src/distrib/sets/lists/base/ad.mips cvs rdiff -u -r1.43 -r1.44 src/distrib/sets/lists/base/ad.powerpc cvs rdiff -u -r1.26 -r1.27 src/distrib/sets/lists/base/ad.riscv cvs rdiff -u -r1.289 -r1.290 src/distrib/sets/lists/base/md.amd64 cvs rdiff -u -r1.259 -r1.260 src/distrib/sets/lists/base/md.sparc64 cvs rdiff -u -r1.1320 -r1.1321 src/distrib/sets/lists/base/mi cvs rdiff -u -r1.249 -r1.250 src/etc/mtree/NetBSD.dist.base cvs rdiff -u -r1.5 -r1.6 src/etc/mtree/NetBSD.dist.compat.in Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/distrib/sets/lists/base/ad.mips diff -u src/distrib/sets/lists/base/ad.mips:1.85 src/distrib/sets/lists/base/ad.mips:1.86 --- src/distrib/sets/lists/base/ad.mips:1.85 Fri May 26 13:21:52 2023 +++ src/distrib/sets/lists/base/ad.mips Fri May 26 22:26:11 2023 @@ -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 Index: src/distrib/sets/lists/base/ad.powerpc diff -u src/distrib/sets/lists/base/ad.powerpc:1.43 src/distrib/sets/lists/base/ad.powerpc:1.44 --- src/distrib/sets/lists/base/ad.powerpc:1.43 Fri May 26 13:21:52 2023 +++ src/distrib/sets/lists/base/ad.powerpc Fri May 26 22:26:11 2023 @@ -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 Index: src/distrib/sets/lists/base/ad.riscv diff -u src/distrib/sets/lists/base/ad.riscv:1.26 src/distrib/sets/lists/base/ad.riscv:1.27 --- src/distrib/sets/lists/base/ad.riscv:1.26 Fri May 26 13:21:52 2023 +++ src/distrib/sets/lists/base/ad.riscv Fri May 26 22:26:11 2023 @@ -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 Index: src/distrib/sets/lists/base/md.amd64 diff -u src/distrib/sets/lists/base/md.amd64:1.289 src/distrib/sets/lists/base/md.amd64:1.290 --- src/distrib/sets/lists/base/md.amd64:1.289 Fri May 26 13:21:52 2023 +++ src/distrib/sets/lists/base/md.amd64 Fri May 26 22:26:11 2023 @@ -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 Index: src/distrib/sets/lists/base/md.sparc64 diff -u src/distrib/sets/lists/base/md.sparc64:1.259 src/distrib/sets/lists/base/md.sparc64:1.260 --- src/distrib/sets/lists/base/md.sparc64:1.259 Fri May 26 13:21:52 2023 +++ src/distrib/sets/lists/base/md.sparc64 Fri May 26 22:26:11 2023 @@ -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 Index: src/distrib/sets/lists/base/mi diff -u src/distrib/sets/lists/base/mi:1.1320 src/distrib/sets/lists/base/mi:1.1321 --- src/distrib/sets/lists/base/mi:1.1320 Fri May 26 13:21:52 2023 +++ src/distrib/sets/lists/base/mi Fri May 26 22:26:11 2023 @@ -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 Index: src/etc/mtree/NetBSD.dist.base diff -u src/etc/mtree/NetBSD.dist.base:1.249 src/etc/mtree/NetBSD.dist.base:1.250 --- src/etc/mtree/NetBSD.dist.base:1.249 Fri May 26 13:21:52 2023 +++ src/etc/mtree/NetBSD.dist.base Fri May 26 22:26:11 2023 @@ -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 Index: src/etc/mtree/NetBSD.dist.compat.in diff -u src/etc/mtree/NetBSD.dist.compat.in:1.5 src/etc/mtree/NetBSD.dist.compat.in:1.6 --- src/etc/mtree/NetBSD.dist.compat.in:1.5 Fri May 26 13:21:52 2023 +++ src/etc/mtree/NetBSD.dist.compat.in Fri May 26 22:26:11 2023 @@ -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 $ ./lib/@ARCH_SUBDIR@ ./lib/@ARCH_SUBDIR@/npf @@ -7,6 +7,7 @@ ./usr/lib/@ARCH_SUBDIR@/lua ./usr/lib/@ARCH_SUBDIR@/lua/5.4 ./usr/lib/@ARCH_SUBDIR@/openssl +./usr/lib/@ARCH_SUBDIR@/openssl/engines ./usr/lib/@ARCH_SUBDIR@/openssl/modules ./usr/lib/@ARCH_SUBDIR@/security ./usr/libdata/debug/lib/@ARCH_SUBDIR@ Added files: Index: src/crypto/external/bsd/openssl/lib/engines/Makefile diff -u /dev/null src/crypto/external/bsd/openssl/lib/engines/Makefile:1.4 --- /dev/null Fri May 26 22:26:11 2023 +++ src/crypto/external/bsd/openssl/lib/engines/Makefile Fri May 26 22:26:10 2023 @@ -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> Index: src/crypto/external/bsd/openssl/lib/engines/engines.mk diff -u /dev/null src/crypto/external/bsd/openssl/lib/engines/engines.mk:1.5 --- /dev/null Fri May 26 22:26:11 2023 +++ src/crypto/external/bsd/openssl/lib/engines/engines.mk Fri May 26 22:26:10 2023 @@ -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} Index: src/crypto/external/bsd/openssl/lib/engines/capi/Makefile diff -u /dev/null src/crypto/external/bsd/openssl/lib/engines/capi/Makefile:1.3 --- /dev/null Fri May 26 22:26:11 2023 +++ src/crypto/external/bsd/openssl/lib/engines/capi/Makefile Fri May 26 22:26:10 2023 @@ -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" 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.3 --- /dev/null Fri May 26 22:26:11 2023 +++ src/crypto/external/bsd/openssl/lib/engines/capi/capi.map Fri May 26 22:26:10 2023 @@ -0,0 +1,6 @@ +{ + global: + bind_engine; + v_check; + local: *; +}; Index: src/crypto/external/bsd/openssl/lib/engines/dasync/Makefile diff -u /dev/null src/crypto/external/bsd/openssl/lib/engines/dasync/Makefile:1.3 --- /dev/null Fri May 26 22:26:11 2023 +++ src/crypto/external/bsd/openssl/lib/engines/dasync/Makefile Fri May 26 22:26:10 2023 @@ -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" 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.3 --- /dev/null Fri May 26 22:26:11 2023 +++ src/crypto/external/bsd/openssl/lib/engines/dasync/dasync.map Fri May 26 22:26:10 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.3 --- /dev/null Fri May 26 22:26:11 2023 +++ src/crypto/external/bsd/openssl/lib/engines/devcrypto/Makefile Fri May 26 22:26:10 2023 @@ -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" 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.3 --- /dev/null Fri May 26 22:26:11 2023 +++ src/crypto/external/bsd/openssl/lib/engines/devcrypto/devcrypto.map Fri May 26 22:26:10 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.3 --- /dev/null Fri May 26 22:26:11 2023 +++ src/crypto/external/bsd/openssl/lib/engines/loader_attic/Makefile Fri May 26 22:26:10 2023 @@ -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" 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.3 --- /dev/null Fri May 26 22:26:11 2023 +++ src/crypto/external/bsd/openssl/lib/engines/loader_attic/loader_attic.map Fri May 26 22:26:10 2023 @@ -0,0 +1,6 @@ +{ + global: + bind_engine; + v_check; + local: *; +}; Index: src/crypto/external/bsd/openssl/lib/engines/ossltest/Makefile diff -u /dev/null src/crypto/external/bsd/openssl/lib/engines/ossltest/Makefile:1.3 --- /dev/null Fri May 26 22:26:11 2023 +++ src/crypto/external/bsd/openssl/lib/engines/ossltest/Makefile Fri May 26 22:26:10 2023 @@ -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" 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.3 --- /dev/null Fri May 26 22:26:11 2023 +++ src/crypto/external/bsd/openssl/lib/engines/ossltest/ossltest.map Fri May 26 22:26:10 2023 @@ -0,0 +1,6 @@ +{ + global: + bind_engine; + v_check; + local: *; +}; Index: src/crypto/external/bsd/openssl/lib/engines/padlock/Makefile diff -u /dev/null src/crypto/external/bsd/openssl/lib/engines/padlock/Makefile:1.3 --- /dev/null Fri May 26 22:26:11 2023 +++ src/crypto/external/bsd/openssl/lib/engines/padlock/Makefile Fri May 26 22:26:10 2023 @@ -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" 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.3 --- /dev/null Fri May 26 22:26:11 2023 +++ src/crypto/external/bsd/openssl/lib/engines/padlock/padlock.map Fri May 26 22:26:10 2023 @@ -0,0 +1,6 @@ +{ + global: + bind_engine; + v_check; + local: *; +};