From 8957817186974d33c7e9a74a3a1a8dc2f777dae8 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Mon, 14 Nov 2022 15:25:48 +0100 Subject: [PATCH 1/5] profiles: Update accept keywords for app-editors/vim --- .../coreos-overlay/profiles/coreos/base/package.accept_keywords | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 27c1ee4155..5c4dc33d2b 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 @@ -18,7 +18,7 @@ =net-misc/curl-7.86.0-r1 ~amd64 ~arm64 # Required for some CVEs -=app-editors/vim-9.0.0655-r1 ~amd64 ~arm64 +=app-editors/vim-9.0.0828-r1 ~amd64 ~arm64 =app-editors/vim-core-9.0.0655 ~amd64 ~arm64 =net-misc/openssh-8.8_p1-r3 ~amd64 ~arm64 From 1a045b9cccf8253ad7a36c04f66810d580e1d4e9 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Mon, 14 Nov 2022 15:29:35 +0100 Subject: [PATCH 2/5] profiles: Update accept keywords for app-editors/vim-core --- .../coreos-overlay/profiles/coreos/base/package.accept_keywords | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 5c4dc33d2b..63c5400e83 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 @@ -19,7 +19,7 @@ # Required for some CVEs =app-editors/vim-9.0.0828-r1 ~amd64 ~arm64 -=app-editors/vim-core-9.0.0655 ~amd64 ~arm64 +=app-editors/vim-core-9.0.0828-r1 ~amd64 ~arm64 =net-misc/openssh-8.8_p1-r3 ~amd64 ~arm64 From 8eff949fff6b6c7c0b8753b92d1c6d6fb9c25bb2 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Mon, 14 Nov 2022 16:12:26 +0100 Subject: [PATCH 3/5] profiles: drop dev-util/glib-utils from packages.provided Should not be necessary - dev-libs/glib is not pulling it anymore, and other ebuilds needing the package pull it with BDEPEND, which means that the package on SDK is being used. --- .../profiles/coreos/targets/generic/package.provided | 3 --- 1 file changed, 3 deletions(-) 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 9bf5ae807e..0d639114c7 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 @@ -15,6 +15,3 @@ app-eselect/eselect-iptables-20200508 # pulled in by app-admin/sudo app-misc/editor-wrapper-4 - -# pulled in by dev-libs/glib -dev-util/glib-utils-9999 From 11d976f35243db76336617207ed33aa4ac3a6b3d Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Mon, 14 Nov 2022 16:31:21 +0100 Subject: [PATCH 4/5] profiles: Drop arm64 from accept keywords for net-misc/curl --- .../coreos-overlay/profiles/coreos/base/package.accept_keywords | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 63c5400e83..e177bc37e1 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 @@ -15,7 +15,7 @@ =dev-libs/libgcrypt-1.9.4 ~amd64 ~arm64 # To address CVE-2022-32221, CVE-2022-35260, CVE-2022-42915 and CVE-2022-42916. -=net-misc/curl-7.86.0-r1 ~amd64 ~arm64 +=net-misc/curl-7.86.0-r1 ~amd64 # Required for some CVEs =app-editors/vim-9.0.0828-r1 ~amd64 ~arm64 From e596583d76a81c85b1332ba79c5daa182186a0bf Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Thu, 17 Nov 2022 11:10:02 +0100 Subject: [PATCH 5/5] profiles: Build static libraries for dev-libs/libpcre2 app-emulation/qemu depends on dev-libs/glib preferentially built with static libraries. The GLib library started to depend on dev-libs/libpcre2 after the update. Since dev-libs/glib is built with static-libs USE flag, it propagates the requirement to dev-libs/libpcre2 too. Thus update the line with old dev-libs/libpcre in package.use to new dev-libs/libpcre2 now. Hopefully nothing needs static libs of old dev-libs/libpcre. --- .../coreos-overlay/profiles/coreos/targets/sdk/package.use | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/sdk/package.use b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/sdk/package.use index 1bd1d2dcb6..82cd27b1a9 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/sdk/package.use +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/sdk/package.use @@ -12,7 +12,7 @@ app-arch/bzip2 static-libs app-emulation/qemu -doc -jpeg ncurses python static-user virtfs qemu_softmmu_targets_x86_64 qemu_softmmu_targets_aarch64 dev-libs/glib static-libs dev-libs/libaio static-libs -dev-libs/libpcre static-libs +dev-libs/libpcre2 static-libs dev-libs/openssl static-libs media-libs/libjpeg-turbo static-libs media-libs/libpng static-libs