From 037b53190eb5107cd96cb4784a48c90d631c1dbc Mon Sep 17 00:00:00 2001 From: Dongsu Park Date: Thu, 25 Jun 2020 14:13:36 +0200 Subject: [PATCH] profiles: force to use ssl USE flag for wget When catalyst tries to fetch a file via https, wget sometimes fails to do so, with the following messages: ``` https://www.kernel.org/pub/software/scm/git/git-2.24.1.tar.xz: HTTPS support not compiled in. !!! Couldn't download 'git-2.24.1.tar.xz'. Aborting. ``` That probably happens because wget in some catalyst stages are compiled without `ssl` USE flag. If a catalyst stage is lucky enough to rebuild wget with `ssl` before actually fetching a file, it would work well. Though if not, it would fail. It is not deterministic, and hard to reproduce. So backport the fix from upstream Gentoo, https://github.com/gentoo/gentoo/commit/d141380b915d , for both amd64 and arm64. By setting `ssl` for wget in `package.use.force`, it is now not possible to disable `ssl` for wget. More details: https://bugs.gentoo.org/611072 --- .../coreos-overlay/profiles/coreos/arm64/package.use.force | 5 +++++ .../coreos-overlay/profiles/coreos/base/package.use.force | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/package.use.force b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/package.use.force index 1947a2fd59..782eff3ff2 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/package.use.force +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/package.use.force @@ -1,2 +1,7 @@ sys-auth/polkit -introspection sys-apps/systemd -introspection + +# Matt Turner (2020-03-28) +# wget is the default FETCHCOMMAND, and most distfiles are distributed via +# HTTPS. Bug #611072 +net-misc/wget ssl diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use.force b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use.force index b642673c60..959a4c0225 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use.force +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use.force @@ -3,3 +3,8 @@ # Do not force this flag, we don't need XATTR_PAX sys-apps/portage -xattr + +# Matt Turner (2020-03-28) +# wget is the default FETCHCOMMAND, and most distfiles are distributed via +# HTTPS. Bug #611072 +net-misc/wget ssl