diff --git a/srcpkgs/python-openssl/patches/libressl.patch b/srcpkgs/python-openssl/patches/libressl.patch deleted file mode 100644 index 0652d0bb14c..00000000000 --- a/srcpkgs/python-openssl/patches/libressl.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- 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 -+#ifdef HAVE_OPENSSL_RAND_EGD - { "egd", (PyCFunction)rand_egd, METH_VARARGS, rand_egd_doc }, -+#endif - { "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 }, diff --git a/srcpkgs/python-openssl/template b/srcpkgs/python-openssl/template index 5f4e55d22e4..3fdd999fc7d 100644 --- a/srcpkgs/python-openssl/template +++ b/srcpkgs/python-openssl/template @@ -1,22 +1,24 @@ # Template file for 'python-openssl' pkgname=python-openssl -version=0.13 -revision=2 +version=0.14 +revision=1 +noarch=yes wrksrc="pyOpenSSL-${version}" -replaces="pyopenssl>=0" build_style=python-module python_versions="2.7 3.4" -pycompile_module="OpenSSL" hostmakedepends="python-setuptools python3.4-setuptools" -makedepends="libressl-devel>=2.1.2 python-devel python3.4-devel" +depends="python-cryptography python-six" +pycompile_module="OpenSSL" short_desc="Python2 interface to the OpenSSL library" maintainer="Juan RP " homepage="https://github.com/pyca/pyopenssl" license="Apache-2.0" -distfiles="https://pypi.python.org/packages/source/p/pyOpenSSL/pyOpenSSL-${version}.tar.gz" -checksum=21e12b03abaa0e04ecc8cd9c251598f71bae11c9f385304234e4ea5618c6163b +distfiles="${PYPI_SITE}/p/pyOpenSSL/pyOpenSSL-${version}.tar.gz" +checksum=a99db8e59c120138ad8a72eecedcc24b4510d2eed3ce48213b7e32f22cc4ee6e python3.4-openssl_package() { + noarch=yes + depends="python3.4-cryptography python3.4-six" pycompile_version="3.4" pycompile_module="OpenSSL" short_desc="${short_desc/Python2/Python3.4}"