- added smime_callback.patch (allow overiding standar passphrase prompt, needed for...

Changed files:
    M2Crypto-smime_callback.patch -> 1.1
    python-M2Crypto.spec -> 1.16

diff --git a/M2Crypto-smime_callback.patch b/M2Crypto-smime_callback.patch
new file mode 100644 (file)
index 0000000..10dd59c
--- /dev/null
+++ b/M2Crypto-smime_callback.patch
@@ -0,0 +1,32 @@
+--- m2crypto-0.11/M2Crypto/SMIME.py.wiget      2002-12-23 04:48:35.000000000 +0100
++++ m2crypto-0.11/M2Crypto/SMIME.py    2003-09-16 13:36:00.000000000 +0200
+@@ -4,7 +4,7 @@
+ 
+ RCS_id='$Id$'
+ 
+-import BIO, EVP, X509, Err
++import BIO, EVP, X509, Err, util
+ import m2
+ 
+ PKCS7_TEXT    = m2.PKCS7_TEXT
+@@ -117,16 +117,16 @@
+ m2.smime_init(SMIME_Error)
+ 
+ class SMIME:
+-    def load_key(self, keyfile, certfile=None):
++    def load_key(self, keyfile, certfile=None, callback=util.passphrase_callback):
+         if certfile is None:
+             certfile = keyfile
+-        self.pkey = EVP.load_key(keyfile)
++        self.pkey = EVP.load_key(keyfile, callback)
+         self.x509 = X509.load_cert(certfile)
+ 
+-    def load_key_bio(self, keybio, certbio=None):
++    def load_key_bio(self, keybio, certbio=None, callback=util.passphrase_callback):
+         if certbio is None:
+             certbio = keybio
+-        self.pkey = EVP.load_key_bio(keybio)
++        self.pkey = EVP.load_key_bio(keybio, callback)
+         self.x509 = X509.load_cert_bio(certbio)
+ 
+     def set_x509_stack(self, stack):

diff --git a/python-M2Crypto.spec b/python-M2Crypto.spec
index 994da0720f793910cd9ec812b74bd0c0c84e1a44..ae5ca35052e45bf40ff0487e7e015e6dd253648e 100644 (file)
--- a/python-M2Crypto.spec
+++ b/python-M2Crypto.spec
@@ -8,6 +8,7 @@ Release:        1
 License:       BSD-like
 Source0:       http://www.pobox.org.sg/home/ngps/m2/m2crypto-%{version}.zip
 # Source0-md5: c018c94e00b33aac969fbbe02b244aba
+Patch0:                M2Crypto-smime_callback.patch
 URL:           http://www.pobox.org.sg/home/ngps/m2/
 Group:         Development/Languages/Python
 %pyrequires_eq python
@@ -34,6 +35,7 @@ M2Crypto udost
 
 %prep
 %setup -q -n m2crypto-%{version}
+%patch0 -p1
 
 %build
 # workaroud (no way to pass -ISWIG to swig invocation)