Skip to content

Commit 4733f32

Browse files
committed
Auto merge of #86583 - dns2utf8:use_https, r=pietroalbini
Use https for sourceforge during CI I saw that we use http during CI opening up the CI process to on the wire tampering. based on #86573 r? `@pietroalbini`
2 parents 117799b + 10b83cd commit 4733f32

File tree

4 files changed

+7
-6
lines changed

4 files changed

+7
-6
lines changed

src/ci/docker/host-x86_64/dist-arm-linux/arm-linux-gnueabi.config

+1-1
Original file line numberDiff line numberDiff line change
@@ -711,7 +711,7 @@ CT_ZLIB_PATCH_ORDER="global"
711711
CT_ZLIB_V_1_2_11=y
712712
# CT_ZLIB_NO_VERSIONS is not set
713713
CT_ZLIB_VERSION="1.2.11"
714-
CT_ZLIB_MIRRORS="http://downloads.sourceforge.net/project/libpng/zlib/${CT_ZLIB_VERSION}"
714+
CT_ZLIB_MIRRORS="https://downloads.sourceforge.net/project/libpng/zlib/${CT_ZLIB_VERSION}"
715715
CT_ZLIB_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
716716
CT_ZLIB_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
717717
CT_ZLIB_ARCHIVE_FORMATS=".tar.xz .tar.gz"

src/ci/docker/host-x86_64/dist-armhf-linux/arm-linux-gnueabihf.config

+1-1
Original file line numberDiff line numberDiff line change
@@ -725,7 +725,7 @@ CT_ZLIB_PATCH_ORDER="global"
725725
CT_ZLIB_V_1_2_11=y
726726
# CT_ZLIB_NO_VERSIONS is not set
727727
CT_ZLIB_VERSION="1.2.11"
728-
CT_ZLIB_MIRRORS="http://downloads.sourceforge.net/project/libpng/zlib/${CT_ZLIB_VERSION}"
728+
CT_ZLIB_MIRRORS="https://downloads.sourceforge.net/project/libpng/zlib/${CT_ZLIB_VERSION}"
729729
CT_ZLIB_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
730730
CT_ZLIB_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
731731
CT_ZLIB_ARCHIVE_FORMATS=".tar.xz .tar.gz"

src/ci/docker/host-x86_64/dist-armv7-linux/armv7-linux-gnueabihf.config

+2-2
Original file line numberDiff line numberDiff line change
@@ -671,7 +671,7 @@ CT_MPFR_PATCH_ORDER="global"
671671
CT_MPFR_V_3_1=y
672672
# CT_MPFR_NO_VERSIONS is not set
673673
CT_MPFR_VERSION="3.1.6"
674-
CT_MPFR_MIRRORS="http://www.mpfr.org/mpfr-${CT_MPFR_VERSION} $(CT_Mirrors GNU mpfr)"
674+
CT_MPFR_MIRRORS="https://www.mpfr.org/mpfr-${CT_MPFR_VERSION} $(CT_Mirrors GNU mpfr)"
675675
CT_MPFR_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
676676
CT_MPFR_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
677677
CT_MPFR_ARCHIVE_FORMATS=".tar.xz .tar.bz2 .tar.gz .zip"
@@ -711,7 +711,7 @@ CT_ZLIB_PATCH_ORDER="global"
711711
CT_ZLIB_V_1_2_11=y
712712
# CT_ZLIB_NO_VERSIONS is not set
713713
CT_ZLIB_VERSION="1.2.11"
714-
CT_ZLIB_MIRRORS="http://downloads.sourceforge.net/project/libpng/zlib/${CT_ZLIB_VERSION}"
714+
CT_ZLIB_MIRRORS="https://downloads.sourceforge.net/project/libpng/zlib/${CT_ZLIB_VERSION}"
715715
CT_ZLIB_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
716716
CT_ZLIB_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
717717
CT_ZLIB_ARCHIVE_FORMATS=".tar.xz .tar.gz"

src/ci/docker/host-x86_64/dist-riscv64-linux/riscv64-unknown-linux-gnu.config

+3-2
Original file line numberDiff line numberDiff line change
@@ -645,7 +645,8 @@ CT_EXPAT_PATCH_ORDER="global"
645645
CT_EXPAT_V_2_2=y
646646
# CT_EXPAT_NO_VERSIONS is not set
647647
CT_EXPAT_VERSION="2.4.1"
648-
CT_EXPAT_MIRRORS="http://downloads.sourceforge.net/project/expat/expat/${CT_EXPAT_VERSION}"
648+
CT_EXPAT_VERSION_TAG="2_4_1"
649+
CT_EXPAT_MIRRORS="https://github.com/libexpat/libexpat/releases/download/R_${CT_EXPAT_VERSION_TAG}"
649650
CT_EXPAT_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
650651
CT_EXPAT_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
651652
CT_EXPAT_ARCHIVE_FORMATS=".tar.bz2"
@@ -862,7 +863,7 @@ CT_ZLIB_PATCH_ORDER="global"
862863
CT_ZLIB_V_1_2_11=y
863864
# CT_ZLIB_NO_VERSIONS is not set
864865
CT_ZLIB_VERSION="1.2.11"
865-
CT_ZLIB_MIRRORS="http://downloads.sourceforge.net/project/libpng/zlib/${CT_ZLIB_VERSION}"
866+
CT_ZLIB_MIRRORS="https://downloads.sourceforge.net/project/libpng/zlib/${CT_ZLIB_VERSION}"
866867
CT_ZLIB_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
867868
CT_ZLIB_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
868869
CT_ZLIB_ARCHIVE_FORMATS=".tar.xz .tar.gz"

0 commit comments

Comments
 (0)