From cfa67be2b1f8112637f4f26ebe3817dca5029008 Mon Sep 17 00:00:00 2001 From: Andrew Phelps Date: Thu, 15 Oct 2020 17:03:40 -0700 Subject: [PATCH] update libffi to use https source0 --- SPECS/libffi/libffi.spec | 6 ++++-- cgmanifest.json | 2 +- toolkit/resources/manifests/package/pkggen_core_aarch64.txt | 2 +- toolkit/resources/manifests/package/pkggen_core_x86_64.txt | 2 +- toolkit/resources/manifests/package/toolchain_aarch64.txt | 6 +++--- toolkit/resources/manifests/package/toolchain_x86_64.txt | 6 +++--- .../scripts/toolchain/container/toolchain-remote-wget-list | 2 +- 7 files changed, 14 insertions(+), 12 deletions(-) diff --git a/SPECS/libffi/libffi.spec b/SPECS/libffi/libffi.spec index e89fb1ec113..4de226afd8c 100644 --- a/SPECS/libffi/libffi.spec +++ b/SPECS/libffi/libffi.spec @@ -1,13 +1,13 @@ Summary: A portable, high level programming interface to various calling conventions Name: libffi Version: 3.2.1 -Release: 11%{?dist} +Release: 12%{?dist} License: BSD URL: http://sourceware.org/libffi/ Group: System Environment/GeneralLibraries Vendor: Microsoft Corporation Distribution: Mariner -Source0: ftp://sourceware.org/pub/libffi/%{name}-%{version}.tar.gz +Source0: https://gcc.gnu.org/pub/libffi/%{name}-%{version}.tar.gz Provides: pkgconfig(libffi) #%if %{with_check} #BuildRequires: dejagnu @@ -77,6 +77,8 @@ rm -rf %{buildroot}/* %{_mandir}/man3/* %changelog +* Thu Oct 15 2020 Andrew Phelps 3.2.1-12 +- Update Source0 to use more reliable https URL instead of ftp * Fri Sep 18 2020 Mateusz Malisz 3.2.1-11 - Fix normal libffi build by replacing destination for .so files from $(toolexeclibdir) to $(libdir) - Replace ./configure and manual options with %%configure macro diff --git a/cgmanifest.json b/cgmanifest.json index dca184a1cee..37984139e76 100644 --- a/cgmanifest.json +++ b/cgmanifest.json @@ -2107,7 +2107,7 @@ "other": { "name": "libffi", "version": "3.2.1", - "downloadUrl": "ftp://sourceware.org/pub/libffi/libffi-3.2.1.tar.gz" + "downloadUrl": "https://gcc.gnu.org/pub/libffi/libffi-3.2.1.tar.gz" } } }, diff --git a/toolkit/resources/manifests/package/pkggen_core_aarch64.txt b/toolkit/resources/manifests/package/pkggen_core_aarch64.txt index 42c40cb14c9..3fcdf9ba5c4 100644 --- a/toolkit/resources/manifests/package/pkggen_core_aarch64.txt +++ b/toolkit/resources/manifests/package/pkggen_core_aarch64.txt @@ -157,7 +157,7 @@ gnupg2-2.2.20-3.cm1.aarch64.rpm gpgme-1.13.1-5.cm1.aarch64.rpm mariner-repos-1.0-11.cm1.noarch.rpm mariner-repos-preview-1.0-11.cm1.noarch.rpm -libffi-3.2.1-11.cm1.aarch64.rpm +libffi-3.2.1-12.cm1.aarch64.rpm libtasn1-4.14-2.cm1.aarch64.rpm p11-kit-0.23.16.1-2.cm1.aarch64.rpm p11-kit-trust-0.23.16.1-2.cm1.aarch64.rpm diff --git a/toolkit/resources/manifests/package/pkggen_core_x86_64.txt b/toolkit/resources/manifests/package/pkggen_core_x86_64.txt index ff0859fcf60..849d7231a45 100644 --- a/toolkit/resources/manifests/package/pkggen_core_x86_64.txt +++ b/toolkit/resources/manifests/package/pkggen_core_x86_64.txt @@ -157,7 +157,7 @@ gnupg2-2.2.20-3.cm1.x86_64.rpm gpgme-1.13.1-5.cm1.x86_64.rpm mariner-repos-1.0-11.cm1.noarch.rpm mariner-repos-preview-1.0-11.cm1.noarch.rpm -libffi-3.2.1-11.cm1.x86_64.rpm +libffi-3.2.1-12.cm1.x86_64.rpm libtasn1-4.14-2.cm1.x86_64.rpm p11-kit-0.23.16.1-2.cm1.x86_64.rpm p11-kit-trust-0.23.16.1-2.cm1.x86_64.rpm diff --git a/toolkit/resources/manifests/package/toolchain_aarch64.txt b/toolkit/resources/manifests/package/toolchain_aarch64.txt index 33e851752ff..c0c6c23b58b 100644 --- a/toolkit/resources/manifests/package/toolchain_aarch64.txt +++ b/toolkit/resources/manifests/package/toolchain_aarch64.txt @@ -168,9 +168,9 @@ libdb-5.3.28-4.cm1.aarch64.rpm libdb-debuginfo-5.3.28-4.cm1.aarch64.rpm libdb-devel-5.3.28-4.cm1.aarch64.rpm libdb-docs-5.3.28-4.cm1.aarch64.rpm -libffi-3.2.1-11.cm1.aarch64.rpm -libffi-debuginfo-3.2.1-11.cm1.aarch64.rpm -libffi-devel-3.2.1-11.cm1.aarch64.rpm +libffi-3.2.1-12.cm1.aarch64.rpm +libffi-debuginfo-3.2.1-12.cm1.aarch64.rpm +libffi-devel-3.2.1-12.cm1.aarch64.rpm libgcc-9.1.0-7.cm1.aarch64.rpm libgcc-atomic-9.1.0-7.cm1.aarch64.rpm libgcc-devel-9.1.0-7.cm1.aarch64.rpm diff --git a/toolkit/resources/manifests/package/toolchain_x86_64.txt b/toolkit/resources/manifests/package/toolchain_x86_64.txt index b91cf4fd13f..6801469d29a 100644 --- a/toolkit/resources/manifests/package/toolchain_x86_64.txt +++ b/toolkit/resources/manifests/package/toolchain_x86_64.txt @@ -168,9 +168,9 @@ libdb-5.3.28-4.cm1.x86_64.rpm libdb-debuginfo-5.3.28-4.cm1.x86_64.rpm libdb-devel-5.3.28-4.cm1.x86_64.rpm libdb-docs-5.3.28-4.cm1.x86_64.rpm -libffi-3.2.1-11.cm1.x86_64.rpm -libffi-debuginfo-3.2.1-11.cm1.x86_64.rpm -libffi-devel-3.2.1-11.cm1.x86_64.rpm +libffi-3.2.1-12.cm1.x86_64.rpm +libffi-debuginfo-3.2.1-12.cm1.x86_64.rpm +libffi-devel-3.2.1-12.cm1.x86_64.rpm libgcc-9.1.0-7.cm1.x86_64.rpm libgcc-atomic-9.1.0-7.cm1.x86_64.rpm libgcc-devel-9.1.0-7.cm1.x86_64.rpm diff --git a/toolkit/scripts/toolchain/container/toolchain-remote-wget-list b/toolkit/scripts/toolchain/container/toolchain-remote-wget-list index 36593580ff6..13b9cf8bafd 100644 --- a/toolkit/scripts/toolchain/container/toolchain-remote-wget-list +++ b/toolkit/scripts/toolchain/container/toolchain-remote-wget-list @@ -10,7 +10,7 @@ https://github.com/westes/flex/releases/download/v2.6.4/flex-2.6.4.tar.gz http://ftp.gnu.org/gnu/gdbm/gdbm-1.18.1.tar.gz http://ftp.gnu.org/gnu/gmp/gmp-6.1.2.tar.xz http://ftp.gnu.org/gnu/gperf/gperf-3.1.tar.gz -ftp://sourceware.org/pub/libffi/libffi-3.2.1.tar.gz +https://gcc.gnu.org/pub/libffi/libffi-3.2.1.tar.gz http://ftp.gnu.org/gnu/libtool/libtool-2.4.6.tar.xz http://ftp.gnu.org/gnu/m4/m4-1.4.18.tar.xz http://ftp.gnu.org/gnu/make/make-4.2.1.tar.gz