Merge pull request #2533 from flatcar/krnowak/weekly

Weekly profiles updates and python-oem sync

coreos/config/env/net-dns/bind-tools

@@ -5,6 +5,8 @@
 # and grepping for -Wattributes instead, but we are not yet packaging
 # it. We also know that constructor and destructor attributes are
 # supported - they are available since at least gcc 3.4.
+#
+# Drop this when updating to bind tools 9.17.13 or newer.
 
 EXTRA_ECONF+=" ax_cv_have_func_attribute_constructor=yes"
 EXTRA_ECONF+=" ax_cv_have_func_attribute_destructor=yes"

dev-lang/python-oem/metadata.xml

@@ -1,4 +1,43 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="project">
+		<email>[email protected]</email>
+		<name>Python</name>
+	</maintainer>
+	<use>
+		<flag name="bluetooth">
+			Build Bluetooth protocol support in socket module
+		</flag>
+		<flag name="ensurepip">
+			Install the ensurepip module that uses bundled wheels
+			to bootstrap pip and setuptools (if disabled, it will
+			be only possible to use venv `--without-pip`)
+		</flag>
+		<flag name="libedit">
+			Link readline extension against <pkg>dev-libs/libedit</pkg>
+			instead of <pkg>sys-libs/readline</pkg>
+		</flag>
+		<flag name="pgo">
+			Optimize the build using Profile Guided Optimization (PGO)
+			by running Python's test suite and collecting statistics
+			based on its performance. This will take longer to build.
+		</flag>
+		<flag name="lto">
+			Optimize the build using Link Time Optimization (LTO)
+		</flag>
+		<flag name="valgrind">
+			Disable pymalloc when running under
+			<pkg>dev-util/valgrind</pkg> is detected (may incur minor
+			performance penalty even when valgrind is not used)
+		</flag>
+		<flag name="wininst">
+			Install Windows executables required to create an executable
+			installer for MS Windows
+		</flag>
+	</use>
+	<upstream>
+		<remote-id type="cpe">cpe:/a:python:python</remote-id>
+		<remote-id type="github">python/cpython</remote-id>
+	</upstream>
 </pkgmetadata>

dev-lang/python-oem/python-oem-3.10.10_p2.ebuild

@@ -28,7 +28,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="PSF-2"
 SLOT="${PYVER}"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="
 	bluetooth build +ensurepip examples gdbm hardened libedit lto
 	+ncurses pgo +readline +sqlite +ssl test tk valgrind +xml
@@ -98,6 +98,8 @@ VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/python.org.asc
 CHECKREQS_DISK_BUILD=5500M
 
 QA_PKGCONFIG_VERSION=${PYVER}
+# false positives -- functions specific to *BSD
+QA_CONFIG_IMPL_DECL_SKIP=( chflags lchflags )
 
 pkg_pretend() {
 	use test && check-reqs_pkg_pretend

profiles/coreos/arm64/package.accept_keywords

@@ -17,9 +17,6 @@
 
 =net-dns/c-ares-1.17.2 ~arm64
 
-# needed to address CVE-2022-0934
-=net-dns/dnsmasq-2.89 ~arm64
-
 =net-firewall/conntrack-tools-1.4.6-r1 ~arm64
 =net-libs/libnetfilter_cthelper-1.0.0-r1 ~arm64
 =net-libs/libnetfilter_cttimeout-1.0.0-r1 ~arm64

profiles/coreos/base/package.accept_keywords

@@ -2,16 +2,13 @@
 # Copyright (c) 2013 The CoreOS Authors. All rights reserved.
 # Distributed under the terms of the GNU General Public License v2
 
-# Necessary for the symlink fix for uncompress utility.
-=app-arch/ncompress-5.0-r1 ~amd64 ~arm64
-
 =app-arch/zstd-1.4.9 ~amd64 ~arm64
 
-=coreos-devel/fero-client-0.1.1 **
+# Necessary to fix CVE-2023-0288 and CVE-2023-0433.
+=app-editors/vim-9.0.1363 ~amd64 ~arm64
+=app-editors/vim-core-9.0.1363 ~amd64 ~arm64
 
-# Keep versions even for both arches
-=dev-lang/python-3.10.10_p2 ~arm64
-=dev-lang/python-oem-3.10.10_p2 ~arm64
+=coreos-devel/fero-client-0.1.1 **
 
 # Accept unstable host Rust compilers
 =dev-lang/rust-1.68.0 ~amd64 ~arm64