Merge remote-tracking branch 'ms/aws-cli' into next

diff --git a/config/rootfiles/common/openssl b/config/rootfiles/common/openssl
index dd20f9fab8d1925cc6c4d99fc835014513039dae..8b26c4b429a80d67a3ba8b0191b5fe4ab19d6c35 100644 (file)
--- a/config/rootfiles/common/openssl
+++ b/config/rootfiles/common/openssl
@@ -1285,13 +1285,17 @@ usr/lib/libssl.so.1.1
 #usr/share/doc/openssl/html/man3/EVP_EncryptInit_ex.html
 #usr/share/doc/openssl/html/man3/EVP_EncryptUpdate.html
 #usr/share/doc/openssl/html/man3/EVP_MD_CTX_block_size.html
+#usr/share/doc/openssl/html/man3/EVP_MD_CTX_clear_flags.html
 #usr/share/doc/openssl/html/man3/EVP_MD_CTX_copy.html
 #usr/share/doc/openssl/html/man3/EVP_MD_CTX_copy_ex.html
 #usr/share/doc/openssl/html/man3/EVP_MD_CTX_free.html
 #usr/share/doc/openssl/html/man3/EVP_MD_CTX_md.html
+#usr/share/doc/openssl/html/man3/EVP_MD_CTX_md_data.html
 #usr/share/doc/openssl/html/man3/EVP_MD_CTX_new.html
 #usr/share/doc/openssl/html/man3/EVP_MD_CTX_reset.html
+#usr/share/doc/openssl/html/man3/EVP_MD_CTX_set_flags.html
 #usr/share/doc/openssl/html/man3/EVP_MD_CTX_size.html
+#usr/share/doc/openssl/html/man3/EVP_MD_CTX_test_flags.html
 #usr/share/doc/openssl/html/man3/EVP_MD_CTX_type.html
 #usr/share/doc/openssl/html/man3/EVP_MD_block_size.html
 #usr/share/doc/openssl/html/man3/EVP_MD_meth_dup.html
@@ -1628,6 +1632,7 @@ usr/lib/libssl.so.1.1
 #usr/share/doc/openssl/html/man3/OCSP_SINGLERESP_free.html
 #usr/share/doc/openssl/html/man3/OCSP_SINGLERESP_new.html
 #usr/share/doc/openssl/html/man3/OCSP_basic_add1_nonce.html
+#usr/share/doc/openssl/html/man3/OCSP_basic_verify.html
 #usr/share/doc/openssl/html/man3/OCSP_cert_id_new.html
 #usr/share/doc/openssl/html/man3/OCSP_cert_to_id.html
 #usr/share/doc/openssl/html/man3/OCSP_check_nonce.html
@@ -2364,6 +2369,7 @@ usr/lib/libssl.so.1.1
 #usr/share/doc/openssl/html/man3/SSL_get_selected_srtp_profile.html
 #usr/share/doc/openssl/html/man3/SSL_get_server_random.html
 #usr/share/doc/openssl/html/man3/SSL_get_session.html
+#usr/share/doc/openssl/html/man3/SSL_get_shared_ciphers.html
 #usr/share/doc/openssl/html/man3/SSL_get_shared_curve.html
 #usr/share/doc/openssl/html/man3/SSL_get_shared_sigalgs.html
 #usr/share/doc/openssl/html/man3/SSL_get_shutdown.html
@@ -2651,8 +2657,36 @@ usr/lib/libssl.so.1.1
 #usr/share/doc/openssl/html/man3/X509_EXTENSION_set_critical.html
 #usr/share/doc/openssl/html/man3/X509_EXTENSION_set_data.html
 #usr/share/doc/openssl/html/man3/X509_EXTENSION_set_object.html
+#usr/share/doc/openssl/html/man3/X509_LOOKUP_ctrl_fn.html
 #usr/share/doc/openssl/html/man3/X509_LOOKUP_file.html
+#usr/share/doc/openssl/html/man3/X509_LOOKUP_get_by_alias_fn.html
+#usr/share/doc/openssl/html/man3/X509_LOOKUP_get_by_fingerprint_fn.html
+#usr/share/doc/openssl/html/man3/X509_LOOKUP_get_by_issuer_serial_fn.html
+#usr/share/doc/openssl/html/man3/X509_LOOKUP_get_by_subject_fn.html
+#usr/share/doc/openssl/html/man3/X509_LOOKUP_get_method_data.html
+#usr/share/doc/openssl/html/man3/X509_LOOKUP_get_store.html
 #usr/share/doc/openssl/html/man3/X509_LOOKUP_hash_dir.html
+#usr/share/doc/openssl/html/man3/X509_LOOKUP_meth_free.html
+#usr/share/doc/openssl/html/man3/X509_LOOKUP_meth_get_ctrl.html
+#usr/share/doc/openssl/html/man3/X509_LOOKUP_meth_get_free.html
+#usr/share/doc/openssl/html/man3/X509_LOOKUP_meth_get_get_by_alias.html
+#usr/share/doc/openssl/html/man3/X509_LOOKUP_meth_get_get_by_fingerprint.html
+#usr/share/doc/openssl/html/man3/X509_LOOKUP_meth_get_get_by_issuer_serial.html
+#usr/share/doc/openssl/html/man3/X509_LOOKUP_meth_get_get_by_subject.html
+#usr/share/doc/openssl/html/man3/X509_LOOKUP_meth_get_init.html
+#usr/share/doc/openssl/html/man3/X509_LOOKUP_meth_get_new_item.html
+#usr/share/doc/openssl/html/man3/X509_LOOKUP_meth_get_shutdown.html
+#usr/share/doc/openssl/html/man3/X509_LOOKUP_meth_new.html
+#usr/share/doc/openssl/html/man3/X509_LOOKUP_meth_set_ctrl.html
+#usr/share/doc/openssl/html/man3/X509_LOOKUP_meth_set_free.html
+#usr/share/doc/openssl/html/man3/X509_LOOKUP_meth_set_get_by_alias.html
+#usr/share/doc/openssl/html/man3/X509_LOOKUP_meth_set_get_by_fingerprint.html
+#usr/share/doc/openssl/html/man3/X509_LOOKUP_meth_set_get_by_issuer_serial.html
+#usr/share/doc/openssl/html/man3/X509_LOOKUP_meth_set_get_by_subject.html
+#usr/share/doc/openssl/html/man3/X509_LOOKUP_meth_set_init.html
+#usr/share/doc/openssl/html/man3/X509_LOOKUP_meth_set_new_item.html
+#usr/share/doc/openssl/html/man3/X509_LOOKUP_meth_set_shutdown.html
+#usr/share/doc/openssl/html/man3/X509_LOOKUP_set_method_data.html
 #usr/share/doc/openssl/html/man3/X509_NAME_ENTRY_create_by_NID.html
 #usr/share/doc/openssl/html/man3/X509_NAME_ENTRY_create_by_OBJ.html
 #usr/share/doc/openssl/html/man3/X509_NAME_ENTRY_create_by_txt.html
@@ -2683,6 +2717,8 @@ usr/lib/libssl.so.1.1
 #usr/share/doc/openssl/html/man3/X509_NAME_print.html
 #usr/share/doc/openssl/html/man3/X509_NAME_print_ex.html
 #usr/share/doc/openssl/html/man3/X509_NAME_print_ex_fp.html
+#usr/share/doc/openssl/html/man3/X509_OBJECT_set1_X509.html
+#usr/share/doc/openssl/html/man3/X509_OBJECT_set1_X509_CRL.html
 #usr/share/doc/openssl/html/man3/X509_PUBKEY_free.html
 #usr/share/doc/openssl/html/man3/X509_PUBKEY_get.html
 #usr/share/doc/openssl/html/man3/X509_PUBKEY_get0.html
@@ -2828,6 +2864,7 @@ usr/lib/libssl.so.1.1
 #usr/share/doc/openssl/html/man3/X509_VERIFY_PARAM_get_auth_level.html
 #usr/share/doc/openssl/html/man3/X509_VERIFY_PARAM_get_depth.html
 #usr/share/doc/openssl/html/man3/X509_VERIFY_PARAM_get_flags.html
+#usr/share/doc/openssl/html/man3/X509_VERIFY_PARAM_get_hostflags.html
 #usr/share/doc/openssl/html/man3/X509_VERIFY_PARAM_get_inh_flags.html
 #usr/share/doc/openssl/html/man3/X509_VERIFY_PARAM_get_time.html
 #usr/share/doc/openssl/html/man3/X509_VERIFY_PARAM_set1_email.html
@@ -2852,6 +2889,7 @@ usr/lib/libssl.so.1.1
 #usr/share/doc/openssl/html/man3/X509_check_ip.html
 #usr/share/doc/openssl/html/man3/X509_check_ip_asc.html
 #usr/share/doc/openssl/html/man3/X509_check_issued.html
+#usr/share/doc/openssl/html/man3/X509_cmp_time.html
 #usr/share/doc/openssl/html/man3/X509_delete_ext.html
 #usr/share/doc/openssl/html/man3/X509_digest.html
 #usr/share/doc/openssl/html/man3/X509_dup.html
@@ -4531,13 +4569,17 @@ usr/lib/libssl.so.1.1
 #usr/share/man/man3/EVP_EncryptInit_ex.3
 #usr/share/man/man3/EVP_EncryptUpdate.3
 #usr/share/man/man3/EVP_MD_CTX_block_size.3
+#usr/share/man/man3/EVP_MD_CTX_clear_flags.3
 #usr/share/man/man3/EVP_MD_CTX_copy.3
 #usr/share/man/man3/EVP_MD_CTX_copy_ex.3
 #usr/share/man/man3/EVP_MD_CTX_free.3
 #usr/share/man/man3/EVP_MD_CTX_md.3
+#usr/share/man/man3/EVP_MD_CTX_md_data.3
 #usr/share/man/man3/EVP_MD_CTX_new.3
 #usr/share/man/man3/EVP_MD_CTX_reset.3
+#usr/share/man/man3/EVP_MD_CTX_set_flags.3
 #usr/share/man/man3/EVP_MD_CTX_size.3
+#usr/share/man/man3/EVP_MD_CTX_test_flags.3
 #usr/share/man/man3/EVP_MD_CTX_type.3
 #usr/share/man/man3/EVP_MD_block_size.3
 #usr/share/man/man3/EVP_MD_meth_dup.3
@@ -4874,6 +4916,7 @@ usr/lib/libssl.so.1.1
 #usr/share/man/man3/OCSP_SINGLERESP_free.3
 #usr/share/man/man3/OCSP_SINGLERESP_new.3
 #usr/share/man/man3/OCSP_basic_add1_nonce.3
+#usr/share/man/man3/OCSP_basic_verify.3
 #usr/share/man/man3/OCSP_cert_id_new.3
 #usr/share/man/man3/OCSP_cert_to_id.3
 #usr/share/man/man3/OCSP_check_nonce.3
@@ -5610,6 +5653,7 @@ usr/lib/libssl.so.1.1
 #usr/share/man/man3/SSL_get_selected_srtp_profile.3
 #usr/share/man/man3/SSL_get_server_random.3
 #usr/share/man/man3/SSL_get_session.3
+#usr/share/man/man3/SSL_get_shared_ciphers.3
 #usr/share/man/man3/SSL_get_shared_curve.3
 #usr/share/man/man3/SSL_get_shared_sigalgs.3
 #usr/share/man/man3/SSL_get_shutdown.3
@@ -5897,8 +5941,36 @@ usr/lib/libssl.so.1.1
 #usr/share/man/man3/X509_EXTENSION_set_critical.3
 #usr/share/man/man3/X509_EXTENSION_set_data.3
 #usr/share/man/man3/X509_EXTENSION_set_object.3
+#usr/share/man/man3/X509_LOOKUP_ctrl_fn.3
 #usr/share/man/man3/X509_LOOKUP_file.3
+#usr/share/man/man3/X509_LOOKUP_get_by_alias_fn.3
+#usr/share/man/man3/X509_LOOKUP_get_by_fingerprint_fn.3
+#usr/share/man/man3/X509_LOOKUP_get_by_issuer_serial_fn.3
+#usr/share/man/man3/X509_LOOKUP_get_by_subject_fn.3
+#usr/share/man/man3/X509_LOOKUP_get_method_data.3
+#usr/share/man/man3/X509_LOOKUP_get_store.3
 #usr/share/man/man3/X509_LOOKUP_hash_dir.3
+#usr/share/man/man3/X509_LOOKUP_meth_free.3
+#usr/share/man/man3/X509_LOOKUP_meth_get_ctrl.3
+#usr/share/man/man3/X509_LOOKUP_meth_get_free.3
+#usr/share/man/man3/X509_LOOKUP_meth_get_get_by_alias.3
+#usr/share/man/man3/X509_LOOKUP_meth_get_get_by_fingerprint.3
+#usr/share/man/man3/X509_LOOKUP_meth_get_get_by_issuer_serial.3
+#usr/share/man/man3/X509_LOOKUP_meth_get_get_by_subject.3
+#usr/share/man/man3/X509_LOOKUP_meth_get_init.3
+#usr/share/man/man3/X509_LOOKUP_meth_get_new_item.3
+#usr/share/man/man3/X509_LOOKUP_meth_get_shutdown.3
+#usr/share/man/man3/X509_LOOKUP_meth_new.3
+#usr/share/man/man3/X509_LOOKUP_meth_set_ctrl.3
+#usr/share/man/man3/X509_LOOKUP_meth_set_free.3
+#usr/share/man/man3/X509_LOOKUP_meth_set_get_by_alias.3
+#usr/share/man/man3/X509_LOOKUP_meth_set_get_by_fingerprint.3
+#usr/share/man/man3/X509_LOOKUP_meth_set_get_by_issuer_serial.3
+#usr/share/man/man3/X509_LOOKUP_meth_set_get_by_subject.3
+#usr/share/man/man3/X509_LOOKUP_meth_set_init.3
+#usr/share/man/man3/X509_LOOKUP_meth_set_new_item.3
+#usr/share/man/man3/X509_LOOKUP_meth_set_shutdown.3
+#usr/share/man/man3/X509_LOOKUP_set_method_data.3
 #usr/share/man/man3/X509_NAME_ENTRY_create_by_NID.3
 #usr/share/man/man3/X509_NAME_ENTRY_create_by_OBJ.3
 #usr/share/man/man3/X509_NAME_ENTRY_create_by_txt.3
@@ -5929,6 +6001,8 @@ usr/lib/libssl.so.1.1
 #usr/share/man/man3/X509_NAME_print.3
 #usr/share/man/man3/X509_NAME_print_ex.3
 #usr/share/man/man3/X509_NAME_print_ex_fp.3
+#usr/share/man/man3/X509_OBJECT_set1_X509.3
+#usr/share/man/man3/X509_OBJECT_set1_X509_CRL.3
 #usr/share/man/man3/X509_PUBKEY_free.3
 #usr/share/man/man3/X509_PUBKEY_get.3
 #usr/share/man/man3/X509_PUBKEY_get0.3
@@ -6074,6 +6148,7 @@ usr/lib/libssl.so.1.1
 #usr/share/man/man3/X509_VERIFY_PARAM_get_auth_level.3
 #usr/share/man/man3/X509_VERIFY_PARAM_get_depth.3
 #usr/share/man/man3/X509_VERIFY_PARAM_get_flags.3
+#usr/share/man/man3/X509_VERIFY_PARAM_get_hostflags.3
 #usr/share/man/man3/X509_VERIFY_PARAM_get_inh_flags.3
 #usr/share/man/man3/X509_VERIFY_PARAM_get_time.3
 #usr/share/man/man3/X509_VERIFY_PARAM_set1_email.3
@@ -6098,6 +6173,7 @@ usr/lib/libssl.so.1.1
 #usr/share/man/man3/X509_check_ip.3
 #usr/share/man/man3/X509_check_ip_asc.3
 #usr/share/man/man3/X509_check_issued.3
+#usr/share/man/man3/X509_cmp_time.3
 #usr/share/man/man3/X509_delete_ext.3
 #usr/share/man/man3/X509_digest.3
 #usr/share/man/man3/X509_dup.3

diff --git a/lfs/openssl b/lfs/openssl
index 71f2bc826b3aeaaba62203fdf399cd1e75f7a256..94a08b97db45a301013e6fa05bf10e3cd792f84e 100644 (file)
--- a/lfs/openssl
+++ b/lfs/openssl
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 1.1.0h
+VER        = 1.1.0i
 
 THISAPP    = openssl-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -87,7 +87,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 5271477e4d93f4ea032b665ef095ff24
+$(DL_FILE)_MD5 = 9495126aafd2659d357ea66a969c3fe1
 
 install : $(TARGET)
 

diff --git a/lfs/openssl-compat b/lfs/openssl-compat
index 9e991b496029982478d1404cb198aeb6ff4a6f1d..d784903ba764ef667167ae369a7e7381cd90d3ad 100644 (file)
--- a/lfs/openssl-compat
+++ b/lfs/openssl-compat
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 1.0.2o
+VER        = 1.0.2p
 
 THISAPP    = openssl-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -84,7 +84,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 44279b8557c3247cbe324e2322ecd114
+$(DL_FILE)_MD5 = ac5eb30bf5798aa14b1ae6d0e7da58df
 
 install : $(TARGET)