From 50e5de95c28827c8f86c6602e3c23c4a5d415004 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Fri, 25 Feb 2022 10:51:56 +0100 Subject: [PATCH 01/14] profiles: Drop sys-apps/man-db from accept_keywords The updated package is stable for both amd64 and arm64. --- .../coreos-overlay/profiles/coreos/arm64/package.accept_keywords | 1 - 1 file changed, 1 deletion(-) 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 2d2419d651..ed299cdf74 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 @@ -40,7 +40,6 @@ dev-util/checkbashisms * =sec-policy/selinux-virt-2.20200818-r2 ~arm64 =sys-apps/checkpolicy-3.1 ~arm64 -=sys-apps/man-db-2.7.6.1-r2 ~arm64 =sys-apps/policycoreutils-3.1-r3 ~arm64 =sys-apps/kexec-tools-2.0.22 ~arm64 From 22a4df6c057281c005d7636b512325caadb61c5f Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Fri, 25 Feb 2022 14:40:42 +0100 Subject: [PATCH 02/14] profiles: Drop sys-fs/lsscsi from accept_keywords The updated package is stable for both amd64 and arm64. --- .../coreos-overlay/profiles/coreos/arm64/package.accept_keywords | 1 - 1 file changed, 1 deletion(-) 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 ed299cdf74..2991e4175e 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 @@ -54,7 +54,6 @@ dev-util/checkbashisms * =sys-firmware/edk2-aarch64-18.02 ** =sys-fs/btrfs-progs-4.19.1 ~arm64 -=sys-fs/lsscsi-0.28 ~arm64 =sys-fs/quota-4.04-r1 ~arm64 =sys-libs/efivar-31 ~arm64 =sys-libs/libselinux-3.1-r2 ~arm64 From 74c48fb57df5bf12d5379499713817251f4fc75b Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Fri, 25 Feb 2022 14:44:17 +0100 Subject: [PATCH 03/14] profiles: Drop sys-block/thin-provisioning-tools from accept_keywords The updated package is stable for both amd64 and arm64. --- .../coreos-overlay/profiles/coreos/arm64/package.accept_keywords | 1 - 1 file changed, 1 deletion(-) 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 2991e4175e..330bec6a59 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 @@ -46,7 +46,6 @@ dev-util/checkbashisms * =sys-apps/sandbox-2.12 ~arm64 =sys-apps/semodule-utils-3.1 ~arm64 -=sys-block/thin-provisioning-tools-0.7.0 ~arm64 =sys-boot/efibootmgr-15 ~arm64 # needed to force enable ipvsadm for arm64 From 03558679ab8e2b01b7149f91256242ac4b2bba76 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Fri, 25 Feb 2022 14:46:53 +0100 Subject: [PATCH 04/14] profiles: Drop virtual/libusb from accept_keywords The updated package is stable for both amd64 and arm64. --- .../coreos-overlay/profiles/coreos/arm64/package.accept_keywords | 1 - 1 file changed, 1 deletion(-) 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 330bec6a59..28d8713e1c 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 @@ -61,4 +61,3 @@ dev-util/checkbashisms * =sys-power/iasl-20200326 ~arm64 =sys-process/tini-0.18.0 ~arm64 =virtual/krb5-0-r1 ~arm64 -=virtual/libusb-1-r2 ~arm64 From c550349cb12a823e0caff3bceb0c342bd956353f Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Fri, 25 Feb 2022 14:48:37 +0100 Subject: [PATCH 05/14] profiles: Drop sys-fs/dosfstools from accept_keywords The updated package is stable for both amd64 and arm64. --- .../profiles/coreos/base/package.accept_keywords | 3 --- 1 file changed, 3 deletions(-) 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 63669f7d44..64c46e053d 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 @@ -43,9 +43,6 @@ dev-util/checkbashisms =sys-fs/cryptsetup-2.4.1-r1 ~amd64 ~arm64 -# Pick up fixes for bugs introduced in 4.0 -=sys-fs/dosfstools-4.1 ~amd64 ~arm64 - =sys-fs/multipath-tools-0.8.5 ~amd64 ~arm64 =sys-libs/libseccomp-2.5.0 ~amd64 ~arm64 From 6e2cdb223ce73c4eab1bb9035290544dc76af7f8 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Fri, 25 Feb 2022 14:58:14 +0100 Subject: [PATCH 06/14] profiles: Drop dev-libs/libevent from accept_keywords The updated package is stable for both amd64 and arm64. --- .../coreos-overlay/profiles/coreos/arm64/package.accept_keywords | 1 - 1 file changed, 1 deletion(-) 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 28d8713e1c..6b76a893e5 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 @@ -13,7 +13,6 @@ =dev-lang/yasm-1.3.0-r1 ~arm64 =dev-libs/libassuan-2.5.1 ~arm64 -=dev-libs/libevent-2.1.8 ~arm64 =dev-libs/libusb-1.0.21 ~arm64 =dev-perl/Text-Unidecode-1.270.0 ~arm64 From be20b0611b5963cef039a7d4dd441382afa89a6c Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Fri, 25 Feb 2022 15:08:43 +0100 Subject: [PATCH 07/14] profiles: Update accept_keywords for dev-util/checkbashisms It's stable for amd64, but still unstable for arm64. --- .../profiles/coreos/arm64/package.accept_keywords | 2 +- .../profiles/coreos/base/package.accept_keywords | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) 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 6b76a893e5..6589f2a981 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 @@ -21,7 +21,7 @@ =dev-util/bpftool-5.15.8 ** # needed by arm64-native SDK -dev-util/checkbashisms * +=dev-util/checkbashisms-2.21.4 ~arm64 =net-dns/c-ares-1.17.2 ~arm64 =net-firewall/conntrack-tools-1.4.5 ~arm64 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 64c46e053d..25abb0e656 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 @@ -12,9 +12,6 @@ =dev-lang/rust-1.58.1 ~amd64 ~arm64 =virtual/rust-1.58.1 ~amd64 ~arm64 -# no version marked stable upstream -dev-util/checkbashisms - =dev-libs/elfutils-0.178 ~amd64 =dev-libs/libgcrypt-1.9.4 ~amd64 ~arm64 From 935353ffa6c1ad994eeb118acd7e6db1383b893d Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Fri, 25 Feb 2022 15:14:46 +0100 Subject: [PATCH 08/14] profiles: Drop net-misc/socat from accept_keywords The updated package is stable for both amd64 and arm64. --- .../coreos-overlay/profiles/coreos/arm64/package.accept_keywords | 1 - 1 file changed, 1 deletion(-) 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 6589f2a981..20dd3357bc 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 @@ -31,7 +31,6 @@ =net-libs/libnetfilter_queue-1.0.3 ~arm64 =net-misc/curl-7.79.1 ~arm64 -=net-misc/socat-1.7.3.2 ~arm64 =perl-core/File-Path-2.130.0 ~arm64 =sec-policy/selinux-base-2.20200818-r2 ~arm64 =sec-policy/selinux-base-policy-2.20200818-r2 ~arm64 From 34becb7f43ddfbcde23b14a7f1320f57f03cb492 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Fri, 25 Feb 2022 15:58:55 +0100 Subject: [PATCH 09/14] profiles: Drop virtual/krb5 from accept_keywords The updated package is stable for both amd64 and arm64. --- .../coreos-overlay/profiles/coreos/arm64/package.accept_keywords | 1 - 1 file changed, 1 deletion(-) 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 20dd3357bc..4661092112 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 @@ -58,4 +58,3 @@ =sys-libs/libsepol-3.1 ~arm64 =sys-power/iasl-20200326 ~arm64 =sys-process/tini-0.18.0 ~arm64 -=virtual/krb5-0-r1 ~arm64 From 9412c64ba38f6c50c83dc0aa68d3fb0116776c83 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Fri, 25 Feb 2022 16:02:38 +0100 Subject: [PATCH 10/14] profiles: Drop sys-boot/efibootmgr from accept_keywords The updated package is stable for both amd64 and arm64. --- .../profiles/coreos/arm64/package.accept_keywords | 2 -- 1 file changed, 2 deletions(-) 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 4661092112..7d3b2691a7 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 @@ -44,8 +44,6 @@ =sys-apps/sandbox-2.12 ~arm64 =sys-apps/semodule-utils-3.1 ~arm64 -=sys-boot/efibootmgr-15 ~arm64 - # needed to force enable ipvsadm for arm64 =sys-cluster/ipvsadm-1.27-r1 ** From 31ac287ea3760aa5542abcf86b4a95363153c14d Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Fri, 25 Feb 2022 16:09:52 +0100 Subject: [PATCH 11/14] profiles: Drop net-nds/rpcbind from accept_keywords The updated package is stable for both amd64 and arm64. --- .../profiles/coreos/base/package.accept_keywords | 3 --- 1 file changed, 3 deletions(-) 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 25abb0e656..4ea21ef876 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 @@ -31,9 +31,6 @@ =net-nds/openldap-2.4.58 ~amd64 ~arm64 -# CVE-2017-8779 -=net-nds/rpcbind-0.2.4-r1 ~amd64 ~arm64 - # Upgrade to GCC 10.3.0 to support latest glibc builds =sys-devel/binutils-2.37_p1 ~amd64 ~arm64 =sys-libs/binutils-libs-2.37_p1 ~amd64 ~arm64 From c6ce357d02764f73bb6c9ea3bcc50b66ec85f6f9 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Fri, 25 Feb 2022 16:16:27 +0100 Subject: [PATCH 12/14] profiles: Sync app-eselect/eselect-pinentry version --- .../profiles/coreos/targets/generic/package.provided | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 5172118715..1220e764dc 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.7 +app-eselect/eselect-pinentry-0.7.2 # pulled in by app-editors/vim app-eselect/eselect-vi-1.2 From 045a3e67694a1947740e4f12b282b72bf2713dc2 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Fri, 25 Feb 2022 16:28:06 +0100 Subject: [PATCH 13/14] profiles: Drop sys-libs/efivar from accept_keywords The updated package is stable for both amd64 and arm64. --- .../coreos-overlay/profiles/coreos/arm64/package.accept_keywords | 1 - 1 file changed, 1 deletion(-) 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 7d3b2691a7..c96218aaf9 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 @@ -50,7 +50,6 @@ =sys-firmware/edk2-aarch64-18.02 ** =sys-fs/btrfs-progs-4.19.1 ~arm64 =sys-fs/quota-4.04-r1 ~arm64 -=sys-libs/efivar-31 ~arm64 =sys-libs/libselinux-3.1-r2 ~arm64 =sys-libs/libsemanage-3.1-r1 ~arm64 =sys-libs/libsepol-3.1 ~arm64 From 90615c215e6d986b08554cc32401b7ffb51dd17a Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Fri, 25 Feb 2022 16:42:03 +0100 Subject: [PATCH 14/14] profiles: Drop dev-perl/Text-Unidecode from accept_keywords The updated package is stable for both amd64 and arm64. --- .../profiles/coreos/arm64/package.accept_keywords | 2 -- 1 file changed, 2 deletions(-) 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 c96218aaf9..ce0f4b8446 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 @@ -15,8 +15,6 @@ =dev-libs/libassuan-2.5.1 ~arm64 =dev-libs/libusb-1.0.21 ~arm64 -=dev-perl/Text-Unidecode-1.270.0 ~arm64 - # needed to force enable bpftool for arm64 =dev-util/bpftool-5.15.8 **