Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/distrib/sets/lists merge openssl-1.1.1
details: https://anonhg.NetBSD.org/src/rev/1c4d514d880d
branches: trunk
changeset: 836037:1c4d514d880d
user: christos <christos%NetBSD.org@localhost>
date: Sun Sep 23 13:36:04 2018 +0000
description:
merge openssl-1.1.1
diffstat:
distrib/sets/lists/base/shl.mi | 18 +-
distrib/sets/lists/comp/mi | 353 +++++++++++++++++++++++++++++++++++++--
distrib/sets/lists/debug/mi | 12 +-
distrib/sets/lists/debug/shl.mi | 10 +-
distrib/sets/lists/man/mi | 8 +-
distrib/sets/lists/tests/mi | 24 +-
6 files changed, 372 insertions(+), 53 deletions(-)
diffs (truncated from 1343 to 300 lines):
diff -r 619dc4351d4f -r 1c4d514d880d distrib/sets/lists/base/shl.mi
--- a/distrib/sets/lists/base/shl.mi Sun Sep 23 13:34:57 2018 +0000
+++ b/distrib/sets/lists/base/shl.mi Sun Sep 23 13:36:04 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.848 2018/09/22 12:54:34 rmind Exp $
+# $NetBSD: shl.mi,v 1.849 2018/09/23 13:36:04 christos Exp $
#
# Note: Don't delete entries from here - mark them as "obsolete" instead,
# unless otherwise stated below.
@@ -25,8 +25,8 @@
./lib/libcrypto.so 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/libcrypto.so.14 base-crypto-shlib dynamicroot,openssl=11
+./lib/libcrypto.so.14.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
@@ -232,8 +232,8 @@
./usr/lib/libcrypto.so 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.so.14 base-crypto-shlib compatfile,openssl=11
+./usr/lib/libcrypto.so.14.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
@@ -250,8 +250,8 @@
./usr/lib/libdes.so 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/libdes.so.14 base-crypto-shlib compatfile,openssl=11
+./usr/lib/libdes.so.14.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
@@ -820,8 +820,8 @@
./usr/lib/libssl.so 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/libssl.so.14 base-crypto-shlib compatfile,openssl=11
+./usr/lib/libssl.so.14.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.8.0 base-sys-shlib compatfile,gcc=5,cxx,libstdcxx
diff -r 619dc4351d4f -r 1c4d514d880d distrib/sets/lists/comp/mi
--- a/distrib/sets/lists/comp/mi Sun Sep 23 13:34:57 2018 +0000
+++ b/distrib/sets/lists/comp/mi Sun Sep 23 13:36:04 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.2230 2018/09/23 09:20:57 maxv Exp $
+# $NetBSD: mi,v 1.2231 2018/09/23 13:36:04 christos Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
./etc/mtree/set.comp comp-sys-root
@@ -2607,28 +2607,40 @@
./usr/include/openpgpsdk/version.h comp-obsolete obsolete
./usr/include/openpgpsdk/writer.h comp-obsolete obsolete
./usr/include/openpgpsdk/writer_armoured.h comp-obsolete obsolete
-./usr/include/openssl/aes.h comp-c-include
-./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/aes.h comp-c-include openssl=11
+./usr/include/openssl/asn1.h comp-c-include openssl=11
+./usr/include/openssl/asn1_mac.h comp-c-include openssl=11
+./usr/include/openssl/asn1err.h comp-c-include openssl=11
+./usr/include/openssl/asn1t.h comp-c-include openssl=11
./usr/include/openssl/async.h comp-c-include openssl=11
+./usr/include/openssl/asyncerr.h comp-c-include openssl=11
./usr/include/openssl/bio.h comp-c-include
+./usr/include/openssl/bioerr.h comp-c-include openssl=11
./usr/include/openssl/blowfish.h comp-c-include
./usr/include/openssl/bn.h comp-c-include
+./usr/include/openssl/bnerr.h comp-c-include openssl=11
./usr/include/openssl/buffer.h comp-c-include
+./usr/include/openssl/buffererr.h comp-c-include openssl=11
./usr/include/openssl/camellia.h comp-c-include
./usr/include/openssl/cast.h comp-c-include
./usr/include/openssl/cmac.h comp-c-include
./usr/include/openssl/cms.h comp-c-include
+./usr/include/openssl/cmserr.h comp-c-include openssl=11
./usr/include/openssl/comp.h comp-c-include
+./usr/include/openssl/comperr.h comp-c-include openssl=11
./usr/include/openssl/conf.h comp-c-include
./usr/include/openssl/conf_api.h comp-c-include
+./usr/include/openssl/conferr.h comp-c-include openssl=11
./usr/include/openssl/crypto.h comp-c-include
+./usr/include/openssl/cryptoerr.h comp-c-include openssl=11
./usr/include/openssl/ct.h comp-c-include openssl=11
+./usr/include/openssl/cterr.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/dherr.h comp-c-include openssl=11
./usr/include/openssl/dsa.h comp-c-include
-./usr/include/openssl/dso.h comp-c-include
+./usr/include/openssl/dsaerr.h comp-c-include openssl=11
+./usr/include/openssl/dso.h comp-obsolete openssl=11,obsolete
./usr/include/openssl/dtls1.h comp-c-include
./usr/include/openssl/e_os.h comp-obsolete obsolete
./usr/include/openssl/e_os2.h comp-c-include
@@ -2636,16 +2648,20 @@
./usr/include/openssl/ec.h comp-c-include
./usr/include/openssl/ecdh.h comp-c-include
./usr/include/openssl/ecdsa.h comp-c-include
+./usr/include/openssl/ecerr.h comp-c-include openssl=11
./usr/include/openssl/engine.h comp-c-include
+./usr/include/openssl/engineerr.h comp-c-include openssl=11
./usr/include/openssl/err.h comp-c-include
./usr/include/openssl/evp.h comp-c-include
+./usr/include/openssl/evperr.h comp-c-include openssl=11
./usr/include/openssl/fips.h comp-obsolete obsolete
./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/kdf.h comp-c-include openssl=11
-./usr/include/openssl/krb5_asn.h comp-obsolete openssl=11,obsolete
+./usr/include/openssl/kdferr.h comp-c-include openssl=11
./usr/include/openssl/krb5_asn.h comp-c-include openssl=10
+./usr/include/openssl/krb5_asn.h comp-obsolete openssl=11,obsolete
./usr/include/openssl/kssl.h comp-c-include openssl=10
./usr/include/openssl/kssl.h comp-obsolete openssl=11,obsolete
./usr/include/openssl/lhash.h comp-c-include
@@ -2656,23 +2672,31 @@
./usr/include/openssl/modes.h comp-c-include
./usr/include/openssl/obj_mac.h comp-c-include
./usr/include/openssl/objects.h comp-c-include
+./usr/include/openssl/objectserr.h comp-c-include openssl=11
./usr/include/openssl/ocsp.h comp-c-include
+./usr/include/openssl/ocsperr.h comp-c-include openssl=11
./usr/include/openssl/opensslconf.h comp-c-include
./usr/include/openssl/opensslv.h comp-c-include
./usr/include/openssl/ossl_typ.h comp-c-include
./usr/include/openssl/pem.h comp-c-include
./usr/include/openssl/pem2.h comp-c-include
+./usr/include/openssl/pemerr.h comp-c-include openssl=11
./usr/include/openssl/pkcs12.h comp-c-include
+./usr/include/openssl/pkcs12err.h comp-c-include openssl=11
./usr/include/openssl/pkcs7.h comp-c-include
+./usr/include/openssl/pkcs7err.h comp-c-include openssl=11
./usr/include/openssl/pq_compat.h comp-obsolete obsolete
./usr/include/openssl/pqueue.h comp-c-include openssl=10
./usr/include/openssl/pqueue.h comp-obsolete openssl=11,obsolete
./usr/include/openssl/rand.h comp-c-include
+./usr/include/openssl/rand_drbg.h comp-c-include openssl=11
+./usr/include/openssl/randerr.h comp-c-include openssl=11
./usr/include/openssl/rc2.h comp-c-include
./usr/include/openssl/rc4.h comp-c-include
./usr/include/openssl/rc5.h comp-c-include
./usr/include/openssl/ripemd.h comp-c-include
./usr/include/openssl/rsa.h comp-c-include
+./usr/include/openssl/rsaerr.h comp-c-include openssl=11
./usr/include/openssl/rsaref.h comp-obsolete obsolete
./usr/include/openssl/safestack.h comp-c-include
./usr/include/openssl/seed.h comp-c-include
@@ -2684,21 +2708,27 @@
./usr/include/openssl/ssl23.h comp-c-include openssl=10
./usr/include/openssl/ssl23.h comp-obsolete openssl=11,obsolete
./usr/include/openssl/ssl3.h comp-c-include
+./usr/include/openssl/sslerr.h comp-c-include openssl=11
./usr/include/openssl/stack.h comp-c-include
./usr/include/openssl/store.h comp-c-include openssl=10
./usr/include/openssl/store.h comp-obsolete openssl=11,obsolete
+./usr/include/openssl/storeerr.h comp-c-include openssl=11
./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/tserr.h comp-c-include openssl=11
./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 openssl=10
./usr/include/openssl/ui_compat.h comp-obsolete openssl=11,obsolete
+./usr/include/openssl/uierr.h comp-c-include openssl=11
./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
+./usr/include/openssl/x509err.h comp-c-include openssl=11
./usr/include/openssl/x509v3.h comp-c-include
+./usr/include/openssl/x509v3err.h comp-c-include openssl=11
./usr/include/panel.h comp-c-include
./usr/include/paths.h comp-c-include
./usr/include/pcap-namedb.h comp-c-include
@@ -4136,11 +4166,15 @@
./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.0 comp-c-catman .cat,openssl=11
./usr/share/man/cat1/openssl_c_rehash.0 comp-c-catman .cat,openssl=10
./usr/share/man/cat1/openssl_engine.0 comp-c-catman .cat,openssl=11
./usr/share/man/cat1/openssl_list.0 comp-c-catman .cat,openssl=11
./usr/share/man/cat1/openssl_ocsp.0 comp-c-catman .cat
+./usr/share/man/cat1/openssl_prime.0 comp-c-catman .cat,openssl=11
./usr/share/man/cat1/openssl_rehash.0 comp-c-catman .cat,openssl=11
+./usr/share/man/cat1/openssl_srp.0 comp-c-catman .cat,openssl=11
+./usr/share/man/cat1/openssl_storeutl.0 comp-c-catman .cat,openssl=11
./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
@@ -4475,8 +4509,11 @@
./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/ADMISSIONS.0 comp-c-catman .cat,openssl=11
./usr/share/man/cat3/ASN1_INTEGER_get_int64.0 comp-c-catman .cat,openssl=11
+./usr/share/man/cat3/ASN1_ITEM_lookup.0 comp-c-catman .cat,openssl=11
./usr/share/man/cat3/ASN1_OBJECT_new.0 comp-c-catman .cat
+./usr/share/man/cat3/ASN1_STRING_TABLE_add.0 comp-c-catman .cat,openssl=11
./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
@@ -4532,6 +4569,7 @@
./usr/share/man/cat3/BN_new.0 comp-c-catman .cat
./usr/share/man/cat3/BN_num_bytes.0 comp-c-catman .cat
./usr/share/man/cat3/BN_rand.0 comp-c-catman .cat
+./usr/share/man/cat3/BN_security_bits.0 comp-c-catman .cat,openssl=11
./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
@@ -4593,6 +4631,7 @@
./usr/share/man/cat3/DH_get_ex_new_index.0 comp-c-catman .cat,openssl=10
./usr/share/man/cat3/DH_meth_new.0 comp-c-catman .cat,openssl=11
./usr/share/man/cat3/DH_new.0 comp-c-catman .cat
+./usr/share/man/cat3/DH_new_by_nid.0 comp-c-catman .cat,openssl=11
./usr/share/man/cat3/DH_set_method.0 comp-c-catman .cat
./usr/share/man/cat3/DH_size.0 comp-c-catman .cat
./usr/share/man/cat3/DSA_SIG_new.0 comp-c-catman .cat
@@ -4607,6 +4646,8 @@
./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/DTLS_get_data_mtu.0 comp-c-catman .cat,openssl=11
+./usr/share/man/cat3/DTLS_set_timer_cb.0 comp-c-catman .cat,openssl=11
./usr/share/man/cat3/DTLSv1_listen.0 comp-c-catman .cat,openssl=11
./usr/share/man/cat3/DTTOIF.0 comp-c-catman .cat
./usr/share/man/cat3/ECDSA_SIG_new.0 comp-c-catman .cat,openssl=11
@@ -4642,7 +4683,10 @@
./usr/share/man/cat3/EVP_PKEY_ASN1_METHOD.0 comp-c-catman .cat,openssl=11
./usr/share/man/cat3/EVP_PKEY_CTX_ctrl.0 comp-c-catman .cat
./usr/share/man/cat3/EVP_PKEY_CTX_new.0 comp-c-catman .cat
+./usr/share/man/cat3/EVP_PKEY_CTX_set1_pbe_pass.0 comp-c-catman .cat,openssl=11
./usr/share/man/cat3/EVP_PKEY_CTX_set_hkdf_md.0 comp-c-catman .cat,openssl=11
+./usr/share/man/cat3/EVP_PKEY_CTX_set_rsa_pss_keygen_md.0 comp-c-catman .cat,openssl=11
+./usr/share/man/cat3/EVP_PKEY_CTX_set_scrypt_N.0 comp-c-catman .cat,openssl=11
./usr/share/man/cat3/EVP_PKEY_CTX_set_tls1_prf_md.0 comp-c-catman .cat,openssl=11
./usr/share/man/cat3/EVP_PKEY_asn1_get_count.0 comp-c-catman .cat,openssl=11
./usr/share/man/cat3/EVP_PKEY_cmp.0 comp-c-catman .cat
@@ -4652,6 +4696,8 @@
./usr/share/man/cat3/EVP_PKEY_get_default_digest.0 comp-c-catman .cat,openssl=10
./usr/share/man/cat3/EVP_PKEY_get_default_digest_nid.0 comp-c-catman .cat,openssl=11
./usr/share/man/cat3/EVP_PKEY_keygen.0 comp-c-catman .cat
+./usr/share/man/cat3/EVP_PKEY_meth_get_count.0 comp-c-catman .cat,openssl=11
+./usr/share/man/cat3/EVP_PKEY_meth_new.0 comp-c-catman .cat,openssl=11
./usr/share/man/cat3/EVP_PKEY_new.0 comp-c-catman .cat
./usr/share/man/cat3/EVP_PKEY_print_private.0 comp-c-catman .cat
./usr/share/man/cat3/EVP_PKEY_set1_RSA.0 comp-c-catman .cat
@@ -4661,6 +4707,31 @@
./usr/share/man/cat3/EVP_SealInit.0 comp-c-catman .cat
./usr/share/man/cat3/EVP_SignInit.0 comp-c-catman .cat
./usr/share/man/cat3/EVP_VerifyInit.0 comp-c-catman .cat
+./usr/share/man/cat3/EVP_aes.0 comp-c-catman .cat,openssl=11
+./usr/share/man/cat3/EVP_aria.0 comp-c-catman .cat,openssl=11
+./usr/share/man/cat3/EVP_bf_cbc.0 comp-c-catman .cat,openssl=11
+./usr/share/man/cat3/EVP_blake2b512.0 comp-c-catman .cat,openssl=11
+./usr/share/man/cat3/EVP_camellia.0 comp-c-catman .cat,openssl=11
+./usr/share/man/cat3/EVP_cast5_cbc.0 comp-c-catman .cat,openssl=11
+./usr/share/man/cat3/EVP_chacha20.0 comp-c-catman .cat,openssl=11
+./usr/share/man/cat3/EVP_des.0 comp-c-catman .cat,openssl=11
+./usr/share/man/cat3/EVP_desx_cbc.0 comp-c-catman .cat,openssl=11
+./usr/share/man/cat3/EVP_idea_cbc.0 comp-c-catman .cat,openssl=11
+./usr/share/man/cat3/EVP_md2.0 comp-c-catman .cat,openssl=11
+./usr/share/man/cat3/EVP_md4.0 comp-c-catman .cat,openssl=11
+./usr/share/man/cat3/EVP_md5.0 comp-c-catman .cat,openssl=11
+./usr/share/man/cat3/EVP_mdc2.0 comp-c-catman .cat,openssl=11
+./usr/share/man/cat3/EVP_rc2_cbc.0 comp-c-catman .cat,openssl=11
+./usr/share/man/cat3/EVP_rc4.0 comp-c-catman .cat,openssl=11
+./usr/share/man/cat3/EVP_rc5_32_12_16_cbc.0 comp-c-catman .cat,openssl=11
+./usr/share/man/cat3/EVP_ripemd160.0 comp-c-catman .cat,openssl=11
+./usr/share/man/cat3/EVP_seed_cbc.0 comp-c-catman .cat,openssl=11
+./usr/share/man/cat3/EVP_sha1.0 comp-c-catman .cat,openssl=11
+./usr/share/man/cat3/EVP_sha224.0 comp-c-catman .cat,openssl=11
+./usr/share/man/cat3/EVP_sha3_224.0 comp-c-catman .cat,openssl=11
+./usr/share/man/cat3/EVP_sm3.0 comp-c-catman .cat,openssl=11
+./usr/share/man/cat3/EVP_sm4_cbc.0 comp-c-catman .cat,openssl=11
+./usr/share/man/cat3/EVP_whirlpool.0 comp-c-catman .cat,openssl=11
./usr/share/man/cat3/GCQ_DEQUEUED_FIRST.0 comp-sys-catman .cat
./usr/share/man/cat3/GCQ_DEQUEUED_FIRST_COND.0 comp-sys-catman .cat
./usr/share/man/cat3/GCQ_DEQUEUED_FIRST_COND_TYPED.0 comp-sys-catman .cat
@@ -4770,6 +4841,7 @@
./usr/share/man/cat3/OPENSSL_LH_stats.0 comp-c-catman .cat,openssl=11
./usr/share/man/cat3/OPENSSL_VERSION_NUMBER.0 comp-c-catman .cat
./usr/share/man/cat3/OPENSSL_config.0 comp-c-man .cat
+./usr/share/man/cat3/OPENSSL_fork_prepare.0 comp-c-catman .cat,openssl=11
Home |
Main Index |
Thread Index |
Old Index