From e75337cdc4bf8a5f521247ff898d821d30c1bd9f Mon Sep 17 00:00:00 2001 From: David Michael Date: Wed, 16 May 2018 15:35:51 -0400 Subject: [PATCH] profiles: Sync versions with portage-stable bumps --- .../coreos-overlay/coreos/config/env/net-dns/bind-tools | 2 ++ .../profiles/coreos/arm64/package.accept_keywords | 8 ++++---- .../coreos-overlay/profiles/coreos/arm64/package.provided | 2 +- .../profiles/coreos/base/package.accept_keywords | 5 +++++ .../profiles/coreos/targets/generic/package.provided | 4 ++-- 5 files changed, 14 insertions(+), 7 deletions(-) create mode 100644 sdk_container/src/third_party/coreos-overlay/coreos/config/env/net-dns/bind-tools diff --git a/sdk_container/src/third_party/coreos-overlay/coreos/config/env/net-dns/bind-tools b/sdk_container/src/third_party/coreos-overlay/coreos/config/env/net-dns/bind-tools new file mode 100644 index 0000000000..4f1c422d57 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/coreos/config/env/net-dns/bind-tools @@ -0,0 +1,2 @@ +# Work around failing OpenSSL feature detection. +EXTRA_ECONF="--without-ecdsa" diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/package.accept_keywords b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/package.accept_keywords index 2e9b3670ec..0ce7a18013 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/package.accept_keywords +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/package.accept_keywords @@ -16,10 +16,9 @@ =dev-libs/liblinear-210-r1 ~arm64 =dev-libs/libnl-3.2.27 ~arm64 =dev-libs/libpcre-8.41 ~arm64 -=dev-libs/libusb-1.0.21 ~arm64 -=dev-libs/libxml2-2.9.4-r3 ~arm64 -=dev-libs/nss-3.29.5 ~arm64 =dev-libs/libpcre2-10.30 ~arm64 +=dev-libs/libusb-1.0.21 ~arm64 +=dev-libs/nss-3.29.5 ~arm64 =dev-libs/userspace-rcu-0.9.1 ** =dev-perl/libintl-perl-1.240.0-r2 ~arm64 =dev-perl/Text-Unidecode-1.270.0 ~arm64 @@ -30,6 +29,7 @@ =net-analyzer/nmap-7.40 ~arm64 =net-analyzer/tcpdump-4.9.2 ~arm64 =net-dialup/minicom-2.7.1 ~arm64 +=net-dns/bind-tools-9.11.2_p1 ~arm64 =net-dns/dnsmasq-2.78 ~arm64 =net-firewall/ebtables-2.0.10.4-r1 ~arm64 =net-firewall/ipset-6.29 ~arm64 @@ -41,7 +41,6 @@ =net-misc/socat-1.7.3.2 ~arm64 =net-nds/openldap-2.4.44 ~arm64 =perl-core/File-Path-2.130.0 ~arm64 -=sys-apps/gptfdisk-1.0.1 ~arm64 =sys-apps/i2c-tools-3.1.1-r1 ~arm64 =sys-apps/lshw-02.17b-r2 ** =sys-apps/man-db-2.7.6.1-r2 ~arm64 @@ -59,6 +58,7 @@ =sys-fs/quota-4.02 ** =sys-libs/binutils-libs-2.29.1-r1 ~arm64 =sys-libs/libcap-ng-0.7.8 ~arm64 +=virtual/krb5-0-r1 ~arm64 =virtual/libudev-232 ~arm64 =virtual/libusb-1-r2 ~arm64 =virtual/perl-File-Path-2.130.0 ~arm64 diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/package.provided b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/package.provided index 05e864cb2f..2fdc03a5c7 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/package.provided +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/package.provided @@ -3,4 +3,4 @@ dev-libs/gobject-introspection-1.40.0-r1 # build errors -net-dns/bind-tools-9.10.1_p1 +net-dns/bind-tools-9.11.2_p1 diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords index ebe5d30135..9dce4a429a 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords @@ -65,3 +65,8 @@ dev-util/checkbashisms =sys-devel/gcc-7.3.0 =cross-aarch64-cros-linux-gnu/gcc-7.3.0 ~arm64 =cross-x86_64-cros-linux-gnu/gcc-7.3.0 ~amd64 + +# Force upgrades to work around catalyst problems while upgrading ncurses. +=app-crypt/gnupg-2.2.7 ~amd64 ~arm64 +=sys-apps/gptfdisk-1.0.3 ~amd64 ~arm64 +=sys-apps/util-linux-2.32 ~amd64 ~arm64 diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/package.provided b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/package.provided index c848732293..eebf292ec4 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/package.provided +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/package.provided @@ -5,7 +5,7 @@ # disable them and we have no need/use for them in prod images. # pulled in by app-crypt/pinentry -app-eselect/eselect-pinentry-0.4 +app-eselect/eselect-pinentry-0.7 # pulled in by app-editors/vim app-admin/eselect-vi-1.1.5 @@ -21,4 +21,4 @@ net-mail/mailbase-1.1 app-arch/xz-utils-0 # doesn't cross-compile, but required for glog, gflags, etc. -dev-util/cmake-3.7.2 +dev-util/cmake-3.9.6