From 752d6256e5204b958b0ef7905675a940b5e9172f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 12 May 2022 16:42:50 +0300 Subject: gentoo resync : 12.05.2022 --- dev-python/pyyaml/Manifest | 8 ++-- .../pyyaml/files/pyyaml-5.1-cve-2017-18342.patch | 40 ------------------ dev-python/pyyaml/metadata.xml | 3 -- dev-python/pyyaml/pyyaml-5.4.1.ebuild | 47 --------------------- dev-python/pyyaml/pyyaml-6.0-r1.ebuild | 49 ++++++++++++++++++++++ dev-python/pyyaml/pyyaml-6.0.ebuild | 4 +- 6 files changed, 54 insertions(+), 97 deletions(-) delete mode 100644 dev-python/pyyaml/files/pyyaml-5.1-cve-2017-18342.patch delete mode 100644 dev-python/pyyaml/pyyaml-5.4.1.ebuild create mode 100644 dev-python/pyyaml/pyyaml-6.0-r1.ebuild (limited to 'dev-python/pyyaml') diff --git a/dev-python/pyyaml/Manifest b/dev-python/pyyaml/Manifest index 524ec2fd9438..992637cc459e 100644 --- a/dev-python/pyyaml/Manifest +++ b/dev-python/pyyaml/Manifest @@ -1,6 +1,4 @@ -AUX pyyaml-5.1-cve-2017-18342.patch 1420 BLAKE2B bf053ed121355aea1e44f9bd29b22c9afbca7b99b68e59a6e213d2723531044049964dcb20dbc036ee27ae8bcc2c26e317cf080637e611fa0105a9d451496125 SHA512 8e7737761555d851b21ca61128d2ced4163d446acb87510b6962a20dc217923bcf835d70224c9e721486351e0aeb57f9f3c570b57086a0a00c3e8ac656a458c5 -DIST pyyaml-5.4.1.gh.tar.gz 173319 BLAKE2B b81cdec32588a419840dd536a2d8addb41eec3e20897f6c464a00a5badb4d6eed9b34b4f95146695187e7d9bcf2d03b81e884290c6dc47927be6192dfdb21eab SHA512 691e54fd9ca01fdc0dcb7de03ddd1970614d92a716c2437032999f9001f90a2ebbcc195a49bfdbe54da0f7a63178c83b02b05b18b5b1024127013f004d1f5997 DIST pyyaml-6.0.gh.tar.gz 119855 BLAKE2B 286678ac81f2e6c252d285d2f98dab98894787e3aa164a29a697986f56200c7b71b0a768edf6d50e61065efcd054078673270872162a4975409928d7dd67aacc SHA512 cbcacc3560a035e2082867e93a9733f8660ea4c7f60573d07642f33a5453dcdc88d67299c3bcb97c27b843202a45d40de7444eb5e815bd4955129c9fc8ae04ad -EBUILD pyyaml-5.4.1.ebuild 1125 BLAKE2B cd03ce8beb70c2e1be3bfe00bbce4387fb98d331217e988aea8678054e5c9f1c98b73563bfb53e3a93f2122da2cfdf899bc39fd0a603b56cd4ab9b535e856367 SHA512 75ed7274f0b8ea11ba1fb50ccfadba104f5fe2fad0aa45c8f8c1a30ead7868e140903b90c25f39a35af665edcad1fd9038810a4ec1cd75b40c03d31122cbf5b8 -EBUILD pyyaml-6.0.ebuild 1316 BLAKE2B b5f7b85b09c77f35e19496271b3ebfe469f1b4e234ffe7477dc1b5c400f5ae417165c37987dacde07484143bf9e4cbb41e30e8e122863962bfab569376be0cff SHA512 c73adf0ac4e60cf90915ef8593fffdd8a9a542d3bfdcb0a28c739bd1a856b0183938f76f1614f78e18a4a2a014b22a747f05efbe6362e7cc4eba2b9e63dd53e8 -MISC metadata.xml 521 BLAKE2B c10b7a0c805b705894457b699d5f352d45a41c025abc307d19068de5ba27a9360bda7ea60343bb12c798626c27b30156e3f749af8ae33ee768ea3698631ef64e SHA512 702a2308f05cb6d8fa0ef2bcf281392edfda73d18a03f8180a5c3647e5211df7422857c1e0ab14bbc4547a1d78f2eefbae73f7ddeb811345aa33d4692a402025 +EBUILD pyyaml-6.0-r1.ebuild 1014 BLAKE2B 728b2e2c697741bde82374965aaee6341f9f0e5b767c13b1e014cbe303f9623f74b27cf43207d2382e2b2b023af0d737403981bca761df27fb33c2b2d5d9fbe4 SHA512 667c7d30921f2e4b21cd1b042fc3a4fb9835670dc6b855009bb51b01c0c320b87557d9e5163ad44624ae997c76129ce115aa4bf4fcb62fb90fe32039659e349b +EBUILD pyyaml-6.0.ebuild 1323 BLAKE2B 073f228376d18a696d7503b661b6b088a39ef5d3511505ae6f18bdbdb122b72dbddee3c4a265d80a9750ac941b1941c2f7edf6b70cf6308e376a5851ec5acfb8 SHA512 950e2cd60852e0f3ef9bb9bc11dd2f63b815b5a26c8a5feed4b2a11080a91c1ec82c3b6436a04cc59ad0970fbbfaa04e6e880bed21035371b7c29b242c9835b0 +MISC metadata.xml 426 BLAKE2B 6216e38c3e79e811aced6c777b49779953abf4f1b0a1185947f6a6fdc851fdf4cc973092024a6cb2d76bf06863feb49742c7a6892a8761b48a5e74902757a610 SHA512 f549b70fcf1588625fcc2bc33ad0c41faa267ad5bb84d564f5502dee1ad2340a663d1a2b92cf9fdeed827a5f7cebdbe76d59166e89de6d03e7933141029c051d 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 deleted file mode 100644 index 28626ba9e974..000000000000 --- a/dev-python/pyyaml/files/pyyaml-5.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/metadata.xml b/dev-python/pyyaml/metadata.xml index 96c887521e1a..ceaaa2ef50fb 100644 --- a/dev-python/pyyaml/metadata.xml +++ b/dev-python/pyyaml/metadata.xml @@ -5,9 +5,6 @@ python@gentoo.org Python - - enable support for C implementation using libyaml - cpe:/a:pyyaml_project:pyyaml PyYAML diff --git a/dev-python/pyyaml/pyyaml-5.4.1.ebuild b/dev-python/pyyaml/pyyaml-5.4.1.ebuild deleted file mode 100644 index c702311e7455..000000000000 --- a/dev-python/pyyaml/pyyaml-5.4.1.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7..10} pypy3 ) -inherit distutils-r1 - -DESCRIPTION="YAML parser and emitter for Python" -HOMEPAGE="https://pyyaml.org/wiki/PyYAML - https://pypi.org/project/PyYAML/ - https://github.com/yaml/pyyaml" -SRC_URI="https://github.com/yaml/pyyaml/archive/${PV}.tar.gz -> ${P}.gh.tar.gz" - -LICENSE="MIT" -SLOT="0" -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" -IUSE="examples +libyaml" - -BDEPEND=" - libyaml? ( - $(python_gen_cond_dep ' - dev-python/cython[${PYTHON_USEDEP}] - ' 'python*') - ) -" -RDEPEND="libyaml? ( dev-libs/libyaml:= )" -DEPEND="${RDEPEND}" - -PATCHES=( - # bug #659348 - "${FILESDIR}/pyyaml-5.1-cve-2017-18342.patch" -) - -distutils_enable_tests setup.py - -python_configure_all() { - mydistutilsargs=( $(use_with libyaml) ) -} - -python_install_all() { - distutils-r1_python_install_all - if use examples; then - dodoc -r examples - docompress -x /usr/share/doc/${PF} - fi -} diff --git a/dev-python/pyyaml/pyyaml-6.0-r1.ebuild b/dev-python/pyyaml/pyyaml-6.0-r1.ebuild new file mode 100644 index 000000000000..b9fb87af60eb --- /dev/null +++ b/dev-python/pyyaml/pyyaml-6.0-r1.ebuild @@ -0,0 +1,49 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{8..11} pypy3 ) + +inherit distutils-r1 + +DESCRIPTION="YAML parser and emitter for Python" +HOMEPAGE=" + https://pyyaml.org/wiki/PyYAML + https://pypi.org/project/PyYAML/ + https://github.com/yaml/pyyaml/ +" +SRC_URI=" + https://github.com/yaml/pyyaml/archive/${PV}.tar.gz + -> ${P}.gh.tar.gz +" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris" +IUSE="examples" + +DEPEND=" + dev-libs/libyaml:= +" +RDEPEND=" + ${DEPEND} +" +BDEPEND=" + dev-python/cython[${PYTHON_USEDEP}] +" + +distutils_enable_tests setup.py + +src_configure() { + export PYYAML_FORCE_CYTHON=1 +} + +python_install_all() { + distutils-r1_python_install_all + if use examples; then + dodoc -r examples + docompress -x /usr/share/doc/${PF} + fi +} diff --git a/dev-python/pyyaml/pyyaml-6.0.ebuild b/dev-python/pyyaml/pyyaml-6.0.ebuild index 4517a49cbc90..75fc788295b0 100644 --- a/dev-python/pyyaml/pyyaml-6.0.ebuild +++ b/dev-python/pyyaml/pyyaml-6.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -15,7 +15,7 @@ SRC_URI="https://github.com/yaml/pyyaml/archive/${PV}.tar.gz -> ${P}.gh.tar.gz" LICENSE="MIT" SLOT="0" -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" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris" IUSE="examples" RDEPEND="dev-libs/libyaml:=" -- cgit v1.2.3