Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

openssl: Wire up dynamic engine build goo. 

This restores the devcrypto engine, which was converted from static
to dynamic since the previous OpenSSL update.

XXX Pretty sure I got some of the set list package names wrong, but
it's not clear what the right ones are or what consequences any of
this has.

XXX Needs testing.
This commit is contained in:
riastradh 2023-05-26 22:27:50 +00:00
parent 93c12d2bae
commit 717caf24ae
10 changed files with 68 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
crypto/external/bsd/openssl/lib/Makefile vendored
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.7 2023/05/08 14:30:33 christos Exp $
# $NetBSD: Makefile,v 1.8 2023/05/26 22:27:50 riastradh Exp $
.include "bsd.own.mk"
@ -6,5 +6,6 @@
SUBDIR= libapps libcommon libcrypto libcryptotest libdes
SUBDIR+= .WAIT libssl liblegacy # depends on libcrypto, libcommon
SUBDIR+= engines
.include <bsd.subdir.mk>

4
crypto/external/bsd/openssl/lib/engines/capi/Makefile vendored
View File

@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.3 2023/05/26 22:26:10 riastradh Exp $
# $NetBSD: Makefile,v 1.4 2023/05/26 22:27:50 riastradh Exp $
LIB= capi
SRCS= e_capi.c e_capi_err.c
SRCS= e_capi.c
.include "../engines.mk"

4
crypto/external/bsd/openssl/lib/engines/dasync/Makefile vendored
View File

@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.3 2023/05/26 22:26:10 riastradh Exp $
# $NetBSD: Makefile,v 1.4 2023/05/26 22:27:51 riastradh Exp $
LIB= dasync
SRCS= e_dasync.c e_dasync_err.c
SRCS= e_dasync.c
.include "../engines.mk"

4
crypto/external/bsd/openssl/lib/engines/ossltest/Makefile vendored
View File

@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.3 2023/05/26 22:26:10 riastradh Exp $
# $NetBSD: Makefile,v 1.4 2023/05/26 22:27:51 riastradh Exp $
LIB= ossltest
SRCS= e_ossltest.c e_ossltest_err.c
SRCS= e_ossltest.c
.include "../engines.mk"

14
distrib/sets/lists/base/ad.aarch64
View File

@ -1,4 +1,4 @@
# $NetBSD: ad.aarch64,v 1.40 2023/05/26 22:26:25 riastradh Exp $
# $NetBSD: ad.aarch64,v 1.41 2023/05/26 22:27:51 riastradh Exp $
./lib/eabi base-compat-lib compat,llvm
./lib/eabi/npf base-compat-lib compat,llvm
./lib/eabihf base-compat-lib compat,llvm
@ -19,6 +19,12 @@
./usr/lib/eabi/lua/5.4 base-compat-lib compat,llvm
./usr/lib/eabi/openssl base-compat-lib compat,llvm
./usr/lib/eabi/openssl/engines base-compat-lib compat,llvm
./usr/lib/eabi/openssl/engines/capi.so base-compat-lib pic,openssl=30,compat,llvm
./usr/lib/eabi/openssl/engines/dasync.so base-compat-lib pic,openssl=30,compat,llvm
./usr/lib/eabi/openssl/engines/devcrypto.so base-compat-lib pic,openssl=30,compat,llvm
./usr/lib/eabi/openssl/engines/loader_attic.so base-compat-lib pic,openssl=30,compat,llvm
./usr/lib/eabi/openssl/engines/ossltest.so base-compat-lib pic,openssl=30,compat,llvm
./usr/lib/eabi/openssl/engines/padlock.so base-compat-lib pic,openssl=30,compat,llvm
./usr/lib/eabi/openssl/modules base-compat-lib compat,llvm
./usr/lib/eabi/openssl/modules/legacy.so base-compat-lib compat,llvm
./usr/lib/eabi/security base-compat-lib compat,llvm
@ -31,6 +37,12 @@
./usr/lib/eabihf/lua/5.4 base-compat-lib compat,llvm
./usr/lib/eabihf/openssl base-compat-lib compat,llvm
./usr/lib/eabihf/openssl/engines base-compat-lib compat,llvm
./usr/lib/eabihf/openssl/engines/capi.so base-compat-lib pic,openssl=30,compat,llvm
./usr/lib/eabihf/openssl/engines/dasync.so base-compat-lib pic,openssl=30,compat,llvm
./usr/lib/eabihf/openssl/engines/devcrypto.so base-compat-lib pic,openssl=30,compat,llvm
./usr/lib/eabihf/openssl/engines/loader_attic.so base-compat-lib pic,openssl=30,compat,llvm
./usr/lib/eabihf/openssl/engines/ossltest.so base-compat-lib pic,openssl=30,compat,llvm
./usr/lib/eabihf/openssl/engines/padlock.so base-compat-lib pic,openssl=30,compat,llvm
./usr/lib/eabihf/openssl/modules base-compat-lib compat,llvm
./usr/lib/eabihf/openssl/modules/legacy.so base-compat-lib compat,llvm
./usr/lib/eabihf/security base-compat-lib compat,llvm

20
distrib/sets/lists/base/ad.mips
View File

@ -1,4 +1,4 @@
# $NetBSD: ad.mips,v 1.86 2023/05/26 22:26:11 riastradh Exp $
# $NetBSD: ad.mips,v 1.87 2023/05/26 22:27:51 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
@ -10,6 +10,12 @@
./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/engines/capi.so base-compat-shlib compat,pic,arch64,!machine_arch=mipsn64el,!machine_arch=mipsn64eb,openssl=30
./usr/lib/64/openssl/engines/dasync.so base-compat-shlib compat,pic,arch64,!machine_arch=mipsn64el,!machine_arch=mipsn64eb,openssl=30
./usr/lib/64/openssl/engines/devcryptoapi.so base-compat-shlib compat,pic,arch64,!machine_arch=mipsn64el,!machine_arch=mipsn64eb,openssl=30
./usr/lib/64/openssl/engines/loader_atticapi.so base-compat-shlib compat,pic,arch64,!machine_arch=mipsn64el,!machine_arch=mipsn64eb,openssl=30
./usr/lib/64/openssl/engines/ossltest.so base-compat-shlib compat,pic,arch64,!machine_arch=mipsn64el,!machine_arch=mipsn64eb,openssl=30
./usr/lib/64/openssl/engines/padlock.so base-compat-shlib compat,pic,arch64,!machine_arch=mipsn64el,!machine_arch=mipsn64eb,openssl=30
./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
@ -24,6 +30,12 @@
./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/engines/capi.so base-compat-shlib compat,pic,arch64,openssl=30
./usr/lib/o32/openssl/engines/dasync.so base-compat-shlib compat,pic,arch64,openssl=30
./usr/lib/o32/openssl/engines/devcrypto.so base-compat-shlib compat,pic,arch64,openssl=30
./usr/lib/o32/openssl/engines/loader_attic.so base-compat-shlib compat,pic,arch64,openssl=30
./usr/lib/o32/openssl/engines/ossltest.so base-compat-shlib compat,pic,arch64,openssl=30
./usr/lib/o32/openssl/engines/padlock.so base-compat-shlib compat,pic,arch64,openssl=30
./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
@ -31,6 +43,12 @@
./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/engines/capi.so base-compat-shlib compat,pic,arch64,!machine_arch=mips64el,!machine_arch=mips64eb,openssl=30
./usr/lib/n32/openssl/engines/dasync.so base-compat-shlib compat,pic,arch64,!machine_arch=mips64el,!machine_arch=mips64eb,openssl=30
./usr/lib/n32/openssl/engines/devcrypto.so base-compat-shlib compat,pic,arch64,!machine_arch=mips64el,!machine_arch=mips64eb,openssl=30
./usr/lib/n32/openssl/engines/loader_attic.so base-compat-shlib compat,pic,arch64,!machine_arch=mips64el,!machine_arch=mips64eb,openssl=30
./usr/lib/n32/openssl/engines/ossltest.so base-compat-shlib compat,pic,arch64,!machine_arch=mips64el,!machine_arch=mips64eb,openssl=30
./usr/lib/n32/openssl/engines/padlock.so base-compat-shlib compat,pic,arch64,!machine_arch=mips64el,!machine_arch=mips64eb,openssl=30
./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

8
distrib/sets/lists/base/ad.powerpc
View File

@ -1,8 +1,14 @@
# $NetBSD: ad.powerpc,v 1.44 2023/05/26 22:26:11 riastradh Exp $
# $NetBSD: ad.powerpc,v 1.45 2023/05/26 22:27:51 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/engines/capi.so base-crypto-usr compat,pic,openssl=30
./usr/lib/powerpc/openssl/engines/dasync.so base-crypto-usr compat,pic,openssl=30
./usr/lib/powerpc/openssl/engines/devcrypto.so base-crypto-usr compat,pic,openssl=30
./usr/lib/powerpc/openssl/engines/loader_attic.so base-crypto-usr compat,pic,openssl=30
./usr/lib/powerpc/openssl/engines/ossltest.so base-crypto-usr compat,pic,openssl=30
./usr/lib/powerpc/openssl/engines/padlock.so base-crypto-usr compat,pic,openssl=30
./usr/lib/powerpc/openssl/modules base-crypto-usr compat
./usr/lib/powerpc/openssl/modules/legacy.so base-crypto-usr compat,pic,openssl=30

8
distrib/sets/lists/base/ad.riscv
View File

@ -1,8 +1,14 @@
# $NetBSD: ad.riscv,v 1.27 2023/05/26 22:26:11 riastradh Exp $
# $NetBSD: ad.riscv,v 1.28 2023/05/26 22:27:51 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/engines/capi.so base-crypto-usr compat,pic,openssl=30
./usr/lib/rv32/openssl/engines/dasync.so base-crypto-usr compat,pic,openssl=30
./usr/lib/rv32/openssl/engines/devcrypto.so base-crypto-usr compat,pic,openssl=30
./usr/lib/rv32/openssl/engines/loader_attic.so base-crypto-usr compat,pic,openssl=30
./usr/lib/rv32/openssl/engines/ossltest.so base-crypto-usr compat,pic,openssl=30
./usr/lib/rv32/openssl/engines/padlock.so base-crypto-usr compat,pic,openssl=30
./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

8
distrib/sets/lists/base/md.amd64
View File

@ -1,4 +1,4 @@
# $NetBSD: md.amd64,v 1.290 2023/05/26 22:26:11 riastradh Exp $
# $NetBSD: md.amd64,v 1.291 2023/05/26 22:27:51 riastradh Exp $
./dev/lms0 base-obsolete obsolete
./dev/mms0 base-obsolete obsolete
./libexec/ld.elf_so-i386 base-sys-shlib compat,pic
@ -13,6 +13,12 @@
./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/engines/capi.so base-crypto-usr compat,pic,openssl=30
./usr/lib/i386/openssl/engines/dasync.so base-crypto-usr compat,pic,openssl=30
./usr/lib/i386/openssl/engines/devcrypto.so base-crypto-usr compat,pic,openssl=30
./usr/lib/i386/openssl/engines/loader_attic.so base-crypto-usr compat,pic,openssl=30
./usr/lib/i386/openssl/engines/ossltest.so base-crypto-usr compat,pic,openssl=30
./usr/lib/i386/openssl/engines/padlock.so base-crypto-usr compat,pic,openssl=30
./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

8
distrib/sets/lists/base/mi
View File

@ -1,4 +1,4 @@
# $NetBSD: mi,v 1.1321 2023/05/26 22:26:11 riastradh Exp $
# $NetBSD: mi,v 1.1322 2023/05/26 22:27:51 riastradh Exp $
#
# Note: Don't delete entries from here - mark them as "obsolete" instead,
# unless otherwise stated below.
@ -1212,6 +1212,12 @@
./usr/lib/npf base-obsolete obsolete
./usr/lib/openssl base-crypto-usr
./usr/lib/openssl/engines base-crypto-usr
./usr/lib/openssl/engines/capi.so base-crypto-usr pic,openssl=30
./usr/lib/openssl/engines/dasync.so base-crypto-usr pic,openssl=30
./usr/lib/openssl/engines/devcrypto.so base-crypto-usr pic,openssl=30
./usr/lib/openssl/engines/loader_attic.so base-crypto-usr pic,openssl=30
./usr/lib/openssl/engines/ossltest.so base-crypto-usr pic,openssl=30
./usr/lib/openssl/engines/padlock.so base-crypto-usr pic,openssl=30
./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