python-openssl: update to 0.13; update libressl patch

This commit is contained in:
Alessio Sergi 2014-08-01 15:11:01 +02:00
parent e3b483b147
commit 0d41040183
2 changed files with 25 additions and 23 deletions

View File

@ -1,6 +1,22 @@
--- OpenSSL/rand/rand.c.orig 2014-07-21 08:43:25.068650199 +0200
+++ OpenSSL/rand/rand.c 2014-07-21 08:45:10.724488166 +0200
@@ -245,7 +245,9 @@ static PyMethodDef rand_methods[] = {
--- OpenSSL/rand/rand.c.orig 2011-09-02 17:46:13.000000000 +0200
+++ OpenSSL/rand/rand.c 2014-08-01 13:34:52.559387445 +0200
@@ -111,6 +111,7 @@
}
#endif
+#ifdef HAVE_OPENSSL_RAND_EGD
static char rand_egd_doc[] = "\n\
Query an entropy gathering daemon (EGD) for random data and add it to the\n\
PRNG. I haven't found any problems when the socket is missing, the function\n\
@@ -133,6 +134,7 @@
return PyLong_FromLong((long)RAND_egd_bytes(path, bytes));
}
+#endif
static char rand_cleanup_doc[] = "\n\
Erase the memory used by the PRNG.\n\
@@ -245,7 +247,9 @@
#ifdef MS_WINDOWS
{ "screen", (PyCFunction)rand_screen, METH_VARARGS, rand_screen_doc },
#endif
@ -10,17 +26,3 @@
{ "cleanup", (PyCFunction)rand_cleanup, METH_VARARGS, rand_cleanup_doc },
{ "load_file", (PyCFunction)rand_load_file, METH_VARARGS, rand_load_file_doc },
{ "write_file",(PyCFunction)rand_write_file, METH_VARARGS, rand_write_file_doc },
--- OpenSSL/ssl/context.c.orig 2014-07-21 08:48:55.940289949 +0200
+++ OpenSSL/ssl/context.c 2014-07-21 08:52:02.068848946 +0200
@@ -1109,9 +1109,11 @@ ssl_Context_init(ssl_ContextObj *self, i
SSL_METHOD *method;
switch (i_method) {
+#if OPENSSL_VERSION_NUMBER < 0x20000000L
case ssl_SSLv2_METHOD:
method = SSLv2_method();
break;
+#endif
case ssl_SSLv23_METHOD:
method = SSLv23_method();
break;

View File

@ -1,7 +1,7 @@
# Template file for 'python-openssl'
pkgname=python-openssl
version=0.11
revision=8
version=0.13
revision=1
wrksrc="pyOpenSSL-${version}"
replaces="pyopenssl>=0"
build_style=python-module
@ -11,16 +11,16 @@ hostmakedepends="python-setuptools python3.4-setuptools"
makedepends="libressl-devel python-devel python3.4-devel"
short_desc="Python2 interface to the OpenSSL library"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="https://launchpad.net/pyopenssl"
homepage="https://github.com/pyca/pyopenssl"
license="Apache-2.0"
distfiles="http://launchpad.net/pyopenssl/main/0.11/+download/pyOpenSSL-${version}.tar.gz"
checksum=42ae2dc29a5ebf5088521cb8df2b1bdf039d28e14845fd9df4ab59658b565cfd
distfiles="https://pypi.python.org/packages/source/p/pyOpenSSL/pyOpenSSL-${version}.tar.gz"
checksum=21e12b03abaa0e04ecc8cd9c251598f71bae11c9f385304234e4ea5618c6163b
python3.4-openssl_package() {
pycompile_version="3.4"
pycompile_module="OpenSSL"
short_desc="${short_desc/Python2/Python3.4}"
pkg_install() {
vmove /usr/lib/python3.4
vmove usr/lib/python3.4
}
}