diff options
author | Andrew Savchenko <bircoph@gmail.com> | 2011-06-02 22:57:10 +0400 |
---|---|---|
committer | Andrew Savchenko <bircoph@gmail.com> | 2011-06-02 22:57:10 +0400 |
commit | f81b6f95c221debe54a6cae80bf2e72dec37ded3 (patch) | |
tree | 06caf8632c544f7b3a49962d81a323d83f8b9d63 /dev-python | |
parent | Add net-dialup/l2tpv3tun (diff) | |
download | bircoph-f81b6f95c221debe54a6cae80bf2e72dec37ded3.tar.gz bircoph-f81b6f95c221debe54a6cae80bf2e72dec37ded3.tar.bz2 bircoph-f81b6f95c221debe54a6cae80bf2e72dec37ded3.zip |
pyopenssl: fix parallel build with USE="doc"
See bug 368191 for details, ebuild patch by Alexander Miller.
Diffstat (limited to 'dev-python')
-rw-r--r-- | dev-python/pyopenssl/ChangeLog | 314 | ||||
-rw-r--r-- | dev-python/pyopenssl/Manifest | 5 | ||||
-rw-r--r-- | dev-python/pyopenssl/files/pyopenssl-0.11-openssl-1.patch | 14 | ||||
-rw-r--r-- | dev-python/pyopenssl/metadata.xml | 5 | ||||
-rw-r--r-- | dev-python/pyopenssl/pyopenssl-0.12.ebuild | 103 |
5 files changed, 441 insertions, 0 deletions
diff --git a/dev-python/pyopenssl/ChangeLog b/dev-python/pyopenssl/ChangeLog new file mode 100644 index 0000000..e82f91d --- /dev/null +++ b/dev-python/pyopenssl/ChangeLog @@ -0,0 +1,314 @@ +# ChangeLog for dev-python/pyopenssl +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-python/pyopenssl/ChangeLog,v 1.77 2011/05/28 13:50:13 ranger Exp $ + + 28 May 2011; Brent Baude <ranger@gentoo.org> pyopenssl-0.12.ebuild: + Marking pyopenssl-0.12 ppc for bug 368085 + + 23 May 2011; Markos Chandras <hwoarang@gentoo.org> pyopenssl-0.12.ebuild: + Stable on amd64 wrt bug #368085 + + 20 May 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> + pyopenssl-0.12.ebuild: + Use Python 2 during generation of documentation (bug #368105). + + 04 May 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> + pyopenssl-0.12.ebuild: + Use doins instead of dodoc (bug #365809). + +*pyopenssl-0.12 (18 Apr 2011) + + 18 Apr 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> + +pyopenssl-0.12.ebuild: + Version bump. + + 29 Jan 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> + -pyopenssl-0.10-r1.ebuild, -files/pyopenssl-0.10-openssl-1.patch: + Delete. + + 29 Jan 2011; Raúl Porcel <armin76@gentoo.org> pyopenssl-0.11.ebuild: + alpha/ia64/s390/sh/sparc stable wrt #348084 + + 21 Jan 2011; Jeroen Roovers <jer@gentoo.org> pyopenssl-0.11.ebuild: + Stable for HPPA (bug #348084). + + 07 Jan 2011; Brent Baude <ranger@gentoo.org> pyopenssl-0.11.ebuild: + Marking pyopenssl-0.11 ppc for bug 348084 + + 27 Dec 2010; Brent Baude <ranger@gentoo.org> pyopenssl-0.11.ebuild: + Marking pyopenssl-0.11 ppc64 for bug 348084 + + 15 Dec 2010; Markus Meier <maekke@gentoo.org> pyopenssl-0.11.ebuild: + arm stable, bug #348084 + + 13 Dec 2010; Thomas Kahle <tomka@gentoo.org> pyopenssl-0.11.ebuild: + x86 stable per bug 348084 + + 12 Dec 2010; Markos Chandras <hwoarang@gentoo.org> pyopenssl-0.11.ebuild: + Stable on amd64 wrt bug #348084 + + 07 Nov 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> + pyopenssl-0.11.ebuild: + Support Python 3. + +*pyopenssl-0.11 (02 Nov 2010) + + 02 Nov 2010; Dirkjan Ochtman <djc@gentoo.org> +pyopenssl-0.11.ebuild, + +files/pyopenssl-0.11-openssl-1.patch: + Version bump to 0.11. + + 28 Sep 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> + pyopenssl-0.10-r1.ebuild: + Disable failing tests instead of all tests. Don't install tests. + + 28 Sep 2010; Samuli Suominen <ssuominen@gentoo.org> + pyopenssl-0.10-r1.ebuild: + Disable testsuite because of syntax change in OpenSSL 1.x wrt #326637. + + 05 Sep 2010; Raúl Porcel <armin76@gentoo.org> pyopenssl-0.10-r1.ebuild: + alpha/ia64/s390/sh/sparc stable wrt #330441 + + 21 Aug 2010; Markus Meier <maekke@gentoo.org> pyopenssl-0.10-r1.ebuild: + arm stable, bug #330441 + + 10 Aug 2010; Samuli Suominen <ssuominen@gentoo.org> + pyopenssl-0.10-r1.ebuild: + ppc64 stable wrt #330441 + + 06 Aug 2010; Jeroen Roovers <jer@gentoo.org> pyopenssl-0.10-r1.ebuild: + Stable for PPC (bug #330441). + + 06 Aug 2010; Jeroen Roovers <jer@gentoo.org> pyopenssl-0.10-r1.ebuild: + Stable for HPPA (bug #330441). + + 31 Jul 2010; Markos Chandras <hwoarang@gentoo.org> + pyopenssl-0.10-r1.ebuild: + Stable on amd64 wrt bug #330441 + + 30 Jul 2010; Christian Faulhammer <fauli@gentoo.org> + pyopenssl-0.10-r1.ebuild: + stable x86, bug 330441 + + 27 Jul 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> + pyopenssl-0.10.ebuild, pyopenssl-0.10-r1.ebuild: + Use -fno-strict-aliasing to avoid breaking strict-aliasing rules. + +*pyopenssl-0.10-r1 (12 Jul 2010) + + 12 Jul 2010; Samuli Suominen <ssuominen@gentoo.org> + +pyopenssl-0.10-r1.ebuild, +files/pyopenssl-0.10-openssl-1.patch: + Fix "assignment discards qualifiers from pointer target type" warning + caused by missing const in usage of SSL_METHOD with OpenSSL >= 1.0.0 wrt + #326637. + + 30 Apr 2010; Fabian Groffen <grobian@gentoo.org> pyopenssl-0.10.ebuild: + Marked ~x64-macos and ~ppc-macos + + 16 Jan 2010; Raúl Porcel <armin76@gentoo.org> pyopenssl-0.10.ebuild: + alpha/ia64/s390/sh/sparc stable wrt #296678 + + 29 Dec 2009; Markus Meier <maekke@gentoo.org> pyopenssl-0.10.ebuild: + arm/x86 stable, bug #296678 + + 24 Dec 2009; Pacho Ramos <pacho@gentoo.org> pyopenssl-0.10.ebuild: + amd64 stable, bug 296678 + + 22 Dec 2009; Brent Baude <ranger@gentoo.org> pyopenssl-0.10.ebuild: + Marking pyopenssl-0.10 ppc64 for bug 296678 + + 20 Dec 2009; Jeroen Roovers <jer@gentoo.org> pyopenssl-0.10.ebuild: + Stable for PPC (bug #296678). + + 20 Dec 2009; Jeroen Roovers <jer@gentoo.org> pyopenssl-0.10.ebuild: + Stable for HPPA (bug #296678). + + 14 Nov 2009; Raúl Porcel <armin76@gentoo.org> pyopenssl-0.9-r1.ebuild: + ia64/s390/sh stable wrt #287563 + +*pyopenssl-0.10 (13 Nov 2009) + + 13 Nov 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> + +pyopenssl-0.10.ebuild: + Version bump. + + 11 Nov 2009; Tiago Cunha <tcunha@gentoo.org> pyopenssl-0.9-r1.ebuild: + stable sparc, bug 287563 + + 11 Nov 2009; Brent Baude <ranger@gentoo.org> pyopenssl-0.9-r1.ebuild: + Marking pyopenssl-0.9-r1 ppc64 for bug 287563 + + 18 Oct 2009; Tobias Klausmann <klausman@gentoo.org> + pyopenssl-0.9-r1.ebuild: + Stable on alpha, bug #287563 + + 16 Oct 2009; Jeroen Roovers <jer@gentoo.org> pyopenssl-0.9-r1.ebuild: + Stable for HPPA (bug #287563). + + 11 Oct 2009; Fabian Groffen <grobian@gentoo.org> pyopenssl-0.9-r1.ebuild: + Merge from Prefix + + 10 Oct 2009; Markus Meier <maekke@gentoo.org> pyopenssl-0.9-r1.ebuild: + amd64/arm/x86 stable, bug #287563 + + 07 Oct 2009; nixnut <nixnut@gentoo.org> pyopenssl-0.9-r1.ebuild: + ppc stable #287563 + + 06 Sep 2009; Christian Ruppert <idl0r@gentoo.org> + -files/pyopenssl-0.7-test.patch: + Remove unused patch. + + 04 Sep 2009; Patrick Lauer <patrick@gentoo.org> -pyopenssl-0.5.1.ebuild, + -pyopenssl-0.6.ebuild, -pyopenssl-0.6-r1.ebuild, -pyopenssl-0.7.ebuild, + -pyopenssl-0.8.ebuild: + Remove old + +*pyopenssl-0.9-r1 (02 Aug 2009) + + 02 Aug 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> + +pyopenssl-0.9-r1.ebuild: + Set SUPPORT_PYTHON_ABIS. + + 17 Jul 2009; nixnut <nixnut@gentoo.org> pyopenssl-0.9.ebuild: + ppc stable #274897 + + 06 Jul 2009; Raúl Porcel <armin76@gentoo.org> pyopenssl-0.9.ebuild: + arm/ia64/s390/sh/sparc stable wrt #274897 + + 04 Jul 2009; Brent Baude <ranger@gentoo.org> pyopenssl-0.9.ebuild: + Marking pyopenssl-0.9 ppc64 for bug 274897 + + 28 Jun 2009; Tobias Klausmann <klausman@gentoo.org> pyopenssl-0.9.ebuild: + Stable on alpha, bug #274897 + + 28 Jun 2009; Markus Meier <maekke@gentoo.org> pyopenssl-0.9.ebuild: + amd64/x86 stable, bug #274897 + + 22 Jun 2009; Jeroen Roovers <jer@gentoo.org> pyopenssl-0.9.ebuild: + Stable for HPPA (bug #274897). + + 22 Jun 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> + pyopenssl-0.9.ebuild, +files/pyopenssl-0.9-tests.patch: + Fix tests (bug #275017). + +*pyopenssl-0.9 (16 May 2009) + + 16 May 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> + +pyopenssl-0.9.ebuild: + Version bump. + + 09 Feb 2009; Peter Volkov <pva@gentoo.org> Manifest: + Fixed manifest, it was updated upstream on 2008-06-04. Take a look at + release announcement. It was updated too. + +*pyopenssl-0.8 (04 Feb 2009) + + 04 Feb 2009; Patrick Lauer <patrick@gentoo.org> +pyopenssl-0.8.ebuild: + Bump to 0.8, fixes #257594 + +*pyopenssl-0.7 (16 Apr 2008) + + 16 Apr 2008; Ali Polatel <hawking@gentoo.org> + +files/pyopenssl-0.7-test.patch, pyopenssl-0.5.1.ebuild, + pyopenssl-0.6.ebuild, +pyopenssl-0.7.ebuild: + Version bump. Added src_test. Quoting. + + 23 Nov 2007; Ali Polatel <hawking@gentoo.org> pyopenssl-0.5.1.ebuild, + pyopenssl-0.6.ebuild: + switched tetex USE to doc wrt #196745 + + 05 Mar 2007; Marius Mauch <genone@gentoo.org> pyopenssl-0.5.1.ebuild, + pyopenssl-0.6.ebuild: + Replacing einfo with elog + + 25 Sep 2006; Javier Villavicencio <the_paya@gentoo.org> + pyopenssl-0.6-r1.ebuild: + Add ~x86-fbsd keyword. + + 16 Jul 2006; Tobias Scherbaum <dertobi123@gentoo.org> + pyopenssl-0.6.ebuild: + hppa stable, bug #139612 + +*pyopenssl-0.6-r1 (01 Jul 2006) + + 01 Jul 2006; Marien Zwart <marienz@gentoo.org> +pyopenssl-0.6-r1.ebuild: + Rename tetex USE flag to doc, thanks to nattfodd for reporting. Minor ebuild + cleanup. + + 21 May 2006; Markus Rothe <corsair@gentoo.org> pyopenssl-0.6.ebuild: + Stable on ppc64 + + 12 May 2006; Tobias Scherbaum <dertobi123@gentoo.org> + pyopenssl-0.6.ebuild: + Added ~hppa + + 01 May 2006; Markus Rothe <corsair@gentoo.org> pyopenssl-0.6.ebuild: + Added ~ppc64 + + 17 Feb 2006; Gustavo Zacarias <gustavoz@gentoo.org> pyopenssl-0.6.ebuild: + Stable on sparc + + 03 Oct 2005; Aron Griffis <agriffis@gentoo.org> pyopenssl-0.6.ebuild: + Mark 0.6 stable on ia64 + + 26 Aug 2005; Aron Griffis <agriffis@gentoo.org> pyopenssl-0.6.ebuild: + add ~ia64 + + 24 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> pyopenssl-0.6.ebuild: + Stable on ppc. + + 01 Apr 2005; Simon Stelling <blubb@gentoo.org> pyopenssl-0.6.ebuild: + stable on amd64 + + 18 Jan 2005; Bryan Østergaard <kloeri@gentoo.org> pyopenssl-0.6.ebuild: + Stable on alpha. + + 30 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> : + Change encoding to UTF-8 for GLEP 31 compliance + + 29 Dec 2004; Rob Cakebread <pythonhead@gentoo.org> pyopenssl-0.6.ebuild: + Marked stable x86 + + 23 Oct 2004; Jason Wever <weeve@gentoo.org> pyopenssl-0.6.ebuild: + Added ~sparc keyword. + + 05 Sep 2004; Sven Wegener <swegener@gentoo.org> : + Fixed ChangeLog header. + + 20 Aug 2004; Bryan Østergaard <kloeri@gentoo.org> pyopenssl-0.6.ebuild: + Fix sandbox violation. + +*pyopenssl-0.6 (18 Aug 2004) + + 18 Aug 2004; Bryan Østergaard <kloeri@gentoo.org> +pyopenssl-0.6.ebuild: + Version bump. + +*pyopenssl-0.5.1 (17 Jul 2004) + + 17 Jul 2004; Bryan Østergaard <kloeri@gentoo.org> +metadata.xml, + +pyopenssl-0.5.1.ebuild: + Renamed to pyopenssl. + + 03 Jun 2004; Aron Griffis <agriffis@gentoo.org> pyOpenSSL-0.5.1.ebuild: + Fix use invocation + + 02 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> pyOpenSSL-0.5.1.ebuild: + Stable on alpha. + + 22 Apr 2004; Bryan Østergaard <kloeri@gentoo.org> pyOpenSSL-0.5.1.ebuild: + Added ~alpha to keywords. + + 06 Mar 2004; David Holm <dholm@gentoo.org> pyOpenSSL-0.5.1.ebuild: + Added to ~ppc. + + 16 Jan 2004; Bart Lauwers <blauwers@gentoo.org) pyOpenSSL-0.5.1.ebuild, ChangeLog : + addwrite to fix bug #37835, added missing changelog entry + +*pyOpenSSL-0.5.1 (05 Dec 2002) + 24 Jun 2003; Robin Johnson <robbat2@gentoo.org> pyOpenSSL-0.5.1.ebuild: + fixed DEPEND as per bug #22978. + + 11 Mar 2003; Raschbacher Thomas <lordvan@gentoo.org> pyOpenSSL-0.5.1.ebuild: + fixed HOMEPAGE + + 05 Dec 2002; Raschbacher Thomas <lordvan@gentoo.org> pyOpenSSL-0.5.1.ebuild: + Initial ebuild diff --git a/dev-python/pyopenssl/Manifest b/dev-python/pyopenssl/Manifest new file mode 100644 index 0000000..78a6054 --- /dev/null +++ b/dev-python/pyopenssl/Manifest @@ -0,0 +1,5 @@ +AUX pyopenssl-0.11-openssl-1.patch 345 RMD160 fc67db02d11f6257833fd6f4b976ee06511622ed SHA1 8528236bd1c7e4d61316723a2dd699ca39ce153b SHA256 3ddd3bf704a75d5cf673814efc051b70938f6f94093e70873f7c83828db52d08 +DIST pyOpenSSL-0.12.tar.gz 236041 RMD160 bb9180f808eee78b1c5e7603596c467eb90f3cff SHA1 23bfc7acc8e4962e4aead5b5e1a37bfbd358bd1e SHA256 4517e9630a90db09ab8fe77d4dad753d5514a5f76b65ac327a7cd5a1d1ddd8a8 +EBUILD pyopenssl-0.12.ebuild 2669 RMD160 89b965c5ae3b161843789bd2a2cd9d6392b44457 SHA1 95e53669c9809283eedd9a1e57dc6f1f5e8265c8 SHA256 d49672549c6264661e74b31b14809c19a8367fd592d7ee1655f68efb6b89fcbc +MISC ChangeLog 10498 RMD160 9ae0b208c53a06770459e380125fc605fe209999 SHA1 105f570b07ff46db8b53929a1f600b490ec1f332 SHA256 09df222ad0de35ec51bc424f84cf7a6ed0d7acc34d16c7b6bd9f15428ca03ffc +MISC metadata.xml 159 RMD160 900a8c55d7a7d2f6312594769aaf941bf9e99c7f SHA1 c8e604d56dae898258b5254d78cfeac0b981e288 SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4 diff --git a/dev-python/pyopenssl/files/pyopenssl-0.11-openssl-1.patch b/dev-python/pyopenssl/files/pyopenssl-0.11-openssl-1.patch new file mode 100644 index 0000000..fec8222 --- /dev/null +++ b/dev-python/pyopenssl/files/pyopenssl-0.11-openssl-1.patch @@ -0,0 +1,14 @@ +--- OpenSSL/ssl/context.c ++++ OpenSSL/ssl/context.c +@@ -1095,7 +1095,11 @@ + */ + static ssl_ContextObj* + ssl_Context_init(ssl_ContextObj *self, int i_method) { ++ #if OPENSSL_VERSION_NUMBER >= 0x10000000L ++ const SSL_METHOD *method; ++ #else + SSL_METHOD *method; ++ #endif + + switch (i_method) { + case ssl_SSLv2_METHOD: diff --git a/dev-python/pyopenssl/metadata.xml b/dev-python/pyopenssl/metadata.xml new file mode 100644 index 0000000..de483c5 --- /dev/null +++ b/dev-python/pyopenssl/metadata.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<herd>python</herd> +</pkgmetadata> diff --git a/dev-python/pyopenssl/pyopenssl-0.12.ebuild b/dev-python/pyopenssl/pyopenssl-0.12.ebuild new file mode 100644 index 0000000..6299b8f --- /dev/null +++ b/dev-python/pyopenssl/pyopenssl-0.12.ebuild @@ -0,0 +1,103 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-python/pyopenssl/pyopenssl-0.12.ebuild,v 1.5 2011/05/28 13:50:13 ranger Exp $ + +EAPI="3" +SUPPORT_PYTHON_ABIS="1" +RESTRICT_PYTHON_ABIS="*-jython" + +inherit distutils eutils + +MY_PN="pyOpenSSL" +MY_P="${MY_PN}-${PV}" + +DESCRIPTION="Python interface to the OpenSSL library" +HOMEPAGE="http://pyopenssl.sourceforge.net/ https://launchpad.net/pyopenssl http://pypi.python.org/pypi/pyOpenSSL" +SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris" +IUSE="doc" + +RDEPEND=">=dev-libs/openssl-0.9.6g" +DEPEND="${RDEPEND} + doc? ( + =dev-lang/python-2* + >=dev-tex/latex2html-2002.2 + )" + +S="${WORKDIR}/${MY_P}" + +PYTHON_CFLAGS=("2.* + -fno-strict-aliasing") + +PYTHON_MODNAME="OpenSSL" + +src_prepare() { + distutils_src_prepare + epatch "${FILESDIR}/${PN}-0.11-openssl-1.patch" + + # Disable tests failing with OpenSSL >=1.0.0. + sed \ + -e "s/test_dump_privatekey/_&/" \ + -e "s/test_export_without_args/_&/" \ + -e "s/test_export_without_mac/_&/" \ + -e "s/test_friendly_name/_&/" \ + -e "s/test_load_pkcs12/_&/" \ + -e "s/test_various_empty_passphrases/_&/" \ + -e "s/test_zero_len_list_for_ca/_&/" \ + -e "s/test_subject_name_hash/_&/" \ + -i OpenSSL/test/test_crypto.py + sed -e "s/test_load_verify_directory/_&/" -i OpenSSL/test/test_ssl.py +} + +src_compile() { + distutils_src_compile + + if use doc; then + addwrite /var/cache/fonts + + pushd doc > /dev/null + python2 tools/mkhowto --html --ps --dvi --a4 --iconserver . \ + pyOpenSSL.tex || die "Generation of documentation failed" + popd > /dev/null + fi +} + +src_test() { + test_package() { + pushd OpenSSL/test > /dev/null + + local return_status="0" test + for test in test_*.py; do + einfo "Running ${test}..." + if ! PYTHONPATH="$(ls -d ../../build-${PYTHON_ABI}/lib.*)" "$(PYTHON)" "${test}"; then + eerror "${test} failed with $(python_get_implementation) $(python_get_version)" + return_status="1" + fi + done + + popd > /dev/null + + return "${return_status}" + } + python_execute_function test_package +} + +src_install() { + distutils_src_install + + delete_tests() { + rm -fr "${ED}$(python_get_sitedir)/OpenSSL/test" + } + python_execute_function -q delete_tests + + if use doc; then + dohtml doc/pyOpenSSL/* || die "dohtml failed" + dodoc doc/pyOpenSSL.* || die "dodoc failed" + fi + + # Install examples + insinto /usr/share/doc/${PF}/examples + doins -r examples/* || die "doins failed" +} |