1 |
commit: 7f03ec4a46055a75eb13bf5fad85cf451822f589 |
2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon May 25 00:43:07 2020 +0000 |
4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon May 25 00:43:23 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f03ec4a |
7 |
|
8 |
sys-apps/portage: Remove vulnerable 2.3.89-r3 for bug 692492 |
9 |
|
10 |
Bug: https://bugs.gentoo.org/692492 |
11 |
Package-Manager: Portage-2.3.100, Repoman-2.3.22 |
12 |
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org> |
13 |
|
14 |
sys-apps/portage/Manifest | 1 - |
15 |
sys-apps/portage/portage-2.3.89-r3.ebuild | 271 ------------------------------ |
16 |
2 files changed, 272 deletions(-) |
17 |
|
18 |
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest |
19 |
index 35e020c7d88..c9b2c7013e1 100644 |
20 |
--- a/sys-apps/portage/Manifest |
21 |
+++ b/sys-apps/portage/Manifest |
22 |
@@ -1,4 +1,3 @@ |
23 |
DIST portage-2.3.100.tar.bz2 1051559 BLAKE2B 32ee47c2d3e28dd7530c4d6518c264f01621677b5d8872c98088117de3bde21bb05f144935b1c035157953814573473a9ac0216595138d804dd30cf8a7c5b4a9 SHA512 b784ced00676020700a27a622a7a10162b8775185e28d639473243949ca32210458523e94960cafa908ca4a97cd8731d3515f768e2512c519c54598316ecf3c9 |
24 |
DIST portage-2.3.89-bug-718578.patch 1325 BLAKE2B 7a3bc520274617736eac2e3d078e90d151bdb5d8615f6217a499c0f5d4c80813f2c753e7902cf34482df0725ad0b43a38707764c8be14aae9f7ca34f0bd8721f SHA512 6f1c5d7b42beb8078c45cccbad2bd65374b69af92521d9be3beb6784477ca5bcdd75d8e762b239e44e3121e6fe5e3a040c92c9b61521e4a9b1d6bafee10d4c88 |
25 |
-DIST portage-2.3.89.tar.bz2 1048621 BLAKE2B 1353f0697a977eb395abd857c8cc43c839912f4bd31436c6620d10e3dc29dc32ee9970478ad0f569b02f14989c48a7d956a233c7db22e172897a49a98fd2a94d SHA512 fa453d3134139fc1f435d6388aa7d6271cd680d08ea1736269a917c12500bb463a81afc956ddd0045e98784bcdbb6541c333be6ff0c2a00feeb482b637f08e98 |
26 |
DIST portage-2.3.99.tar.bz2 1051210 BLAKE2B dd3f990dbc87e655a767ce01e1ee3f0b1d5226fa818949408e54b81a2f96e50a4215a79af42b00dc795792858c4f86453b238b14baef4f0793c937b5617534b8 SHA512 176842318a4134ce54c5aa6485fef296f5a14edd2a72421c2011973a0f1a6af39bc5398f1e9eb3b8666d5fc307589c5b91ab93c219bdedb2d307357d8ddefbf5 |
27 |
|
28 |
diff --git a/sys-apps/portage/portage-2.3.89-r3.ebuild b/sys-apps/portage/portage-2.3.89-r3.ebuild |
29 |
deleted file mode 100644 |
30 |
index 210f4409e40..00000000000 |
31 |
--- a/sys-apps/portage/portage-2.3.89-r3.ebuild |
32 |
+++ /dev/null |
33 |
@@ -1,271 +0,0 @@ |
34 |
-# Copyright 1999-2020 Gentoo Authors |
35 |
-# Distributed under the terms of the GNU General Public License v2 |
36 |
- |
37 |
-EAPI=5 |
38 |
- |
39 |
-DISTUTILS_USE_SETUPTOOLS=no |
40 |
-PYTHON_COMPAT=( pypy3 python3_6 python3_7 python3_8 ) |
41 |
-PYTHON_REQ_USE='bzip2(+),threads(+)' |
42 |
- |
43 |
-inherit distutils-r1 epatch linux-info systemd prefix |
44 |
- |
45 |
-DESCRIPTION="Portage is the package management and distribution system for Gentoo" |
46 |
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage" |
47 |
- |
48 |
-LICENSE="GPL-2" |
49 |
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86" |
50 |
-SLOT="0" |
51 |
-IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr" |
52 |
- |
53 |
-DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') ) |
54 |
- >=app-arch/tar-1.27 |
55 |
- dev-lang/python-exec:2 |
56 |
- >=sys-apps/sed-4.0.5 sys-devel/patch |
57 |
- doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 ) |
58 |
- apidoc? ( |
59 |
- dev-python/sphinx |
60 |
- dev-python/sphinx-epytext |
61 |
- )" |
62 |
-# Require sandbox-2.2 for bug #288863. |
63 |
-# For xattr, we can spawn getfattr and setfattr from sys-apps/attr, but that's |
64 |
-# quite slow, so it's not considered in the dependencies as an alternative to |
65 |
-# to python-3.3 / pyxattr. Also, xattr support is only tested with Linux, so |
66 |
-# for now, don't pull in xattr deps for other kernels. |
67 |
-# For whirlpool hash, require python[ssl] (bug #425046). |
68 |
-# For compgen, require bash[readline] (bug #445576). |
69 |
-# app-portage/gemato goes without PYTHON_USEDEP since we're calling |
70 |
-# the executable. |
71 |
-RDEPEND=" |
72 |
- >=app-arch/tar-1.27 |
73 |
- dev-lang/python-exec:2 |
74 |
- !build? ( |
75 |
- >=sys-apps/sed-4.0.5 |
76 |
- app-shells/bash:0[readline] |
77 |
- >=app-admin/eselect-1.2 |
78 |
- rsync-verify? ( |
79 |
- >=app-portage/gemato-14[${PYTHON_USEDEP}] |
80 |
- >=app-crypt/openpgp-keys-gentoo-release-20180706 |
81 |
- >=app-crypt/gnupg-2.2.4-r2[ssl(-)] |
82 |
- ) |
83 |
- ) |
84 |
- elibc_glibc? ( >=sys-apps/sandbox-2.2 ) |
85 |
- elibc_musl? ( >=sys-apps/sandbox-2.2 ) |
86 |
- elibc_uclibc? ( >=sys-apps/sandbox-2.2 ) |
87 |
- kernel_linux? ( sys-apps/util-linux ) |
88 |
- >=app-misc/pax-utils-0.1.17 |
89 |
- selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] ) |
90 |
- xattr? ( kernel_linux? ( |
91 |
- >=sys-apps/install-xattr-0.3 |
92 |
- ) ) |
93 |
- !<app-admin/logrotate-3.8.0 |
94 |
- !<app-portage/gentoolkit-0.4.6 |
95 |
- !<app-portage/repoman-2.3.10" |
96 |
-PDEPEND=" |
97 |
- !build? ( |
98 |
- >=net-misc/rsync-2.6.4 |
99 |
- userland_GNU? ( >=sys-apps/coreutils-6.4 ) |
100 |
- )" |
101 |
-# coreutils-6.4 rdep is for date format in emerge-webrsync #164532 |
102 |
-# NOTE: FEATURES=installsources requires debugedit and rsync |
103 |
- |
104 |
-SRC_ARCHIVES="https://dev.gentoo.org/~zmedico/portage/archives" |
105 |
- |
106 |
-prefix_src_archives() { |
107 |
- local x y |
108 |
- for x in ${@}; do |
109 |
- for y in ${SRC_ARCHIVES}; do |
110 |
- echo ${y}/${x} |
111 |
- done |
112 |
- done |
113 |
-} |
114 |
- |
115 |
-TARBALL_PV=${PV} |
116 |
-SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2 |
117 |
- $(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2) |
118 |
- https://github.com/gentoo/portage/commit/9738a404e876270cbdef2514f66915bce35d7435.patch -> portage-2.3.89-bug-718578.patch" |
119 |
- |
120 |
-pkg_pretend() { |
121 |
- local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS" |
122 |
- |
123 |
- check_extra_config |
124 |
-} |
125 |
- |
126 |
-python_prepare_all() { |
127 |
- distutils-r1_python_prepare_all |
128 |
- |
129 |
- epatch "${DISTDIR}/portage-2.3.89-bug-718578.patch" |
130 |
- |
131 |
- # Apply e762752a8bf5c19e0d6d7b22de86306bfa4270ba for bug 711400. |
132 |
- sed -e 's|\(if\) \(graph_interface.want_update_pkg(parent, avail_pkg):\)|\1 parent is not None and \2|' -i lib/portage/dep/dep_check.py || die |
133 |
- |
134 |
- # Apply 5570a96ddc859851036035baa4da65df2daa51a0 for bug 700830. |
135 |
- sed -e '50s|"EMERGE_FROM", "EPREFIX",|"EMERGE_FROM", "ENV_UNSET", "EPREFIX",|' -i lib/portage/package/ebuild/_config/special_env_vars.py || die |
136 |
- |
137 |
- sed -e "s:^VERSION = \"HEAD\"$:VERSION = \"${PV}\":" -i lib/portage/__init__.py || die |
138 |
- |
139 |
- if use gentoo-dev; then |
140 |
- einfo "Disabling --dynamic-deps by default for gentoo-dev..." |
141 |
- sed -e 's:\("--dynamic-deps", \)\("y"\):\1"n":' \ |
142 |
- -i lib/_emerge/create_depgraph_params.py || \ |
143 |
- die "failed to patch create_depgraph_params.py" |
144 |
- |
145 |
- einfo "Enabling additional FEATURES for gentoo-dev..." |
146 |
- echo 'FEATURES="${FEATURES} strict-keepdir"' \ |
147 |
- >> cnf/make.globals || die |
148 |
- fi |
149 |
- |
150 |
- if use native-extensions; then |
151 |
- printf "[build_ext]\nportage-ext-modules=true\n" >> \ |
152 |
- setup.cfg || die |
153 |
- fi |
154 |
- |
155 |
- if ! use ipc ; then |
156 |
- einfo "Disabling ipc..." |
157 |
- sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \ |
158 |
- -i lib/_emerge/AbstractEbuildProcess.py || \ |
159 |
- die "failed to patch AbstractEbuildProcess.py" |
160 |
- fi |
161 |
- |
162 |
- if use xattr && use kernel_linux ; then |
163 |
- einfo "Adding FEATURES=xattr to make.globals ..." |
164 |
- echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \ |
165 |
- || die "failed to append to make.globals" |
166 |
- fi |
167 |
- |
168 |
- if use build || ! use rsync-verify; then |
169 |
- sed -e '/^sync-rsync-verify-metamanifest/s|yes|no|' \ |
170 |
- -e '/^sync-webrsync-verify-signature/s|yes|no|' \ |
171 |
- -i cnf/repos.conf || die "sed failed" |
172 |
- fi |
173 |
- |
174 |
- if [[ -n ${EPREFIX} ]] ; then |
175 |
- einfo "Setting portage.const.EPREFIX ..." |
176 |
- hprefixify -e "s|^(EPREFIX[[:space:]]*=[[:space:]]*\").*|\1${EPREFIX}\"|" \ |
177 |
- -w "/_BINARY/" lib/portage/const.py |
178 |
- |
179 |
- einfo "Prefixing shebangs ..." |
180 |
- while read -r -d $'\0' ; do |
181 |
- local shebang=$(head -n1 "$REPLY") |
182 |
- if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then |
183 |
- sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "$REPLY" || \ |
184 |
- die "sed failed" |
185 |
- fi |
186 |
- done < <(find . -type f ! -name etc-update -print0) |
187 |
- |
188 |
- einfo "Adjusting make.globals, repos.conf and etc-update ..." |
189 |
- hprefixify cnf/{make.globals,repos.conf} bin/etc-update |
190 |
- |
191 |
- if use prefix-guest ; then |
192 |
- sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \ |
193 |
- -e "s|^\\[gentoo\\]|[gentoo_prefix]|" \ |
194 |
- -e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \ |
195 |
- -i cnf/repos.conf || die "sed failed" |
196 |
- fi |
197 |
- |
198 |
- einfo "Adding FEATURES=force-prefix to make.globals ..." |
199 |
- echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \ |
200 |
- || die "failed to append to make.globals" |
201 |
- fi |
202 |
- |
203 |
- cd "${S}/cnf" || die |
204 |
- if [ -f "make.conf.example.${ARCH}".diff ]; then |
205 |
- patch make.conf.example "make.conf.example.${ARCH}".diff || \ |
206 |
- die "Failed to patch make.conf.example" |
207 |
- else |
208 |
- eerror "" |
209 |
- eerror "Portage does not have an arch-specific configuration for this arch." |
210 |
- eerror "Please notify the arch maintainer about this issue. Using generic." |
211 |
- eerror "" |
212 |
- fi |
213 |
-} |
214 |
- |
215 |
-python_compile_all() { |
216 |
- local targets=() |
217 |
- use doc && targets+=( docbook ) |
218 |
- use apidoc && targets+=( apidoc ) |
219 |
- |
220 |
- if [[ ${targets[@]} ]]; then |
221 |
- esetup.py "${targets[@]}" |
222 |
- fi |
223 |
-} |
224 |
- |
225 |
-python_test() { |
226 |
- esetup.py test |
227 |
-} |
228 |
- |
229 |
-python_install() { |
230 |
- # Install sbin scripts to bindir for python-exec linking |
231 |
- # they will be relocated in pkg_preinst() |
232 |
- distutils-r1_python_install \ |
233 |
- --system-prefix="${EPREFIX}/usr" \ |
234 |
- --bindir="$(python_get_scriptdir)" \ |
235 |
- --docdir="${EPREFIX}/usr/share/doc/${PF}" \ |
236 |
- --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \ |
237 |
- --portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \ |
238 |
- --sbindir="$(python_get_scriptdir)" \ |
239 |
- --sysconfdir="${EPREFIX}/etc" \ |
240 |
- "${@}" |
241 |
-} |
242 |
- |
243 |
-python_install_all() { |
244 |
- distutils-r1_python_install_all |
245 |
- |
246 |
- local targets=() |
247 |
- use doc && targets+=( |
248 |
- install_docbook |
249 |
- --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" |
250 |
- ) |
251 |
- use apidoc && targets+=( |
252 |
- install_apidoc |
253 |
- --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" |
254 |
- ) |
255 |
- |
256 |
- # install docs |
257 |
- if [[ ${targets[@]} ]]; then |
258 |
- esetup.py "${targets[@]}" |
259 |
- fi |
260 |
- |
261 |
- systemd_dotmpfilesd "${FILESDIR}"/portage-ccache.conf |
262 |
- |
263 |
- # Due to distutils/python-exec limitations |
264 |
- # these must be installed to /usr/bin. |
265 |
- local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld' |
266 |
- einfo "Moving admin scripts to the correct directory" |
267 |
- dodir /usr/sbin |
268 |
- for target in ${sbin_relocations}; do |
269 |
- einfo "Moving /usr/bin/${target} to /usr/sbin/${target}" |
270 |
- mv "${ED}usr/bin/${target}" "${ED}usr/sbin/${target}" || die "sbin scripts move failed!" |
271 |
- done |
272 |
-} |
273 |
- |
274 |
-pkg_preinst() { |
275 |
- python_setup |
276 |
- local sitedir=$(python_get_sitedir) |
277 |
- [[ -d ${D%/}${sitedir} ]] || die "${D%/}${sitedir}: No such directory" |
278 |
- env -u DISTDIR \ |
279 |
- -u PORTAGE_OVERRIDE_EPREFIX \ |
280 |
- -u PORTAGE_REPOSITORIES \ |
281 |
- -u PORTDIR \ |
282 |
- -u PORTDIR_OVERLAY \ |
283 |
- PYTHONPATH="${D%/}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \ |
284 |
- "${PYTHON}" -m portage._compat_upgrade.default_locations || die |
285 |
- |
286 |
- # elog dir must exist to avoid logrotate error for bug #415911. |
287 |
- # This code runs in preinst in order to bypass the mapping of |
288 |
- # portage:portage to root:root which happens after src_install. |
289 |
- keepdir /var/log/portage/elog |
290 |
- # This is allowed to fail if the user/group are invalid for prefix users. |
291 |
- if chown portage:portage "${ED}"var/log/portage{,/elog} 2>/dev/null ; then |
292 |
- chmod g+s,ug+rwx "${ED}"var/log/portage{,/elog} |
293 |
- fi |
294 |
- |
295 |
- if has_version "<${CATEGORY}/${PN}-2.3.77"; then |
296 |
- elog "The emerge --autounmask option is now disabled by default, except for" |
297 |
- elog "portions of behavior which are controlled by the --autounmask-use and" |
298 |
- elog "--autounmask-license options. For backward compatibility, previous" |
299 |
- elog "behavior of --autounmask=y and --autounmask=n is entirely preserved." |
300 |
- elog "Users can get the old behavior simply by adding --autounmask to the" |
301 |
- elog "make.conf EMERGE_DEFAULT_OPTS variable. For the rationale for this" |
302 |
- elog "change, see https://bugs.gentoo.org/658648." |
303 |
- fi |
304 |
-} |