commit: dee6d4d7a9612d4a2a793d40a8b5db62bdada60e Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> AuthorDate: Sun Dec 3 10:16:57 2023 +0000 Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> CommitDate: Sun Dec 3 10:16:57 2023 +0000 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=dee6d4d7
sys-apps/portage-3.0.56: version bump Fix interaction between old Prefix path adjustments and recent newer ones via meson. Double handling could cause bugs such as #918717 when the chosen offset prefix matches the paths replaced by hprefixify (e.g. something starting with /usr). Closes: https://bugs.gentoo.org/918717 Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org> sys-apps/portage/Manifest | 2 +- ...rtage-3.0.55.1.ebuild => portage-3.0.56.ebuild} | 46 +++++++++++----------- 2 files changed, 25 insertions(+), 23 deletions(-) diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest index 2abec9a5f7..dbd547b19e 100644 --- a/sys-apps/portage/Manifest +++ b/sys-apps/portage/Manifest @@ -1,3 +1,3 @@ DIST prefix-portage-3.0.34.2.tar.bz2 1498499 BLAKE2B 47f53e4917bdf204eb23dadd9dc821c06da07d2e5c68cf0a3de908089e4121d45542e2120e57744db1c808a156595624915956e77f547ab671b1584b2c67cf0b SHA512 121dd885a73153e780e28c2e514d4b3babc44368aa6915b2009ed0b205051c2f6c37dd3ccfe8be5ea567e7bab2f9f9b0c5c5b81c49990fbac7360261721a5bb7 DIST prefix-portage-3.0.49.tar.bz2 1421955 BLAKE2B ac6e5b512f943826d0bf06225037885a138f3810db973a60c6dbca4f80d516e3aef3054b532f42a143b35702661a3d35ee59945f745b849dcd6fefbd4ff8f3cc SHA512 dee0035e048b1bfde5859b809bf6ffa3ca0674cd1d59d9cfcc14a279d87215223a6b4497274db7e443f27fd6dd05eadb043ae6872feb8fa8523994d9946b6879 -DIST prefix-portage-3.0.55.1.tar.bz2 1460599 BLAKE2B 07982a1e6af0df7c7849aeab7ed2479bb2fe7ede16183bddba93d25d8839224f87967b0aa776c2cbc124f322b69a275e628e2817c7f3e01c9353a0eeda38fea8 SHA512 5f87c84baa9d13f0ad5aa534013ef7bf8219d742f940cad8a07bfea8630615885950aa6d7cf030fe6012061504d1eeee77a3e024a1bdc2da3a02bed550816805 +DIST prefix-portage-3.0.56.tar.bz2 1461156 BLAKE2B 2b654c65c5b1e358789774f21e6ee0c6e0dfba0d3d7ca6159f89a6c3d99686f52bbcbace08456d679a4dce62e16547f8b3f85723924e41f0270c644fed16d32c SHA512 10fcf17813dcdf216ac2d31aac9097ca53f4b31a01440c48d53b6d46908fa1c47a31237988b5e583cb7cc26bb8689340f5cf7dc3db0f10e463ed8f6ab375de61 diff --git a/sys-apps/portage/portage-3.0.55.1.ebuild b/sys-apps/portage/portage-3.0.56.ebuild similarity index 91% rename from sys-apps/portage/portage-3.0.55.1.ebuild rename to sys-apps/portage/portage-3.0.56.ebuild index 3f24547b1e..834760c3c0 100644 --- a/sys-apps/portage/portage-3.0.55.1.ebuild +++ b/sys-apps/portage/portage-3.0.56.ebuild @@ -70,7 +70,7 @@ RDEPEND=" >=app-misc/pax-utils-0.1.17 dev-lang/python-exec:2 >=sys-apps/baselayout-2.9 - >=sys-apps/findutils-4.4 + >=sys-apps/findutils-4.9 !build? ( >=app-admin/eselect-1.2 !prefix? ( app-portage/getuto ) @@ -83,7 +83,7 @@ RDEPEND=" ) ) elibc_glibc? ( !prefix? ( >=sys-apps/sandbox-2.2 ) ) - elibc_musl? ( >=sys-apps/sandbox-2.2 ) + elibc_musl? ( !prefix? ( >=sys-apps/sandbox-2.2 ) ) kernel_linux? ( sys-apps/util-linux ) selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] ) xattr? ( kernel_linux? ( @@ -126,7 +126,6 @@ src_prepare() { -i cnf/repos.conf || die "sed failed" # PREFIX LOCAL: only hack const_autotool - local extrapath="/usr/sbin:/usr/bin:/sbin:/bin" # ok, we can't rely on PORTAGE_ROOT_USER being there yet, as people # tend not to update that often, as long as we are a separate ebuild # we can assume when unset, it's time for some older trick @@ -141,36 +140,39 @@ src_prepare() { [[ ! -x ${bash} ]] && bash=${BASH} einfo "Adjusting sources for ${EPREFIX}" - find . -type f -exec \ sed -e "s|@PORTAGE_EPREFIX@|${EPREFIX}|" \ -e "s|@PORTAGE_MV@|$(type -P mv)|" \ -e "s|@PORTAGE_BASH@|${bash}|" \ - -e "s|@PREFIX_PORTAGE_PYTHON@|$(type -P python)|" \ - -e "s|@EXTRA_PATH@|${extrapath}|" \ -e "s|@portagegroup@|${PORTAGE_GROUP:-portage}|" \ -e "s|@portageuser@|${PORTAGE_USER:-portage}|" \ -e "s|@rootuser@|${PORTAGE_ROOT_USER:-root}|" \ -e "s|@rootuid@|$(id -u ${PORTAGE_ROOT_USER:-root})|" \ -e "s|@rootgid@|$(id -g ${PORTAGE_ROOT_USER:-root})|" \ -e "s|@sysconfdir@|${EPREFIX}/etc|" \ - -e "1s|/usr/bin/env |${EPREFIX}/usr/bin/|" \ - -i '{}' + || \ - die "Failed to patch sources" + -i \ + lib/portage/const_autotool.py cnf/make.globals \ + || die "Failed to patch sources" + + sed -e "s|@PREFIX_PORTAGE_PYTHON@|$(type -P python)|" \ + -i \ + bin/ebuild-helpers/dohtml bin/ebuild-pyhelper \ + bin/misc-functions.sh bin/phase-functions.sh \ + || die "Failed to patch sources" # remove Makefiles, or else they will get installed - find . -name "Makefile.*" -delete - - einfo "Prefixing shebangs ..." - find . -type f ! -name etc-update | \ - while read -r line; do - [[ -x ${line} || ${line} == *".py" ]] || continue; - local shebang=$(head -n1 "${line}") - if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; - then - sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "${line}" || \ - die "sed failed" - fi - done + #find . -name "Makefile.*" -delete + +# einfo "Prefixing shebangs ..." +# find . -type f ! -name etc-update | \ +# while read -r line; do +# [[ -x ${line} || ${line} == *".py" ]] || continue; +# local shebang=$(head -n1 "${line}") +# if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; +# then +# sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "${line}" || \ +# die "sed failed" +# fi +# done einfo "Setting gentoo_prefix as reponame for emerge-webrsync" sed -i -e 's/repo_name=gentoo/repo_name=gentoo_prefix/' \
