Module Name: src
Committed By: riastradh
Date: Sun May 14 11:04:57 UTC 2023
Modified Files:
src/distrib/sets/lists/base: mi
src/etc/mtree: NetBSD.dist.compat.in
Log Message:
openssl compat: Try this again!
compatdir appears to be for things like /usr/lib that have
/usr/lib/eabi as a subdirectory, so for /usr/lib/openssl it would
mean we have /usr/lib/openssl/eabi as a subdirectory. But that's not
what we have; we have /usr/lib/eabi/openssl.
Let's try using NetBSD.dist.compat.in instead, which appears to be
intended for this purpose, from what I can gather.
To generate a diff of this commit:
cvs rdiff -u -r1.1318 -r1.1319 src/distrib/sets/lists/base/mi
cvs rdiff -u -r1.2 -r1.3 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/mi
diff -u src/distrib/sets/lists/base/mi:1.1318 src/distrib/sets/lists/base/mi:1.1319
--- src/distrib/sets/lists/base/mi:1.1318 Sun May 14 07:07:23 2023
+++ src/distrib/sets/lists/base/mi Sun May 14 11:04:56 2023
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1318 2023/05/14 07:07:23 mrg Exp $
+# $NetBSD: mi,v 1.1319 2023/05/14 11:04:56 riastradh Exp $
#
# Note: Don't delete entries from here - mark them as "obsolete" instead,
# unless otherwise stated below.
@@ -1210,9 +1210,9 @@
./usr/lib/lua/5.4 base-sys-usr compatfile
./usr/lib/named base-sys-usr
./usr/lib/npf base-obsolete obsolete
-./usr/lib/openssl base-crypto-usr compatdir
+./usr/lib/openssl base-crypto-usr
./usr/lib/openssl/engines base-crypto-usr
-./usr/lib/openssl/modules base-crypto-usr compatdir
+./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
./usr/lib/runemodule base-obsolete obsolete
Index: src/etc/mtree/NetBSD.dist.compat.in
diff -u src/etc/mtree/NetBSD.dist.compat.in:1.2 src/etc/mtree/NetBSD.dist.compat.in:1.3
--- src/etc/mtree/NetBSD.dist.compat.in:1.2 Sun Apr 16 20:46:17 2023
+++ src/etc/mtree/NetBSD.dist.compat.in Sun May 14 11:04:57 2023
@@ -1,4 +1,4 @@
-# $NetBSD: NetBSD.dist.compat.in,v 1.2 2023/04/16 20:46:17 nikita Exp $
+# $NetBSD: NetBSD.dist.compat.in,v 1.3 2023/05/14 11:04:57 riastradh Exp $
./lib/@ARCH_SUBDIR@
./lib/@ARCH_SUBDIR@/npf
@@ -6,6 +6,8 @@
./usr/lib/@ARCH_SUBDIR@/i18n
./usr/lib/@ARCH_SUBDIR@/lua
./usr/lib/@ARCH_SUBDIR@/lua/5.4
+./usr/lib/@ARCH_SUBDIR@/openssl
+./usr/lib/@ARCH_SUBDIR@/openssl/modules
./usr/lib/@ARCH_SUBDIR@/security
./usr/libdata/debug/lib/@ARCH_SUBDIR@
./usr/libdata/debug/lib/@ARCH_SUBDIR@/npf
