summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2020-09-11 12:14:10 -0700
committerZac Medico <zmedico@gentoo.org>2020-09-11 12:25:54 -0700
commit3f5468f112ce4a8210fe2073267f842367a7287b (patch)
tree9f462551f205720e98f3497cbb634ac4c8497f75
parentdev-python/asttokens: strip dev-python/wheel 'dep' (diff)
downloadgentoo-3f5468f112ce4a8210fe2073267f842367a7287b.tar.gz
gentoo-3f5468f112ce4a8210fe2073267f842367a7287b.tar.bz2
gentoo-3f5468f112ce4a8210fe2073267f842367a7287b.zip
sys-apps/portage: 3.0.6-r1 revbump for bug 741194
#741194 selinux: encode os path arguments as UTF-8 Bug: https://bugs.gentoo.org/739718 Bug: https://bugs.gentoo.org/741194 Package-Manager: Portage-3.0.6, Repoman-3.0.1 Signed-off-by: Zac Medico <zmedico@gentoo.org>
-rw-r--r--sys-apps/portage/Manifest1
-rw-r--r--sys-apps/portage/portage-3.0.6-r1.ebuild (renamed from sys-apps/portage/portage-3.0.6.ebuild)5
2 files changed, 5 insertions, 1 deletions
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index e9633f5972a..f98a0d5e6be 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -3,4 +3,5 @@ DIST portage-2.3.89-bug-718578.patch 1325 BLAKE2B 7a3bc520274617736eac2e3d078e90
DIST portage-2.3.99.tar.bz2 1051210 BLAKE2B dd3f990dbc87e655a767ce01e1ee3f0b1d5226fa818949408e54b81a2f96e50a4215a79af42b00dc795792858c4f86453b238b14baef4f0793c937b5617534b8 SHA512 176842318a4134ce54c5aa6485fef296f5a14edd2a72421c2011973a0f1a6af39bc5398f1e9eb3b8666d5fc307589c5b91ab93c219bdedb2d307357d8ddefbf5
DIST portage-3.0.4.tar.bz2 1042654 BLAKE2B 6f869b2eb24f9e590bf8e01172050105a1bd9ea88657db5893133b4620231a0ddcda871d6fcc10623f7f2ef809116310c76355263819be6c3734b0ca184d5fc0 SHA512 7a0c39cd4ed65aebd84ff8bbadba29760b3aa392a0d606c5b29a1112fd0845c42f74eebb0728a069b2b097a6eb7eec2d18af615fd9edcc38f1018ae6ff686812
DIST portage-3.0.5.tar.bz2 1043083 BLAKE2B f95fea950c15a9ddc7b1e87820a6d300c54d0b027c36a6522293496cbe39b40a7e4e472faf9f65c96c4f83f34a27830c4795d433860ed9f87d042f9b18a59878 SHA512 59f06514c16f215647ab7c3f4eec40bacb8e17bba46b2d59b94be938891c2e48d157d240fb47ae736968bbd754ea56343b0138d4ccba58458913b95a798f0c66
+DIST portage-3.0.6-selinux-utf8-bug-741194.patch 2721 BLAKE2B 6f743fd32f72e18a029827ecbaf168d67cf5056a60ba89d00dd1ff7225f4a4ffa63dbb14310cf590553d47d4ac52d0899c5b48ebb799bed6dd76fc74a762e134 SHA512 108dd63d029bf296a26723e35f8c05ae9c5c81fd1b1f5398bbc310dd832b1af452865893e0c434b857cca12bd458dc1963dab689fab629ab7d48678472d9bc47
DIST portage-3.0.6.tar.bz2 1045033 BLAKE2B 3c31252215069619bde15191fade18198e777f892e910ec6f5a9ebbc8569a56d219943ccbaf18517eae51f74d8c53047d4e0ef5675166b09e28766f940ad7391 SHA512 0ec6ca0470060d6a441fa48728f542afc97e49f93c8f2bd66ab51dda946f65a4bcc52e1f7b2afe19c040b4dcf05d4a2d8578cea2ab3526c7b8fa630670e8a98a
diff --git a/sys-apps/portage/portage-3.0.6.ebuild b/sys-apps/portage/portage-3.0.6-r1.ebuild
index 5cd1667bfdd..0308cd5b74f 100644
--- a/sys-apps/portage/portage-3.0.6.ebuild
+++ b/sys-apps/portage/portage-3.0.6-r1.ebuild
@@ -80,7 +80,8 @@ prefix_src_archives() {
TARBALL_PV=${PV}
SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2
- $(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)"
+ $(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)
+ https://github.com/gentoo/portage/commit/a8f0e05d35b0ba2747827ce03dff42682192def8.patch -> ${P}-selinux-utf8-bug-741194.patch"
pkg_pretend() {
local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS ~UTS_NS"
@@ -91,6 +92,8 @@ pkg_pretend() {
python_prepare_all() {
distutils-r1_python_prepare_all
+ eapply "${DISTDIR}/${P}-selinux-utf8-bug-741194.patch"
+
sed -e "s:^VERSION = \"HEAD\"$:VERSION = \"${PV}\":" -i lib/portage/__init__.py || die
if use gentoo-dev; then