diff options
| -rw-r--r-- | dev-python/m2crypto/Manifest | 1 | ||||
| -rw-r--r-- | dev-python/m2crypto/files/0.26.4-libressl.patch | 245 | ||||
| -rw-r--r-- | dev-python/m2crypto/m2crypto-0.27.0.ebuild | 56 | ||||
| -rw-r--r-- | dev-python/m2crypto/metadata.xml | 12 |
4 files changed, 0 insertions, 314 deletions
diff --git a/dev-python/m2crypto/Manifest b/dev-python/m2crypto/Manifest deleted file mode 100644 index bb56a61..0000000 --- a/dev-python/m2crypto/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST M2Crypto-0.27.0.tar.gz 1119288 SHA256 82317459d653322d6b37f122ce916dc91ddcd9d1b814847497ac796c4549dd68 SHA512 df0f6b16f7d00a19fafbb5da5a3ececff6b4627accd00ca65e0d6f9e752a97f41016d0072c8e681475fe1d87c89b7474067068c0bfce6c68a30baddeb31bfac2 WHIRLPOOL 678f19d7bcd0663b704761a78b8e2d39a1c62450f99d5b0aa513e8b8af717ef1935b274eef99d4e027e8e5992887806bd270fcba02fd3e650f086f8b87f5adc7 diff --git a/dev-python/m2crypto/files/0.26.4-libressl.patch b/dev-python/m2crypto/files/0.26.4-libressl.patch deleted file mode 100644 index 4db1bff..0000000 --- a/dev-python/m2crypto/files/0.26.4-libressl.patch +++ /dev/null @@ -1,245 +0,0 @@ -diff -Naur M2Crypto-0.26.4.orig/SWIG/_bio.i M2Crypto-0.26.4/SWIG/_bio.i ---- M2Crypto-0.26.4.orig/SWIG/_bio.i 2017-10-17 18:22:17.157602333 -0700 -+++ M2Crypto-0.26.4/SWIG/_bio.i 2017-10-17 18:31:52.799592024 -0700 -@@ -63,14 +63,14 @@ - static PyObject *_bio_err; - - --#if OPENSSL_VERSION_NUMBER >= 0x10100000L -+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) - void pyfd_init(void); - #endif - - void bio_init(PyObject *bio_err) { - Py_INCREF(bio_err); - _bio_err = bio_err; --#if OPENSSL_VERSION_NUMBER >= 0x10100000L -+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) - pyfd_init(); - #endif - } -@@ -298,7 +298,7 @@ - return BIO_should_write(a); - } - --#if OPENSSL_VERSION_NUMBER >= 0x10100000L -+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) - /* implment custom BIO_s_pyfd */ - - #ifdef WIN32 -diff -Naur M2Crypto-0.26.4.orig/SWIG/_evp.i M2Crypto-0.26.4/SWIG/_evp.i ---- M2Crypto-0.26.4.orig/SWIG/_evp.i 2017-10-17 18:22:17.157602333 -0700 -+++ M2Crypto-0.26.4/SWIG/_evp.i 2017-10-17 18:32:48.379591029 -0700 -@@ -19,7 +19,7 @@ - #include <openssl/rsa.h> - #include <openssl/opensslv.h> - --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - - HMAC_CTX *HMAC_CTX_new(void) { - HMAC_CTX *ret = PyMem_Malloc(sizeof(HMAC_CTX)); -diff -Naur M2Crypto-0.26.4.orig/SWIG/_lib.i M2Crypto-0.26.4/SWIG/_lib.i ---- M2Crypto-0.26.4.orig/SWIG/_lib.i 2017-10-17 18:22:17.157602333 -0700 -+++ M2Crypto-0.26.4/SWIG/_lib.i 2017-10-17 18:33:13.535590578 -0700 -@@ -487,7 +487,7 @@ - %inline %{ - - void lib_init() { --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - SSLeay_add_all_algorithms(); - ERR_load_ERR_strings(); - #endif -diff -Naur M2Crypto-0.26.4.orig/SWIG/_lib11_compat.i M2Crypto-0.26.4/SWIG/_lib11_compat.i ---- M2Crypto-0.26.4.orig/SWIG/_lib11_compat.i 2017-10-17 18:22:17.156602333 -0700 -+++ M2Crypto-0.26.4/SWIG/_lib11_compat.i 2017-10-17 18:34:12.117589529 -0700 -@@ -8,7 +8,7 @@ - */ - - %{ --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - - #include <string.h> - #include <openssl/engine.h> -@@ -454,5 +454,5 @@ - return 1; - } - --#endif /* OPENSSL_VERSION_NUMBER */ -+#endif /* OPENSSL_VERSION_NUMBER || LIBRESSL_VERSION_NUMBER */ - %} -diff -Naur M2Crypto-0.26.4.orig/SWIG/_m2crypto_wrap.c M2Crypto-0.26.4/SWIG/_m2crypto_wrap.c ---- M2Crypto-0.26.4.orig/SWIG/_m2crypto_wrap.c 2017-10-17 18:22:17.156602333 -0700 -+++ M2Crypto-0.26.4/SWIG/_m2crypto_wrap.c 2017-10-17 18:40:03.847583230 -0700 -@@ -3764,7 +3764,7 @@ - #include <pythread.h> - #include <openssl/crypto.h> - --#if defined(THREADING) && OPENSSL_VERSION_NUMBER < 0x10100000L -+#if defined(THREADING) && (OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)) - #define CRYPTO_num_locks() (CRYPTO_NUM_LOCKS) - static PyThread_type_lock lock_cs[CRYPTO_num_locks()]; - static long lock_count[CRYPTO_num_locks()]; -@@ -3772,7 +3772,7 @@ - #endif - - void threading_locking_callback(int mode, int type, const char *file, int line) { --#if defined(THREADING) && OPENSSL_VERSION_NUMBER < 0x10100000L -+#if defined(THREADING) && (OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)) - if (mode & CRYPTO_LOCK) { - PyThread_acquire_lock(lock_cs[type], WAIT_LOCK); - lock_count[type]++; -@@ -3784,7 +3784,7 @@ - } - - unsigned long threading_id_callback(void) { --#if defined(THREADING) && OPENSSL_VERSION_NUMBER < 0x10100000L -+#if defined(THREADING) && (OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)) - return (unsigned long)PyThread_get_thread_ident(); - #else - return (unsigned long)0; -@@ -3793,7 +3793,7 @@ - - - void threading_init(void) { --#if defined(THREADING) && OPENSSL_VERSION_NUMBER < 0x10100000L -+#if defined(THREADING) && (OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)) - int i; - if (!thread_mode) { - for (i=0; i<CRYPTO_num_locks(); i++) { -@@ -3808,7 +3808,7 @@ - } - - void threading_cleanup(void) { --#if defined(THREADING) && OPENSSL_VERSION_NUMBER < 0x10100000L -+#if defined(THREADING) && (OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)) - int i; - if (thread_mode) { - CRYPTO_set_locking_callback(NULL); -@@ -3834,7 +3834,7 @@ - #include <ceval.h> - - --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - - #include <string.h> - #include <openssl/engine.h> -@@ -4745,7 +4745,7 @@ - - - void lib_init() { --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - SSLeay_add_all_algorithms(); - ERR_load_ERR_strings(); - #endif -@@ -5038,14 +5038,14 @@ - static PyObject *_bio_err; - - --#if OPENSSL_VERSION_NUMBER >= 0x10100000L -+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) - void pyfd_init(void); - #endif - - void bio_init(PyObject *bio_err) { - Py_INCREF(bio_err); - _bio_err = bio_err; --#if OPENSSL_VERSION_NUMBER >= 0x10100000L -+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) - pyfd_init(); - #endif - } -@@ -5268,7 +5268,7 @@ - return BIO_should_write(a); - } - --#if OPENSSL_VERSION_NUMBER >= 0x10100000L -+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) - /* implment custom BIO_s_pyfd */ - - #ifdef WIN32 -@@ -5749,7 +5749,7 @@ - #include <openssl/rsa.h> - #include <openssl/opensslv.h> - --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - - HMAC_CTX *HMAC_CTX_new(void) { - HMAC_CTX *ret = PyMem_Malloc(sizeof(HMAC_CTX)); -diff -Naur M2Crypto-0.26.4.orig/SWIG/_ssl.i M2Crypto-0.26.4/SWIG/_ssl.i ---- M2Crypto-0.26.4.orig/SWIG/_ssl.i 2017-10-17 18:22:17.157602333 -0700 -+++ M2Crypto-0.26.4/SWIG/_ssl.i 2017-10-17 18:41:25.205581773 -0700 -@@ -29,7 +29,7 @@ - #endif - %} - --#if OPENSSL_VERSION_NUMBER >= 0x10100005L -+#if OPENSSL_VERSION_NUMBER >= 0x10100005L && !defined(LIBRESSL_VERSION_NUMBER) - %include <openssl/safestack.h> - #endif - -diff -Naur M2Crypto-0.26.4.orig/SWIG/_threads.i M2Crypto-0.26.4/SWIG/_threads.i ---- M2Crypto-0.26.4.orig/SWIG/_threads.i 2017-10-17 18:22:17.157602333 -0700 -+++ M2Crypto-0.26.4/SWIG/_threads.i 2017-10-17 18:42:10.303580966 -0700 -@@ -5,7 +5,7 @@ - #include <pythread.h> - #include <openssl/crypto.h> - --#if defined(THREADING) && OPENSSL_VERSION_NUMBER < 0x10100000L -+#if defined(THREADING) && (OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)) - #define CRYPTO_num_locks() (CRYPTO_NUM_LOCKS) - static PyThread_type_lock lock_cs[CRYPTO_num_locks()]; - static long lock_count[CRYPTO_num_locks()]; -@@ -13,7 +13,7 @@ - #endif - - void threading_locking_callback(int mode, int type, const char *file, int line) { --#if defined(THREADING) && OPENSSL_VERSION_NUMBER < 0x10100000L -+#if defined(THREADING) && (OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)) - if (mode & CRYPTO_LOCK) { - PyThread_acquire_lock(lock_cs[type], WAIT_LOCK); - lock_count[type]++; -@@ -25,7 +25,7 @@ - } - - unsigned long threading_id_callback(void) { --#if defined(THREADING) && OPENSSL_VERSION_NUMBER < 0x10100000L -+#if defined(THREADING) && (OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)) - return (unsigned long)PyThread_get_thread_ident(); - #else - return (unsigned long)0; -@@ -35,7 +35,7 @@ - - %inline %{ - void threading_init(void) { --#if defined(THREADING) && OPENSSL_VERSION_NUMBER < 0x10100000L -+#if defined(THREADING) && (OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)) - int i; - if (!thread_mode) { - for (i=0; i<CRYPTO_num_locks(); i++) { -@@ -50,7 +50,7 @@ - } - - void threading_cleanup(void) { --#if defined(THREADING) && OPENSSL_VERSION_NUMBER < 0x10100000L -+#if defined(THREADING) && (OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)) - int i; - if (thread_mode) { - CRYPTO_set_locking_callback(NULL); -diff -Naur M2Crypto-0.26.4.orig/SWIG/libcrypto-compat.h M2Crypto-0.26.4/SWIG/libcrypto-compat.h ---- M2Crypto-0.26.4.orig/SWIG/libcrypto-compat.h 2017-10-17 18:22:17.157602333 -0700 -+++ M2Crypto-0.26.4/SWIG/libcrypto-compat.h 2017-10-17 18:42:49.654580261 -0700 -@@ -1,7 +1,7 @@ - #ifndef LIBCRYPTO_COMPAT_H - #define LIBCRYPTO_COMPAT_H - --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - - #include <openssl/rsa.h> - #include <openssl/dsa.h> diff --git a/dev-python/m2crypto/m2crypto-0.27.0.ebuild b/dev-python/m2crypto/m2crypto-0.27.0.ebuild deleted file mode 100644 index 4d813e0..0000000 --- a/dev-python/m2crypto/m2crypto-0.27.0.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 ) -PYTHON_REQ_USE="threads(+)" - -inherit distutils-r1 - -MY_PN="M2Crypto" - -DESCRIPTION="M2Crypto: A Python crypto and SSL toolkit" -HOMEPAGE="https://gitlab.com/m2crypto/m2crypto https://pypi.python.org/pypi/M2Crypto" -SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos" - -IUSE="libressl" - -RDEPEND=" - !libressl? ( >=dev-libs/openssl-0.9.8:0=[-bindist(-)] ) - libressl? ( dev-libs/libressl:0= ) - dev-python/typing[${PYTHON_USEDEP}] -" -DEPEND="${RDEPEND} - >=dev-lang/swig-1.3.28:0 - dev-python/setuptools[${PYTHON_USEDEP}] -" - -S="${WORKDIR}/${MY_PN}-${PV}" - -# Tests access network, and fail randomly. Bug #431458. -RESTRICT=test - -PATCHES=( - "${FILESDIR}"/0.26.4-libressl.patch -) - -python_compile() { - # setup.py looks at platform.machine() to determine swig options. - # For exotic ABIs, we need to give swig a hint. - # https://bugs.gentoo.org/617946 - # TODO: Fix cross-compiles - local -x SWIG_FEATURES= - case ${ABI} in - x32) SWIG_FEATURES="-D__ILP32__" ;; - esac - distutils-r1_python_compile --openssl="${EPREFIX}"/usr -} - -python_test() { - esetup.py test -} diff --git a/dev-python/m2crypto/metadata.xml b/dev-python/m2crypto/metadata.xml deleted file mode 100644 index ed10818..0000000 --- a/dev-python/m2crypto/metadata.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>python@gentoo.org</email> - <name>Python</name> - </maintainer> - <upstream> - <remote-id type="pypi">M2Crypto</remote-id> - <remote-id type="gitlab">m2crypto/m2crypto</remote-id> - </upstream> -</pkgmetadata> |