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.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 102 insertions, 2 deletions

diff --git a/dev-python/pyopenssl/ChangeLog b/dev-python/pyopenssl/ChangeLog
index 99def548a5a3..0659d4ff4ff4 100644
--- a/dev-python/pyopenssl/ChangeLog
+++ b/dev-python/pyopenssl/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-python/pyopenssl
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyopenssl/ChangeLog,v 1.51 2010/04/30 15:13:41 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyopenssl/ChangeLog,v 1.52 2010/07/12 14:05:16 ssuominen Exp $
+
+*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
diff --git a/dev-python/pyopenssl/Manifest b/dev-python/pyopenssl/Manifest
index 0d39a0e92c38..f844cdb32ba6 100644
--- a/dev-python/pyopenssl/Manifest
+++ b/dev-python/pyopenssl/Manifest
@@ -1,7 +1,9 @@
+AUX pyopenssl-0.10-openssl-1.patch 337 RMD160 b5bf588c64f58a31594c2077d90d9d3828212dab SHA1 7c5ed0d32ca93b18b1a20eca0d49d1432c95b8e2 SHA256 8f608442f669fed20aac98d86a1f97725ea42004c77e6655fd130a38a34af661
 AUX pyopenssl-0.9-tests.patch 930 RMD160 be71ae7b9780451ff5165c3e97c0083fe8594fc3 SHA1 e58c702dfa3cac47248995985a10b71f33f8a402 SHA256 2d6f9b0d31328fb25eeb17be99585e8cb7f593f615da6df41e4aa3bdea955c48
 DIST pyOpenSSL-0.10.tar.gz 222169 RMD160 1e303655754b5652327151a790ac6f3b25959972 SHA1 11c956d317ab2b1628937a2681acc31f4b890fe8 SHA256 4514f8960389042ca2587f9cb801a13f7990387753fc678680b0c084719b5b60
 DIST pyOpenSSL-0.9.tar.gz 197981 RMD160 fec72e02a922ffb37a9c66ed809c573b778138db SHA1 d39eeb26c73e4b96804e1e403e2136062910b6c2 SHA256 7089f1d47ce74480325411d34a31e3747175980889d99d2e1180f16d123251ab
+EBUILD pyopenssl-0.10-r1.ebuild 1910 RMD160 50ba91721b11bd44069c977f8d163a64b091b7d2 SHA1 a4aeb3d16ed8e68d71b50e9a3dfedf3c68938713 SHA256 93609205ec1d76b08b45559aa8c5609fba52448ef729f50b0abcda055cc4d4c7
 EBUILD pyopenssl-0.10.ebuild 1832 RMD160 c4a1aa276147ef3a220b849f58a2b6f93557ae87 SHA1 8ec9aaede51a191a190ac473b808d4d6e58f7edf SHA256 1d9b00783dc69bcb4476132b4f926ea08b741b4a9f8c3157cec67fa73672f6fa
 EBUILD pyopenssl-0.9-r1.ebuild 1781 RMD160 387f695eb03470b7004427d2a84f719c92838319 SHA1 ab78491d221b9c99525effd33ec26035418a37db SHA256 ceeae1ff1a25e28c40579aa5543773f02a86fe4e1f6ebb6f0d97ab3e336dff57
-MISC ChangeLog 7012 RMD160 6b9fcd50da7a986d842510aa20cb2b909b27204a SHA1 139a846f25747b97b448ddcc90869a6801633479 SHA256 98e38da5b33076e0f40c32d06ee5a0e49d36515d57de2965bfba29b271d7ddbd
+MISC ChangeLog 7329 RMD160 30930843ca6540436ffc43908f0fbc9b00f23dc8 SHA1 6e827b0f7f1d4ced32d082462481290fee4b5946 SHA256 d507d8562fb9a21f8ec1eb14d05b9aa2548f4c2775f052d82b8ac82f921e27b5
 MISC metadata.xml 159 RMD160 900a8c55d7a7d2f6312594769aaf941bf9e99c7f SHA1 c8e604d56dae898258b5254d78cfeac0b981e288 SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4
diff --git a/dev-python/pyopenssl/files/pyopenssl-0.10-openssl-1.patch b/dev-python/pyopenssl/files/pyopenssl-0.10-openssl-1.patch
new file mode 100644
index 000000000000..c813034837d3
--- /dev/null
+++ b/dev-python/pyopenssl/files/pyopenssl-0.10-openssl-1.patch
@@ -0,0 +1,14 @@
+--- src/ssl/context.c
++++ src/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/pyopenssl-0.10-r1.ebuild b/dev-python/pyopenssl/pyopenssl-0.10-r1.ebuild
new file mode 100644
index 000000000000..cc3e5e47f2ec
--- /dev/null
+++ b/dev-python/pyopenssl/pyopenssl-0.10-r1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyopenssl/pyopenssl-0.10-r1.ebuild,v 1.1 2010/07/12 14:05:16 ssuominen Exp $
+
+EAPI="2"
+SUPPORT_PYTHON_ABIS="1"
+
+inherit distutils eutils
+
+MY_PN="pyOpenSSL"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Python interface to the OpenSSL library"
+HOMEPAGE="http://pyopenssl.sourceforge.net/ http://pypi.python.org/pypi/pyOpenSSL"
+SRC_URI="http://pypi.python.org/packages/source/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz
+	mirror://sourceforge/pyopenssl/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+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-tex/latex2html-2002.2 )"
+RESTRICT_PYTHON_ABIS="3.*"
+
+S="${WORKDIR}/${MY_P}"
+
+PYTHON_MODNAME="OpenSSL"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-openssl-1.patch
+}
+
+src_compile() {
+	distutils_src_compile
+	if use doc; then
+		addwrite /var/cache/fonts
+		# This one seems to be unnecessary with a recent tetex, but
+		# according to bugs it was definitely necessary in the past,
+		# so leaving it in.
+		addwrite /usr/share/texmf/fonts/pk
+
+		cd doc
+		make html ps dvi
+	fi
+}
+
+src_test() {
+	test_package() {
+		pushd test > /dev/null
+		local test
+		for test in test_*.py; do
+			echo -e "\e[1;31mRunning ${test}...\e[0m"
+			PYTHONPATH="$(ls -d ../build-${PYTHON_ABI}/lib.*)" "$(PYTHON)" "${test}" || die "${test} failed with Python ${PYTHON_ABI}"
+		done
+		popd > /dev/null
+	}
+	python_execute_function test_package
+}
+
+src_install() {
+	distutils_src_install
+
+	if use doc; then
+		dohtml doc/html/*
+		dodoc doc/pyOpenSSL.*
+	fi
+
+	# Install examples
+	docinto examples
+	dodoc examples/*
+	docinto examples/simple
+	dodoc examples/simple/*
+}