Module Name: src
Committed By: riastradh
Date: Sat May 27 02:28:46 UTC 2023
Modified Files:
src/crypto/external/bsd/openssl/lib/engines: Makefile
src/distrib/sets/lists/base: ad.aarch64 ad.mips ad.powerpc ad.riscv
md.amd64 mi
Log Message:
openssl: Nix capi.so engine -- it's for the Windows crypto API.
Not likely to work in NetBSD base!
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/crypto/external/bsd/openssl/lib/engines/Makefile
cvs rdiff -u -r1.42 -r1.43 src/distrib/sets/lists/base/ad.aarch64
cvs rdiff -u -r1.89 -r1.90 src/distrib/sets/lists/base/ad.mips
cvs rdiff -u -r1.46 -r1.47 src/distrib/sets/lists/base/ad.powerpc
cvs rdiff -u -r1.29 -r1.30 src/distrib/sets/lists/base/ad.riscv
cvs rdiff -u -r1.292 -r1.293 src/distrib/sets/lists/base/md.amd64
cvs rdiff -u -r1.1323 -r1.1324 src/distrib/sets/lists/base/mi
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/openssl/lib/engines/Makefile
diff -u src/crypto/external/bsd/openssl/lib/engines/Makefile:1.5 src/crypto/external/bsd/openssl/lib/engines/Makefile:1.6
--- src/crypto/external/bsd/openssl/lib/engines/Makefile:1.5 Sat May 27 00:08:30 2023
+++ src/crypto/external/bsd/openssl/lib/engines/Makefile Sat May 27 02:28:45 2023
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2023/05/27 00:08:30 riastradh Exp $
+# $NetBSD: Makefile,v 1.6 2023/05/27 02:28:45 riastradh Exp $
.include "bsd.own.mk"
# OpenSSL engines.
-SUBDIR= capi dasync devcrypto loader_attic ossltest
+SUBDIR= dasync devcrypto loader_attic ossltest
# VIA Padlock -- only makes sense for x86 which might be a VIA CPU
.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
Index: src/distrib/sets/lists/base/ad.aarch64
diff -u src/distrib/sets/lists/base/ad.aarch64:1.42 src/distrib/sets/lists/base/ad.aarch64:1.43
--- src/distrib/sets/lists/base/ad.aarch64:1.42 Sat May 27 00:08:30 2023
+++ src/distrib/sets/lists/base/ad.aarch64 Sat May 27 02:28:46 2023
@@ -1,4 +1,4 @@
-# $NetBSD: ad.aarch64,v 1.42 2023/05/27 00:08:30 riastradh Exp $
+# $NetBSD: ad.aarch64,v 1.43 2023/05/27 02:28:46 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,7 +19,6 @@
./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
@@ -36,7 +35,6 @@
./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
Index: src/distrib/sets/lists/base/ad.mips
diff -u src/distrib/sets/lists/base/ad.mips:1.89 src/distrib/sets/lists/base/ad.mips:1.90
--- src/distrib/sets/lists/base/ad.mips:1.89 Sat May 27 00:09:06 2023
+++ src/distrib/sets/lists/base/ad.mips Sat May 27 02:28:46 2023
@@ -1,4 +1,4 @@
-# $NetBSD: ad.mips,v 1.89 2023/05/27 00:09:06 riastradh Exp $
+# $NetBSD: ad.mips,v 1.90 2023/05/27 02:28:46 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,7 +10,6 @@
./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/devcrypto.so base-compat-shlib compat,pic,arch64,!machine_arch=mipsn64el,!machine_arch=mipsn64eb,openssl=30
./usr/lib/64/openssl/engines/loader_attic.so base-compat-shlib compat,pic,arch64,!machine_arch=mipsn64el,!machine_arch=mipsn64eb,openssl=30
@@ -29,7 +28,6 @@
./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
@@ -41,7 +39,6 @@
./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
Index: src/distrib/sets/lists/base/ad.powerpc
diff -u src/distrib/sets/lists/base/ad.powerpc:1.46 src/distrib/sets/lists/base/ad.powerpc:1.47
--- src/distrib/sets/lists/base/ad.powerpc:1.46 Sat May 27 00:08:30 2023
+++ src/distrib/sets/lists/base/ad.powerpc Sat May 27 02:28:46 2023
@@ -1,10 +1,9 @@
-# $NetBSD: ad.powerpc,v 1.46 2023/05/27 00:08:30 riastradh Exp $
+# $NetBSD: ad.powerpc,v 1.47 2023/05/27 02:28:46 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
Index: src/distrib/sets/lists/base/ad.riscv
diff -u src/distrib/sets/lists/base/ad.riscv:1.29 src/distrib/sets/lists/base/ad.riscv:1.30
--- src/distrib/sets/lists/base/ad.riscv:1.29 Sat May 27 00:08:30 2023
+++ src/distrib/sets/lists/base/ad.riscv Sat May 27 02:28:46 2023
@@ -1,9 +1,8 @@
-# $NetBSD: ad.riscv,v 1.29 2023/05/27 00:08:30 riastradh Exp $
+# $NetBSD: ad.riscv,v 1.30 2023/05/27 02:28:46 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
Index: src/distrib/sets/lists/base/md.amd64
diff -u src/distrib/sets/lists/base/md.amd64:1.292 src/distrib/sets/lists/base/md.amd64:1.293
--- src/distrib/sets/lists/base/md.amd64:1.292 Sat May 27 00:08:30 2023
+++ src/distrib/sets/lists/base/md.amd64 Sat May 27 02:28:46 2023
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.292 2023/05/27 00:08:30 riastradh Exp $
+# $NetBSD: md.amd64,v 1.293 2023/05/27 02:28:46 riastradh Exp $
./dev/lms0 base-obsolete obsolete
./dev/mms0 base-obsolete obsolete
./libexec/ld.elf_so-i386 base-sys-shlib compat,pic
@@ -13,7 +13,6 @@
./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
Index: src/distrib/sets/lists/base/mi
diff -u src/distrib/sets/lists/base/mi:1.1323 src/distrib/sets/lists/base/mi:1.1324
--- src/distrib/sets/lists/base/mi:1.1323 Sat May 27 00:08:30 2023
+++ src/distrib/sets/lists/base/mi Sat May 27 02:28:46 2023
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1323 2023/05/27 00:08:30 riastradh Exp $
+# $NetBSD: mi,v 1.1324 2023/05/27 02:28:46 riastradh Exp $
#
# Note: Don't delete entries from here - mark them as "obsolete" instead,
# unless otherwise stated below.
@@ -1212,7 +1212,6 @@
./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
