commit: bb044a3dd58f5d6ac0fa66dfe07daf3c6773480e Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Fri Apr 15 08:35:57 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Fri Apr 15 08:36:54 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb044a3d
sys-apps/portage: backport new QA checks; /run warning removal portage.git is currently undergoing a fair bit of refactoring and other non-trivial changes, so let's backport some useful bits. - Backport QA checks (eend w/o ebegin, ebegin w/o eend, /var/tmp install dir) - Drop obsolete /run-not-mounted warning Bug: https://bugs.gentoo.org/835824 Bug: https://bugs.gentoo.org/835823 Bug: https://bugs.gentoo.org/832853 Bug: https://bugs.gentoo.org/493154 Bug: https://bugs.gentoo.org/837536 Signed-off-by: Sam James <sam <AT> gentoo.org> sys-apps/portage/files/3.0.30-qa-checks.patch | 137 ++++++++++ .../portage/files/3.0.30-revert-run-warn.patch | 64 +++++ sys-apps/portage/portage-3.0.30-r2.ebuild | 276 +++++++++++++++++++++ 3 files changed, 477 insertions(+) diff --git a/sys-apps/portage/files/3.0.30-qa-checks.patch b/sys-apps/portage/files/3.0.30-qa-checks.patch new file mode 100644 index 000000000000..19290d352f49 --- /dev/null +++ b/sys-apps/portage/files/3.0.30-qa-checks.patch @@ -0,0 +1,137 @@ +Backport a bunch of QA notice changes so tinderboxes etc can pick them up, +given portage.git is currently undergoing a fair bit of refactoring. + +https://github.com/gentoo/portage/commit/7b44116b4a669a49e51e5a495ab62a25229e18e4 +https://github.com/gentoo/portage/commit/8ded447a1d194ad0190a174f7bb330417685d861 +https://github.com/gentoo/portage/commit/23c4a45827fccebb969d5130ccc234ed3d1a9b35 +https://github.com/gentoo/portage/commit/3994939f982f22afbc7aaf3b8eca6680ad85c617 + +From: Sam James <s...@gentoo.org> +Date: Sat, 2 Apr 2022 05:10:31 +0100 +Subject: [PATCH] bin/install-qa-check.d/95empty-dirs: update message for EAPI + 8 + +Portage changed the default for >= EAPI 8 ("newer EAPIs" at the time, not +actually specific to 8) in bfda0d2bd4ba03a4e77f488ec3fd4f9c6c351662 to +enable FEATURES="strict-keepdir". + +Signed-off-by: Sam James <s...@gentoo.org> +Closes: https://github.com/gentoo/portage/pull/802 +Signed-off-by: Sam James <s...@gentoo.org> +--- a/bin/install-qa-check.d/95empty-dirs ++++ b/bin/install-qa-check.d/95empty-dirs +@@ -33,7 +33,7 @@ find_empty_dirs() { + done + eqawarn + eqawarn "If those directories need to be preserved, please make sure to create" +- eqawarn "or mark them for keeping using 'keepdir'. Future versions of Portage" ++ eqawarn "or mark them for keeping using 'keepdir'. Portage for >= EAPI 8 ebuilds" + eqawarn "will strip empty directories from installation image." + fi + } + + + +From: Sam James <s...@gentoo.org> +Date: Sun, 10 Apr 2022 17:51:02 +0100 +Subject: [PATCH] install-qa-check.d/20runtime-directories: warn on /var/tmp + too + +Bug: https://bugs.gentoo.org/493154 +Bug: https://bugs.gentoo.org/837536 +Signed-off-by: Sam James <s...@gentoo.org> +--- a/bin/install-qa-check.d/20runtime-directories ++++ b/bin/install-qa-check.d/20runtime-directories +@@ -1,10 +1,10 @@ + # Check for directories that need to be created at runtime + + runtime_dir_check() { +- # It's ok create these directories, but not to install into them. #493154 ++ # It's ok to create these directories, but not to install into them. #493154 + # TODO: We should add var/lib to this list. + local x f= +- for x in var/cache var/lock var/run run ; do ++ for x in var/cache var/lock var/run var/tmp run ; do + if [[ ! -L ${ED}/${x} && -d ${ED}/${x} ]] ; then + if [[ -z $(find "${ED}/${x}" -prune -empty) ]] ; then + f+=$(cd "${ED}"; find "${x}" -printf ' %p\n') + +From: Thomas Bracht Laumann Jespersen <t...@laumann.xyz> +Date: Mon, 11 Apr 2022 15:46:06 +0200 +Subject: [PATCH] eend: Output QA warning if ebegin has not been called + +The assumption here is that ebegin-eend aren't nested. + +Closes: https://bugs.gentoo.org/835824 +Signed-off-by: Thomas Bracht Laumann Jespersen <t...@laumann.xyz> +Closes: https://github.com/gentoo/portage/pull/807 +Signed-off-by: Sam James <s...@gentoo.org> +--- a/bin/isolated-functions.sh ++++ b/bin/isolated-functions.sh +@@ -339,6 +339,7 @@ ebegin() { + [[ ${RC_ENDCOL} == "yes" ]] && echo >&2 + LAST_E_LEN=$(( 3 + ${#RC_INDENTATION} + ${#msg} )) + LAST_E_CMD="ebegin" ++ EBEGIN_EEND=1 + return 0 + } + +@@ -367,6 +368,11 @@ __eend() { + + eend() { + [[ -n $1 ]] || eqawarn "QA Notice: eend called without first argument" ++ if [[ -v EBEGIN_EEND ]] ; then ++ unset EBEGIN_EEND ++ else ++ eqawarn "QA Notice: eend called without preceding ebegin (phase: ${EBUILD_PHASE})" ++ fi + local retval=${1:-0} + shift + + +From: Thomas Bracht Laumann Jespersen <t...@laumann.xyz> +Date: Tue, 12 Apr 2022 10:59:11 +0200 +Subject: [PATCH] ebegin: Output QA warning if call to eend is missing + +The idea here is to check if EBEGIN_EEND is set after the phase has been +executed. If so, then a call to eend is probably missing. This is under +the assumption that ebegin-eend invocations should be properly paired +within the same phase. + +In ebegin, the EBEGIN_EEND variable is also checked, and, if set, +indicates that ebegin has been called and is missing the closing call to +eend. + +I doubt that this check is perfect, but it seems to work in what little +testing I've done. + +Closes: https://bugs.gentoo.org/835823 +Signed-off-by: Thomas Bracht Laumann Jespersen <t...@laumann.xyz> +Closes: https://github.com/gentoo/portage/pull/811 +Signed-off-by: Sam James <s...@gentoo.org> +--- a/bin/isolated-functions.sh ++++ b/bin/isolated-functions.sh +@@ -339,6 +339,9 @@ ebegin() { + [[ ${RC_ENDCOL} == "yes" ]] && echo >&2 + LAST_E_LEN=$(( 3 + ${#RC_INDENTATION} + ${#msg} )) + LAST_E_CMD="ebegin" ++ if [[ -v EBEGIN_EEND ]] ; then ++ eqawarn "QA Notice: ebegin called, but missing call to eend (phase: ${EBUILD_PHASE})" ++ fi + EBEGIN_EEND=1 + return 0 + } +--- a/bin/phase-functions.sh ++++ b/bin/phase-functions.sh +@@ -1088,6 +1088,10 @@ __ebuild_main() { + ;; + esac + ++ if [[ -v EBEGIN_EEND ]] ; then ++ eqawarn "QA Notice: ebegin called, but missing call to eend (phase: ${1})" ++ fi ++ + # Save the env only for relevant phases. + if ! has "${1}" clean help info nofetch ; then + umask 002 + diff --git a/sys-apps/portage/files/3.0.30-revert-run-warn.patch b/sys-apps/portage/files/3.0.30-revert-run-warn.patch new file mode 100644 index 000000000000..d5f20421695e --- /dev/null +++ b/sys-apps/portage/files/3.0.30-revert-run-warn.patch @@ -0,0 +1,64 @@ +https://github.com/gentoo/portage/commit/1327fa9f829e8670c65ff35b9b0bda446991f7ed + +From: Mike Gilbert <flop...@gentoo.org> +Date: Mon, 14 Feb 2022 15:30:18 -0500 +Subject: [PATCH] Revert "lib/_emerge/actions.py: warn on missing /run" + +Portage itself does not need /run to be mounted. +build-docbook-catalog was adjusted to create locks in /etc/xml instead. + +Bug: https://bugs.gentoo.org/832853 +Reverts: 0e9e12aadb889766d61c0561b9723e71542d43e6 +Signed-off-by: Mike Gilbert <flop...@gentoo.org> +Closes: https://github.com/gentoo/portage/pull/788 +Signed-off-by: Sam James <s...@gentoo.org> +--- a/lib/_emerge/actions.py ++++ b/lib/_emerge/actions.py +@@ -3020,25 +3020,17 @@ def validate_ebuild_environment(trees): + check_locale() + + +-def check_mounted_fs(): +- """We need /proc for finding CPU counts and finding other system information. +- We need /run for e.g. lock files in ebuilds.""" +- paths = {"/proc": False, "/run": False} +- +- for path in paths.keys(): +- if platform.system() not in ("Linux",) or os.path.ismount(path): +- paths[path] = True +- continue +- +- msg = "It seems %s is not mounted. Process management may malfunction." % path +- writemsg_level( +- "".join("!!! %s\n" % l for l in textwrap.wrap(msg, 70)), +- level=logging.ERROR, +- noiselevel=-1, +- ) +- +- # Were all of the mounts we were looking for available? +- return all(paths.values()) ++def check_procfs(): ++ procfs_path = "/proc" ++ if platform.system() not in ("Linux",) or os.path.ismount(procfs_path): ++ return os.EX_OK ++ msg = "It seems that %s is not mounted. You have been warned." % procfs_path ++ writemsg_level( ++ "".join("!!! %s\n" % l for l in textwrap.wrap(msg, 70)), ++ level=logging.ERROR, ++ noiselevel=-1, ++ ) ++ return 1 + + + def config_protect_check(trees): +@@ -3516,8 +3508,7 @@ def run_action(emerge_config): + repo_name_check(emerge_config.trees) + repo_name_duplicate_check(emerge_config.trees) + config_protect_check(emerge_config.trees) +- +- check_mounted_fs() ++ check_procfs() + + for mytrees in emerge_config.trees.values(): + mydb = mytrees["porttree"].dbapi + diff --git a/sys-apps/portage/portage-3.0.30-r2.ebuild b/sys-apps/portage/portage-3.0.30-r2.ebuild new file mode 100644 index 000000000000..41d008c12f34 --- /dev/null +++ b/sys-apps/portage/portage-3.0.30-r2.ebuild @@ -0,0 +1,276 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( pypy3 python3_{8..10} ) +PYTHON_REQ_USE='bzip2(+),threads(+)' +TMPFILES_OPTIONAL=1 + +inherit distutils-r1 linux-info toolchain-funcs tmpfiles prefix + +DESCRIPTION="The package management and distribution system for Gentoo" +HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"; +SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2"; + +LICENSE="GPL-2" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +SLOT="0" +IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux test xattr" +RESTRICT="!test? ( test )" + +BDEPEND=" + app-arch/xz-utils + test? ( dev-vcs/git )" +DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') ) + >=app-arch/tar-1.27 + dev-lang/python-exec:2 + >=sys-apps/sed-4.0.5 sys-devel/patch + doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 ) + apidoc? ( + dev-python/sphinx[${PYTHON_USEDEP}] + dev-python/sphinx-epytext[${PYTHON_USEDEP}] + )" +# Require sandbox-2.2 for bug #288863. +# For whirlpool hash, require python[ssl] (bug #425046). +# For compgen, require bash[readline] (bug #445576). +# app-portage/gemato goes without PYTHON_USEDEP since we're calling +# the executable. +RDEPEND=" + acct-user/portage + app-arch/zstd + >=app-arch/tar-1.27 + dev-lang/python-exec:2 + >=sys-apps/findutils-4.4 + !build? ( + >=sys-apps/sed-4.0.5 + >=app-shells/bash-5.0:0[readline] + >=app-admin/eselect-1.2 + rsync-verify? ( + >=app-portage/gemato-14.5[${PYTHON_USEDEP}] + >=sec-keys/openpgp-keys-gentoo-release-20180706 + >=app-crypt/gnupg-2.2.4-r2[ssl(-)] + ) + ) + elibc_glibc? ( >=sys-apps/sandbox-2.2 ) + elibc_musl? ( >=sys-apps/sandbox-2.2 ) + kernel_linux? ( sys-apps/util-linux ) + >=app-misc/pax-utils-0.1.17 + selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] ) + xattr? ( kernel_linux? ( + >=sys-apps/install-xattr-0.3 + ) ) + !<app-admin/logrotate-3.8.0 + !<app-portage/gentoolkit-0.4.6 + !<app-portage/repoman-2.3.10 + !~app-portage/repoman-3.0.0" +PDEPEND=" + !build? ( + >=net-misc/rsync-2.6.4 + >=sys-apps/file-5.41 + >=sys-apps/coreutils-6.4 + )" +# coreutils-6.4 rdep is for date format in emerge-webrsync #164532 +# NOTE: FEATURES=installsources requires debugedit and rsync + +pkg_pretend() { + local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS ~UTS_NS" + + if use native-extensions && tc-is-cross-compiler; then + einfo "Disabling USE=native-extensions for cross-compilation (bug #612158)" + fi + + check_extra_config +} + +python_prepare_all() { + local PATCHES=( + "${FILESDIR}/3.0.30-revert-default-enable-soname-dependencies.patch" + "${FILESDIR}/3.0.30-revert-run-warn.patch" + "${FILESDIR}/3.0.30-qa-checks.patch" + ) + + distutils-r1_python_prepare_all + + sed -e "s:^VERSION = \"HEAD\"$:VERSION = \"${PV}\":" -i lib/portage/__init__.py || die + + if use gentoo-dev; then + einfo "Disabling --dynamic-deps by default for gentoo-dev..." + sed -e 's:\("--dynamic-deps", \)\("y"\):\1"n":' \ + -i lib/_emerge/create_depgraph_params.py || \ + die "failed to patch create_depgraph_params.py" + + einfo "Enabling additional FEATURES for gentoo-dev..." + echo 'FEATURES="${FEATURES} ipc-sandbox network-sandbox strict-keepdir"' \ + >> cnf/make.globals || die + fi + + if use native-extensions && ! tc-is-cross-compiler; then + printf "[build_ext]\nportage_ext_modules=true\n" >> \ + setup.cfg || die + fi + + if ! use ipc ; then + einfo "Disabling ipc..." + sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \ + -i lib/_emerge/AbstractEbuildProcess.py || \ + die "failed to patch AbstractEbuildProcess.py" + fi + + if use xattr && use kernel_linux ; then + einfo "Adding FEATURES=xattr to make.globals ..." + echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \ + || die "failed to append to make.globals" + fi + + if use build || ! use rsync-verify; then + sed -e '/^sync-rsync-verify-metamanifest/s|yes|no|' \ + -e '/^sync-webrsync-verify-signature/s|yes|no|' \ + -i cnf/repos.conf || die "sed failed" + fi + + if [[ -n ${EPREFIX} ]] ; then + einfo "Setting portage.const.EPREFIX ..." + hprefixify -e "s|^(EPREFIX[[:space:]]*=[[:space:]]*\").*|\1${EPREFIX}\"|" \ + -w "/_BINARY/" lib/portage/const.py + + einfo "Prefixing shebangs ..." + > "${T}/shebangs" || die + while read -r -d $'\0' ; do + local shebang=$(head -n1 "$REPLY") + if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then + echo "${REPLY}" >> "${T}/shebangs" || die + fi + done < <(find . -type f -executable ! -name etc-update -print0) + + if [[ -s ${T}/shebangs ]]; then + xargs sed -i -e "1s:^#!:#!${EPREFIX}:" < "${T}/shebangs" || die "sed failed" + fi + + einfo "Adjusting make.globals, repos.conf and etc-update ..." + hprefixify cnf/{make.globals,repos.conf} bin/etc-update + + 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 + + einfo "Adding FEATURES=force-prefix to make.globals ..." + echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \ + || die "failed to append to make.globals" + fi + + cd "${S}/cnf" || die + if [ -f "make.conf.example.${ARCH}".diff ]; then + patch make.conf.example "make.conf.example.${ARCH}".diff || \ + die "Failed to patch make.conf.example" + else + eerror "" + eerror "Portage does not have an arch-specific configuration for this arch." + eerror "Please notify the arch maintainer about this issue. Using generic." + eerror "" + fi +} + +python_compile_all() { + local targets=() + use doc && targets+=( docbook ) + use apidoc && targets+=( apidoc ) + + if [[ ${targets[@]} ]]; then + esetup.py "${targets[@]}" + fi +} + +python_test() { + esetup.py test +} + +python_install() { + # Install sbin scripts to bindir for python-exec linking + # they will be relocated in pkg_preinst() + distutils-r1_python_install \ + --system-prefix="${EPREFIX}/usr" \ + --bindir="$(python_get_scriptdir)" \ + --docdir="${EPREFIX}/usr/share/doc/${PF}" \ + --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \ + --portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \ + --sbindir="$(python_get_scriptdir)" \ + --sysconfdir="${EPREFIX}/etc" \ + "${@}" +} + +python_install_all() { + distutils-r1_python_install_all + + local targets=() + use doc && targets+=( + install_docbook + --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" + ) + use apidoc && targets+=( + install_apidoc + --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" + ) + + # install docs + if [[ ${targets[@]} ]]; then + esetup.py "${targets[@]}" + fi + + dotmpfiles "${FILESDIR}"/portage-ccache.conf + + # Due to distutils/python-exec limitations + # these must be installed to /usr/bin. + local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld' + einfo "Moving admin scripts to the correct directory" + dodir /usr/sbin + for target in ${sbin_relocations}; do + einfo "Moving /usr/bin/${target} to /usr/sbin/${target}" + mv "${ED}/usr/bin/${target}" "${ED}/usr/sbin/${target}" || die "sbin scripts move failed!" + done +} + +pkg_preinst() { + if ! use build; 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}}" \ + "${PYTHON}" -m portage._compat_upgrade.default_locations || die + + env -u BINPKG_COMPRESS -u PORTAGE_REPOSITORIES \ + PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \ + "${PYTHON}" -m portage._compat_upgrade.binpkg_compression || die + + env -u FEATURES -u PORTAGE_REPOSITORIES \ + PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \ + "${PYTHON}" -m portage._compat_upgrade.binpkg_multi_instance || 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 +}
