Module Name: src
Committed By: christos
Date: Thu May 11 17:57:14 UTC 2023
Modified Files:
src/distrib/sets/lists/base: md.sparc64
src/etc/mtree: NetBSD.dist.sparc64
src/share/mk: bsd.own.mk
Log Message:
switch sparc64/aarch64 to OpenSSL-3.x
To generate a diff of this commit:
cvs rdiff -u -r1.257 -r1.258 src/distrib/sets/lists/base/md.sparc64
cvs rdiff -u -r1.14 -r1.15 src/etc/mtree/NetBSD.dist.sparc64
cvs rdiff -u -r1.1315 -r1.1316 src/share/mk/bsd.own.mk
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/md.sparc64
diff -u src/distrib/sets/lists/base/md.sparc64:1.257 src/distrib/sets/lists/base/md.sparc64:1.258
--- src/distrib/sets/lists/base/md.sparc64:1.257 Thu Sep 8 01:16:45 2022
+++ src/distrib/sets/lists/base/md.sparc64 Thu May 11 13:57:14 2023
@@ -1,8 +1,12 @@
-# $NetBSD: md.sparc64,v 1.257 2022/09/08 05:16:45 rillig Exp $
+# $NetBSD: md.sparc64,v 1.258 2023/05/11 17:57:14 christos 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
./usr/lkm/compat_sunos32.o base-obsolete obsolete
./usr/lkm/compat_svr4.o base-obsolete obsolete
Index: src/etc/mtree/NetBSD.dist.sparc64
diff -u src/etc/mtree/NetBSD.dist.sparc64:1.14 src/etc/mtree/NetBSD.dist.sparc64:1.15
--- src/etc/mtree/NetBSD.dist.sparc64:1.14 Wed Apr 3 15:52:38 2019
+++ src/etc/mtree/NetBSD.dist.sparc64 Thu May 11 13:57:14 2023
@@ -1,3 +1,7 @@
-# $NetBSD: NetBSD.dist.sparc64,v 1.14 2019/04/03 19:52:38 nakayama Exp $
+# $NetBSD: NetBSD.dist.sparc64,v 1.15 2023/05/11 17:57:14 christos Exp $
./usr/include/sparc
+./usr/lib/sparc
+./usr/lib/sparc/openssl
+./usr/lib/sparc/openssl/modules
+./usr/lib/sparc/openssl/engines
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1315 src/share/mk/bsd.own.mk:1.1316
--- src/share/mk/bsd.own.mk:1.1315 Thu May 11 04:49:41 2023
+++ src/share/mk/bsd.own.mk Thu May 11 13:57:14 2023
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1315 2023/05/11 08:49:41 skrll Exp $
+# $NetBSD: bsd.own.mk,v 1.1316 2023/05/11 17:57:14 christos Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -131,7 +131,9 @@ EXTERNAL_GDB_SUBDIR= /does/not/exist
#
# What OpenSSL is used?
#
-.if ${MACHINE} == "amd64"
+.if ${MACHINE} == "amd64" || \
+ ${MACHINE_ARCH:Maarch64*} || \
+ ${MACHINE_ARCH} == "sparc64"
HAVE_OPENSSL?= 30
.else
HAVE_OPENSSL?= 11
