Module Name: src
Committed By: riastradh
Date: Fri May 26 13:21:52 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
Removed 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:
openssl: Nix build goo for dynamically loaded engines.
- Engines are deprecated in openssl 3.
- We never actually had the .so engines wired up to be built in
openssl 1.1, and judging by the lack of obsolete entries in the set
lists, I don't think we ever had them wired up to be built at all.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r0 src/crypto/external/bsd/openssl/lib/engines/Makefile
cvs rdiff -u -r1.3 -r0 src/crypto/external/bsd/openssl/lib/engines/engines.mk
cvs rdiff -u -r1.1 -r0 \
src/crypto/external/bsd/openssl/lib/engines/capi/Makefile \
src/crypto/external/bsd/openssl/lib/engines/capi/capi.map
cvs rdiff -u -r1.1 -r0 \
src/crypto/external/bsd/openssl/lib/engines/dasync/Makefile \
src/crypto/external/bsd/openssl/lib/engines/dasync/dasync.map
cvs rdiff -u -r1.1 -r0 \
src/crypto/external/bsd/openssl/lib/engines/devcrypto/Makefile \
src/crypto/external/bsd/openssl/lib/engines/devcrypto/devcrypto.map
cvs rdiff -u -r1.1 -r0 \
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 -r1.1 -r0 \
src/crypto/external/bsd/openssl/lib/engines/ossltest/Makefile \
src/crypto/external/bsd/openssl/lib/engines/ossltest/ossltest.map
cvs rdiff -u -r1.1 -r0 \
src/crypto/external/bsd/openssl/lib/engines/padlock/Makefile \
src/crypto/external/bsd/openssl/lib/engines/padlock/padlock.map
cvs rdiff -u -r1.84 -r1.85 src/distrib/sets/lists/base/ad.mips
cvs rdiff -u -r1.42 -r1.43 src/distrib/sets/lists/base/ad.powerpc
cvs rdiff -u -r1.25 -r1.26 src/distrib/sets/lists/base/ad.riscv
cvs rdiff -u -r1.288 -r1.289 src/distrib/sets/lists/base/md.amd64
cvs rdiff -u -r1.258 -r1.259 src/distrib/sets/lists/base/md.sparc64
cvs rdiff -u -r1.1319 -r1.1320 src/distrib/sets/lists/base/mi
cvs rdiff -u -r1.248 -r1.249 src/etc/mtree/NetBSD.dist.base
cvs rdiff -u -r1.4 -r1.5 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.84 src/distrib/sets/lists/base/ad.mips:1.85
--- src/distrib/sets/lists/base/ad.mips:1.84 Wed May 17 15:01:17 2023
+++ src/distrib/sets/lists/base/ad.mips Fri May 26 13:21:52 2023
@@ -1,4 +1,4 @@
-# $NetBSD: ad.mips,v 1.84 2023/05/17 15:01:17 christos Exp $
+# $NetBSD: ad.mips,v 1.85 2023/05/26 13:21:52 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,7 +9,6 @@
./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
@@ -23,14 +22,12 @@
./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.42 src/distrib/sets/lists/base/ad.powerpc:1.43
--- src/distrib/sets/lists/base/ad.powerpc:1.42 Thu May 18 00:24:22 2023
+++ src/distrib/sets/lists/base/ad.powerpc Fri May 26 13:21:52 2023
@@ -1,8 +1,7 @@
-# $NetBSD: ad.powerpc,v 1.42 2023/05/18 00:24:22 christos Exp $
+# $NetBSD: ad.powerpc,v 1.43 2023/05/26 13:21:52 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.25 src/distrib/sets/lists/base/ad.riscv:1.26
--- src/distrib/sets/lists/base/ad.riscv:1.25 Fri May 19 11:43:20 2023
+++ src/distrib/sets/lists/base/ad.riscv Fri May 26 13:21:52 2023
@@ -1,8 +1,7 @@
-# $NetBSD: ad.riscv,v 1.25 2023/05/19 11:43:20 christos Exp $
+# $NetBSD: ad.riscv,v 1.26 2023/05/26 13:21:52 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.288 src/distrib/sets/lists/base/md.amd64:1.289
--- src/distrib/sets/lists/base/md.amd64:1.288 Wed May 10 15:52:07 2023
+++ src/distrib/sets/lists/base/md.amd64 Fri May 26 13:21:52 2023
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.288 2023/05/10 15:52:07 christos Exp $
+# $NetBSD: md.amd64,v 1.289 2023/05/26 13:21:52 riastradh Exp $
./dev/lms0 base-obsolete obsolete
./dev/mms0 base-obsolete obsolete
./libexec/ld.elf_so-i386 base-sys-shlib compat,pic
@@ -12,7 +12,6 @@
./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.258 src/distrib/sets/lists/base/md.sparc64:1.259
--- src/distrib/sets/lists/base/md.sparc64:1.258 Thu May 11 17:57:14 2023
+++ src/distrib/sets/lists/base/md.sparc64 Fri May 26 13:21:52 2023
@@ -1,10 +1,9 @@
-# $NetBSD: md.sparc64,v 1.258 2023/05/11 17:57:14 christos Exp $
+# $NetBSD: md.sparc64,v 1.259 2023/05/26 13:21:52 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.1319 src/distrib/sets/lists/base/mi:1.1320
--- src/distrib/sets/lists/base/mi:1.1319 Sun May 14 11:04:56 2023
+++ src/distrib/sets/lists/base/mi Fri May 26 13:21:52 2023
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1319 2023/05/14 11:04:56 riastradh Exp $
+# $NetBSD: mi,v 1.1320 2023/05/26 13:21:52 riastradh Exp $
#
# Note: Don't delete entries from here - mark them as "obsolete" instead,
# unless otherwise stated below.
@@ -1211,7 +1211,6 @@
./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.248 src/etc/mtree/NetBSD.dist.base:1.249
--- src/etc/mtree/NetBSD.dist.base:1.248 Wed May 10 15:52:50 2023
+++ src/etc/mtree/NetBSD.dist.base Fri May 26 13:21:52 2023
@@ -1,4 +1,4 @@
-# $NetBSD: NetBSD.dist.base,v 1.248 2023/05/10 15:52:50 christos Exp $
+# $NetBSD: NetBSD.dist.base,v 1.249 2023/05/26 13:21:52 riastradh Exp $
# @(#)4.4BSD.dist 8.1 (Berkeley) 6/13/93
# Do not customize this file as it may be overwritten on upgrades.
@@ -356,7 +356,6 @@
./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.4 src/etc/mtree/NetBSD.dist.compat.in:1.5
--- src/etc/mtree/NetBSD.dist.compat.in:1.4 Tue May 16 18:57:49 2023
+++ src/etc/mtree/NetBSD.dist.compat.in Fri May 26 13:21:52 2023
@@ -1,4 +1,4 @@
-# $NetBSD: NetBSD.dist.compat.in,v 1.4 2023/05/16 18:57:49 christos Exp $
+# $NetBSD: NetBSD.dist.compat.in,v 1.5 2023/05/26 13:21:52 riastradh Exp $
./lib/@ARCH_SUBDIR@
./lib/@ARCH_SUBDIR@/npf
@@ -7,7 +7,6 @@
./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@
