From 848a38ce438f8c2518f03539bf82442f474f015d Mon Sep 17 00:00:00 2001 From: Andrea Brancaleoni Date: Thu, 1 Mar 2018 09:17:25 +0100 Subject: [PATCH] python-M2Crypto: update to 0.29.0. --- .../python-M2Crypto/patches/libressl.patch | 148 ------------------ srcpkgs/python-M2Crypto/template | 9 +- 2 files changed, 7 insertions(+), 150 deletions(-) delete mode 100644 srcpkgs/python-M2Crypto/patches/libressl.patch diff --git a/srcpkgs/python-M2Crypto/patches/libressl.patch b/srcpkgs/python-M2Crypto/patches/libressl.patch deleted file mode 100644 index 54620a6afb3..00000000000 --- a/srcpkgs/python-M2Crypto/patches/libressl.patch +++ /dev/null @@ -1,148 +0,0 @@ ---- SWIG/_bio.i.orig -+++ SWIG/_bio.i -@@ -63,14 +63,14 @@ extern BIO *BIO_pop(BIO *); - 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 - } -@@ -299,7 +299,7 @@ int bio_should_write(BIO* a) { - 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 ---- SWIG/_evp.i.orig -+++ SWIG/_evp.i -@@ -19,7 +19,7 @@ Copyright (c) 2009-2010 Heikki Toivonen. All rights re - #include - #include - --#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)); ---- SWIG/_lib11_compat.i.orig -+++ SWIG/_lib11_compat.i -@@ -8,7 +8,7 @@ - */ - - %{ --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - - #include - #include ---- SWIG/_lib.i.orig -+++ SWIG/_lib.i -@@ -18,7 +18,7 @@ - - %{ - /* OpenSSL 1.0.2 copmatbility shim */ --#if OPENSSL_VERSION_NUMBER < 0x10002000L -+#if OPENSSL_VERSION_NUMBER < 0x10002000L || defined(LIBRESSL_VERSION_NUMBER) - typedef void (*OPENSSL_sk_freefunc)(void *); - typedef void *(*OPENSSL_sk_copyfunc)(const void *); - typedef struct stack_st OPENSSL_STACK; -@@ -501,7 +501,7 @@ int passphrase_callback(char *buf, int num, int v, voi - %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 ---- SWIG/_ssl.i.orig -+++ SWIG/_ssl.i -@@ -268,7 +268,7 @@ void ssl_init(PyObject *ssl_err, PyObject *ssl_timeout - - #ifndef OPENSSL_NO_SSL3 - const SSL_METHOD *sslv3_method(void) { --#if OPENSSL_VERSION_NUMBER >= 0x10100000L -+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) - PyErr_WarnEx(PyExc_DeprecationWarning, - "Function SSLv3_method has been deprecated.", 1); - #endif -@@ -277,7 +277,7 @@ const SSL_METHOD *sslv3_method(void) { - #endif - - const SSL_METHOD *tlsv1_method(void) { --#if OPENSSL_VERSION_NUMBER >= 0x10100000L -+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) - PyErr_WarnEx(PyExc_DeprecationWarning, - "Function TLSv1_method has been deprecated.", 1); - #endif ---- SWIG/_threads.i.orig -+++ SWIG/_threads.i -@@ -5,7 +5,7 @@ - #include - #include - --#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 @@ static int thread_mode = 0; - #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 @@ void threading_locking_callback(int mode, int type, co - } - - 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 @@ unsigned long threading_id_callback(void) { - - %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 - #include diff --git a/srcpkgs/python-M2Crypto/template b/srcpkgs/python-M2Crypto/template index bca69b94bd2..8541fb89439 100644 --- a/srcpkgs/python-M2Crypto/template +++ b/srcpkgs/python-M2Crypto/template @@ -1,6 +1,6 @@ # Template file for 'python-M2Crypto' pkgname=python-M2Crypto -version=0.28.2 +version=0.29.0 revision=1 wrksrc="M2Crypto-${version}" build_style=python2-module @@ -13,7 +13,12 @@ maintainer="Andrea Brancaleoni " license="MIT" homepage="https://gitlab.com/m2crypto/m2crypto/" distfiles="${PYPI_SITE}/M/M2Crypto/M2Crypto-${version}.tar.gz" -checksum=f4dfa7a77f983444e64f7b81f946bdfc1b05bc92b1aeca0775be8742aa939c3f +checksum=a0fea2c5ab913e42864d1ccbaee5878c23886368b606e923609fda4ce37d26c0 + +pre_configure() { + sed -i 's/OPENSSL_VERSION_NUMBER < 0x10100000L/OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)/g' SWIG/*.i + sed -i 's/OPENSSL_VERSION_NUMBER >= 0x10100000L/OPENSSL_VERSION_NUMBER >= 0x10100000L \&\& !defined(LIBRESSL_VERSION_NUMBER)/g' SWIG/*.i +} post_install() { vlicense LICENCE