This commit was manufactured by cvs2git to create branch 'DEVEL'.

Sprout from master 2006-02-28 23:53:22 UTC Elan Ruusamäe <glen@pld-linux.org> '- adapterized (killed trailing spaces/tabs)'
Delete:
    M2Crypto-pkcs7_get0_signers.patch
    M2Crypto-smime_callback.patch
    python-M2Crypto-0.13p1.patch

diff --git a/M2Crypto-pkcs7_get0_signers.patch b/M2Crypto-pkcs7_get0_signers.patch
deleted file mode 100644 (file)
index 2e9776f..0000000
--- a/M2Crypto-pkcs7_get0_signers.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- m2crypto-0.11/M2Crypto/SMIME.py.wiget      2002-12-23 04:48:35.000000000 +0100
-+++ m2crypto-0.11/M2Crypto/SMIME.py    2003-10-08 16:18:10.682936771 +0200
-@@ -54,6 +54,9 @@
-     def write_der(self, bio):
-         return m2.pkcs7_write_bio_der(self.pkcs7, bio._ptr())
- 
-+    def get0_signers(self, certs, flags = 0):
-+      return X509.X509_Stack(m2.pkcs7_get0_signers(self.pkcs7, certs.stack, flags), 1)
-+
- 
- def load_pkcs7(p7file):
-     bio = m2.bio_new_file(p7file, 'r')
---- m2crypto-0.11/SWIG/_pkcs7.i.wiget  2003-10-08 16:24:43.072269817 +0200
-+++ m2crypto-0.11/SWIG/_pkcs7.i        2003-10-08 16:25:00.601515310 +0200
-@@ -170,5 +170,10 @@
- int smime_crlf_copy(BIO *in, BIO *out) {
-     return SMIME_crlf_copy(in, out, PKCS7_TEXT);
- }
-+
-+/* return STACK_OF(X509)* */
-+STACK *pkcs7_get0_signers(PKCS7 *p7, STACK *certs, int flags) {
-+      return PKCS7_get0_signers(p7,certs,flags);
-+}
- %}
- 

diff --git a/M2Crypto-smime_callback.patch b/M2Crypto-smime_callback.patch
deleted file mode 100644 (file)
index 10dd59c..0000000
--- a/M2Crypto-smime_callback.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- 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-0.13p1.patch b/python-M2Crypto-0.13p1.patch
deleted file mode 100644 (file)
index d938f79..0000000
--- a/python-M2Crypto-0.13p1.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- M2Crypto/SSL/Connection.py.org     Wed Mar 31 08:49:57 2004
-+++ M2Crypto/SSL/Connection.py Wed Mar 31 08:50:45 2004
-@@ -143,11 +143,11 @@
-         """Set this connection's underlying socket to _mode_."""
-         self.socket.setblocking(mode)
-         if mode:
--            self.send = self.write = self._write_bio
--            self.recv = self.read = self._read_bio
-+            self.send = self.write = Connection._write_bio
-+            self.recv = self.read = Connection._read_bio
-         else:
--            self.send = self.write = self._write_nbio
--            self.recv = self.read = self._read_nbio
-+            self.send = self.write = Connection._write_nbio
-+            self.recv = self.read = Connection._read_nbio
- 
-     def fileno(self):
-         return self.socket.fileno()
---- M2Crypto/DSA.py.org        Wed Mar 31 08:53:16 2004
-+++ M2Crypto/DSA.py    Wed Mar 31 08:53:35 2004
-@@ -35,7 +35,7 @@
- 
-     def __getattr__(self, name):
-         if name in ['p', 'q', 'g', 'pub', 'priv']:
--            method = getattr(m2, 'm2.dsa_get_%s' % (name,))
-+            method = getattr(m2, 'dsa_get_%s' % (name,))
-             assert m2.dsa_type_check(self.dsa), "'dsa' type error"
-             return method(self.dsa)
-         else:
---- M2Crypto/_version.py.org   Wed Mar 31 12:25:21 2004
-+++ M2Crypto/_version.py       Wed Mar 31 12:24:18 2004
-@@ -1,8 +1,8 @@
- """M2Crypto Version Info"""
- 
--RCS_id='$Id$'
-+RCS_id='$Id$'
- 
- import string
--version_info = (0, 13)
-+version_info = (0, 13, 1)
- version = string.join(map(lambda x: "%s" % x, version_info), ".")
-