mirror of
https://github.com/void-linux/void-packages.git
synced 2025-08-01 02:12:55 +02:00
python3-M2Crypto: update to 0.38.0.
* remove python2 version * enable tests
This commit is contained in:
parent
4bb9644685
commit
0e72ce7ddc
5 changed files with 20 additions and 170 deletions
|
@ -1,140 +0,0 @@
|
||||||
--- a/SWIG/_bio.i
|
|
||||||
+++ b/SWIG/_bio.i
|
|
||||||
@@ -293,8 +293,12 @@ int bio_should_write(BIO* a) {
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Macros for things not defined before 1.1.0 */
|
|
||||||
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
|
|
||||||
-static BIO_METHOD *
|
|
||||||
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
|
|
||||||
+
|
|
||||||
+#if !defined(LIBRESSL_VERSION_NUMBER)
|
|
||||||
+static
|
|
||||||
+#endif
|
|
||||||
+BIO_METHOD *
|
|
||||||
BIO_meth_new( int type, const char *name )
|
|
||||||
{
|
|
||||||
BIO_METHOD *method = malloc( sizeof(BIO_METHOD) );
|
|
||||||
@@ -306,7 +310,10 @@ BIO_meth_new( int type, const char *name )
|
|
||||||
return method;
|
|
||||||
}
|
|
||||||
|
|
||||||
-static void
|
|
||||||
+#if !defined(LIBRESSL_VERSION_NUMBER)
|
|
||||||
+static
|
|
||||||
+#endif
|
|
||||||
+void
|
|
||||||
BIO_meth_free( BIO_METHOD *meth )
|
|
||||||
{
|
|
||||||
if ( meth == NULL ) {
|
|
||||||
--- a/SWIG/_evp.i
|
|
||||||
+++ b/SWIG/_evp.i
|
|
||||||
@@ -19,7 +19,7 @@ Copyright (c) 2009-2010 Heikki Toivonen. All rights re
|
|
||||||
#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));
|
|
||||||
--- a/SWIG/_lib11_compat.i
|
|
||||||
+++ b/SWIG/_lib11_compat.i
|
|
||||||
@@ -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>
|
|
||||||
--- a/SWIG/_lib.i
|
|
||||||
+++ b/SWIG/_lib.i
|
|
||||||
@@ -21,7 +21,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;
|
|
||||||
@@ -499,7 +499,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
|
|
||||||
--- a/SWIG/_ssl.i
|
|
||||||
+++ b/SWIG/_ssl.i
|
|
||||||
@@ -275,7 +275,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
|
|
||||||
--- a/SWIG/_threads.i
|
|
||||||
+++ b/SWIG/_threads.i
|
|
||||||
@@ -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 @@ 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<CRYPTO_num_locks(); i++) {
|
|
||||||
@@ -50,7 +50,7 @@ void threading_init(void) {
|
|
||||||
}
|
|
||||||
|
|
||||||
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);
|
|
||||||
--- a/SWIG/libcrypto-compat.h
|
|
||||||
+++ b/SWIG/libcrypto-compat.h
|
|
||||||
@@ -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>
|
|
|
@ -1,29 +0,0 @@
|
||||||
# Template file for 'python-M2Crypto'
|
|
||||||
pkgname=python-M2Crypto
|
|
||||||
version=0.35.2
|
|
||||||
revision=7
|
|
||||||
wrksrc="M2Crypto-${version}"
|
|
||||||
build_style=python-module
|
|
||||||
pycompile_module="M2Crypto"
|
|
||||||
hostmakedepends="python-setuptools python3-setuptools swig openssl-devel"
|
|
||||||
makedepends="openssl-devel python-devel python3-devel"
|
|
||||||
depends="python-typing"
|
|
||||||
short_desc="Python2 crypto and SSL toolkit"
|
|
||||||
maintainer="Orphaned <orphan@voidlinux.org>"
|
|
||||||
license="MIT"
|
|
||||||
homepage="https://gitlab.com/m2crypto/m2crypto/"
|
|
||||||
distfiles="${PYPI_SITE}/M/M2Crypto/M2Crypto-${version}.tar.gz"
|
|
||||||
checksum=4c6ad45ffb88670c590233683074f2440d96aaccb05b831371869fc387cbd127
|
|
||||||
|
|
||||||
post_install() {
|
|
||||||
vlicense LICENCE
|
|
||||||
}
|
|
||||||
|
|
||||||
python3-M2Crypto_package() {
|
|
||||||
pycompile_module="M2Crypto"
|
|
||||||
short_desc="${short_desc/Python2/Python3}"
|
|
||||||
pkg_install() {
|
|
||||||
vmove usr/lib/python3*
|
|
||||||
vlicense LICENCE
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1 +0,0 @@
|
||||||
python-M2Crypto
|
|
20
srcpkgs/python3-M2Crypto/template
Normal file
20
srcpkgs/python3-M2Crypto/template
Normal file
|
@ -0,0 +1,20 @@
|
||||||
|
# Template file for 'python3-M2Crypto'
|
||||||
|
pkgname=python3-M2Crypto
|
||||||
|
version=0.38.0
|
||||||
|
revision=1
|
||||||
|
wrksrc="M2Crypto-${version}"
|
||||||
|
build_style=python3-module
|
||||||
|
hostmakedepends="python3-setuptools swig openssl-devel"
|
||||||
|
makedepends="openssl-devel python3-devel"
|
||||||
|
depends="python3"
|
||||||
|
checkdepends="ca-certificates python3-pytest python3-parameterized"
|
||||||
|
short_desc="Python crypto and SSL toolkit"
|
||||||
|
maintainer="Orphaned <orphan@voidlinux.org>"
|
||||||
|
license="MIT"
|
||||||
|
homepage="https://gitlab.com/m2crypto/m2crypto/"
|
||||||
|
distfiles="${PYPI_SITE}/M/M2Crypto/M2Crypto-${version}.tar.gz"
|
||||||
|
checksum=99f2260a30901c949a8dc6d5f82cd5312ffb8abc92e76633baf231bbbcb2decb
|
||||||
|
|
||||||
|
post_install() {
|
||||||
|
vlicense LICENCE
|
||||||
|
}
|
Loading…
Add table
Reference in a new issue