1 |
commit: 7505df3b4d3f36ee501be24d5cf7cca7b0434eda |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue May 10 20:42:17 2022 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue May 10 20:43:26 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7505df3b |
7 |
|
8 |
dev-python/pyyaml: Remove old |
9 |
|
10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
11 |
|
12 |
dev-python/pyyaml/Manifest | 1 - |
13 |
.../pyyaml/files/pyyaml-5.1-cve-2017-18342.patch | 40 ------------------ |
14 |
dev-python/pyyaml/metadata.xml | 3 -- |
15 |
dev-python/pyyaml/pyyaml-5.4.1.ebuild | 47 ---------------------- |
16 |
4 files changed, 91 deletions(-) |
17 |
|
18 |
diff --git a/dev-python/pyyaml/Manifest b/dev-python/pyyaml/Manifest |
19 |
index c11baf76eb9e..a415685ef288 100644 |
20 |
--- a/dev-python/pyyaml/Manifest |
21 |
+++ b/dev-python/pyyaml/Manifest |
22 |
@@ -1,2 +1 @@ |
23 |
-DIST pyyaml-5.4.1.gh.tar.gz 173319 BLAKE2B b81cdec32588a419840dd536a2d8addb41eec3e20897f6c464a00a5badb4d6eed9b34b4f95146695187e7d9bcf2d03b81e884290c6dc47927be6192dfdb21eab SHA512 691e54fd9ca01fdc0dcb7de03ddd1970614d92a716c2437032999f9001f90a2ebbcc195a49bfdbe54da0f7a63178c83b02b05b18b5b1024127013f004d1f5997 |
24 |
DIST pyyaml-6.0.gh.tar.gz 119855 BLAKE2B 286678ac81f2e6c252d285d2f98dab98894787e3aa164a29a697986f56200c7b71b0a768edf6d50e61065efcd054078673270872162a4975409928d7dd67aacc SHA512 cbcacc3560a035e2082867e93a9733f8660ea4c7f60573d07642f33a5453dcdc88d67299c3bcb97c27b843202a45d40de7444eb5e815bd4955129c9fc8ae04ad |
25 |
|
26 |
diff --git a/dev-python/pyyaml/files/pyyaml-5.1-cve-2017-18342.patch b/dev-python/pyyaml/files/pyyaml-5.1-cve-2017-18342.patch |
27 |
deleted file mode 100644 |
28 |
index 28626ba9e974..000000000000 |
29 |
--- a/dev-python/pyyaml/files/pyyaml-5.1-cve-2017-18342.patch |
30 |
+++ /dev/null |
31 |
@@ -1,40 +0,0 @@ |
32 |
-diff --git a/lib/yaml/__init__.py b/lib/yaml/__init__.py |
33 |
-index e7a419d..5f80761 100644 |
34 |
---- a/lib/yaml/__init__.py |
35 |
-+++ b/lib/yaml/__init__.py |
36 |
-@@ -106,6 +106,7 @@ def load(stream, Loader=None): |
37 |
- and produce the corresponding Python object. |
38 |
- """ |
39 |
- if Loader is None: |
40 |
-+ raise RuntimeError("Unsafe load() call disabled by Gentoo. See bug #659348") |
41 |
- load_warning('load') |
42 |
- Loader = FullLoader |
43 |
- |
44 |
-@@ -121,6 +122,7 @@ def load_all(stream, Loader=None): |
45 |
- and produce corresponding Python objects. |
46 |
- """ |
47 |
- if Loader is None: |
48 |
-+ raise RuntimeError("Unsafe load() call disabled by Gentoo. See bug #659348") |
49 |
- load_warning('load_all') |
50 |
- Loader = FullLoader |
51 |
- |
52 |
-diff --git a/lib3/yaml/__init__.py b/lib3/yaml/__init__.py |
53 |
-index 5df0bb5..6952ba5 100644 |
54 |
---- a/lib3/yaml/__init__.py |
55 |
-+++ b/lib3/yaml/__init__.py |
56 |
-@@ -106,6 +106,7 @@ def load(stream, Loader=None): |
57 |
- and produce the corresponding Python object. |
58 |
- """ |
59 |
- if Loader is None: |
60 |
-+ raise RuntimeError("Unsafe load() call disabled by Gentoo. See bug #659348") |
61 |
- load_warning('load') |
62 |
- Loader = FullLoader |
63 |
- |
64 |
-@@ -121,6 +122,7 @@ def load_all(stream, Loader=None): |
65 |
- and produce corresponding Python objects. |
66 |
- """ |
67 |
- if Loader is None: |
68 |
-+ raise RuntimeError("Unsafe load() call disabled by Gentoo. See bug #659348") |
69 |
- load_warning('load_all') |
70 |
- Loader = FullLoader |
71 |
- |
72 |
|
73 |
diff --git a/dev-python/pyyaml/metadata.xml b/dev-python/pyyaml/metadata.xml |
74 |
index 96c887521e1a..ceaaa2ef50fb 100644 |
75 |
--- a/dev-python/pyyaml/metadata.xml |
76 |
+++ b/dev-python/pyyaml/metadata.xml |
77 |
@@ -5,9 +5,6 @@ |
78 |
<email>python@g.o</email> |
79 |
<name>Python</name> |
80 |
</maintainer> |
81 |
- <use> |
82 |
- <flag name="libyaml">enable support for C implementation using libyaml</flag> |
83 |
- </use> |
84 |
<upstream> |
85 |
<remote-id type="cpe">cpe:/a:pyyaml_project:pyyaml</remote-id> |
86 |
<remote-id type="pypi">PyYAML</remote-id> |
87 |
|
88 |
diff --git a/dev-python/pyyaml/pyyaml-5.4.1.ebuild b/dev-python/pyyaml/pyyaml-5.4.1.ebuild |
89 |
deleted file mode 100644 |
90 |
index c702311e7455..000000000000 |
91 |
--- a/dev-python/pyyaml/pyyaml-5.4.1.ebuild |
92 |
+++ /dev/null |
93 |
@@ -1,47 +0,0 @@ |
94 |
-# Copyright 1999-2021 Gentoo Authors |
95 |
-# Distributed under the terms of the GNU General Public License v2 |
96 |
- |
97 |
-EAPI=7 |
98 |
- |
99 |
-PYTHON_COMPAT=( python3_{7..10} pypy3 ) |
100 |
-inherit distutils-r1 |
101 |
- |
102 |
-DESCRIPTION="YAML parser and emitter for Python" |
103 |
-HOMEPAGE="https://pyyaml.org/wiki/PyYAML |
104 |
- https://pypi.org/project/PyYAML/ |
105 |
- https://github.com/yaml/pyyaml" |
106 |
-SRC_URI="https://github.com/yaml/pyyaml/archive/${PV}.tar.gz -> ${P}.gh.tar.gz" |
107 |
- |
108 |
-LICENSE="MIT" |
109 |
-SLOT="0" |
110 |
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris" |
111 |
-IUSE="examples +libyaml" |
112 |
- |
113 |
-BDEPEND=" |
114 |
- libyaml? ( |
115 |
- $(python_gen_cond_dep ' |
116 |
- dev-python/cython[${PYTHON_USEDEP}] |
117 |
- ' 'python*') |
118 |
- ) |
119 |
-" |
120 |
-RDEPEND="libyaml? ( dev-libs/libyaml:= )" |
121 |
-DEPEND="${RDEPEND}" |
122 |
- |
123 |
-PATCHES=( |
124 |
- # bug #659348 |
125 |
- "${FILESDIR}/pyyaml-5.1-cve-2017-18342.patch" |
126 |
-) |
127 |
- |
128 |
-distutils_enable_tests setup.py |
129 |
- |
130 |
-python_configure_all() { |
131 |
- mydistutilsargs=( $(use_with libyaml) ) |
132 |
-} |
133 |
- |
134 |
-python_install_all() { |
135 |
- distutils-r1_python_install_all |
136 |
- if use examples; then |
137 |
- dodoc -r examples |
138 |
- docompress -x /usr/share/doc/${PF} |
139 |
- fi |
140 |
-} |