Updated flexget / certbot

2019-10-05 17:35:18 +02:00
parent 0dfe6c9adf
commit a14af22c9a
23 changed files with 447 additions and 142 deletions
@@ -0,0 +1,4 @@
+AUX pyyaml-5.1-cve-2017-18342.patch 1420 BLAKE2B bf053ed121355aea1e44f9bd29b22c9afbca7b99b68e59a6e213d2723531044049964dcb20dbc036ee27ae8bcc2c26e317cf080637e611fa0105a9d451496125 SHA512 8e7737761555d851b21ca61128d2ced4163d446acb87510b6962a20dc217923bcf835d70224c9e721486351e0aeb57f9f3c570b57086a0a00c3e8ac656a458c5
+DIST PyYAML-5.1.2.tar.gz 265034 BLAKE2B a3f6fe4a0c0a24f8934b94545e7727fad26b397755416a8127bd52fd9ea5e8fea3c6452ddfbd91edfa2e8ca88522b1ae9061c9221f394c8fa4cbd1c2dc256f72 SHA512 b5ee201c612486a95c87b7e41d474313160284359b8b30ababc80b51325aef9dd7dc27eb3b8a03a4749cb8c7e3789c5684d5c285fe35d4b20be1f189641531e0
+EBUILD pyyaml-5.1.2.ebuild 1153 BLAKE2B 2fc4bec2f14d5982d433b0564d4a735fe0254107403a0006bc5d69ef6836d542193e6636cbe4ecb60165236f9b8a4b9d263db162837d64db24a31a527c80bb77 SHA512 df0e89caac252e76cc703e969a51ae1844654a5adefe698a89571c101eac7503740ddc39b21e887b0b5ce303afa037e6bf10320eba0f49a65950c86a647b988b
+MISC metadata.xml 345 BLAKE2B 8c26b8b05b08ed9abab5ed2cb36552dc9af33ee2b30cf3ebe551576d7ad44908b3dff195cd7f1a3f5af9323d17eadee407e42bfeb99150be2a0ac4b48653c1eb SHA512 1fdee5219c989b3edf11bdb63264c6ca6bd54fb1f44907bf20ce7ee6b1968c9c6f2c94363698be87d92eb6cd07a034acca7dbcffaeac40d2add8d57a240772da
@@ -0,0 +1,40 @@
+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
+ 
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <use>
+    <flag name="libyaml">enable support for C implementation using libyaml</flag>
+  </use>
+</pkgmetadata>
@@ -0,0 +1,46 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+
+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="https://pyyaml.org/download/${PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+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}/${PN}-5.1-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
+}