From e85dee5f43541bc6b28e785f56e4a5c60992d962 Mon Sep 17 00:00:00 2001 From: "Andreas Billmeier (@Home/mbp)" Date: Sat, 19 Mar 2022 13:40:37 +0100 Subject: [PATCH] remove old pyyaml-5.3 --- README.md | 4 +- dev-python/pyyaml/Manifest | 6 --- .../files/pyyaml-5.1.1-cve-2017-18342.patch | 40 ---------------- .../files/pyyaml-5.1.2-cve-2017-18342.patch | 40 ---------------- .../files/pyyaml-5.2-cve-2017-18342.patch | 40 ---------------- dev-python/pyyaml/metadata.xml | 18 -------- dev-python/pyyaml/pyyaml-5.3.ebuild | 46 ------------------- 7 files changed, 2 insertions(+), 192 deletions(-) delete mode 100644 dev-python/pyyaml/Manifest delete mode 100644 dev-python/pyyaml/files/pyyaml-5.1.1-cve-2017-18342.patch delete mode 100644 dev-python/pyyaml/files/pyyaml-5.1.2-cve-2017-18342.patch delete mode 100644 dev-python/pyyaml/files/pyyaml-5.2-cve-2017-18342.patch delete mode 100644 dev-python/pyyaml/metadata.xml delete mode 100644 dev-python/pyyaml/pyyaml-5.3.ebuild diff --git a/README.md b/README.md index 32669c1a6..76e92d430 100644 --- a/README.md +++ b/README.md @@ -496,11 +496,11 @@ From time to time a fresh compile test on empty boxes (one with Python 3.9 and o ## Licenses This repository itself is released under GPL-3 (like most Gentoo repositories), all work on the depending components under the licenses they came from. Perhaps you came here because I filed an issue at your component about a bad or missing license. It is easy to [assign a license](https://docs.github.com/en/communities/setting-up-your-project-for-healthy-contributions/adding-a-license-to-a-repository). During cleanups and license investigations I have been asked often which license to choose. I am not a lawyer, but I can offer the following table, counted over this repository, perhaps this helps your decision. If a package has more than one license listed, all of them are counted. -There are 1759 Ebuilds in total, 1751 of them have in total 1759 (34 different) licenses assigned. +There are 1758 Ebuilds in total, 1750 of them have in total 1758 (34 different) licenses assigned. |License| Ebuilds using it| |-------|-----| -|MIT|1065| +|MIT|1064| |Apache-2.0|320| |GPL-3|105| |BSD|101| diff --git a/dev-python/pyyaml/Manifest b/dev-python/pyyaml/Manifest deleted file mode 100644 index 54d7aa104..000000000 --- a/dev-python/pyyaml/Manifest +++ /dev/null @@ -1,6 +0,0 @@ -AUX pyyaml-5.1.1-cve-2017-18342.patch 1420 BLAKE2B bf053ed121355aea1e44f9bd29b22c9afbca7b99b68e59a6e213d2723531044049964dcb20dbc036ee27ae8bcc2c26e317cf080637e611fa0105a9d451496125 SHA512 8e7737761555d851b21ca61128d2ced4163d446acb87510b6962a20dc217923bcf835d70224c9e721486351e0aeb57f9f3c570b57086a0a00c3e8ac656a458c5 -AUX pyyaml-5.1.2-cve-2017-18342.patch 1420 BLAKE2B bf053ed121355aea1e44f9bd29b22c9afbca7b99b68e59a6e213d2723531044049964dcb20dbc036ee27ae8bcc2c26e317cf080637e611fa0105a9d451496125 SHA512 8e7737761555d851b21ca61128d2ced4163d446acb87510b6962a20dc217923bcf835d70224c9e721486351e0aeb57f9f3c570b57086a0a00c3e8ac656a458c5 -AUX pyyaml-5.2-cve-2017-18342.patch 1420 BLAKE2B 1e3e6b3d3a977336d33d7925a7d0aac83ada2e73c6b1978bca641881f14c794fe931b522621e838388166b3aaf7555359b13d878a0bdcd0bfd1544e4566b8ba5 SHA512 5d852e78892e1b2e2ca1fe72ed8f1c02d5d7e15f66cb947c98afda5099d95bfe2634f415848b207f6fc7271b182fa955d7d52b034b32ffdfea71b375f3d43c2c -DIST PyYAML-5.3.tar.gz 268214 BLAKE2B 2017ec6d64744323c7e6f3bdcea77b249943ba93844de363ba5d2b14cf70cc5c06e8427d12515e1e60f8432a87a115df1033d959fc42851f61818d0bdc8cd7a2 SHA512 9124bf4d58ebe925f430fd6ed749e5a3311a54d536a035d39794c485843ddb80692fd7f7bac05797507128b933297ff730d967f49e7237c7c567086a83ee9e1f -EBUILD pyyaml-5.3.ebuild 973 BLAKE2B 671a0000b9c5acaf7c8876ed7be998c1c475c0a6cf6f933c37fc91be6d3d6cb15d72516009ffd1bbdd6101933d042b0352f8c31cd67cf4de37f87b04b7060369 SHA512 18fa08093cfa73a65a2e21a93f654e0214376738a27ddfb00389bea00579c23330cab9f1c7a8e3223ead0e43faaed783253b690aaec28df85f5cf63581129a23 -MISC metadata.xml 542 BLAKE2B e97a76f493271a2b29267b0d3ba3f6f0a88788309ba76330b138057ed415aa5986d0e18358c5b3ed3d74485855388da361b455c48b4917ce4c06dd860693c717 SHA512 46fb8b1bb269416c8861bb0e5688ff9b8d5b6e8ce554cac310a2fe46484bef9cce0e1c3452d634532ae25f7cdbf0c306d6d57a052db4b6522e69e8705813d83f diff --git a/dev-python/pyyaml/files/pyyaml-5.1.1-cve-2017-18342.patch b/dev-python/pyyaml/files/pyyaml-5.1.1-cve-2017-18342.patch deleted file mode 100644 index 28626ba9e..000000000 --- a/dev-python/pyyaml/files/pyyaml-5.1.1-cve-2017-18342.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff --git a/lib/yaml/__init__.py b/lib/yaml/__init__.py -index e7a419d..5f80761 100644 ---- a/lib/yaml/__init__.py -+++ b/lib/yaml/__init__.py -@@ -106,6 +106,7 @@ def load(stream, Loader=None): - and produce the corresponding Python object. - """ - if Loader is None: -+ raise RuntimeError("Unsafe load() call disabled by Gentoo. See bug #659348") - load_warning('load') - Loader = FullLoader - -@@ -121,6 +122,7 @@ def load_all(stream, Loader=None): - and produce corresponding Python objects. - """ - if Loader is None: -+ raise RuntimeError("Unsafe load() call disabled by Gentoo. See bug #659348") - load_warning('load_all') - Loader = FullLoader - -diff --git a/lib3/yaml/__init__.py b/lib3/yaml/__init__.py -index 5df0bb5..6952ba5 100644 ---- a/lib3/yaml/__init__.py -+++ b/lib3/yaml/__init__.py -@@ -106,6 +106,7 @@ def load(stream, Loader=None): - and produce the corresponding Python object. - """ - if Loader is None: -+ raise RuntimeError("Unsafe load() call disabled by Gentoo. See bug #659348") - load_warning('load') - Loader = FullLoader - -@@ -121,6 +122,7 @@ def load_all(stream, Loader=None): - and produce corresponding Python objects. - """ - if Loader is None: -+ raise RuntimeError("Unsafe load() call disabled by Gentoo. See bug #659348") - load_warning('load_all') - Loader = FullLoader - diff --git a/dev-python/pyyaml/files/pyyaml-5.1.2-cve-2017-18342.patch b/dev-python/pyyaml/files/pyyaml-5.1.2-cve-2017-18342.patch deleted file mode 100644 index 28626ba9e..000000000 --- a/dev-python/pyyaml/files/pyyaml-5.1.2-cve-2017-18342.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff --git a/lib/yaml/__init__.py b/lib/yaml/__init__.py -index e7a419d..5f80761 100644 ---- a/lib/yaml/__init__.py -+++ b/lib/yaml/__init__.py -@@ -106,6 +106,7 @@ def load(stream, Loader=None): - and produce the corresponding Python object. - """ - if Loader is None: -+ raise RuntimeError("Unsafe load() call disabled by Gentoo. See bug #659348") - load_warning('load') - Loader = FullLoader - -@@ -121,6 +122,7 @@ def load_all(stream, Loader=None): - and produce corresponding Python objects. - """ - if Loader is None: -+ raise RuntimeError("Unsafe load() call disabled by Gentoo. See bug #659348") - load_warning('load_all') - Loader = FullLoader - -diff --git a/lib3/yaml/__init__.py b/lib3/yaml/__init__.py -index 5df0bb5..6952ba5 100644 ---- a/lib3/yaml/__init__.py -+++ b/lib3/yaml/__init__.py -@@ -106,6 +106,7 @@ def load(stream, Loader=None): - and produce the corresponding Python object. - """ - if Loader is None: -+ raise RuntimeError("Unsafe load() call disabled by Gentoo. See bug #659348") - load_warning('load') - Loader = FullLoader - -@@ -121,6 +122,7 @@ def load_all(stream, Loader=None): - and produce corresponding Python objects. - """ - if Loader is None: -+ raise RuntimeError("Unsafe load() call disabled by Gentoo. See bug #659348") - load_warning('load_all') - Loader = FullLoader - diff --git a/dev-python/pyyaml/files/pyyaml-5.2-cve-2017-18342.patch b/dev-python/pyyaml/files/pyyaml-5.2-cve-2017-18342.patch deleted file mode 100644 index b890d7138..000000000 --- a/dev-python/pyyaml/files/pyyaml-5.2-cve-2017-18342.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff --git a/lib/yaml/__init__.py b/lib/yaml/__init__.py -index 32d848e..57d5551 100644 ---- a/lib/yaml/__init__.py -+++ b/lib/yaml/__init__.py -@@ -106,6 +106,7 @@ def load(stream, Loader=None): - and produce the corresponding Python object. - """ - if Loader is None: -+ raise RuntimeError("Unsafe load() call disabled by Gentoo. See bug #659348") - load_warning('load') - Loader = FullLoader - -@@ -121,6 +122,7 @@ def load_all(stream, Loader=None): - and produce corresponding Python objects. - """ - if Loader is None: -+ raise RuntimeError("Unsafe load() call disabled by Gentoo. See bug #659348") - load_warning('load_all') - Loader = FullLoader - -diff --git a/lib3/yaml/__init__.py b/lib3/yaml/__init__.py -index d9e3ac2..a8820a4 100644 ---- a/lib3/yaml/__init__.py -+++ b/lib3/yaml/__init__.py -@@ -106,6 +106,7 @@ def load(stream, Loader=None): - and produce the corresponding Python object. - """ - if Loader is None: -+ raise RuntimeError("Unsafe load() call disabled by Gentoo. See bug #659348") - load_warning('load') - Loader = FullLoader - -@@ -121,6 +122,7 @@ def load_all(stream, Loader=None): - and produce corresponding Python objects. - """ - if Loader is None: -+ raise RuntimeError("Unsafe load() call disabled by Gentoo. See bug #659348") - load_warning('load_all') - Loader = FullLoader - diff --git a/dev-python/pyyaml/metadata.xml b/dev-python/pyyaml/metadata.xml deleted file mode 100644 index f8f981a75..000000000 --- a/dev-python/pyyaml/metadata.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - python@gentoo.org - Python - - - enable support for C implementation using libyaml - - - PyYAML - - xi@resolvent.net - Kirill Simonov - - - diff --git a/dev-python/pyyaml/pyyaml-5.3.ebuild b/dev-python/pyyaml/pyyaml-5.3.ebuild deleted file mode 100644 index af1e9b7ad..000000000 --- a/dev-python/pyyaml/pyyaml-5.3.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6,7,8} ) - -inherit distutils-r1 - -MY_P="PyYAML-${PV}" - -DESCRIPTION="YAML parser and emitter for Python" -HOMEPAGE="https://pyyaml.org/wiki/PyYAML https://pypi.org/project/PyYAML/" -SRC_URI="mirror://pypi/${P:0:1}/${PN}/${MY_P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux" -IUSE="examples libyaml" - -RDEPEND="libyaml? ( dev-libs/libyaml )" -DEPEND="${RDEPEND} - libyaml? ( $(python_gen_cond_dep 'dev-python/cython[${PYTHON_USEDEP}]' python2_7 'python3*') )" - -S="${WORKDIR}/${MY_P}" - -PATCHES=( - # bug #659348 - "${FILESDIR}/${P}-cve-2017-18342.patch" -) - -python_configure_all() { - mydistutilsargs=( $(use_with libyaml) ) -} - -python_test() { - esetup.py test -} - -python_install_all() { - distutils-r1_python_install_all - if use examples; then - dodoc -r examples - docompress -x /usr/share/doc/${PF} - fi -}