summaryrefslogtreecommitdiff
path: root/etc
diff options
context:
space:
mode:
authorriastradh <riastradh@NetBSD.org>2023-05-26 22:26:10 +0000
committerriastradh <riastradh@NetBSD.org>2023-05-26 22:26:10 +0000
commit5ebe2d43a160aee855031380bd7b0332f948e670 (patch)
tree0b18064eff027bd44f69f61f73b929fd041ae3c7 /etc
parentb346068282d3b13d45c364af446f60bfaa528250 (diff)
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 (limited to 'etc')
-rw-r--r--etc/mtree/NetBSD.dist.base3
-rw-r--r--etc/mtree/NetBSD.dist.compat.in3
2 files changed, 4 insertions, 2 deletions
diff --git a/etc/mtree/NetBSD.dist.base b/etc/mtree/NetBSD.dist.base
index 25a410c3977..3c8e27ed82f 100644
--- a/etc/mtree/NetBSD.dist.base
+++ b/etc/mtree/NetBSD.dist.base
@@ -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 --git a/etc/mtree/NetBSD.dist.compat.in b/etc/mtree/NetBSD.dist.compat.in
index 9d7976abe44..3e2df185a48 100644
--- a/etc/mtree/NetBSD.dist.compat.in
+++ b/etc/mtree/NetBSD.dist.compat.in
@@ -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@