From mboxrd@z Thu Jan 1 00:00:00 1970 From: git@ipfire.org To: ipfire-scm@lists.ipfire.org Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. f7e9c14842dee00529df1e4a30f46255a1ed37e4 Date: Thu, 29 Mar 2018 13:50:56 +0100 Message-ID: <20180329125056.C4D631081DF2@git01.ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============6084670833865752749==" List-Id: --===============6084670833865752749== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via f7e9c14842dee00529df1e4a30f46255a1ed37e4 (commit) via 4b072d640efde44017aeceb66d816ea59639be46 (commit) from 66a0f3646ad2b1da568282464b9a63479c8b45d9 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit f7e9c14842dee00529df1e4a30f46255a1ed37e4 Author: Michael Tremer Date: Thu Mar 29 13:49:44 2018 +0100 Rootfile update =20 Signed-off-by: Michael Tremer commit 4b072d640efde44017aeceb66d816ea59639be46 Author: Michael Tremer Date: Wed Mar 28 16:55:18 2018 +0100 pakfire: Use upstream proxy for HTTPS, too =20 Signed-off-by: Michael Tremer ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/openssl | 10 ++++++---- src/pakfire/lib/functions.pl | 4 ++-- 2 files changed, 8 insertions(+), 6 deletions(-) Difference in files: diff --git a/config/rootfiles/common/openssl b/config/rootfiles/common/openssl index 87143c5c6..9d49d298b 100644 --- a/config/rootfiles/common/openssl +++ b/config/rootfiles/common/openssl @@ -371,6 +371,7 @@ usr/lib/libssl.so.1.1 #usr/share/doc/openssl/html/man3/BIO_get_write_guarantee.html #usr/share/doc/openssl/html/man3/BIO_gets.html #usr/share/doc/openssl/html/man3/BIO_hostserv_priorities.html +#usr/share/doc/openssl/html/man3/BIO_info_cb.html #usr/share/doc/openssl/html/man3/BIO_int_ctrl.html #usr/share/doc/openssl/html/man3/BIO_listen.html #usr/share/doc/openssl/html/man3/BIO_lookup.html @@ -1287,7 +1288,6 @@ usr/lib/libssl.so.1.1 #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_size.html @@ -1648,6 +1648,7 @@ usr/lib/libssl.so.1.1 #usr/share/doc/openssl/html/man3/OCSP_resp_get0_certs.html #usr/share/doc/openssl/html/man3/OCSP_resp_get0_id.html #usr/share/doc/openssl/html/man3/OCSP_resp_get0_produced_at.html +#usr/share/doc/openssl/html/man3/OCSP_resp_get0_signer.html #usr/share/doc/openssl/html/man3/OCSP_response_create.html #usr/share/doc/openssl/html/man3/OCSP_response_get1_basic.html #usr/share/doc/openssl/html/man3/OCSP_response_status.html @@ -2854,6 +2855,7 @@ usr/lib/libssl.so.1.1 #usr/share/doc/openssl/html/man3/X509_digest.html #usr/share/doc/openssl/html/man3/X509_dup.html #usr/share/doc/openssl/html/man3/X509_free.html +#usr/share/doc/openssl/html/man3/X509_get0_authority_key_id.html #usr/share/doc/openssl/html/man3/X509_get0_extensions.html #usr/share/doc/openssl/html/man3/X509_get0_notAfter.html #usr/share/doc/openssl/html/man3/X509_get0_notBefore.html @@ -2914,7 +2916,6 @@ usr/lib/libssl.so.1.1 #usr/share/doc/openssl/html/man3/X509v3_get_ext_by_critical.html #usr/share/doc/openssl/html/man3/X509v3_get_ext_count.html #usr/share/doc/openssl/html/man3/bio.html -#usr/share/doc/openssl/html/man3/bio_info_cb.html #usr/share/doc/openssl/html/man3/custom_ext_add_cb.html #usr/share/doc/openssl/html/man3/custom_ext_free_cb.html #usr/share/doc/openssl/html/man3/custom_ext_parse_cb.html @@ -3616,6 +3617,7 @@ usr/lib/libssl.so.1.1 #usr/share/man/man3/BIO_get_write_guarantee.3 #usr/share/man/man3/BIO_gets.3 #usr/share/man/man3/BIO_hostserv_priorities.3 +#usr/share/man/man3/BIO_info_cb.3 #usr/share/man/man3/BIO_int_ctrl.3 #usr/share/man/man3/BIO_listen.3 #usr/share/man/man3/BIO_lookup.3 @@ -4532,7 +4534,6 @@ usr/lib/libssl.so.1.1 #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_size.3 @@ -4893,6 +4894,7 @@ usr/lib/libssl.so.1.1 #usr/share/man/man3/OCSP_resp_get0_certs.3 #usr/share/man/man3/OCSP_resp_get0_id.3 #usr/share/man/man3/OCSP_resp_get0_produced_at.3 +#usr/share/man/man3/OCSP_resp_get0_signer.3 #usr/share/man/man3/OCSP_response_create.3 #usr/share/man/man3/OCSP_response_get1_basic.3 #usr/share/man/man3/OCSP_response_status.3 @@ -6099,6 +6101,7 @@ usr/lib/libssl.so.1.1 #usr/share/man/man3/X509_digest.3 #usr/share/man/man3/X509_dup.3 #usr/share/man/man3/X509_free.3 +#usr/share/man/man3/X509_get0_authority_key_id.3 #usr/share/man/man3/X509_get0_extensions.3 #usr/share/man/man3/X509_get0_notAfter.3 #usr/share/man/man3/X509_get0_notBefore.3 @@ -6159,7 +6162,6 @@ usr/lib/libssl.so.1.1 #usr/share/man/man3/X509v3_get_ext_by_critical.3 #usr/share/man/man3/X509v3_get_ext_count.3 #usr/share/man/man3/bio.3 -#usr/share/man/man3/bio_info_cb.3 #usr/share/man/man3/custom_ext_add_cb.3 #usr/share/man/man3/custom_ext_free_cb.3 #usr/share/man/man3/custom_ext_parse_cb.3 diff --git a/src/pakfire/lib/functions.pl b/src/pakfire/lib/functions.pl index 6cc177128..78761aef6 100644 --- a/src/pakfire/lib/functions.pl +++ b/src/pakfire/lib/functions.pl @@ -166,10 +166,10 @@ sub fetchfile { if ($proxysettings{'UPSTREAM_PROXY'}) { logger("DOWNLOAD INFO: Upstream proxy: \"$proxysettings{'UPSTREAM_PROXY'}= \"") unless ($bfile =3D~ /^counter.py\?.*/);=20 if ($proxysettings{'UPSTREAM_USER'}) { - $ua->proxy("http","http://$proxysettings{'UPSTREAM_USER'}:$proxysettings= {'UPSTREAM_PASSWORD'}@"."$proxysettings{'UPSTREAM_PROXY'}/"); + $ua->proxy([["http", "https"] =3D> "http://$proxysettings{'UPSTREAM_USER= '}:$proxysettings{'UPSTREAM_PASSWORD'}@"."$proxysettings{'UPSTREAM_PROXY'}/"]= ); logger("DOWNLOAD INFO: Logging in with: \"$proxysettings{'UPSTREAM_USER'= }\" - \"$proxysettings{'UPSTREAM_PASSWORD'}\"") unless ($bfile =3D~ /^counter= .py\?.*/); } else { - $ua->proxy("http","http://$proxysettings{'UPSTREAM_PROXY'}/"); + $ua->proxy([["http", "https"] =3D> "http://$proxysettings{'UPSTREAM_PROX= Y'}/"]); } } =20 hooks/post-receive -- IPFire 2.x development tree --===============6084670833865752749==--