commit: 5f3e99194d06a7523589925689954b6c659f0eae Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Wed Jan 21 16:35:42 2026 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Wed Jan 21 16:36:22 2026 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f3e9919
sys-apps/portage: backport EAPI 9 egencache fix Signed-off-by: Sam James <sam <AT> gentoo.org> ...ebuild-fix-unexported_env_vars-chown-call.patch | 59 ++++++ sys-apps/portage/portage-3.0.76-r1.ebuild | 235 +++++++++++++++++++++ 2 files changed, 294 insertions(+) diff --git a/sys-apps/portage/files/0001-doebuild-fix-unexported_env_vars-chown-call.patch b/sys-apps/portage/files/0001-doebuild-fix-unexported_env_vars-chown-call.patch new file mode 100644 index 000000000000..000b54ef4b27 --- /dev/null +++ b/sys-apps/portage/files/0001-doebuild-fix-unexported_env_vars-chown-call.patch @@ -0,0 +1,59 @@ +From cf604f442d2a2aebfbaab1c2d8419c7dada0de7a Mon Sep 17 00:00:00 2001 +Message-ID: <cf604f442d2a2aebfbaab1c2d8419c7dada0de7a.1769013270.git....@gentoo.org> +From: Sam James <[email protected]> +Date: Wed, 21 Jan 2026 16:12:07 +0000 +Subject: [PATCH] doebuild: fix unexported_env_vars chown call + +With PORTAGE_USERNAME and PORTAGE_GRPNAME set, we try to chown a tmpdir +in /tmp to portage and fail: +``` +Exception in callback EbuildMetadataPhase._async_start_done(<Task finishe...t permitted')>) +handle: <Handle EbuildMetadataPhase._async_start_done(<Task finishe...t permitted')>)> +Traceback (most recent call last): + File "/usr/lib/python3.12/asyncio/events.py", line 88, in _run + self._context.run(self._callback, *self._args) + File "/usr/lib/python3.12/site-packages/_emerge/EbuildMetadataPhase.py", line 162, in _async_start_done + future.cancelled() or future.result() + ^^^^^^^^^^^^^^^ + File "/usr/lib/python3.12/site-packages/_emerge/EbuildMetadataPhase.py", line 129, in _async_start + retval = doebuild( + ^^^^^^^^^ + File "/usr/lib/python3.12/site-packages/portage/package/ebuild/doebuild.py", line 1117, in doebuild + return _spawn_phase( + ^^^^^^^^^^^^^ + File "/usr/lib/python3.12/site-packages/portage/package/ebuild/doebuild.py", line 309, in _spawn_phase + return _doebuild_spawn( + ^^^^^^^^^^^^^^^^ + File "/usr/lib/python3.12/site-packages/portage/package/ebuild/doebuild.py", line 292, in _doebuild_spawn + return spawn(cmd, settings, **kwargs) + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + File "/usr/lib/python3.12/site-packages/portage/package/ebuild/doebuild.py", line 2251, in spawn + os.chown(_emerge_tmpdir, -1, int(portage_gid)) +PermissionError: [Errno 1] Operation not permitted: '/tmp/portage-tmpdir-717664-garvzxqz' +Sandboxed process killed by signal: Broken pipe +Sandboxed process killed by signal: Broken pipe +``` + +Use the Portage build gid instead. + +Signed-off-by: Sam James <[email protected]> +--- + lib/portage/package/ebuild/doebuild.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/portage/package/ebuild/doebuild.py b/lib/portage/package/ebuild/doebuild.py +index e55a56e7cb..c0c9f17db4 100644 +--- a/lib/portage/package/ebuild/doebuild.py ++++ b/lib/portage/package/ebuild/doebuild.py +@@ -2248,7 +2248,7 @@ def spawn( + prefix=f"portage-tmpdir-{portage.getpid()}-" + ) + os.chmod(_emerge_tmpdir, 0o1775) +- os.chown(_emerge_tmpdir, -1, int(portage_gid)) ++ os.chown(_emerge_tmpdir, -1, int(portage_build_gid)) + portage.process.atexit_register(shutil.rmtree, _emerge_tmpdir) + ebuild_extra_source_fd, ebuild_extra_source_path = tempfile.mkstemp( + prefix=f"portage-ebuild-extra-source-{phase}-", +-- +2.52.0 + diff --git a/sys-apps/portage/portage-3.0.76-r1.ebuild b/sys-apps/portage/portage-3.0.76-r1.ebuild new file mode 100644 index 000000000000..03b0fea6729c --- /dev/null +++ b/sys-apps/portage/portage-3.0.76-r1.ebuild @@ -0,0 +1,235 @@ +# Copyright 1999-2026 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{12..14} ) +PYTHON_REQ_USE='bzip2(+),threads(+)' +TMPFILES_OPTIONAL=1 + +inherit meson linux-info python-r1 tmpfiles + +DESCRIPTION="The package management and distribution system for Gentoo" +HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"; + +if [[ ${PV} == 9999 ]] ; then + EGIT_REPO_URI=" + https://anongit.gentoo.org/git/proj/portage.git + https://github.com/gentoo/portage.git + " + inherit git-r3 +else + SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2"; + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +fi + +LICENSE="GPL-2" +SLOT="0" +IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux test xattr" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" +RESTRICT="!test? ( test )" + +BDEPEND=" + ${PYTHON_DEPS} + >=app-arch/tar-1.27 + >=dev-build/meson-1.3.0-r1 + >=sys-apps/sed-4.0.5 + sys-devel/patch + !build? ( $(python_gen_impl_dep 'ssl(+)') ) + apidoc? ( + dev-python/sphinx[${PYTHON_USEDEP}] + dev-python/sphinx-epytext[${PYTHON_USEDEP}] + ) + doc? ( + ~app-text/docbook-xml-dtd-4.4 + app-text/xmlto + ) + test? ( + dev-python/pytest-xdist[${PYTHON_USEDEP}] + dev-vcs/git + ) +" +# Require sandbox-2.2 for bug #288863. +# For whirlpool hash, require python[ssl] (bug #425046). +RDEPEND=" + ${PYTHON_DEPS} + >=acct-user/portage-0-r4 + >=app-arch/tar-1.27 + app-arch/zstd + >=app-misc/pax-utils-0.1.17 + dev-lang/python-exec:2 + >=sys-apps/baselayout-2.9 + >=sys-apps/findutils-4.9 + !build? ( + >=app-admin/eselect-1.2 + app-portage/getuto + >=app-shells/bash-5.3:0 + >=sec-keys/openpgp-keys-gentoo-release-20240703 + >=sys-apps/sed-4.0.5 + rsync-verify? ( + app-alternatives/gpg[ssl(-)] + >=app-portage/gemato-14.5[${PYTHON_USEDEP}] + ) + ) + elibc_glibc? ( >=sys-apps/sandbox-2.2 ) + elibc_musl? ( >=sys-apps/sandbox-2.2 ) + kernel_linux? ( sys-apps/util-linux ) + selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] ) + xattr? ( kernel_linux? ( + >=sys-apps/install-xattr-0.3 + ) ) +" +# coreutils-6.4 rdep is for date format in emerge-webrsync #164532 +# NOTE: FEATURES=installsources requires debugedit and rsync +PDEPEND=" + !build? ( + >=net-misc/rsync-2.6.4 + >=sys-apps/coreutils-6.4 + >=sys-apps/file-5.44-r3 + ) +" + +PATCHES=( + "${FILESDIR}"/0001-doebuild-fix-unexported_env_vars-chown-call.patch +) + +pkg_pretend() { + local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS ~UTS_NS" + + check_extra_config +} + +src_prepare() { + default + + if use prefix-guest; then + sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \ + -e "s|^\\[gentoo\\]|[gentoo_prefix]|" \ + -e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \ + -i cnf/repos.conf || die "sed failed" + fi +} + +src_configure() { + local code_only=false + python_foreach_impl my_src_configure +} + +my_src_configure() { + local emesonargs=( + -Dcode-only=${code_only} + -Deprefix="${EPREFIX}" + -Dportage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" + -Ddocdir="${EPREFIX}/usr/share/doc/${PF}" + $(meson_use doc) + $(meson_use apidoc) + $(meson_use gentoo-dev) + $(meson_use ipc) + $(meson_use xattr) + ) + + if use native-extensions && [[ "${EPYTHON}" != pypy3* ]] ; then + emesonargs+=( -Dnative-extensions=true ) + else + emesonargs+=( -Dnative-extensions=false ) + fi + + if use build; then + emesonargs+=( -Drsync-verify=false ) + else + emesonargs+=( $(meson_use rsync-verify) ) + fi + + meson_src_configure + code_only=true +} + +src_compile() { + python_foreach_impl meson_src_compile +} + +src_test() { + local EPYTEST_XDIST=1 + local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 + python_foreach_impl epytest +} + +src_install() { + python_foreach_impl my_src_install + dotmpfiles "${FILESDIR}"/portage-{ccache,tmpdir}.conf + + local scripts + mapfile -t scripts < <(awk '/^#!.*python/ {print FILENAME} {nextfile}' "${ED}"/usr/{bin,sbin}/* || die) + python_replicate_script "${scripts[@]}" +} + +my_src_install() { + local pydirs=( + "${D}$(python_get_sitedir)" + "${ED}/usr/lib/portage/${EPYTHON}" + ) + + meson_src_install + python_fix_shebang "${pydirs[@]}" + python_optimize "${pydirs[@]}" +} + +pkg_preinst() { + if ! use build && [[ -z ${ROOT} ]]; then + python_setup + local sitedir=$(python_get_sitedir) + [[ -d ${D}${sitedir} ]] || die "${D}${sitedir}: No such directory" + env -u DISTDIR \ + -u PORTAGE_OVERRIDE_EPREFIX \ + -u PORTAGE_REPOSITORIES \ + -u PORTDIR \ + -u PORTDIR_OVERLAY \ + PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \ + ED="${ED}" \ + "${PYTHON}" -m portage._compat_upgrade.default_locations || die + + env -u BINPKG_COMPRESS -u PORTAGE_REPOSITORIES \ + PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \ + ED="${ED}" \ + "${PYTHON}" -m portage._compat_upgrade.binpkg_compression || die + + env -u FEATURES -u PORTAGE_REPOSITORIES \ + PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \ + ED="${ED}" \ + "${PYTHON}" -m portage._compat_upgrade.binpkg_multi_instance || die + + env -u BINPKG_FORMAT \ + PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \ + ED="${ED}" \ + "${PYTHON}" -m portage._compat_upgrade.binpkg_format || die + fi + + # elog dir must exist to avoid logrotate error for bug #415911. + # This code runs in preinst in order to bypass the mapping of + # portage:portage to root:root which happens after src_install. + keepdir /var/log/portage/elog + # This is allowed to fail if the user/group are invalid for prefix users. + if chown portage:portage "${ED}"/var/log/portage{,/elog} 2>/dev/null ; then + chmod g+s,ug+rwx "${ED}"/var/log/portage{,/elog} + fi + + if has_version "<${CATEGORY}/${PN}-2.3.77"; then + elog "The emerge --autounmask option is now disabled by default, except for" + elog "portions of behavior which are controlled by the --autounmask-use and" + elog "--autounmask-license options. For backward compatibility, previous" + elog "behavior of --autounmask=y and --autounmask=n is entirely preserved." + elog "Users can get the old behavior simply by adding --autounmask to the" + elog "make.conf EMERGE_DEFAULT_OPTS variable. For the rationale for this" + elog "change, see https://bugs.gentoo.org/658648."; + fi +} + +pkg_postinst() { + # Warn about obsolete "enotice" script, bug #867010 + local bashrc=${EROOT}/etc/portage/profile/profile.bashrc + if [[ -e ${bashrc} ]] && grep -q enotice "${bashrc}"; then + eerror "Obsolete 'enotice' script detected!" + eerror "Please remove this from ${bashrc} to avoid problems." + eerror "See bug 867010 for more details." + fi +}
