* [gentoo-commits] repo/gentoo:master commit in: dev-python/pycurl/, dev-python/pycurl/files/
@ 2017-01-31 10:19 Patrice Clement
0 siblings, 0 replies; 4+ messages in thread
From: Patrice Clement @ 2017-01-31 10:19 UTC (permalink / raw
To: gentoo-commits
commit: afeac9b0fb8bded5449791dd33952cd97ab836b8
Author: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 31 10:19:35 2017 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Tue Jan 31 10:19:35 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=afeac9b0
dev-python/pycurl: remove vulnerable versions.
Gentoo-Bug: https://bugs.gentoo.org/564768
Package-Manager: portage-2.3.3
dev-python/pycurl/Manifest | 4 --
.../pycurl/files/pycurl-7.19.3.1-ssl-test.patch | 64 -------------------
.../files/pycurl-7.19.5.1-py3.5-backport.patch | 15 -----
dev-python/pycurl/pycurl-7.19.3.1-r2.ebuild | 64 -------------------
dev-python/pycurl/pycurl-7.19.5.1-r1.ebuild | 73 ----------------------
dev-python/pycurl/pycurl-7.19.5.1.ebuild | 64 -------------------
dev-python/pycurl/pycurl-7.19.5.3.ebuild | 71 ---------------------
dev-python/pycurl/pycurl-7.21.5.ebuild | 71 ---------------------
8 files changed, 426 deletions(-)
diff --git a/dev-python/pycurl/Manifest b/dev-python/pycurl/Manifest
index 2b337fa..0e24462 100644
--- a/dev-python/pycurl/Manifest
+++ b/dev-python/pycurl/Manifest
@@ -1,5 +1 @@
-DIST pycurl-7.19.3.1.tar.gz 116687 SHA256 c0d673fe99a9de07239eabe77c798f1b043f60c02afaec1430ceaf59d7501a4f SHA512 65ccb07638c663bc2a723664f1ade50f08eafa70bbcdc492cc99362a91873f453b63336a6b393d9f6591308f1450dadc64ce729b29990f37b170dda0eae0b23f WHIRLPOOL bf25bbb959e30140a261b9bede2e1a3675ec99c8f6c36f8afc8ca73288aa7f7cea6fa1d28385ca808872b251a676aebf8d77d203aed60619dab8852cac17b296
-DIST pycurl-7.19.5.1.tar.gz 142140 SHA256 6e9770f80459757f73bd71af82fbb29cd398b38388cdf1beab31ea91a331bc6c SHA512 89a474d7285cb040099dc6107a238f326dcb22cdb2c2325139f0d7ebea56f0860869d20b6e8e3bb43882048a261a8ff5734c7fc3e790fde8a96de3fffd04894f WHIRLPOOL 87eac50707acb4d764941e334a490d1c72c28433e8ff72caa7811f23d3f8ab2c6949a25ba8edd0cdacb27e498e60e728745c787a05853f1428ede8d91294a5cc
-DIST pycurl-7.19.5.3.tar.gz 154800 SHA256 24f6c4016b1dd2a5e29d1b025ac2ad61f80c17adfdcf8a7f47aefab63ace78d7 SHA512 f7e65e0c6f7d1666ed3bebc4fabb41205f6dadd96d80fb5d1985c13ab28d35effef2966e961383e01881648fca4a4d500e9692d712888313dbe164b2c651530c WHIRLPOOL c5fe1cc232bae07dfc63e1a8a3b0929b3c1bbf7adf29c2b6085e5bc1e97656d6f5afc236974bfc3febdd2ab4fe1b7cce08c96d4a8eba5ba870505c7c423badeb
-DIST pycurl-7.21.5.tar.gz 170962 SHA256 8a1e0eb55573388275a1d6c2534ca4cfca5d7fa772b99b505c08fa149b27aed0 SHA512 0f07b9e2256e4e019bf0ac85d9ca2fff56cffd49986495f2235f91e341ed937c9895da1636548be90523404027d063d83910055899e178e653842bc5de4151c4 WHIRLPOOL 2e46b5e16181d3cc66be56b38d40f4b7fd2ff7b9574fc4214247140a43ce70c0eac71d793ceddd24ff05bf784a1e8105c315fa4a7b0460bd908901b159e6655d
DIST pycurl-7.43.0.tar.gz 182522 SHA256 aa975c19b79b6aa6c0518c0cc2ae33528900478f0b500531dbcdbf05beec584c SHA512 7442462c74c19964b9d72976e9b92bf68bb37debc1401bc399590bea42704065da13d6de710e795eeae79a4651b9a08841d50454243cb0994c7eb1c1bab233a5 WHIRLPOOL 640ef7669273bccdf72f0d98bd5f5c9d882f35ac507d2152f8ab1e2e680298ebe2691b4960713bb39b0a405ba8d0e9a03d69617c5150bb65581efaab99304185
diff --git a/dev-python/pycurl/files/pycurl-7.19.3.1-ssl-test.patch b/dev-python/pycurl/files/pycurl-7.19.3.1-ssl-test.patch
deleted file mode 100644
index c7e1580..00000000
--- a/dev-python/pycurl/files/pycurl-7.19.3.1-ssl-test.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-https://github.com/p-push/pycurl/commit/8644393bec56cd05c19d5dbe420ff741ba899d10
-diff --git a/tests/runwsgi.py b/tests/runwsgi.py
-index f419d7c..242ef1d 100644
---- a/tests/runwsgi.py
-+++ b/tests/runwsgi.py
-@@ -11,6 +11,10 @@
-
- class Server(bottle.WSGIRefServer):
- def run(self, handler): # pragma: no cover
-+ self.srv = self.make_server(handler)
-+ self.serve()
-+
-+ def make_server(self, handler):
- from wsgiref.simple_server import make_server, WSGIRequestHandler
- if self.quiet:
- base = self.options.get('handler_class', WSGIRequestHandler)
-@@ -18,7 +22,10 @@ class QuietHandler(base):
- def log_request(*args, **kw):
- pass
- self.options['handler_class'] = QuietHandler
-- self.srv = make_server(self.host, self.port, handler, **self.options)
-+ srv = make_server(self.host, self.port, handler, **self.options)
-+ return srv
-+
-+ def serve(self):
- if sys.version_info[0] == 2 and sys.version_info[1] < 6:
- # python 2.5 has no poll_interval
- # and thus no way to stop the server
-@@ -27,20 +34,21 @@ def log_request(*args, **kw):
- else:
- self.srv.serve_forever(poll_interval=0.1)
-
--class SslServer(bottle.CherryPyServer):
-- def run(self, handler):
-- import cherrypy.wsgiserver, cherrypy.wsgiserver.ssl_builtin
-- server = cherrypy.wsgiserver.CherryPyWSGIServer((self.host, self.port), handler)
-+# http://www.socouldanyone.com/2014/01/bottle-with-ssl.html
-+# https://github.com/mfm24/miscpython/blob/master/bottle_ssl.py
-+class SslServer(Server):
-+ def run(self, handler): # pragma: no cover
-+ self.srv = self.make_server(handler)
-+
-+ import ssl
- cert_dir = os.path.join(os.path.dirname(__file__), 'certs')
-- ssl_adapter = cherrypy.wsgiserver.ssl_builtin.BuiltinSSLAdapter(
-- os.path.join(cert_dir, 'server.crt'),
-- os.path.join(cert_dir, 'server.key'),
-- )
-- server.ssl_adapter = ssl_adapter
-- try:
-- server.start()
-- finally:
-- server.stop()
-+ self.srv.socket = ssl.wrap_socket(
-+ self.srv.socket,
-+ keyfile=os.path.join(cert_dir, 'server.key'),
-+ certfile=os.path.join(cert_dir, 'server.crt'),
-+ server_side=True)
-+
-+ self.serve()
-
- def start_bottle_server(app, port, server, **kwargs):
- server_thread = ServerThread(app, port, server, kwargs)
-
diff --git a/dev-python/pycurl/files/pycurl-7.19.5.1-py3.5-backport.patch b/dev-python/pycurl/files/pycurl-7.19.5.1-py3.5-backport.patch
deleted file mode 100644
index 0bc6f6c..00000000
--- a/dev-python/pycurl/files/pycurl-7.19.5.1-py3.5-backport.patch
+++ /dev/null
@@ -1,15 +0,0 @@
- tests/memory_mgmt_test.py | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/tests/memory_mgmt_test.py b/tests/memory_mgmt_test.py
-index 08636ae..a7b8a21 100644
---- a/tests/memory_mgmt_test.py
-+++ b/tests/memory_mgmt_test.py
-@@ -258,4 +258,6 @@ class MemoryMgmtTest(unittest.TestCase):
-
- gc.collect()
- new_object_count = len(gc.get_objects())
-- self.assertEqual(new_object_count, object_count)
-+ # it seems that GC sometimes collects something that existed
-+ # before this test ran, GH issues #273/#274
-+ self.assertTrue(new_object_count in (object_count, object_count-1))
diff --git a/dev-python/pycurl/pycurl-7.19.3.1-r2.ebuild b/dev-python/pycurl/pycurl-7.19.3.1-r2.ebuild
deleted file mode 100644
index da04b60..00000000
--- a/dev-python/pycurl/pycurl-7.19.3.1-r2.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-EAPI=5
-
-# The selftests fail with pypy, and urlgrabber segfaults for me.
-PYTHON_COMPAT=( python{2_7,3_4} )
-
-inherit distutils-r1
-
-DESCRIPTION="python binding for curl/libcurl"
-HOMEPAGE="https://github.com/pycurl/pycurl https://pypi.python.org/pypi/pycurl"
-SRC_URI="http://pycurl.sourceforge.net/download/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="curl_ssl_gnutls curl_ssl_nss +curl_ssl_openssl examples ssl test"
-
-# Depend on a curl with curl_ssl_* USE flags.
-# libcurl must not be using an ssl backend we do not support.
-# If the libcurl ssl backend changes pycurl should be recompiled.
-# If curl uses gnutls, depend on at least gnutls 2.11.0 so that pycurl
-# does not need to initialize gcrypt threading and we do not need to
-# explicitly link to libgcrypt.
-RDEPEND=">=net-misc/curl-7.25.0-r1[ssl=]
- ssl? (
- net-misc/curl[curl_ssl_gnutls(-)=,curl_ssl_nss(-)=,curl_ssl_openssl(-)=,-curl_ssl_axtls(-),-curl_ssl_cyassl(-),-curl_ssl_polarssl(-)]
- curl_ssl_gnutls? ( >=net-libs/gnutls-2.11.0 ) )"
-
-# bottle-0.12.7: https://github.com/pycurl/pycurl/issues/180
-# bottle-0.12.7: https://github.com/defnull/bottle/commit/f35197e2a18de1672831a70a163fcfd38327a802
-DEPEND="${RDEPEND}
- test? ( dev-python/nose[${PYTHON_USEDEP}]
- >=dev-python/bottle-0.12.7[${PYTHON_USEDEP}] )"
-# Needed for individual runs of testsuite by python impls.
-DISTUTILS_IN_SOURCE_BUILD=1
-
-PATCHES=( "${FILESDIR}"/${P}-ssl-test.patch )
-
-python_prepare_all() {
- sed -e "/setup_args\['data_files'\] = /d" -i setup.py || die
- distutils-r1_python_prepare_all
-}
-
-src_configure() {
- # Override faulty detection in setup.py, bug 510974.
- export PYCURL_SSL_LIBRARY=${CURL_SSL}
-}
-
-python_compile() {
- python_is_python3 || local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
- distutils-r1_python_compile
-}
-
-python_test() {
- emake test
-}
-
-python_install_all() {
- local HTML_DOCS=( doc/. )
- use examples && local EXAMPLES=( examples/. )
- distutils-r1_python_install_all
-}
diff --git a/dev-python/pycurl/pycurl-7.19.5.1-r1.ebuild b/dev-python/pycurl/pycurl-7.19.5.1-r1.ebuild
deleted file mode 100644
index 1ae172c..00000000
--- a/dev-python/pycurl/pycurl-7.19.5.1-r1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-EAPI=5
-
-# The selftests fail with pypy, and urlgrabber segfaults for me.
-PYTHON_COMPAT=( python2_7 python3_{4,5} )
-
-inherit distutils-r1
-
-DESCRIPTION="python binding for curl/libcurl"
-HOMEPAGE="https://github.com/pycurl/pycurl https://pypi.python.org/pypi/pycurl"
-SRC_URI="http://pycurl.sourceforge.net/download/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="curl_ssl_gnutls curl_ssl_libressl curl_ssl_nss +curl_ssl_openssl examples ssl test"
-
-# Depend on a curl with curl_ssl_* USE flags.
-# libcurl must not be using an ssl backend we do not support.
-# If the libcurl ssl backend changes pycurl should be recompiled.
-# If curl uses gnutls, depend on at least gnutls 2.11.0 so that pycurl
-# does not need to initialize gcrypt threading and we do not need to
-# explicitly link to libgcrypt.
-RDEPEND="
- >=net-misc/curl-7.25.0-r1[ssl=]
- ssl? (
- net-misc/curl[curl_ssl_gnutls(-)=,curl_ssl_libressl(-)=,curl_ssl_nss(-)=,curl_ssl_openssl(-)=,-curl_ssl_axtls(-),-curl_ssl_cyassl(-),-curl_ssl_polarssl(-)]
- curl_ssl_gnutls? ( >=net-libs/gnutls-2.11.0 )
- )"
-
-# bottle-0.12.7: https://github.com/pycurl/pycurl/issues/180
-# bottle-0.12.7: https://github.com/defnull/bottle/commit/f35197e2a18de1672831a70a163fcfd38327a802
-DEPEND="${RDEPEND}
- test? (
- dev-python/nose[${PYTHON_USEDEP}]
- >=dev-python/bottle-0.12.7[${PYTHON_USEDEP}]
- )"
-# Needed for individual runs of testsuite by python impls.
-DISTUTILS_IN_SOURCE_BUILD=1
-
-PATCHES=(
- "${FILESDIR}"/${P}-py3.5-backport.patch
-)
-
-python_prepare_all() {
- sed -e "/setup_args\['data_files'\] = /d" -i setup.py || die
- distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
- # Override faulty detection in setup.py, bug 510974.
- export PYCURL_SSL_LIBRARY=${CURL_SSL/libressl/openssl}
-}
-
-python_compile() {
- python_is_python3 || local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
- distutils-r1_python_compile
-}
-
-python_test() {
- # Python3.5 test problems
- # https://github.com/pycurl/pycurl/issues/273
- # https://github.com/pycurl/pycurl/issues/274
- emake -j1 do-test
-}
-
-python_install_all() {
- local HTML_DOCS=( doc/. )
- use examples && local EXAMPLES=( examples/. )
- distutils-r1_python_install_all
-}
diff --git a/dev-python/pycurl/pycurl-7.19.5.1.ebuild b/dev-python/pycurl/pycurl-7.19.5.1.ebuild
deleted file mode 100644
index e1c2ed0..00000000
--- a/dev-python/pycurl/pycurl-7.19.5.1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-EAPI=5
-
-# The selftests fail with pypy, and urlgrabber segfaults for me.
-PYTHON_COMPAT=( python2_7 python3_4 )
-
-inherit distutils-r1
-
-DESCRIPTION="python binding for curl/libcurl"
-HOMEPAGE="https://github.com/pycurl/pycurl https://pypi.python.org/pypi/pycurl"
-SRC_URI="http://pycurl.sourceforge.net/download/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="curl_ssl_gnutls curl_ssl_nss +curl_ssl_openssl examples ssl test"
-
-# Depend on a curl with curl_ssl_* USE flags.
-# libcurl must not be using an ssl backend we do not support.
-# If the libcurl ssl backend changes pycurl should be recompiled.
-# If curl uses gnutls, depend on at least gnutls 2.11.0 so that pycurl
-# does not need to initialize gcrypt threading and we do not need to
-# explicitly link to libgcrypt.
-RDEPEND=">=net-misc/curl-7.25.0-r1[ssl=]
- ssl? (
- net-misc/curl[curl_ssl_gnutls(-)=,curl_ssl_nss(-)=,curl_ssl_openssl(-)=,-curl_ssl_axtls(-),-curl_ssl_cyassl(-),-curl_ssl_polarssl(-)]
- curl_ssl_gnutls? ( >=net-libs/gnutls-2.11.0 ) )"
-
-# bottle-0.12.7: https://github.com/pycurl/pycurl/issues/180
-# bottle-0.12.7: https://github.com/defnull/bottle/commit/f35197e2a18de1672831a70a163fcfd38327a802
-DEPEND="${RDEPEND}
- test? (
- dev-python/nose[${PYTHON_USEDEP}]
- >=dev-python/bottle-0.12.7[${PYTHON_USEDEP}]
- )"
-# Needed for individual runs of testsuite by python impls.
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_prepare_all() {
- sed -e "/setup_args\['data_files'\] = /d" -i setup.py || die
- distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
- # Override faulty detection in setup.py, bug 510974.
- export PYCURL_SSL_LIBRARY=${CURL_SSL}
-}
-
-python_compile() {
- python_is_python3 || local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
- distutils-r1_python_compile
-}
-
-python_test() {
- emake -j1 do-test
-}
-
-python_install_all() {
- local HTML_DOCS=( doc/. )
- use examples && local EXAMPLES=( examples/. )
- distutils-r1_python_install_all
-}
diff --git a/dev-python/pycurl/pycurl-7.19.5.3.ebuild b/dev-python/pycurl/pycurl-7.19.5.3.ebuild
deleted file mode 100644
index 8889d08..00000000
--- a/dev-python/pycurl/pycurl-7.19.5.3.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-# The selftests fail with pypy, and urlgrabber segfaults for me.
-PYTHON_COMPAT=( python2_7 python3_{4,5} )
-
-inherit distutils-r1
-
-DESCRIPTION="python binding for curl/libcurl"
-HOMEPAGE="https://github.com/pycurl/pycurl https://pypi.python.org/pypi/pycurl"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="curl_ssl_gnutls curl_ssl_libressl curl_ssl_nss +curl_ssl_openssl examples ssl test"
-
-# Depend on a curl with curl_ssl_* USE flags.
-# libcurl must not be using an ssl backend we do not support.
-# If the libcurl ssl backend changes pycurl should be recompiled.
-# If curl uses gnutls, depend on at least gnutls 2.11.0 so that pycurl
-# does not need to initialize gcrypt threading and we do not need to
-# explicitly link to libgcrypt.
-RDEPEND="
- >=net-misc/curl-7.25.0-r1[ssl=]
- ssl? (
- net-misc/curl[curl_ssl_gnutls(-)=,curl_ssl_libressl(-)=,curl_ssl_nss(-)=,curl_ssl_openssl(-)=,-curl_ssl_axtls(-),-curl_ssl_cyassl(-),-curl_ssl_polarssl(-)]
- curl_ssl_gnutls? ( >=net-libs/gnutls-2.11.0 )
- )"
-
-# bottle-0.12.7: https://github.com/pycurl/pycurl/issues/180
-# bottle-0.12.7: https://github.com/defnull/bottle/commit/f35197e2a18de1672831a70a163fcfd38327a802
-DEPEND="${RDEPEND}
- test? (
- dev-python/bottle[${PYTHON_USEDEP}]
- dev-python/flaky[${PYTHON_USEDEP}]
- dev-python/nose[${PYTHON_USEDEP}]
- net-misc/curl[curl_ssl_gnutls(-)=,curl_ssl_libressl(-)=,curl_ssl_nss(-)=,curl_ssl_openssl(-)=,-curl_ssl_axtls(-),-curl_ssl_cyassl(-),-curl_ssl_polarssl(-),kerberos]
- >=dev-python/bottle-0.12.7[${PYTHON_USEDEP}]
- )"
-# Needed for individual runs of testsuite by python impls.
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_prepare_all() {
- sed -e "/setup_args\['data_files'\] = /d" -i setup.py || die
- sed -e '/pyflakes/d' -i Makefile || die
- distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
- # Override faulty detection in setup.py, bug 510974.
- export PYCURL_SSL_LIBRARY=${CURL_SSL/libressl/openssl}
-}
-
-python_compile() {
- python_is_python3 || local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
- distutils-r1_python_compile
-}
-
-python_test() {
- emake -j1 do-test
-}
-
-python_install_all() {
- local HTML_DOCS=( doc/. )
- use examples && local EXAMPLES=( examples/. )
- distutils-r1_python_install_all
-}
diff --git a/dev-python/pycurl/pycurl-7.21.5.ebuild b/dev-python/pycurl/pycurl-7.21.5.ebuild
deleted file mode 100644
index 8889d08..00000000
--- a/dev-python/pycurl/pycurl-7.21.5.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-# The selftests fail with pypy, and urlgrabber segfaults for me.
-PYTHON_COMPAT=( python2_7 python3_{4,5} )
-
-inherit distutils-r1
-
-DESCRIPTION="python binding for curl/libcurl"
-HOMEPAGE="https://github.com/pycurl/pycurl https://pypi.python.org/pypi/pycurl"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="curl_ssl_gnutls curl_ssl_libressl curl_ssl_nss +curl_ssl_openssl examples ssl test"
-
-# Depend on a curl with curl_ssl_* USE flags.
-# libcurl must not be using an ssl backend we do not support.
-# If the libcurl ssl backend changes pycurl should be recompiled.
-# If curl uses gnutls, depend on at least gnutls 2.11.0 so that pycurl
-# does not need to initialize gcrypt threading and we do not need to
-# explicitly link to libgcrypt.
-RDEPEND="
- >=net-misc/curl-7.25.0-r1[ssl=]
- ssl? (
- net-misc/curl[curl_ssl_gnutls(-)=,curl_ssl_libressl(-)=,curl_ssl_nss(-)=,curl_ssl_openssl(-)=,-curl_ssl_axtls(-),-curl_ssl_cyassl(-),-curl_ssl_polarssl(-)]
- curl_ssl_gnutls? ( >=net-libs/gnutls-2.11.0 )
- )"
-
-# bottle-0.12.7: https://github.com/pycurl/pycurl/issues/180
-# bottle-0.12.7: https://github.com/defnull/bottle/commit/f35197e2a18de1672831a70a163fcfd38327a802
-DEPEND="${RDEPEND}
- test? (
- dev-python/bottle[${PYTHON_USEDEP}]
- dev-python/flaky[${PYTHON_USEDEP}]
- dev-python/nose[${PYTHON_USEDEP}]
- net-misc/curl[curl_ssl_gnutls(-)=,curl_ssl_libressl(-)=,curl_ssl_nss(-)=,curl_ssl_openssl(-)=,-curl_ssl_axtls(-),-curl_ssl_cyassl(-),-curl_ssl_polarssl(-),kerberos]
- >=dev-python/bottle-0.12.7[${PYTHON_USEDEP}]
- )"
-# Needed for individual runs of testsuite by python impls.
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_prepare_all() {
- sed -e "/setup_args\['data_files'\] = /d" -i setup.py || die
- sed -e '/pyflakes/d' -i Makefile || die
- distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
- # Override faulty detection in setup.py, bug 510974.
- export PYCURL_SSL_LIBRARY=${CURL_SSL/libressl/openssl}
-}
-
-python_compile() {
- python_is_python3 || local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
- distutils-r1_python_compile
-}
-
-python_test() {
- emake -j1 do-test
-}
-
-python_install_all() {
- local HTML_DOCS=( doc/. )
- use examples && local EXAMPLES=( examples/. )
- distutils-r1_python_install_all
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/pycurl/, dev-python/pycurl/files/
@ 2020-08-27 5:55 Michał Górny
0 siblings, 0 replies; 4+ messages in thread
From: Michał Górny @ 2020-08-27 5:55 UTC (permalink / raw
To: gentoo-commits
commit: 4af3cd5c7df291ed2093f0b60ffbcca01322ec65
Author: Stefan Strogin <steils <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 26 23:23:35 2020 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Aug 27 05:54:34 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4af3cd5c
dev-python/pycurl: add patch for multiple SSL backends
net-misc/curl supports multiple SSL backends since 5e560782
"net-misc/curl: enable multiple ssl implementations", which is supported
in curl since 7.56.
pycurl supporting this feature is not released yet, so with the latest
pycurl users could get an error like:
ImportError: pycurl: libcurl link-time ssl backend (gnutls) is
different from compile-time ssl backend (openssl)
Add patch from upstream to support multiple SSL backend in pycurl.
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Stefan Strogin <steils <AT> gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/17272
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
.../files/pycurl-7.43.0.5-multiple-ssl.patch | 146 +++++++++++++++++++++
dev-python/pycurl/pycurl-7.43.0.5-r1.ebuild | 93 +++++++++++++
2 files changed, 239 insertions(+)
diff --git a/dev-python/pycurl/files/pycurl-7.43.0.5-multiple-ssl.patch b/dev-python/pycurl/files/pycurl-7.43.0.5-multiple-ssl.patch
new file mode 100644
index 00000000000..035ad6f9ca3
--- /dev/null
+++ b/dev-python/pycurl/files/pycurl-7.43.0.5-multiple-ssl.patch
@@ -0,0 +1,146 @@
+From 290d762ea13a1d95affa0888c5450b33b00241e8 Mon Sep 17 00:00:00 2001
+From: Bo Anderson <mail@boanderson.me>
+Date: Tue, 21 Jul 2020 18:28:31 +0100
+Subject: [PATCH] Handle MultiSSL
+
+Upstream-Status: Accepted [https://github.com/pycurl/pycurl/pull/639]
+Signed-off-by: Stefan Strogin <steils@gentoo.org>
+---
+ src/module.c | 41 ++++++++++++++++++++++++++++++++++++++++-
+ src/pycurl.h | 11 +++++++++++
+ 2 files changed, 51 insertions(+), 1 deletion(-)
+
+diff --git a/src/module.c b/src/module.c
+index 23387ec..dbc5b0c 100644
+--- a/src/module.c
++++ b/src/module.c
+@@ -322,12 +322,21 @@ initpycurl(void)
+ {
+ PyObject *m, *d;
+ const curl_version_info_data *vi;
+- const char *libcurl_version, *runtime_ssl_lib;
++ const char *libcurl_version;
+ size_t libcurl_version_len, pycurl_version_len;
+ PyObject *xio_module = NULL;
+ PyObject *collections_module = NULL;
+ PyObject *named_tuple = NULL;
+ PyObject *arglist = NULL;
++#ifdef HAVE_CURL_GLOBAL_SSLSET
++ const curl_ssl_backend **ssllist = NULL;
++ CURLsslset sslset;
++ int i, runtime_supported_backend_found = 0;
++ char backends[200];
++ size_t backends_len = 0;
++#else
++ const char *runtime_ssl_lib;
++#endif
+
+ assert(Curl_Type.tp_weaklistoffset > 0);
+ assert(CurlMulti_Type.tp_weaklistoffset > 0);
+@@ -346,6 +355,35 @@ initpycurl(void)
+ }
+
+ /* Our compiled crypto locks should correspond to runtime ssl library. */
++#ifdef HAVE_CURL_GLOBAL_SSLSET
++ sslset = curl_global_sslset(-1, COMPILE_SSL_LIB, &ssllist);
++ if (sslset != CURLSSLSET_OK) {
++ if (sslset == CURLSSLSET_NO_BACKENDS) {
++ strcpy(backends, "none");
++ } else {
++ for (i = 0; ssllist[i] != NULL; i++) {
++ switch (ssllist[i]->id) {
++ case CURLSSLBACKEND_OPENSSL:
++ case CURLSSLBACKEND_GNUTLS:
++ case CURLSSLBACKEND_NSS:
++ case CURLSSLBACKEND_WOLFSSL:
++ case CURLSSLBACKEND_MBEDTLS:
++ runtime_supported_backend_found = 1;
++ break;
++ default:
++ break;
++ }
++ if (backends_len < sizeof(backends)) {
++ backends_len += snprintf(backends + backends_len, sizeof(backends) - backends_len, "%s%s", (i > 0) ? ", " : "", ssllist[i]->name);
++ }
++ }
++ }
++ if (runtime_supported_backend_found == COMPILE_SUPPORTED_SSL_BACKEND_FOUND) {
++ PyErr_Format(PyExc_ImportError, "pycurl: libcurl link-time ssl backends (%s) do not include compile-time ssl backend (%s)", backends, COMPILE_SSL_LIB);
++ goto error;
++ }
++ }
++#else
+ if (vi->ssl_version == NULL) {
+ runtime_ssl_lib = "none/other";
+ } else if (!strncmp(vi->ssl_version, "OpenSSL/", 8) || !strncmp(vi->ssl_version, "LibreSSL/", 9) ||
+@@ -366,6 +404,7 @@ initpycurl(void)
+ PyErr_Format(PyExc_ImportError, "pycurl: libcurl link-time ssl backend (%s) is different from compile-time ssl backend (%s)", runtime_ssl_lib, COMPILE_SSL_LIB);
+ goto error;
+ }
++#endif
+
+ /* Initialize the type of the new type objects here; doing it here
+ * is required for portability to Windows without requiring C++. */
+diff --git a/src/pycurl.h b/src/pycurl.h
+index 02db495..a83c85b 100644
+--- a/src/pycurl.h
++++ b/src/pycurl.h
+@@ -154,6 +154,10 @@ pycurl_inet_ntop (int family, void *addr, char *string, size_t string_size);
+ #define HAVE_CURLINFO_HTTP_VERSION
+ #endif
+
++#if LIBCURL_VERSION_NUM >= 0x073800 /* check for 7.56.0 or greater */
++#define HAVE_CURL_GLOBAL_SSLSET
++#endif
++
+ #undef UNUSED
+ #define UNUSED(var) ((void)&var)
+
+@@ -165,6 +169,7 @@ pycurl_inet_ntop (int family, void *addr, char *string, size_t string_size);
+ # include <openssl/ssl.h>
+ # include <openssl/err.h>
+ # define COMPILE_SSL_LIB "openssl"
++# define COMPILE_SUPPORTED_SSL_BACKEND_FOUND 1
+ # elif defined(HAVE_CURL_WOLFSSL)
+ # include <wolfssl/options.h>
+ # if defined(OPENSSL_EXTRA)
+@@ -187,6 +192,7 @@ pycurl_inet_ntop (int family, void *addr, char *string, size_t string_size);
+ # endif
+ # endif
+ # define COMPILE_SSL_LIB "wolfssl"
++# define COMPILE_SUPPORTED_SSL_BACKEND_FOUND 1
+ # elif defined(HAVE_CURL_GNUTLS)
+ # include <gnutls/gnutls.h>
+ # if GNUTLS_VERSION_NUMBER <= 0x020b00
+@@ -195,13 +201,16 @@ pycurl_inet_ntop (int family, void *addr, char *string, size_t string_size);
+ # include <gcrypt.h>
+ # endif
+ # define COMPILE_SSL_LIB "gnutls"
++# define COMPILE_SUPPORTED_SSL_BACKEND_FOUND 1
+ # elif defined(HAVE_CURL_NSS)
+ # define COMPILE_SSL_LIB "nss"
++# define COMPILE_SUPPORTED_SSL_BACKEND_FOUND 1
+ # elif defined(HAVE_CURL_MBEDTLS)
+ # include <mbedtls/ssl.h>
+ # define PYCURL_NEED_SSL_TSL
+ # define PYCURL_NEED_MBEDTLS_TSL
+ # define COMPILE_SSL_LIB "mbedtls"
++# define COMPILE_SUPPORTED_SSL_BACKEND_FOUND 1
+ # else
+ # ifdef _MSC_VER
+ /* sigh */
+@@ -218,9 +227,11 @@ pycurl_inet_ntop (int family, void *addr, char *string, size_t string_size);
+ /* since we have no crypto callbacks for other ssl backends,
+ * no reason to require users match those */
+ # define COMPILE_SSL_LIB "none/other"
++# define COMPILE_SUPPORTED_SSL_BACKEND_FOUND 0
+ # endif /* HAVE_CURL_OPENSSL || HAVE_CURL_WOLFSSL || HAVE_CURL_GNUTLS || HAVE_CURL_NSS || HAVE_CURL_MBEDTLS */
+ #else
+ # define COMPILE_SSL_LIB "none/other"
++# define COMPILE_SUPPORTED_SSL_BACKEND_FOUND 0
+ #endif /* HAVE_CURL_SSL */
+
+ #if defined(PYCURL_NEED_SSL_TSL)
+--
+2.28.0
+
diff --git a/dev-python/pycurl/pycurl-7.43.0.5-r1.ebuild b/dev-python/pycurl/pycurl-7.43.0.5-r1.ebuild
new file mode 100644
index 00000000000..1b678aa041e
--- /dev/null
+++ b/dev-python/pycurl/pycurl-7.43.0.5-r1.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=manual
+# The selftests fail with pypy, and urlgrabber segfaults for me.
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+
+inherit distutils-r1 toolchain-funcs
+
+DESCRIPTION="python binding for curl/libcurl"
+HOMEPAGE="
+ https://github.com/pycurl/pycurl
+ https://pypi.org/project/pycurl/
+ http://pycurl.io/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="curl_ssl_gnutls curl_ssl_libressl curl_ssl_nss +curl_ssl_openssl examples ssl test"
+RESTRICT="!test? ( test )"
+
+# Depend on a curl with curl_ssl_* USE flags.
+# libcurl must not be using an ssl backend we do not support.
+# If the libcurl ssl backend changes pycurl should be recompiled.
+# If curl uses gnutls, depend on at least gnutls 2.11.0 so that pycurl
+# does not need to initialize gcrypt threading and we do not need to
+# explicitly link to libgcrypt.
+RDEPEND="
+ >=net-misc/curl-7.25.0-r1:=[ssl=]
+ ssl? (
+ net-misc/curl[curl_ssl_gnutls(-)=,curl_ssl_libressl(-)=,curl_ssl_nss(-)=,curl_ssl_openssl(-)=,-curl_ssl_axtls(-),-curl_ssl_cyassl(-)]
+ curl_ssl_gnutls? ( >=net-libs/gnutls-2.11.0:= )
+ curl_ssl_libressl? ( dev-libs/libressl:= )
+ curl_ssl_openssl? ( dev-libs/openssl:= )
+ )"
+
+# bottle-0.12.7: https://github.com/pycurl/pycurl/issues/180
+# bottle-0.12.7: https://github.com/defnull/bottle/commit/f35197e2a18de1672831a70a163fcfd38327a802
+DEPEND="${RDEPEND}
+ test? (
+ dev-python/bottle[${PYTHON_USEDEP}]
+ dev-python/flaky[${PYTHON_USEDEP}]
+ dev-python/nose[${PYTHON_USEDEP}]
+ net-misc/curl[curl_ssl_gnutls(-)=,curl_ssl_libressl(-)=,curl_ssl_nss(-)=,curl_ssl_openssl(-)=,-curl_ssl_axtls(-),-curl_ssl_cyassl(-),http2]
+ >=dev-python/bottle-0.12.7[${PYTHON_USEDEP}]
+ )"
+
+PATCHES=(
+ "${FILESDIR}"/pycurl-7.43.0.5-telnet-test.patch
+ "${FILESDIR}"/pycurl-7.43.0.5-cc-cflags.patch
+ "${FILESDIR}"/pycurl-7.43.0.5-multiple-ssl.patch
+)
+
+python_prepare_all() {
+ sed -e "/setup_args\['data_files'\] = /d" -i setup.py || die
+ # disable automagic use of setuptools
+ sed -e 's:import wheel:raise ImportError:' -i setup.py || die
+ # these tests are broken with newer versions of bottle
+ sed -e 's:test.*_invalid_utf8:_&:' -i tests/getinfo_test.py || die
+ distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+ # Override faulty detection in setup.py, bug 510974.
+ export PYCURL_SSL_LIBRARY=${CURL_SSL/libressl/openssl}
+}
+
+src_test() {
+ # upstream bundles precompiled amd64 libs
+ rm tests/fake-curl/libcurl/*.so || die
+ emake -C tests/fake-curl/libcurl CC="$(tc-getCC)"
+
+ distutils-r1_src_test
+}
+
+python_compile() {
+ python_is_python3 || local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
+ distutils-r1_python_compile
+}
+
+python_test() {
+ nosetests -a '!standalone,!gssapi' -v --with-flaky || die "Tests fail with ${EPYTHON}"
+ nosetests -a 'standalone' -v --with-flaky || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+ local HTML_DOCS=( doc/. )
+ use examples && dodoc -r examples
+ distutils-r1_python_install_all
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/pycurl/, dev-python/pycurl/files/
@ 2023-02-27 5:38 Michał Górny
0 siblings, 0 replies; 4+ messages in thread
From: Michał Górny @ 2023-02-27 5:38 UTC (permalink / raw
To: gentoo-commits
commit: c629fe4dac9c5200c2e7eaa5338855d5f5cc2bda
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 27 05:29:22 2023 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Feb 27 05:38:15 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c629fe4d
dev-python/pycurl: Remove old
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-python/pycurl/Manifest | 1 -
dev-python/pycurl/files/7.44-fix-tests.patch | 34 ----------
dev-python/pycurl/pycurl-7.45.1.ebuild | 93 ----------------------------
3 files changed, 128 deletions(-)
diff --git a/dev-python/pycurl/Manifest b/dev-python/pycurl/Manifest
index 876ac8788f96..12303b7d4f75 100644
--- a/dev-python/pycurl/Manifest
+++ b/dev-python/pycurl/Manifest
@@ -1,2 +1 @@
-DIST pycurl-7.45.1.tar.gz 233879 BLAKE2B 8a6fe72f00cfd172b4f5e257f4526c4115047aa911d7fb3802d3bf105ac70dc866b27fa4878aae9f92229a5dd5108a2b5e1c9acfe93e1a94dac60d9405c5d5e6 SHA512 05639d484aac6d6688677589e391975158c5ef778456a47df575ad13fb8bd0db67ff8f5a39bdd99d82a67926aca421c01e687eec9d4fd87f32822b492b429635
DIST pycurl-7.45.2.tar.gz 234245 BLAKE2B 16257a967d2867de08d83478f602d00b54316d37b6a544804e606a814f61507530fb7e1ef3247be824dfa22b9487a69bbfc9b1038b2b776ebc556b18ed2d93ca SHA512 8a82346395acfc0bd37a8c4d8d2b17e5ab4602710308ed50f9ed88c223c73f15f5b1c95fc6191708e3bd9d647e4bc5ec91f740de433dd87e2ae0796ac79879ac
diff --git a/dev-python/pycurl/files/7.44-fix-tests.patch b/dev-python/pycurl/files/7.44-fix-tests.patch
deleted file mode 100644
index d5d900100086..000000000000
--- a/dev-python/pycurl/files/7.44-fix-tests.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-https://github.com/pycurl/pycurl/commit/d47c68b1364f8a1a45ab8c584c291d44b762f7b1
-From: Samuel Henrique <samueloph@debian.org>
-Date: Sat, 30 Apr 2022 23:02:34 +0100
-Subject: [PATCH] tests: fix error message on error_test (for curl >= 7.83)
-
-curl 7.83.0 removed exclamation marks from a few error messages, curl commit:
-https://github.com/curl/curl/commit/6968fb9d54dc3a1aaa1b16088f038eaf5dd8b2d7
-
-This commit adds support for the new curl release while also supporting the previous ones.
---- a/tests/error_test.py
-+++ b/tests/error_test.py
-@@ -29,7 +29,8 @@ def test_pycurl_error_libcurl(self):
- err, msg = exc.args
- self.assertEqual(pycurl.E_URL_MALFORMAT, err)
- # possibly fragile
-- self.assertEqual('No URL set!', msg)
-+ # curl < 7.83.0 has an exclamation mark in this error message
-+ self.assertIn(msg, ['No URL set!', 'No URL set'])
- else:
- self.fail('Expected pycurl.error to be raised')
-
-@@ -43,9 +44,10 @@ def test_pycurl_errstr_type(self):
- self.curl.perform()
- except pycurl.error:
- # might be fragile
-- self.assertEqual('No URL set!', self.curl.errstr())
-+ # curl < 7.83.0 has an exclamation mark in this error message
-+ self.assertIn(self.curl.errstr(), ['No URL set!', 'No URL set'])
- # repeated checks do not clear value
-- self.assertEqual('No URL set!', self.curl.errstr())
-+ self.assertIn(self.curl.errstr(), ['No URL set!', 'No URL set'])
- # check the type - on all python versions
- self.assertEqual(str, type(self.curl.errstr()))
- else:
diff --git a/dev-python/pycurl/pycurl-7.45.1.ebuild b/dev-python/pycurl/pycurl-7.45.1.ebuild
deleted file mode 100644
index d8fd41fb47b5..000000000000
--- a/dev-python/pycurl/pycurl-7.45.1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1 toolchain-funcs
-
-DESCRIPTION="Python bindings for curl/libcurl"
-HOMEPAGE="
- http://pycurl.io/
- https://github.com/pycurl/pycurl/
- https://pypi.org/project/pycurl/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="curl_ssl_gnutls curl_ssl_nss +curl_ssl_openssl examples ssl"
-
-# Depend on a curl with curl_ssl_* USE flags.
-# libcurl must not be using an ssl backend we do not support.
-# If the libcurl ssl backend changes pycurl should be recompiled.
-# If curl uses gnutls, depend on at least gnutls 2.11.0 so that pycurl
-# does not need to initialize gcrypt threading and we do not need to
-# explicitly link to libgcrypt.
-DEPEND="
- >=net-misc/curl-7.25.0-r1:=[ssl=]
- ssl? (
- net-misc/curl[curl_ssl_gnutls(-)=,curl_ssl_nss(-)=,curl_ssl_openssl(-)=,-curl_ssl_axtls(-),-curl_ssl_cyassl(-)]
- curl_ssl_gnutls? ( >=net-libs/gnutls-2.11.0:= )
- curl_ssl_openssl? ( dev-libs/openssl:= )
- )
-"
-
-RDEPEND="
- ${DEPEND}
-"
-BDEPEND="
- test? (
- >=dev-python/bottle-0.12.7[${PYTHON_USEDEP}]
- dev-python/flaky[${PYTHON_USEDEP}]
- net-misc/curl[curl_ssl_gnutls(-)=,curl_ssl_nss(-)=,curl_ssl_openssl(-)=,-curl_ssl_axtls(-),-curl_ssl_cyassl(-),http2]
- )
-"
-
-PATCHES=(
- "${FILESDIR}/7.44-fix-tests.patch"
-)
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
- # docs installed into the wrong directory
- sed -e "/setup_args\['data_files'\] = /d" -i setup.py || die
- # TODO
- sed -e 's:test_socks5_gssapi_nec_setopt:_&:' \
- -i tests/option_constants_test.py || die
-
- distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
- # Override faulty detection in setup.py, bug #510974.
- export PYCURL_SSL_LIBRARY=${CURL_SSL}
-}
-
-src_test() {
- emake -C tests/fake-curl/libcurl CC="$(tc-getCC)"
-
- distutils-r1_src_test
-}
-
-python_test() {
- local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
- local EPYTEST_DESELECT=(
- # refcounting tests are unreliable
- tests/memory_mgmt_test.py::MemoryMgmtTest::test_readdata_refcounting
- tests/memory_mgmt_test.py::MemoryMgmtTest::test_writedata_refcounting
- tests/memory_mgmt_test.py::MemoryMgmtTest::test_writeheader_refcounting
- )
-
- epytest -p flaky tests
-}
-
-python_install_all() {
- local HTML_DOCS=( doc/. )
- use examples && dodoc -r examples
- distutils-r1_python_install_all
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/pycurl/, dev-python/pycurl/files/
@ 2024-06-06 15:32 Michał Górny
0 siblings, 0 replies; 4+ messages in thread
From: Michał Górny @ 2024-06-06 15:32 UTC (permalink / raw
To: gentoo-commits
commit: b010408a779c65c179c6ea862a5a9bdaf0a5d5d7
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 6 15:15:21 2024 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Jun 6 15:32:34 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b010408a
dev-python/pycurl: Remove old
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-python/pycurl/Manifest | 1 -
.../files/pycurl-7.45.2-skip-http3-test.patch | 28 ------
dev-python/pycurl/pycurl-7.45.2-r1.ebuild | 100 ---------------------
3 files changed, 129 deletions(-)
diff --git a/dev-python/pycurl/Manifest b/dev-python/pycurl/Manifest
index dcded486c50b..cd047d2d69e2 100644
--- a/dev-python/pycurl/Manifest
+++ b/dev-python/pycurl/Manifest
@@ -1,2 +1 @@
-DIST pycurl-7.45.2.tar.gz 234245 BLAKE2B 16257a967d2867de08d83478f602d00b54316d37b6a544804e606a814f61507530fb7e1ef3247be824dfa22b9487a69bbfc9b1038b2b776ebc556b18ed2d93ca SHA512 8a82346395acfc0bd37a8c4d8d2b17e5ab4602710308ed50f9ed88c223c73f15f5b1c95fc6191708e3bd9d647e4bc5ec91f740de433dd87e2ae0796ac79879ac
DIST pycurl-7.45.3.tar.gz 236470 BLAKE2B 690e49f92f569352e26d95a0fa58508c4e96c845c7e3ae1169b8bc55036902f64859987880565217df56a57031dc2775e3c6979b4cfdf8a8c9a94c67ae94cb79 SHA512 12a55070602a1fd22b160ad582a4001bdd28531d2b2ccd365ff0136bc13dd23af80b19488bdbbc60a902a3a362b64383b9ae6acce6ed328c74dcffc8a6a3f4ad
diff --git a/dev-python/pycurl/files/pycurl-7.45.2-skip-http3-test.patch b/dev-python/pycurl/files/pycurl-7.45.2-skip-http3-test.patch
deleted file mode 100644
index 4ebf3b4b1ba8..000000000000
--- a/dev-python/pycurl/files/pycurl-7.45.2-skip-http3-test.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-In Gentoo, we don't yet usually have HTTP3 for curl either.
-
-https://src.fedoraproject.org/rpms/python-pycurl/raw/rawhide/f/0002-python-pycurl-7.45.2-disable-test_http_version_3.patch
-
-From 6c55e6822a064edb8dd6dfe1ee21080f4f30b5cf Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Zaoral?= <lzaoral@redhat.com>
-Date: Tue, 7 Mar 2023 16:32:19 +0100
-Subject: [PATCH] tests: temporarily disable test_http_version_3
-
-HTTP3 support in curl is only experimental at the moment and is disabled
-in the corresponding Fedora package.
---- a/tests/option_constants_test.py
-+++ b/tests/option_constants_test.py
-@@ -508,10 +508,6 @@ class OptionConstantsSettingTest(unittest.TestCase):
- def test_http_version_2prior_knowledge(self):
- self.curl.setopt(self.curl.HTTP_VERSION, self.curl.CURL_HTTP_VERSION_2_PRIOR_KNOWLEDGE)
-
-- @util.min_libcurl(7, 66, 0)
-- def test_http_version_3(self):
-- self.curl.setopt(self.curl.HTTP_VERSION, self.curl.CURL_HTTP_VERSION_3)
--
- @util.min_libcurl(7, 21, 5)
- def test_sockopt_constants(self):
- assert self.curl.SOCKOPT_OK is not None
---
-2.39.2
-
-
diff --git a/dev-python/pycurl/pycurl-7.45.2-r1.ebuild b/dev-python/pycurl/pycurl-7.45.2-r1.ebuild
deleted file mode 100644
index e0b8e79c33dd..000000000000
--- a/dev-python/pycurl/pycurl-7.45.2-r1.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1 pypi toolchain-funcs
-
-DESCRIPTION="Python bindings for curl/libcurl"
-HOMEPAGE="
- http://pycurl.io/
- https://github.com/pycurl/pycurl/
- https://pypi.org/project/pycurl/
-"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="curl_ssl_gnutls +curl_ssl_openssl examples ssl"
-
-# Depend on a curl with curl_ssl_* USE flags.
-# libcurl must not be using an ssl backend we do not support.
-# If the libcurl ssl backend changes pycurl should be recompiled.
-# If curl uses gnutls, depend on at least gnutls 2.11.0 so that pycurl
-# does not need to initialize gcrypt threading and we do not need to
-# explicitly link to libgcrypt.
-DEPEND="
- >=net-misc/curl-7.25.0-r1:=[ssl=]
- ssl? (
- net-misc/curl[curl_ssl_gnutls(-)=,curl_ssl_openssl(-)=,-curl_ssl_axtls(-),-curl_ssl_cyassl(-)]
- curl_ssl_gnutls? ( >=net-libs/gnutls-2.11.0:= )
- curl_ssl_openssl? ( dev-libs/openssl:= )
- )
-"
-
-RDEPEND="
- ${DEPEND}
-"
-BDEPEND="
- test? (
- >=dev-python/bottle-0.12.7[${PYTHON_USEDEP}]
- dev-python/flaky[${PYTHON_USEDEP}]
- dev-python/pytest-timeout[${PYTHON_USEDEP}]
- net-misc/curl[curl_ssl_gnutls(-)=,curl_ssl_openssl(-)=,-curl_ssl_axtls(-),-curl_ssl_cyassl(-),http2]
- )
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-7.45.2-skip-http3-test.patch
-)
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
- # docs installed into the wrong directory
- sed -e "/setup_args\['data_files'\] = /d" -i setup.py || die
- # TODO
- sed -e 's:test_socks5_gssapi_nec_setopt:_&:' \
- -i tests/option_constants_test.py || die
-
- distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
- # Override faulty detection in setup.py, bug #510974.
- export PYCURL_SSL_LIBRARY=${CURL_SSL}
-}
-
-src_test() {
- emake -C tests/fake-curl/libcurl CC="$(tc-getCC)"
-
- distutils-r1_src_test
-}
-
-python_test() {
- local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
- local EPYTEST_DESELECT=(
- # refcounting tests are unreliable
- tests/memory_mgmt_test.py::MemoryMgmtTest::test_readdata_refcounting
- tests/memory_mgmt_test.py::MemoryMgmtTest::test_writedata_refcounting
- tests/memory_mgmt_test.py::MemoryMgmtTest::test_writeheader_refcounting
- # broken with curl 8.4.0+
- tests/multi_callback_test.py::MultiCallbackTest::test_multi_socket_action
- tests/multi_socket_select_test.py::MultiSocketSelectTest::test_multi_socket_select
- # TODO
- tests/option_constants_test.py::OptionConstantsTest::test_proxy_tlsauth
- tests/option_constants_test.py::OptionConstantsTest::test_socks5_gssapi_nec_setopt
- )
-
- epytest -p flaky -p timeout --timeout=30 tests
-}
-
-python_install_all() {
- local HTML_DOCS=( doc/. )
- use examples && dodoc -r examples
- distutils-r1_python_install_all
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-06-06 15:32 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-08-27 5:55 [gentoo-commits] repo/gentoo:master commit in: dev-python/pycurl/, dev-python/pycurl/files/ Michał Górny
-- strict thread matches above, loose matches on Subject: below --
2024-06-06 15:32 Michał Górny
2023-02-27 5:38 Michał Górny
2017-01-31 10:19 Patrice Clement
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox