[arch-commits] Commit in python-m2crypto/trunk (PKGBUILD)

2020-12-08 Thread Morten Linderud via arch-commits
Date: Tuesday, December 8, 2020 @ 22:16:20
  Author: foxboron
Revision: 772288

upgpkg: python-m2crypto 0.37.1-1

Modified:
  python-m2crypto/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-12-08 22:16:08 UTC (rev 772287)
+++ PKGBUILD2020-12-08 22:16:20 UTC (rev 772288)
@@ -5,8 +5,8 @@
 
 pkgbase=python-m2crypto
 pkgname=(python2-m2crypto python-m2crypto)
-pkgver=0.36.0
-pkgrel=3
+pkgver=0.37.1
+pkgrel=1
 pkgdesc="A crypto and SSL toolkit for Python"
 arch=('x86_64')
 url="https://pypi.python.org/pypi/M2Crypto";
@@ -16,7 +16,7 @@
  'swig')
 
source=("${pkgname}-${pkgver}.tar.gz::https://gitlab.com/m2crypto/m2crypto/repository/${pkgver}/archive.tar.gz";
 "LICENSE")
-sha256sums=('18e23c5a4d5962a5bd44feba00a521f662c4f7a391b27b8464df095494f21eda'
+sha256sums=('bf6156ea3b094a36d9f14985e44695146808eeb4299d50a2f80c942ae1c2cccf'
 '4eca478396f4b2b020729a111fce3f096456d74500bfd8f2b0388c3c69f997c0')
 
 prepare() {


[arch-commits] Commit in python-m2crypto/trunk (PKGBUILD)

2020-11-12 Thread Evangelos Foutras via arch-commits
Date: Thursday, November 12, 2020 @ 16:58:34
  Author: foutrelis
Revision: 752136

upgpkg: python-m2crypto 0.36.0-3: Python 3.9 rebuild

Modified:
  python-m2crypto/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-11-12 16:58:28 UTC (rev 752135)
+++ PKGBUILD2020-11-12 16:58:34 UTC (rev 752136)
@@ -6,7 +6,7 @@
 pkgbase=python-m2crypto
 pkgname=(python2-m2crypto python-m2crypto)
 pkgver=0.36.0
-pkgrel=2
+pkgrel=3
 pkgdesc="A crypto and SSL toolkit for Python"
 arch=('x86_64')
 url="https://pypi.python.org/pypi/M2Crypto";


[arch-commits] Commit in python-m2crypto/trunk (PKGBUILD)

2020-07-16 Thread Morten Linderud via arch-commits
Date: Thursday, July 16, 2020 @ 11:15:17
  Author: foxboron
Revision: 664112

upgpkg: python-m2crypto 0.36.0-1

Modified:
  python-m2crypto/trunk/PKGBUILD

--+
 PKGBUILD |   15 ---
 1 file changed, 4 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-07-16 11:11:26 UTC (rev 664111)
+++ PKGBUILD2020-07-16 11:15:17 UTC (rev 664112)
@@ -5,8 +5,8 @@
 
 pkgbase=python-m2crypto
 pkgname=(python2-m2crypto python-m2crypto)
-pkgver=0.35.2
-pkgrel=3
+pkgver=0.36.0
+pkgrel=1
 pkgdesc="A crypto and SSL toolkit for Python"
 arch=('x86_64')
 url="https://pypi.python.org/pypi/M2Crypto";
@@ -15,19 +15,12 @@
  'python2' 'python2-setuptools'
  'swig')
 
source=("${pkgname}-${pkgver}.tar.gz::https://gitlab.com/m2crypto/m2crypto/repository/${pkgver}/archive.tar.gz";
-"socketio.patch"
-"LICENSE")
-sha256sums=('57220b06de0622d0fad464ec2f16abe6f7aaa6d8ab5ab11372e6a17d7b52550b'
-'d4937399c15c00986088f35c3a813584c4b171bea631ffe1a71e483c8236c304'
+"LICENSE")
+sha256sums=('18e23c5a4d5962a5bd44feba00a521f662c4f7a391b27b8464df095494f21eda'
 '4eca478396f4b2b020729a111fce3f096456d74500bfd8f2b0388c3c69f997c0')
 
 prepare() {
   mv m2crypto-${pkgver}-* m2crypto-${pkgver}
-
-  cd "m2crypto-$pkgver"
-  patch -Np1 < "$srcdir/socketio.patch"
-  cd ..
-
   cp -a m2crypto-$pkgver{,-py2}
 }
 


[arch-commits] Commit in python-m2crypto/trunk (PKGBUILD socketio.patch)

2020-06-06 Thread Morten Linderud via arch-commits
Date: Saturday, June 6, 2020 @ 14:31:42
  Author: foxboron
Revision: 639492

upgpkg: python-m2crypto 0.35.2-3

Added:
  python-m2crypto/trunk/socketio.patch
Modified:
  python-m2crypto/trunk/PKGBUILD

+
 PKGBUILD   |   13 ++---
 socketio.patch |   47 +++
 2 files changed, 57 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-06-06 14:17:08 UTC (rev 639491)
+++ PKGBUILD2020-06-06 14:31:42 UTC (rev 639492)
@@ -6,7 +6,7 @@
 pkgbase=python-m2crypto
 pkgname=(python2-m2crypto python-m2crypto)
 pkgver=0.35.2
-pkgrel=2
+pkgrel=3
 pkgdesc="A crypto and SSL toolkit for Python"
 arch=('x86_64')
 url="https://pypi.python.org/pypi/M2Crypto";
@@ -13,14 +13,21 @@
 license=('BSD')
 makedepends=('python' 'python-setuptools'
  'python2' 'python2-setuptools'
-'swig')
+ 'swig')
 
source=("${pkgname}-${pkgver}.tar.gz::https://gitlab.com/m2crypto/m2crypto/repository/${pkgver}/archive.tar.gz";
-   "LICENSE")
+"socketio.patch"
+"LICENSE")
 sha256sums=('57220b06de0622d0fad464ec2f16abe6f7aaa6d8ab5ab11372e6a17d7b52550b'
+'d4937399c15c00986088f35c3a813584c4b171bea631ffe1a71e483c8236c304'
 '4eca478396f4b2b020729a111fce3f096456d74500bfd8f2b0388c3c69f997c0')
 
 prepare() {
   mv m2crypto-${pkgver}-* m2crypto-${pkgver}
+
+  cd "m2crypto-$pkgver"
+  patch -Np1 < "$srcdir/socketio.patch"
+  cd ..
+
   cp -a m2crypto-$pkgver{,-py2}
 }
 

Added: socketio.patch
===
--- socketio.patch  (rev 0)
+++ socketio.patch  2020-06-06 14:31:42 UTC (rev 639492)
@@ -0,0 +1,47 @@
+From d3a43ffe1bfe4c128d6ab7c390419dee68f4ca5a Mon Sep 17 00:00:00 2001
+From: lethliel 
+Date: Wed, 19 Feb 2020 11:53:05 +0100
+Subject: [PATCH] wrap SocketIO in io.Buffered* for makefile
+
+In python3.8 the fp is wrapped in a Buffer.
+SSL.Connection.makefile returns a socketIO which is no buffer.
+
+SocketIO in 'r' mode:
+use io.BufferedReader
+
+SocketIO in 'rw' mode:
+use io.BufferedRWPair
+---
+ M2Crypto/SSL/Connection.py | 8 ++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/M2Crypto/SSL/Connection.py b/M2Crypto/SSL/Connection.py
+index 7053aa6b..01bb61c5 100644
+--- a/M2Crypto/SSL/Connection.py
 b/M2Crypto/SSL/Connection.py
+@@ -12,6 +12,7 @@ Copyright 2008 Heikki Toivonen. All rights reserved.
+ 
+ import logging
+ import socket
++import io
+ 
+ from M2Crypto import BIO, Err, X509, m2, py27plus, six, util  # noqa
+ from M2Crypto.SSL import Checker, Context, timeout  # noqa
+@@ -582,9 +583,12 @@ class Connection(object):
+ return m2.ssl_set_cipher_list(self.ssl, cipher_list)
+ 
+ def makefile(self, mode='rb', bufsize=-1):
+-# type: (AnyStr, int) -> socket._fileobject
++# type: (AnyStr, int) -> Union[io.BufferedRWPair,io.BufferedReader]
+ if six.PY3:
+-return socket.SocketIO(self, mode)
++raw = socket.SocketIO(self, mode)
++if 'rw' in mode:
++return io.BufferedRWPair(raw, raw)
++return io.BufferedReader(raw, io.DEFAULT_BUFFER_SIZE)
+ else:
+ return socket._fileobject(self, mode, bufsize)
+ 
+-- 
+2.26.2
+


[arch-commits] Commit in python-m2crypto/trunk (PKGBUILD)

2019-11-04 Thread Felix Yan via arch-commits
Date: Monday, November 4, 2019 @ 09:42:01
  Author: felixonmars
Revision: 523940

Python 3.8 rebuild

Modified:
  python-m2crypto/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-11-04 09:41:32 UTC (rev 523939)
+++ PKGBUILD2019-11-04 09:42:01 UTC (rev 523940)
@@ -6,7 +6,7 @@
 pkgbase=python-m2crypto
 pkgname=(python2-m2crypto python-m2crypto)
 pkgver=0.35.2
-pkgrel=1
+pkgrel=2
 pkgdesc="A crypto and SSL toolkit for Python"
 arch=('x86_64')
 url="https://pypi.python.org/pypi/M2Crypto";


[arch-commits] Commit in python-m2crypto/trunk (PKGBUILD)

2019-09-22 Thread Morten Linderud via arch-commits
Date: Sunday, September 22, 2019 @ 13:57:45
  Author: foxboron
Revision: 511522

upgpkg: python-m2crypto 0.35.2-1

Modified:
  python-m2crypto/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-09-22 13:56:39 UTC (rev 511521)
+++ PKGBUILD2019-09-22 13:57:45 UTC (rev 511522)
@@ -5,7 +5,7 @@
 
 pkgbase=python-m2crypto
 pkgname=(python2-m2crypto python-m2crypto)
-pkgver=0.34.0
+pkgver=0.35.2
 pkgrel=1
 pkgdesc="A crypto and SSL toolkit for Python"
 arch=('x86_64')
@@ -16,7 +16,7 @@
 'swig')
 
source=("${pkgname}-${pkgver}.tar.gz::https://gitlab.com/m2crypto/m2crypto/repository/${pkgver}/archive.tar.gz";
"LICENSE")
-sha256sums=('862173e517b3919a840ce58834bee0cbac1114a08851e049ed97bf7f9a084426'
+sha256sums=('57220b06de0622d0fad464ec2f16abe6f7aaa6d8ab5ab11372e6a17d7b52550b'
 '4eca478396f4b2b020729a111fce3f096456d74500bfd8f2b0388c3c69f997c0')
 
 prepare() {


[arch-commits] Commit in python-m2crypto/trunk (PKGBUILD)

2019-06-02 Thread Morten Linderud via arch-commits
Date: Sunday, June 2, 2019 @ 13:49:12
  Author: foxboron
Revision: 476608

upgpkg: python-m2crypto 0.34.0-1

Modified:
  python-m2crypto/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-06-02 13:47:44 UTC (rev 476607)
+++ PKGBUILD2019-06-02 13:49:12 UTC (rev 476608)
@@ -5,8 +5,8 @@
 
 pkgbase=python-m2crypto
 pkgname=(python2-m2crypto python-m2crypto)
-pkgver=0.30.1
-pkgrel=2
+pkgver=0.34.0
+pkgrel=1
 pkgdesc="A crypto and SSL toolkit for Python"
 arch=('x86_64')
 url="https://pypi.python.org/pypi/M2Crypto";
@@ -16,7 +16,7 @@
 'swig')
 
source=("${pkgname}-${pkgver}.tar.gz::https://gitlab.com/m2crypto/m2crypto/repository/${pkgver}/archive.tar.gz";
"LICENSE")
-sha256sums=('02eacd9b47aace718bb64cd2233e225aa44db8d60e9f077fb176a36b79ed14a6'
+sha256sums=('862173e517b3919a840ce58834bee0cbac1114a08851e049ed97bf7f9a084426'
 '4eca478396f4b2b020729a111fce3f096456d74500bfd8f2b0388c3c69f997c0')
 
 prepare() {


[arch-commits] Commit in python-m2crypto/trunk (PKGBUILD)

2018-06-30 Thread Evangelos Foutras via arch-commits
Date: Saturday, June 30, 2018 @ 17:42:47
  Author: foutrelis
Revision: 348661

Python 3.7 rebuild

Modified:
  python-m2crypto/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-06-30 17:42:45 UTC (rev 348660)
+++ PKGBUILD2018-06-30 17:42:47 UTC (rev 348661)
@@ -7,7 +7,7 @@
 pkgbase=python-m2crypto
 pkgname=(python2-m2crypto python-m2crypto)
 pkgver=0.30.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A crypto and SSL toolkit for Python"
 arch=('x86_64')
 url="https://pypi.python.org/pypi/M2Crypto";


[arch-commits] Commit in python-m2crypto/trunk (PKGBUILD)

2018-05-01 Thread Morten Linderud via arch-commits
Date: Tuesday, May 1, 2018 @ 13:22:21
  Author: foxboron
Revision: 318590

upgpkg: python-m2crypto 0.30.1-1

Updated to 0.30.1

Modified:
  python-m2crypto/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-05-01 11:11:15 UTC (rev 318589)
+++ PKGBUILD2018-05-01 13:22:21 UTC (rev 318590)
@@ -6,7 +6,7 @@
 
 pkgbase=python-m2crypto
 pkgname=(python2-m2crypto python-m2crypto)
-pkgver=0.29.0
+pkgver=0.30.1
 pkgrel=1
 pkgdesc="A crypto and SSL toolkit for Python"
 arch=('x86_64')
@@ -17,7 +17,7 @@
 'swig')
 
source=("${pkgname}-${pkgver}.tar.gz::https://gitlab.com/m2crypto/m2crypto/repository/${pkgver}/archive.tar.gz";
"LICENSE")
-sha256sums=('3884d98802014679d0fc38c2de6549d0259d5a89855a93d5eb264edabe67d536'
+sha256sums=('02eacd9b47aace718bb64cd2233e225aa44db8d60e9f077fb176a36b79ed14a6'
 '4eca478396f4b2b020729a111fce3f096456d74500bfd8f2b0388c3c69f997c0')
 
 prepare() {


[arch-commits] Commit in python-m2crypto/trunk (PKGBUILD)

2011-10-09 Thread Angel Velásquez
Date: Sunday, October 9, 2011 @ 04:26:30
  Author: angvp
Revision: 140195

upgpkg: python-m2crypto 0.21.1-1

Bump release to 0.21.1

Modified:
  python-m2crypto/trunk/PKGBUILD

--+
 PKGBUILD |   13 +
 1 file changed, 5 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-10-09 05:40:19 UTC (rev 140194)
+++ PKGBUILD2011-10-09 08:26:30 UTC (rev 140195)
@@ -1,25 +1,22 @@
 # $Id$
-# Maintainer:
+# Maintainer: Angel Velasquez  
 # Contributor: Sergej Pupykin 
 # Contributor: William Rea 
 
 pkgname=python-m2crypto
-pkgver=0.20.2
-pkgrel=3
+pkgver=0.21.1
+pkgrel=1
 pkgdesc="A crypto and SSL toolkit for Python"
 arch=('i686' 'x86_64')
 url="http://wiki.osafoundation.org/bin/view/Projects/MeTooCrypto";
 license=('BSD')
 depends=('python2' 'openssl')
 makedepends=('swig')
-source=("http://pypi.python.org/packages/source/M/M2Crypto/M2Crypto-${pkgver}.tar.gz";
-   'openssl1.patch')
-md5sums=('6c24410410d6eb1920ea43f77a93613a'
- '80a707ad6610f2871efdf40658e30364')
+source=("http://pypi.python.org/packages/source/M/M2Crypto/M2Crypto-${pkgver}.tar.gz";)
+md5sums=('f93d8462ff7646397a9f77a2fe602d17')
 
 build() {
   cd "${srcdir}/M2Crypto-${pkgver}"
-  patch -Np0 -i ${srcdir}/openssl1.patch
   python2 setup.py build
 }
 



[arch-commits] Commit in python-m2crypto/trunk (PKGBUILD)

2010-08-18 Thread Ionut Biru
Date: Wednesday, August 18, 2010 @ 12:12:44
  Author: ibiru
Revision: 87898

upgpkg: python-m2crypto 0.20.2-3
python rebuild

Modified:
  python-m2crypto/trunk/PKGBUILD

--+
 PKGBUILD |   12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-08-18 16:06:32 UTC (rev 87897)
+++ PKGBUILD2010-08-18 16:12:44 UTC (rev 87898)
@@ -5,27 +5,27 @@
 
 pkgname=python-m2crypto
 pkgver=0.20.2
-pkgrel=2
+pkgrel=3
 pkgdesc="A crypto and SSL toolkit for Python"
 arch=('i686' 'x86_64')
 url="http://wiki.osafoundation.org/bin/view/Projects/MeTooCrypto";
 license=('BSD')
-depends=('python' 'openssl')
+depends=('python2' 'openssl')
 makedepends=('swig')
 
source=("http://pypi.python.org/packages/source/M/M2Crypto/M2Crypto-${pkgver}.tar.gz";
'openssl1.patch')
 md5sums=('6c24410410d6eb1920ea43f77a93613a'
-   '80a707ad6610f2871efdf40658e30364')
+ '80a707ad6610f2871efdf40658e30364')
 
 build() {
   cd "${srcdir}/M2Crypto-${pkgver}"
-  patch -Np0 -i ${srcdir}/openssl1.patch || return 1
-  python setup.py build
+  patch -Np0 -i ${srcdir}/openssl1.patch
+  python2 setup.py build
 }
 
 package() {
   cd "${srcdir}/M2Crypto-${pkgver}"
-  python setup.py install --root="${pkgdir}/"
+  python2 setup.py install --root="${pkgdir}/" --optimize=1
 
   install -D -m644 LICENCE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }



[arch-commits] Commit in python-m2crypto/trunk (PKGBUILD openssl1.patch)

2010-04-01 Thread Andrea Scarpino
Date: Thursday, April 1, 2010 @ 13:47:09
  Author: andrea
Revision: 75489

upgpkg: python-m2crypto 0.20.2-2
openssl rebuild

Added:
  python-m2crypto/trunk/openssl1.patch
Modified:
  python-m2crypto/trunk/PKGBUILD

+
 PKGBUILD   |   17 +
 openssl1.patch |  531 +++
 2 files changed, 543 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-04-01 17:43:58 UTC (rev 75488)
+++ PKGBUILD2010-04-01 17:47:09 UTC (rev 75489)
@@ -1,23 +1,30 @@
 # $Id$
-# Maintainer: Sergej Pupykin 
+# Maintainer:
+# Contributor: Sergej Pupykin 
 # Contributor: William Rea 
 
 pkgname=python-m2crypto
 pkgver=0.20.2
-pkgrel=1
+pkgrel=2
 pkgdesc="A crypto and SSL toolkit for Python"
 arch=('i686' 'x86_64')
 url="http://wiki.osafoundation.org/bin/view/Projects/MeTooCrypto";
 license=('BSD')
 depends=('python' 'openssl')
 makedepends=('swig')
-source=(http://pypi.python.org/packages/source/M/M2Crypto/M2Crypto-${pkgver}.tar.gz)
-md5sums=('6c24410410d6eb1920ea43f77a93613a')
-sha1sums=('6e85d7035971c353db74a497fca0ec2eaea4dea0')
+source=("http://pypi.python.org/packages/source/M/M2Crypto/M2Crypto-${pkgver}.tar.gz";
+   'openssl1.patch')
+md5sums=('6c24410410d6eb1920ea43f77a93613a'
+   '80a707ad6610f2871efdf40658e30364')
 
 build() {
   cd "${srcdir}/M2Crypto-${pkgver}"
+  patch -Np0 -i ${srcdir}/openssl1.patch || return 1
   python setup.py build
+}
+
+package() {
+  cd "${srcdir}/M2Crypto-${pkgver}"
   python setup.py install --root="${pkgdir}/"
 
   install -D -m644 LICENCE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"

Added: openssl1.patch
===
--- openssl1.patch  (rev 0)
+++ openssl1.patch  2010-04-01 17:47:09 UTC (rev 75489)
@@ -0,0 +1,531 @@
+Index: tests/test_ssl.py
+===
+--- tests/test_ssl.py  (revision 698)
 tests/test_ssl.py  (working copy)
+@@ -405,8 +405,11 @@
+ try:
+ ctx = SSL.Context('sslv23', weak_crypto=1)
+ s = SSL.Connection(ctx)
+-s.connect(self.srv_addr)
+-self.failUnlessEqual(s.get_version(), 'SSLv2')
++if m2.OPENSSL_VERSION_NUMBER < 0x1000: # SSLv2 ciphers 
disabled by default in newer OpenSSL
++s.connect(self.srv_addr)
++self.failUnlessEqual(s.get_version(), 'SSLv2')
++else:
++self.assertRaises(SSL.SSLError, s.connect, self.srv_addr)
+ s.close()
+ finally:
+ self.stop_server(pid)
+Index: tests/test_x509.py
+===
+--- tests/test_x509.py (revision 698)
 tests/test_x509.py (working copy)
+@@ -142,7 +142,7 @@
+ cn.set_data("Hello There!")
+ assert cn.get_data().as_text() == "Hello There!", 
cn.get_data().as_text()
+ 
+-assert n.as_hash() == 1697185131
++self.assertEquals(n.as_hash(), 1697185131)
+ 
+ self.assertRaises(IndexError, lambda: n[100])
+ self.assert_(n[10])
+Index: tests/test_smime.py
+===
+--- tests/test_smime.py(revision 698)
 tests/test_smime.py(working copy)
+@@ -6,7 +6,7 @@
+ """
+ 
+ import unittest
+-from M2Crypto import SMIME, BIO, Rand, X509, EVP
++from M2Crypto import SMIME, BIO, Rand, X509, EVP, Err
+ 
+ class SMIMETestCase(unittest.TestCase):
+ cleartext = 'some text to manipulate'
+@@ -213,7 +213,7 @@
+ 
+ self.filenameSmime = 'tests/sig.p7s'
+ f = BIO.openfile(self.filenameSmime, 'wb')
+-assert s.write(f, p7, BIO.MemoryBuffer('some text')) == 1
++assert s.write(f, p7, BIO.MemoryBuffer('some text')) == 1, 
Err.get_error()
+ f.close()
+ 
+ def test_write_pkcs7_der(self):
+Index: SWIG/_evp.i
+===
+--- SWIG/_evp.i(revision 695)
 SWIG/_evp.i(working copy)
+@@ -180,7 +180,7 @@
+ 
+ PKCS5_PBKDF2_HMAC_SHA1(passbuf, passlen, saltbuf, saltlen, iter,
+keylen, key);
+-ret = PyString_FromStringAndSize(key, keylen);
++ret = PyString_FromStringAndSize((char*)key, keylen);
+ OPENSSL_cleanse(key, keylen);
+ return ret;
+ }
+@@ -339,7 +339,7 @@
+ klen = EVP_BytesToKey(cipher, md, (unsigned char *)sbuf, 
+ (unsigned char *)dbuf, dlen, iter, 
+ key, NULL); /* Since we are not returning IV no need to derive it */
+-ret = PyString_FromStringAndSize(key, klen);
++ret = PyString_FromStringAndSize((char*)key, klen);
+ return ret;
+ }
+ 
+@@ -435,7 +435,7 @@
+ PyErr_SetString(_evp_err, ERR_reason_error_string(ERR_get_error()));
+ return NULL;
+ }
+-ret = PyString_FromStringAndSize(sigb

[arch-commits] Commit in python-m2crypto/trunk (PKGBUILD)

2009-10-31 Thread Eric Bélanger
Date: Saturday, October 31, 2009 @ 15:46:29
  Author: eric
Revision: 57515

upgpkg: python-m2crypto 0.20.2-1
Upstream update

Modified:
  python-m2crypto/trunk/PKGBUILD

--+
 PKGBUILD |7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2009-10-31 19:44:47 UTC (rev 57514)
+++ PKGBUILD2009-10-31 19:46:29 UTC (rev 57515)
@@ -3,8 +3,8 @@
 # Contributor: William Rea 
 
 pkgname=python-m2crypto
-pkgver=0.19.1
-pkgrel=2
+pkgver=0.20.2
+pkgrel=1
 pkgdesc="A crypto and SSL toolkit for Python"
 arch=('i686' 'x86_64')
 url="http://wiki.osafoundation.org/bin/view/Projects/MeTooCrypto";
@@ -12,7 +12,8 @@
 depends=('python' 'openssl')
 makedepends=('swig')
 
source=(http://pypi.python.org/packages/source/M/M2Crypto/M2Crypto-${pkgver}.tar.gz)
-md5sums=('c92286fdf0a75f017e72122c2832d5ff')
+md5sums=('6c24410410d6eb1920ea43f77a93613a')
+sha1sums=('6e85d7035971c353db74a497fca0ec2eaea4dea0')
 
 build() {
   cd "${srcdir}/M2Crypto-${pkgver}"