Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/distrib/sets add openssl to the list of selectable variables...
details: https://anonhg.NetBSD.org/src/rev/4f56f9965ea0
branches: trunk
changeset: 829661:4f56f9965ea0
user: christos <christos%NetBSD.org@localhost>
date: Thu Feb 08 03:27:50 2018 +0000
description:
add openssl to the list of selectable variables for sets and fix the sets.
diffstat:
distrib/sets/lists/base/shl.mi | 26 +-
distrib/sets/lists/comp/mi | 820 ++++++++++++++++++++++++++++++---------
distrib/sets/lists/debug/mi | 8 +-
distrib/sets/lists/debug/shl.mi | 14 +-
distrib/sets/lists/misc/mi | 4 +-
distrib/sets/lists/tests/mi | 8 +-
distrib/sets/mkvars.mk | 3 +-
distrib/sets/sets.subr | 9 +-
8 files changed, 663 insertions(+), 229 deletions(-)
diffs (truncated from 1995 to 300 lines):
diff -r a172f39aaff0 -r 4f56f9965ea0 distrib/sets/lists/base/shl.mi
--- a/distrib/sets/lists/base/shl.mi Thu Feb 08 03:18:37 2018 +0000
+++ b/distrib/sets/lists/base/shl.mi Thu Feb 08 03:27:50 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.830 2018/02/06 09:41:55 mrg Exp $
+# $NetBSD: shl.mi,v 1.831 2018/02/08 03:27:50 christos Exp $
#
# Note: Don't delete entries from here - mark them as "obsolete" instead,
# unless otherwise stated below.
@@ -23,8 +23,10 @@
./lib/libcrypt.so.1 base-sys-shlib dynamicroot
./lib/libcrypt.so.1.0 base-sys-shlib dynamicroot
./lib/libcrypto.so base-crypto-shlib dynamicroot
-./lib/libcrypto.so.12 base-crypto-shlib dynamicroot
-./lib/libcrypto.so.12.0 base-crypto-shlib dynamicroot
+./lib/libcrypto.so.12 base-crypto-shlib dynamicroot,openssl=10
+./lib/libcrypto.so.12.0 base-crypto-shlib dynamicroot,openssl=10
+./lib/libcrypto.so.13 base-crypto-shlib dynamicroot,openssl=11
+./lib/libcrypto.so.13.0 base-crypto-shlib dynamicroot,openssl=11
./lib/libdevmapper.so base-lvm-shlib dynamicroot,lvm
./lib/libdevmapper.so.1 base-lvm-shlib dynamicroot,lvm
./lib/libdevmapper.so.1.0 base-lvm-shlib dynamicroot,lvm
@@ -227,8 +229,10 @@
./usr/lib/libcrypt.so.1 base-sys-shlib compatfile
./usr/lib/libcrypt.so.1.0 base-sys-shlib compatfile
./usr/lib/libcrypto.so base-crypto-shlib compatfile
-./usr/lib/libcrypto.so.12 base-crypto-shlib compatfile
-./usr/lib/libcrypto.so.12.0 base-crypto-shlib compatfile
+./usr/lib/libcrypto.so.12 base-crypto-shlib compatfile,openssl=10
+./usr/lib/libcrypto.so.12.0 base-crypto-shlib compatfile,openssl=10
+./usr/lib/libcrypto.so.13 base-crypto-shlib compatfile,openssl=11
+./usr/lib/libcrypto.so.13.0 base-crypto-shlib compatfile,openssl=11
./usr/lib/libcrypto_idea.so.7 base-obsolete compatfile,obsolete
./usr/lib/libcrypto_idea.so.7.0 base-obsolete compatfile,obsolete
./usr/lib/libcrypto_mdc2.so.7 base-obsolete compatfile,obsolete
@@ -243,8 +247,10 @@
./usr/lib/libcurses.so.7 base-sys-shlib compatfile
./usr/lib/libcurses.so.7.1 base-sys-shlib compatfile
./usr/lib/libdes.so base-crypto-shlib compatfile
-./usr/lib/libdes.so.12 base-crypto-shlib compatfile
-./usr/lib/libdes.so.12.0 base-crypto-shlib compatfile
+./usr/lib/libdes.so.12 base-crypto-shlib compatfile,openssl=10
+./usr/lib/libdes.so.12.0 base-crypto-shlib compatfile,openssl=10
+./usr/lib/libdes.so.13 base-crypto-shlib compatfile,openssl=11
+./usr/lib/libdes.so.13.0 base-crypto-shlib compatfile,openssl=11
./usr/lib/libdevmapper.so base-lvm-shlib compatfile,lvm
./usr/lib/libdevmapper.so.1 base-lvm-shlib compatfile,lvm
./usr/lib/libdevmapper.so.1.0 base-lvm-shlib compatfile,lvm
@@ -803,8 +809,10 @@
./usr/lib/libssh.so.31 base-secsh-shlib compatfile
./usr/lib/libssh.so.31.0 base-secsh-shlib compatfile
./usr/lib/libssl.so base-crypto-shlib compatfile
-./usr/lib/libssl.so.12 base-crypto-shlib compatfile
-./usr/lib/libssl.so.12.0 base-crypto-shlib compatfile
+./usr/lib/libssl.so.12 base-crypto-shlib compatfile,openssl=10
+./usr/lib/libssl.so.12.0 base-crypto-shlib compatfile,openssl=10
+./usr/lib/libssl.so.13 base-crypto-shlib compatfile,openssl=11
+./usr/lib/libssl.so.13.0 base-crypto-shlib compatfile,openssl=11
./usr/lib/libstdc++.so base-sys-shlib compatfile,gcc,cxx,libstdcxx
./usr/lib/libstdc++.so.8 base-sys-shlib compatfile,gcc,cxx,libstdcxx
./usr/lib/libstdc++.so.7.3 base-sys-shlib compatfile,gcc=48,cxx,libstdcxx
diff -r a172f39aaff0 -r 4f56f9965ea0 distrib/sets/lists/comp/mi
--- a/distrib/sets/lists/comp/mi Thu Feb 08 03:18:37 2018 +0000
+++ b/distrib/sets/lists/comp/mi Thu Feb 08 03:27:50 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.2176 2018/02/06 23:12:01 mrg Exp $
+# $NetBSD: mi,v 1.2177 2018/02/08 03:27:50 christos Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
./etc/mtree/set.comp comp-sys-root
@@ -828,8 +828,8 @@
./usr/include/fnmatch.h comp-c-include
./usr/include/form.h comp-c-include
./usr/include/frame.h comp-obsolete obsolete
+./usr/include/fs/autofs/autofs_ioctl.h comp-c-include
./usr/include/fs/autofs/autofs_mount.h comp-c-include
-./usr/include/fs/autofs/autofs_ioctl.h comp-c-include
./usr/include/fs/efs/efs.h comp-c-include
./usr/include/fs/efs/efs_mount.h comp-c-include
./usr/include/fs/efs/efs_sb.h comp-c-include
@@ -1146,10 +1146,8 @@
./usr/include/g++/cwctype comp-cxx-include gcc,cxx,libstdcxx
./usr/include/g++/cxxabi-forced.h comp-obsolete obsolete
./usr/include/g++/cxxabi.h comp-cxx-include gcc,cxx,libstdcxx
+./usr/include/g++/debug/array comp-cxx-include gcc,cxx,libstdcxx
./usr/include/g++/debug/assertions.h comp-cxx-include gcc=6,cxx,libstdcxx
-./usr/include/g++/debug/helper_functions.h comp-cxx-include gcc=6,cxx,libstdcxx
-./usr/include/g++/debug/stl_iterator.h comp-cxx-include gcc=6,cxx,libstdcxx
-./usr/include/g++/debug/array comp-cxx-include gcc,cxx,libstdcxx
./usr/include/g++/debug/bitset comp-cxx-include gcc,cxx,libstdcxx
./usr/include/g++/debug/debug.h comp-cxx-include gcc,cxx,libstdcxx
./usr/include/g++/debug/deque comp-cxx-include gcc,cxx,libstdcxx
@@ -1162,6 +1160,7 @@
./usr/include/g++/debug/hash_multiset.h comp-obsolete obsolete
./usr/include/g++/debug/hash_set comp-obsolete obsolete
./usr/include/g++/debug/hash_set.h comp-obsolete obsolete
+./usr/include/g++/debug/helper_functions.h comp-cxx-include gcc=6,cxx,libstdcxx
./usr/include/g++/debug/list comp-cxx-include gcc,cxx,libstdcxx
./usr/include/g++/debug/macros.h comp-cxx-include gcc,cxx,libstdcxx
./usr/include/g++/debug/map comp-cxx-include gcc,cxx,libstdcxx
@@ -1181,6 +1180,7 @@
./usr/include/g++/debug/safe_unordered_container.tcc comp-cxx-include gcc,cxx,libstdcxx
./usr/include/g++/debug/set comp-cxx-include gcc,cxx,libstdcxx
./usr/include/g++/debug/set.h comp-cxx-include gcc,cxx,libstdcxx
+./usr/include/g++/debug/stl_iterator.h comp-cxx-include gcc=6,cxx,libstdcxx
./usr/include/g++/debug/string comp-cxx-include gcc,cxx,libstdcxx
./usr/include/g++/debug/unordered_map comp-cxx-include gcc,cxx,libstdcxx
./usr/include/g++/debug/unordered_set comp-cxx-include gcc,cxx,libstdcxx
@@ -2003,18 +2003,18 @@
./usr/include/gcc-4.8/omp.h comp-gcc-include obsolete
./usr/include/gcc-5/omp.h comp-gcc-include gcc=5
./usr/include/gcc-5/openacc.h comp-gcc-include gcc=5
-./usr/include/gcc-5/stdatomic.h comp-gcc-include gcc=5,gcccmds
./usr/include/gcc-5/sanitizer/allocator_interface.h comp-gcc-include gcc=5
./usr/include/gcc-5/sanitizer/asan_interface.h comp-gcc-include gcc=5
./usr/include/gcc-5/sanitizer/common_interface_defs.h comp-gcc-include gcc=5
./usr/include/gcc-5/sanitizer/tsan_interface_atomic.h comp-gcc-include gcc=5
+./usr/include/gcc-5/stdatomic.h comp-gcc-include gcc=5,gcccmds
./usr/include/gcc-6/omp.h comp-gcc-include gcc=6
./usr/include/gcc-6/openacc.h comp-gcc-include gcc=6
-./usr/include/gcc-6/stdatomic.h comp-gcc-include gcc=6,gcccmds
./usr/include/gcc-6/sanitizer/allocator_interface.h comp-gcc-include gcc=6
./usr/include/gcc-6/sanitizer/asan_interface.h comp-gcc-include gcc=6
./usr/include/gcc-6/sanitizer/common_interface_defs.h comp-gcc-include gcc=6
./usr/include/gcc-6/sanitizer/tsan_interface_atomic.h comp-gcc-include gcc=6
+./usr/include/gcc-6/stdatomic.h comp-gcc-include gcc=6,gcccmds
./usr/include/gelf.h comp-c-include
./usr/include/getopt.h comp-c-include
./usr/include/glob.h comp-c-include
@@ -2401,8 +2401,8 @@
./usr/include/netipsec/ipcomp_var.h comp-c-include
./usr/include/netipsec/ipip_var.h comp-c-include
./usr/include/netipsec/ipsec.h comp-c-include
+./usr/include/netipsec/ipsec_var.h comp-c-include
./usr/include/netipsec/ipsecif.h comp-c-include
-./usr/include/netipsec/ipsec_var.h comp-c-include
./usr/include/netipsec/keydb.h comp-obsolete obsolete
./usr/include/netipsec/keysock.h comp-c-include
./usr/include/netisdn/i4b_cause.h comp-c-include
@@ -2546,6 +2546,7 @@
./usr/include/openssl/asn1.h comp-c-include
./usr/include/openssl/asn1_mac.h comp-c-include
./usr/include/openssl/asn1t.h comp-c-include
+./usr/include/openssl/async.h comp-c-include ,openssl=11
./usr/include/openssl/bio.h comp-c-include
./usr/include/openssl/blowfish.h comp-c-include
./usr/include/openssl/bn.h comp-c-include
@@ -2558,6 +2559,7 @@
./usr/include/openssl/conf.h comp-c-include
./usr/include/openssl/conf_api.h comp-c-include
./usr/include/openssl/crypto.h comp-c-include
+./usr/include/openssl/ct.h comp-c-include ,openssl=11
./usr/include/openssl/des.h comp-c-include
./usr/include/openssl/dh.h comp-c-include
./usr/include/openssl/dsa.h comp-c-include
@@ -2576,8 +2578,9 @@
./usr/include/openssl/fips_rand.h comp-obsolete obsolete
./usr/include/openssl/hmac.h comp-c-include
./usr/include/openssl/idea.h comp-c-include
-./usr/include/openssl/krb5_asn.h comp-c-include
-./usr/include/openssl/kssl.h comp-c-include
+./usr/include/openssl/kdf.h comp-c-include
+./usr/include/openssl/krb5_asn.h comp-c-include ,openssl=10
+./usr/include/openssl/kssl.h comp-c-include ,openssl=10
./usr/include/openssl/lhash.h comp-c-include
./usr/include/openssl/md2.h comp-c-include
./usr/include/openssl/md4.h comp-c-include
@@ -2595,7 +2598,7 @@
./usr/include/openssl/pkcs12.h comp-c-include
./usr/include/openssl/pkcs7.h comp-c-include
./usr/include/openssl/pq_compat.h comp-obsolete obsolete
-./usr/include/openssl/pqueue.h comp-c-include
+./usr/include/openssl/pqueue.h comp-c-include ,openssl=10
./usr/include/openssl/rand.h comp-c-include
./usr/include/openssl/rc2.h comp-c-include
./usr/include/openssl/rc4.h comp-c-include
@@ -2610,17 +2613,17 @@
./usr/include/openssl/srtp.h comp-c-include
./usr/include/openssl/ssl.h comp-c-include
./usr/include/openssl/ssl2.h comp-c-include
-./usr/include/openssl/ssl23.h comp-c-include
+./usr/include/openssl/ssl23.h comp-c-include ,openssl=10
./usr/include/openssl/ssl3.h comp-c-include
./usr/include/openssl/stack.h comp-c-include
-./usr/include/openssl/store.h comp-c-include
+./usr/include/openssl/store.h comp-c-include ,openssl=10
./usr/include/openssl/symhacks.h comp-c-include
./usr/include/openssl/tls1.h comp-c-include
./usr/include/openssl/tmdiff.h comp-obsolete obsolete
./usr/include/openssl/ts.h comp-c-include
./usr/include/openssl/txt_db.h comp-c-include
./usr/include/openssl/ui.h comp-c-include
-./usr/include/openssl/ui_compat.h comp-c-include
+./usr/include/openssl/ui_compat.h comp-c-include ,openssl=10
./usr/include/openssl/whrlpool.h comp-c-include
./usr/include/openssl/x509.h comp-c-include
./usr/include/openssl/x509_vfy.h comp-c-include
@@ -4013,8 +4016,8 @@
./usr/share/man/cat1/g77.0 comp-obsolete obsolete
./usr/share/man/cat1/gcc.0 comp-c-catman gcccmds,.cat
./usr/share/man/cat1/gcore.0 comp-debug-catman .cat
+./usr/share/man/cat1/gcov-dump.0 comp-debug-catman gcccmds,.cat,gcc=6
./usr/share/man/cat1/gcov.0 comp-debug-catman gcccmds,.cat
-./usr/share/man/cat1/gcov-dump.0 comp-debug-catman gcccmds,.cat,gcc=6
./usr/share/man/cat1/gdb.0 comp-debug-catman gdb,.cat
./usr/share/man/cat1/genassym.0 comp-util-catman .cat
./usr/share/man/cat1/gprof.0 comp-debug-catman binutils,.cat
@@ -4043,7 +4046,11 @@
./usr/share/man/cat1/nm.0 comp-util-catman binutils,.cat
./usr/share/man/cat1/objcopy.0 comp-util-catman binutils,.cat
./usr/share/man/cat1/objdump.0 comp-util-catman binutils,.cat
+./usr/share/man/cat1/openssl_c_rehash.0 comp-c-catman .cat,openssl=1.0
+./usr/share/man/cat1/openssl_engine.0 comp-c-catman .cat,openssl=1.1
+./usr/share/man/cat1/openssl_list.0 comp-c-catman .cat,openssl=1.1
./usr/share/man/cat1/openssl_ocsp.0 comp-c-catman .cat
+./usr/share/man/cat1/openssl_rehash.0 comp-c-catman .cat,openssl=1.1
./usr/share/man/cat1/ranlib.0 comp-util-catman binutils,.cat
./usr/share/man/cat1/rcs2log.0 comp-cvs-catman cvs,.cat
./usr/share/man/cat1/readelf.0 comp-util-catman binutils,.cat
@@ -4377,11 +4384,19 @@
./usr/share/man/cat2/x86_64_get_mtrr.0 comp-c-catman .cat
./usr/share/man/cat2/x86_64_iopl.0 comp-c-catman .cat
./usr/share/man/cat2/x86_64_set_mtrr.0 comp-c-catman .cat
+./usr/share/man/cat3/ASN1_INTEGER_get_int64.0 comp-c-catman .cat,openssl=1.1
./usr/share/man/cat3/ASN1_OBJECT_new.0 comp-c-catman .cat
./usr/share/man/cat3/ASN1_STRING_length.0 comp-c-catman .cat
./usr/share/man/cat3/ASN1_STRING_new.0 comp-c-catman .cat
./usr/share/man/cat3/ASN1_STRING_print_ex.0 comp-c-catman .cat
+./usr/share/man/cat3/ASN1_TYPE_get.0 comp-c-catman .cat,openssl=1.1
./usr/share/man/cat3/ASN1_generate_nconf.0 comp-c-catman .cat
+./usr/share/man/cat3/ASYNC_WAIT_CTX_new.0 comp-c-catman .cat,openssl=1.1
+./usr/share/man/cat3/ASYNC_start_job.0 comp-c-catman .cat,openssl=1.1
+./usr/share/man/cat3/BF_encrypt.0 comp-c-catman .cat,openssl=1.1
+./usr/share/man/cat3/BIO_ADDR.0 comp-c-catman .cat,openssl=1.1
+./usr/share/man/cat3/BIO_ADDRINFO.0 comp-c-catman .cat,openssl=1.1
+./usr/share/man/cat3/BIO_connect.0 comp-c-catman .cat,openssl=1.1
./usr/share/man/cat3/BIO_ctrl.0 comp-c-catman .cat
./usr/share/man/cat3/BIO_f_base64.0 comp-c-catman .cat
./usr/share/man/cat3/BIO_f_buffer.0 comp-c-catman .cat
@@ -4390,9 +4405,14 @@
./usr/share/man/cat3/BIO_f_null.0 comp-c-catman .cat
./usr/share/man/cat3/BIO_f_ssl.0 comp-c-catman .cat
./usr/share/man/cat3/BIO_find_type.0 comp-c-catman .cat
+./usr/share/man/cat3/BIO_get_data. 0 comp-c-catman .cat,openssl=1.1
+./usr/share/man/cat3/BIO_get_ex_new_index.0 comp-c-catman .cat,openssl=1.1
+./usr/share/man/cat3/BIO_meth_new.0 comp-c-catman .cat,openssl=1.1
./usr/share/man/cat3/BIO_new.0 comp-c-catman .cat
./usr/share/man/cat3/BIO_new_CMS.0 comp-c-catman .cat
./usr/share/man/cat3/BIO_new_bio_pair.0 comp-obsolete obsolete
+./usr/share/man/cat3/BIO_parse_hostserv.0 comp-c-catman .cat,openssl=1.1
+./usr/share/man/cat3/BIO_printf.0 comp-c-catman .cat,openssl=1.1
./usr/share/man/cat3/BIO_push.0 comp-c-catman .cat
./usr/share/man/cat3/BIO_read.0 comp-c-catman .cat
./usr/share/man/cat3/BIO_s_accept.0 comp-c-catman .cat
@@ -4423,6 +4443,7 @@
./usr/share/man/cat3/BN_set_bit.0 comp-c-catman .cat
./usr/share/man/cat3/BN_swap.0 comp-c-catman .cat
./usr/share/man/cat3/BN_zero.0 comp-c-catman .cat
+./usr/share/man/cat3/BUF_MEM_new.0 comp-c-catman .cat,openssl=1.1
./usr/share/man/cat3/CIRCLEQ_EMPTY.0 comp-obsolete obsolete
./usr/share/man/cat3/CIRCLEQ_ENTRY.0 comp-obsolete obsolete
./usr/share/man/cat3/CIRCLEQ_FIRST.0 comp-obsolete obsolete
@@ -4464,10 +4485,21 @@
./usr/share/man/cat3/CMS_verify_receipt.0 comp-c-catman .cat
./usr/share/man/cat3/CONF_modules_free.0 comp-c-catman .cat
./usr/share/man/cat3/CONF_modules_load_file.0 comp-c-man .cat
-./usr/share/man/cat3/CRYPTO_set_ex_data.0 comp-c-catman .cat
+./usr/share/man/cat3/CRYPTO_THREAD_run_once.0 comp-c-catman .cat,openssl=1.1
+./usr/share/man/cat3/CRYPTO_get_ex_new_index.0 comp-c-catman .cat,openssl=1.1
+./usr/share/man/cat3/CRYPTO_set_ex_data.0 comp-c-catman .cat,openssl=1.0
+./usr/share/man/cat3/CTLOG_STORE_get0_log_by_id.0 comp-c-catman .cat,openssl=1.1
+./usr/share/man/cat3/CTLOG_STORE_new.0 comp-c-catman .cat,openssl=1.1
+./usr/share/man/cat3/CTLOG_new.0 comp-c-catman .cat,openssl=1.1
+./usr/share/man/cat3/CT_POLICY_EVAL_CTX_new.0 comp-c-catman .cat,openssl=1.1
+./usr/share/man/cat3/DEFINE_STACK_OF.0 comp-c-catman .cat,openssl=1.1
+./usr/share/man/cat3/DES_random_key.0 comp-c-catman .cat,openssl=1.1
./usr/share/man/cat3/DH_generate_key.0 comp-c-catman .cat
./usr/share/man/cat3/DH_generate_parameters.0 comp-c-catman .cat
-./usr/share/man/cat3/DH_get_ex_new_index.0 comp-c-catman .cat
+./usr/share/man/cat3/DH_get0_pqg.0 comp-c-catman .cat,openssl=1.1
+./usr/share/man/cat3/DH_get_1024_160.0 comp-c-catman .cat,openssl=1.1
+./usr/share/man/cat3/DH_get_ex_new_index.0 comp-c-catman .cat,openssl=1.0
+./usr/share/man/cat3/DH_meth_new.0 comp-c-catman .cat,openssl=1.1
./usr/share/man/cat3/DH_new.0 comp-c-catman .cat
./usr/share/man/cat3/DH_set_method.0 comp-c-catman .cat
./usr/share/man/cat3/DH_size.0 comp-c-catman .cat
@@ -4476,12 +4508,19 @@
./usr/share/man/cat3/DSA_dup_DH.0 comp-c-catman .cat
./usr/share/man/cat3/DSA_generate_key.0 comp-c-catman .cat
./usr/share/man/cat3/DSA_generate_parameters.0 comp-c-catman .cat
-./usr/share/man/cat3/DSA_get_ex_new_index.0 comp-c-catman .cat
+./usr/share/man/cat3/DSA_get0_pqg.0 comp-c-catman .cat,openssl=1.1
+./usr/share/man/cat3/DSA_get_ex_new_index.0 comp-c-catman .cat,openssl=1.0
+./usr/share/man/cat3/DSA_meth_new.0 comp-c-catman .cat,openssl=1.1
./usr/share/man/cat3/DSA_new.0 comp-c-catman .cat
./usr/share/man/cat3/DSA_set_method.0 comp-c-catman .cat
./usr/share/man/cat3/DSA_sign.0 comp-c-catman .cat
./usr/share/man/cat3/DSA_size.0 comp-c-catman .cat
+./usr/share/man/cat3/DTLSv1_listen.0 comp-c-catman .cat,openssl=1.1
./usr/share/man/cat3/DTTOIF.0 comp-c-catman .cat
Home |
Main Index |
Thread Index |
Old Index