aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAric Belsito <lluixhi@gmail.com>2016-02-22 00:12:28 -0800
committerAric Belsito <lluixhi@gmail.com>2016-02-22 00:12:28 -0800
commit83fd6c0c3e6053654dbdc0cf33ee33a66e6b6033 (patch)
tree87a3befc0b141fba190bf65c1cd8259f3feefae7 /dev-python
parentMerge pull request #120 from maurerpe/master (diff)
downloadlibressl-83fd6c0c3e6053654dbdc0cf33ee33a66e6b6033.tar.gz
libressl-83fd6c0c3e6053654dbdc0cf33ee33a66e6b6033.tar.bz2
libressl-83fd6c0c3e6053654dbdc0cf33ee33a66e6b6033.zip
Update m2crypto.
Diffstat (limited to 'dev-python')
-rw-r--r--dev-python/m2crypto/Manifest1
-rw-r--r--dev-python/m2crypto/files/0.23.0-no-ssl3.patch14
-rw-r--r--dev-python/m2crypto/m2crypto-0.23.0.ebuild (renamed from dev-python/m2crypto/m2crypto-0.22.3-r5.ebuild)4
-rw-r--r--dev-python/m2crypto/metadata.xml5
4 files changed, 20 insertions, 4 deletions
diff --git a/dev-python/m2crypto/Manifest b/dev-python/m2crypto/Manifest
index 5ceb0d4..e2ea80b 100644
--- a/dev-python/m2crypto/Manifest
+++ b/dev-python/m2crypto/Manifest
@@ -1 +1,2 @@
DIST M2Crypto-0.22.3.tar.gz 74795 SHA256 6071bfc817d94723e9b458a010d565365104f84aa73f7fe11919871f7562ff72 SHA512 c179d3cf03ced77aed24285ca3f1527d5e05bbfe091a1522bff94a940fd390213fbb9b83d7ccd43ceae49626b427ae8790782cf93ead85be1e063bc4121c62e0 WHIRLPOOL 66a9a6e7c9b195814048a1bcecf6ef71a269bebb9dbda73801c88b3ba27330b555a46d05c53bbd0778f9c1e1bb5f9c6e7e860de443bf16baffc2072ee5996e31
+DIST M2Crypto-0.23.0.tar.gz 183590 SHA256 1ac3b6eafa5ff7e2a0796675316d7569b28aada45a7ab74042ad089d15a9567f SHA512 b1c57328c60cb82fdc196c491d9518d58a996fbae35e32b0bd20d3d38ec8f72d0981ba7dde154f7684224ce9ee38e69460328f1bd8931b16210233c8199e6c51 WHIRLPOOL a618c294e59ede845cec02cc28146fa05b8ac68959e10c19eb2d6b97b113cf87620d89226ff9453f66fc7f4592e7a106ddf75b946cd4042f754c0c6dd9759fbd
diff --git a/dev-python/m2crypto/files/0.23.0-no-ssl3.patch b/dev-python/m2crypto/files/0.23.0-no-ssl3.patch
new file mode 100644
index 0000000..62ca419
--- /dev/null
+++ b/dev-python/m2crypto/files/0.23.0-no-ssl3.patch
@@ -0,0 +1,14 @@
+diff -Naurw M2Crypto-0.23.0.orig/SWIG/_ssl.i M2Crypto-0.23.0/SWIG/_ssl.i
+--- M2Crypto-0.23.0.orig/SWIG/_ssl.i 2015-12-04 04:27:05.000000000 -0800
++++ M2Crypto-0.23.0/SWIG/_ssl.i 2016-02-18 16:46:48.725288975 -0800
+@@ -56,8 +56,10 @@
+ %rename(sslv2_method) SSLv2_method;
+ extern SSL_METHOD *SSLv2_method(void);
+ #endif
++#ifndef OPENSSL_NO_SSL3
+ %rename(sslv3_method) SSLv3_method;
+ extern SSL_METHOD *SSLv3_method(void);
++#endif
+ %rename(sslv23_method) SSLv23_method;
+ extern SSL_METHOD *SSLv23_method(void);
+ %rename(tlsv1_method) TLSv1_method;
diff --git a/dev-python/m2crypto/m2crypto-0.22.3-r5.ebuild b/dev-python/m2crypto/m2crypto-0.23.0.ebuild
index 00ded73..8a4906b 100644
--- a/dev-python/m2crypto/m2crypto-0.22.3-r5.ebuild
+++ b/dev-python/m2crypto/m2crypto-0.23.0.ebuild
@@ -35,9 +35,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
RESTRICT=test
PATCHES=(
- "${FILESDIR}"/0.22.3-Use-swig-generated-python-loader.patch
- "${FILESDIR}"/0.22.3-packaging.patch
- "${FILESDIR}"/0.22.3-no-ssl3.patch
+ "${FILESDIR}"/0.23.0-no-ssl3.patch
)
python_test() {
diff --git a/dev-python/m2crypto/metadata.xml b/dev-python/m2crypto/metadata.xml
index 63966d0..7bdb37c 100644
--- a/dev-python/m2crypto/metadata.xml
+++ b/dev-python/m2crypto/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>python</herd>
+ <maintainer type="project">
+ <email>python@gentoo.org</email>
+ <name>Python</name>
+ </maintainer>
<upstream>
<remote-id type="pypi">M2Crypto</remote-id>
<remote-id type="github">martinpaljak/M2Crypto</remote-id>