diff options
Diffstat (limited to 'dev-python')
| -rw-r--r-- | dev-python/django-environ/Manifest | 2 | ||||
| -rw-r--r-- | dev-python/django-environ/django-environ-0.12.1.ebuild (renamed from dev-python/django-environ/django-environ-0.11.2.ebuild) | 2 | ||||
| -rw-r--r-- | dev-python/m2crypto/Manifest | 2 | ||||
| -rw-r--r-- | dev-python/m2crypto/files/patch-src_SWIG__lib11_compat_i | 23 | ||||
| -rw-r--r-- | dev-python/m2crypto/files/patch-src_SWIG__lib_i | 70 | ||||
| -rw-r--r-- | dev-python/m2crypto/files/patch-src_SWIG__threads_i | 50 | ||||
| -rw-r--r-- | dev-python/m2crypto/files/patch-src_SWIG__x509_i | 16 | ||||
| -rw-r--r-- | dev-python/m2crypto/m2crypto-0.46.2.ebuild | 70 | ||||
| -rw-r--r-- | dev-python/m2crypto/m2crypto-0.47.0.ebuild | 70 | ||||
| -rw-r--r-- | dev-python/m2crypto/metadata.xml | 14 |
10 files changed, 2 insertions, 317 deletions
diff --git a/dev-python/django-environ/Manifest b/dev-python/django-environ/Manifest index 4190401fa2da..5f17dee8ee70 100644 --- a/dev-python/django-environ/Manifest +++ b/dev-python/django-environ/Manifest @@ -1,2 +1,2 @@ -DIST django-environ-0.11.2.gh.tar.gz 50806 BLAKE2B d7ae0300fb3074e1f0c1bd97b46623f4e703f9330ce016f3690b8758ed6109f64f007747cf098d3f680110edd576476bf7c5c4080651b50f35bfd14320e24d80 SHA512 f712783d087f8942ac23d88ae1fc3f3a55ef9eaf4e63124a433151717b7245853c6e70a3fcfb0d90c31d0432de12ebd246dfc465c7a428d244393ca82194b649 DIST django-environ-0.12.0.gh.tar.gz 52854 BLAKE2B 4c930d3ac66bbf9bd629ceee10c0fbeb78073c26e49c910a6300e481488562de97b9074b3da74aa27500b330eb391399922a19edd42aa40f09c8b2b107b0f5e2 SHA512 299ded59546847e0bfac25dea3c8967685d6e1f35b4aabe27cc7ae7104430bda1b989fd286915428e1dd1c429fd8ed156faaecfc41a2df0d2293d7cd75f9adb8 +DIST django-environ-0.12.1.gh.tar.gz 54327 BLAKE2B 33d667f147322ed7d383217db13faaca398ea0ea37930819545cfd0bd835f658fe958752515cb5b4422f8c532f4f7b4f8d454853194d5b41d87a80ffcf1213bd SHA512 653e424530a284307232d42317a55b4a8b023fb866df4e0cca3917750e9f7b1f8f3dea6b2a52fff1b0461278c5c6e26b5c05c77ca282902742ec7691fa65cee8 diff --git a/dev-python/django-environ/django-environ-0.11.2.ebuild b/dev-python/django-environ/django-environ-0.12.1.ebuild index 2a8c2a49e255..5fba9adad02d 100644 --- a/dev-python/django-environ/django-environ-0.11.2.ebuild +++ b/dev-python/django-environ/django-environ-0.12.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 2023 Liguros Authors +# Copyright 2023-2026 Liguros Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 diff --git a/dev-python/m2crypto/Manifest b/dev-python/m2crypto/Manifest deleted file mode 100644 index 146cd46b54a7..000000000000 --- a/dev-python/m2crypto/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST m2crypto-0.46.2.tar.gz 499931 BLAKE2B 1ce48566700e5bc74b3783ce0f73cc1137ee07b48ccb88eb1a722c408566cf6e0020d9cfd2889d443464c38afac225e5f3a3ea924ee3504e1a3b26a01dbcab1e SHA512 593ed3acd4e6add303c0cfd115bb311528f137b97b2cf84aa04aa3e4f4eec72601a13435a622305d7860d0fffb831ef5cd28547b6e2c24d0275e219b25d52633 -DIST m2crypto-0.47.0.tar.gz 526447 BLAKE2B fba86900a44e272bb55a25804d59bd7fbfe2652d261b2ece8918754fefc6c3d2ba25d47f327995760e657ce32f653c1747d2f5c88d1240938173b5448b7b0c36 SHA512 ad1f9e8a155055287689dc502900d5cf7df6defacf2da4f923683f2041ab7999ea1d2fac7105053e362778c3326c9aad36f8ce9bd5810a0ea1bb33f1e91dffc8 diff --git a/dev-python/m2crypto/files/patch-src_SWIG__lib11_compat_i b/dev-python/m2crypto/files/patch-src_SWIG__lib11_compat_i deleted file mode 100644 index c2600fea04a6..000000000000 --- a/dev-python/m2crypto/files/patch-src_SWIG__lib11_compat_i +++ /dev/null @@ -1,23 +0,0 @@ -Provide CRYPTO_zalloc to fix build with LibreSSL - -Index: src/SWIG/_lib11_compat.i ---- src/SWIG/_lib11_compat.i.orig -+++ src/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> -@@ -24,6 +24,8 @@ static void *CRYPTO_zalloc(size_t num, const char *fil - return ret; - } - -+#endif -+#if OPENSSL_VERSION_NUMBER < 0x10100000L - #include <openssl/bn.h> - - #ifndef BN_F_BN_GENCB_NEW diff --git a/dev-python/m2crypto/files/patch-src_SWIG__lib_i b/dev-python/m2crypto/files/patch-src_SWIG__lib_i deleted file mode 100644 index 952b7198b214..000000000000 --- a/dev-python/m2crypto/files/patch-src_SWIG__lib_i +++ /dev/null @@ -1,70 +0,0 @@ -Fix build with LibreSSL - -Index: src/SWIG/_lib.i ---- src/SWIG/_lib.i.orig -+++ src/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; -@@ -31,47 +31,21 @@ typedef struct stack_st OPENSSL_STACK; - - void OPENSSL_sk_free(OPENSSL_STACK *st) - { -- if (st == NULL) -- return; -- OPENSSL_free(st->data); -- OPENSSL_free(st); -+ sk_free(st); - } - - OPENSSL_STACK *OPENSSL_sk_deep_copy(const OPENSSL_STACK *sk, - OPENSSL_sk_copyfunc copy_func, - OPENSSL_sk_freefunc free_func) - { -- OPENSSL_STACK *ret; -- int i; -+ /* Do not support this. It relies on UB via function pointer casting. */ -+ return NULL; -+} - -- if (sk->num < 0) -- return NULL; -- -- if ((ret = OPENSSL_malloc(sizeof(*ret))) == NULL) -- return NULL; -- -- /* direct structure assignment */ -- *ret = *sk; -- -- ret->num_alloc = sk->num > MIN_NODES ? (size_t)sk->num : MIN_NODES; -- ret->data = OPENSSL_zalloc(sizeof(*ret->data) * ret->num_alloc); -- if (ret->data == NULL) { -- OPENSSL_free(ret); -- return NULL; -- } -- -- for (i = 0; i < ret->num; ++i) { -- if (sk->data[i] == NULL) -- continue; -- if ((ret->data[i] = copy_func(sk->data[i])) == NULL) { -- while (--i >= 0) -- if (ret->data[i] != NULL) -- free_func((void *)ret->data[i]); -- OPENSSL_sk_free(ret); -- return NULL; -- } -- } -- return ret; -+int sk_find_ex(OPENSSL_STACK *sk, void *wanted) -+{ -+ /* Let's see if anything fails. */ -+ return -1; - } - #endif /* OpenSSL 1.0.2 copmatbility shim */ - diff --git a/dev-python/m2crypto/files/patch-src_SWIG__threads_i b/dev-python/m2crypto/files/patch-src_SWIG__threads_i deleted file mode 100644 index b0a93a2f5a61..000000000000 --- a/dev-python/m2crypto/files/patch-src_SWIG__threads_i +++ /dev/null @@ -1,50 +0,0 @@ -Fix build with LibreSSL - -Index: src/SWIG/_threads.i ---- src/SWIG/_threads.i.orig -+++ src/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); diff --git a/dev-python/m2crypto/files/patch-src_SWIG__x509_i b/dev-python/m2crypto/files/patch-src_SWIG__x509_i deleted file mode 100644 index 0e1d20a51801..000000000000 --- a/dev-python/m2crypto/files/patch-src_SWIG__x509_i +++ /dev/null @@ -1,16 +0,0 @@ -X509_check_trust() was removed from the public API - -Index: src/SWIG/_x509.i ---- src/SWIG/_x509.i.orig -+++ src/SWIG/_x509.i -@@ -108,8 +108,10 @@ extern int X509_cmp_current_time(ASN1_TIME *); - - %rename(x509_check_purpose) X509_check_purpose; - extern int X509_check_purpose(X509 *, int, int); -+#ifndef LIBRESSL_VERSION_NUMBER - %rename(x509_check_trust) X509_check_trust; - extern int X509_check_trust(X509 *, int, int); -+#endif - - %rename(x509_write_pem) PEM_write_bio_X509; - %threadallow PEM_write_bio_X509; diff --git a/dev-python/m2crypto/m2crypto-0.46.2.ebuild b/dev-python/m2crypto/m2crypto-0.46.2.ebuild deleted file mode 100644 index 96fd67c2a593..000000000000 --- a/dev-python/m2crypto/m2crypto-0.46.2.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 2021-2025 Liguros Authors -# Distributed under the terms of the GNU General Public License v2 -EAPI=8 - -DISTUTILS_EXT=1 -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{10..14} ) -PYTHON_REQ_USE="threads(+)" - -inherit distutils-r1 toolchain-funcs - -DESCRIPTION="A Python crypto and SSL toolkit" -HOMEPAGE="https://sr.ht/~mcepl/m2crypto/ https://pypi.org/project/M2Crypto/" -SRC_URI=" - https://git.sr.ht/~mcepl/m2crypto/archive/${PV}.tar.gz -> ${P}.tar.gz -" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos" -IUSE="libressl" - -BDEPEND=" - >=dev-lang/swig-2.0.9 -" -RDEPEND=" - !libressl? ( dev-libs/openssl:0= ) - libressl? ( >=dev-libs/libressl-3.5.0:0= ) -" -DEPEND="${RDEPEND}" - -swig_define() { - local x - for x; do - if tc-cpp-is-true "defined(${x})"; then - SWIG_FEATURES+=" -D${x}" - fi - done -} - -src_prepare() { - if use libressl; then - eapply -p0 ${FILESDIR}/patch-src_SWIG__x509_i - eapply -p0 ${FILESDIR}/patch-src_SWIG__lib11_compat_i - eapply -p0 ${FILESDIR}/patch-src_SWIG__lib_i - eapply -p0 ${FILESDIR}/patch-src_SWIG__threads_i - fi - - sed -e 's:test_server_simple_timeouts:_&:' \ - -i tests/test_ssl.py || die - distutils-r1_src_prepare -} - -python_compile() { - # setup.py looks at platform.machine() to determine swig options. - # For exotic ABIs, we need to give swig a hint. - local -x SWIG_FEATURES= - - # https://bugs.gentoo.org/617946 - swig_define __ILP32__ - # https://bugs.gentoo.org/674112 - swig_define __ARM_PCS_VFP - - distutils-r1_python_compile -} - -python_test() { - "${EPYTHON}" -m unittest -b -v tests.alltests.suite || - die "Tests failed for ${EPYTHON}" -} diff --git a/dev-python/m2crypto/m2crypto-0.47.0.ebuild b/dev-python/m2crypto/m2crypto-0.47.0.ebuild deleted file mode 100644 index 201e003c497e..000000000000 --- a/dev-python/m2crypto/m2crypto-0.47.0.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 2021-2026 Liguros Authors -# Distributed under the terms of the GNU General Public License v2 -EAPI=8 - -DISTUTILS_EXT=1 -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{10..14} ) -PYTHON_REQ_USE="threads(+)" - -inherit distutils-r1 toolchain-funcs - -DESCRIPTION="A Python crypto and SSL toolkit" -HOMEPAGE="https://sr.ht/~mcepl/m2crypto/ https://pypi.org/project/M2Crypto/" -SRC_URI=" - https://git.sr.ht/~mcepl/m2crypto/archive/${PV}.tar.gz -> ${P}.tar.gz -" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos" -IUSE="libressl" - -BDEPEND=" - >=dev-lang/swig-2.0.9 -" -RDEPEND=" - !libressl? ( dev-libs/openssl:0= ) - libressl? ( >=dev-libs/libressl-3.5.0:0= ) -" -DEPEND="${RDEPEND}" - -swig_define() { - local x - for x; do - if tc-cpp-is-true "defined(${x})"; then - SWIG_FEATURES+=" -D${x}" - fi - done -} - -src_prepare() { - if use libressl; then - eapply -p0 ${FILESDIR}/patch-src_SWIG__x509_i - eapply -p0 ${FILESDIR}/patch-src_SWIG__lib11_compat_i - eapply -p0 ${FILESDIR}/patch-src_SWIG__lib_i - eapply -p0 ${FILESDIR}/patch-src_SWIG__threads_i - fi - - sed -e 's:test_server_simple_timeouts:_&:' \ - -i tests/test_ssl.py || die - distutils-r1_src_prepare -} - -python_compile() { - # setup.py looks at platform.machine() to determine swig options. - # For exotic ABIs, we need to give swig a hint. - local -x SWIG_FEATURES= - - # https://bugs.gentoo.org/617946 - swig_define __ILP32__ - # https://bugs.gentoo.org/674112 - swig_define __ARM_PCS_VFP - - distutils-r1_python_compile -} - -python_test() { - "${EPYTHON}" -m unittest -b -v tests.alltests.suite || - die "Tests failed for ${EPYTHON}" -} diff --git a/dev-python/m2crypto/metadata.xml b/dev-python/m2crypto/metadata.xml deleted file mode 100644 index d58e6b044b8a..000000000000 --- a/dev-python/m2crypto/metadata.xml +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>dev@liguros.net</email> - <name>Development</name> - </maintainer> - <maintainer type="project"> - <email>python@gentoo.org</email> - <name>Python</name> - </maintainer> - - <origin>ports</origin> -</pkgmetadata>
\ No newline at end of file |
