Update py-m2crypto from 0.13.1 to 0.21.1.

Too many changes to list.  The master site has moved too:

-HOMEPAGE= http://sandbox.rulemaker.net/ngps/m2/
+HOMEPAGE= http://chandlerproject.org/bin/view/Projects/MeTooCrypto

-MASTER_SITES= http://sandbox.rulemaker.net/ngps/Dist/
+MASTER_SITES= http://pypi.python.org/packages/source/M/M2Crypto/

8 files changed, 47 insertions, 197 deletions

diff --git a/security/py-m2crypto/Makefile b/security/py-m2crypto/Makefile
index 52830cd23d5..f52c7f5dcf2 100644
--- a/security/py-m2crypto/Makefile
+++ b/security/py-m2crypto/Makefile
@@ -1,19 +1,15 @@
-# $NetBSD: Makefile,v 1.25 2010/01/17 12:02:44 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2012/01/22 10:05:18 apb Exp $
 #
 
-DISTNAME=		m2crypto-0.13
-PKGNAME=		${PYPKGPREFIX}-${DISTNAME}.1
-PKGREVISION=		3
+DISTNAME=		M2Crypto-0.21.1
+PKGNAME=		${PYPKGPREFIX}-${DISTNAME:tl}
 CATEGORIES=		security python
-MASTER_SITES=		http://sandbox.rulemaker.net/ngps/Dist/
-EXTRACT_SUFX=		.zip
-
-PATCH_SITES=		${MASTER_SITES}
-PATCHFILES=		0.13p1.patch
+MASTER_SITES=		http://pypi.python.org/packages/source/M/M2Crypto/
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://sandbox.rulemaker.net/ngps/m2/
+HOMEPAGE=		http://chandlerproject.org/bin/view/Projects/MeTooCrypto
 COMMENT=		Crypto and SSL toolkit for Python
+LICENSE=		m2crypto-license
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
diff --git a/security/py-m2crypto/PLIST b/security/py-m2crypto/PLIST
index e94f8a59bfd..12449c7a018 100644
--- a/security/py-m2crypto/PLIST
+++ b/security/py-m2crypto/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2009/06/14 18:13:37 joerg Exp $
+@comment $NetBSD: PLIST,v 1.5 2012/01/22 10:05:18 apb Exp $
 ${PYSITELIB}/M2Crypto/ASN1.py
 ${PYSITELIB}/M2Crypto/ASN1.pyc
 ${PYSITELIB}/M2Crypto/ASN1.pyo
@@ -8,15 +8,24 @@ ${PYSITELIB}/M2Crypto/AuthCookie.pyo
 ${PYSITELIB}/M2Crypto/BIO.py
 ${PYSITELIB}/M2Crypto/BIO.pyc
 ${PYSITELIB}/M2Crypto/BIO.pyo
+${PYSITELIB}/M2Crypto/BN.py
+${PYSITELIB}/M2Crypto/BN.pyc
+${PYSITELIB}/M2Crypto/BN.pyo
 ${PYSITELIB}/M2Crypto/DH.py
 ${PYSITELIB}/M2Crypto/DH.pyc
 ${PYSITELIB}/M2Crypto/DH.pyo
 ${PYSITELIB}/M2Crypto/DSA.py
 ${PYSITELIB}/M2Crypto/DSA.pyc
 ${PYSITELIB}/M2Crypto/DSA.pyo
+${PYSITELIB}/M2Crypto/EC.py
+${PYSITELIB}/M2Crypto/EC.pyc
+${PYSITELIB}/M2Crypto/EC.pyo
 ${PYSITELIB}/M2Crypto/EVP.py
 ${PYSITELIB}/M2Crypto/EVP.pyc
 ${PYSITELIB}/M2Crypto/EVP.pyo
+${PYSITELIB}/M2Crypto/Engine.py
+${PYSITELIB}/M2Crypto/Engine.pyc
+${PYSITELIB}/M2Crypto/Engine.pyo
 ${PYSITELIB}/M2Crypto/Err.py
 ${PYSITELIB}/M2Crypto/Err.pyc
 ${PYSITELIB}/M2Crypto/Err.pyo
@@ -50,6 +59,9 @@ ${PYSITELIB}/M2Crypto/Rand.pyo
 ${PYSITELIB}/M2Crypto/SMIME.py
 ${PYSITELIB}/M2Crypto/SMIME.pyc
 ${PYSITELIB}/M2Crypto/SMIME.pyo
+${PYSITELIB}/M2Crypto/SSL/Checker.py
+${PYSITELIB}/M2Crypto/SSL/Checker.pyc
+${PYSITELIB}/M2Crypto/SSL/Checker.pyo
 ${PYSITELIB}/M2Crypto/SSL/Cipher.py
 ${PYSITELIB}/M2Crypto/SSL/Cipher.pyc
 ${PYSITELIB}/M2Crypto/SSL/Cipher.pyo
@@ -59,15 +71,15 @@ ${PYSITELIB}/M2Crypto/SSL/Connection.pyo
 ${PYSITELIB}/M2Crypto/SSL/Context.py
 ${PYSITELIB}/M2Crypto/SSL/Context.pyc
 ${PYSITELIB}/M2Crypto/SSL/Context.pyo
-${PYSITELIB}/M2Crypto/SSL/Error.py
-${PYSITELIB}/M2Crypto/SSL/Error.pyc
-${PYSITELIB}/M2Crypto/SSL/Error.pyo
 ${PYSITELIB}/M2Crypto/SSL/SSLServer.py
 ${PYSITELIB}/M2Crypto/SSL/SSLServer.pyc
 ${PYSITELIB}/M2Crypto/SSL/SSLServer.pyo
 ${PYSITELIB}/M2Crypto/SSL/Session.py
 ${PYSITELIB}/M2Crypto/SSL/Session.pyc
 ${PYSITELIB}/M2Crypto/SSL/Session.pyo
+${PYSITELIB}/M2Crypto/SSL/TwistedProtocolWrapper.py
+${PYSITELIB}/M2Crypto/SSL/TwistedProtocolWrapper.pyc
+${PYSITELIB}/M2Crypto/SSL/TwistedProtocolWrapper.pyo
 ${PYSITELIB}/M2Crypto/SSL/__init__.py
 ${PYSITELIB}/M2Crypto/SSL/__init__.pyc
 ${PYSITELIB}/M2Crypto/SSL/__init__.pyo
@@ -87,9 +99,6 @@ ${PYSITELIB}/M2Crypto/__init__.py
 ${PYSITELIB}/M2Crypto/__init__.pyc
 ${PYSITELIB}/M2Crypto/__init__.pyo
 ${PYSITELIB}/M2Crypto/__m2crypto.so
-${PYSITELIB}/M2Crypto/_version.py
-${PYSITELIB}/M2Crypto/_version.pyc
-${PYSITELIB}/M2Crypto/_version.pyo
 ${PYSITELIB}/M2Crypto/callback.py
 ${PYSITELIB}/M2Crypto/callback.pyc
 ${PYSITELIB}/M2Crypto/callback.pyo
@@ -105,6 +114,9 @@ ${PYSITELIB}/M2Crypto/m2.pyo
 ${PYSITELIB}/M2Crypto/m2urllib.py
 ${PYSITELIB}/M2Crypto/m2urllib.pyc
 ${PYSITELIB}/M2Crypto/m2urllib.pyo
+${PYSITELIB}/M2Crypto/m2urllib2.py
+${PYSITELIB}/M2Crypto/m2urllib2.pyc
+${PYSITELIB}/M2Crypto/m2urllib2.pyo
 ${PYSITELIB}/M2Crypto/m2xmlrpclib.py
 ${PYSITELIB}/M2Crypto/m2xmlrpclib.pyc
 ${PYSITELIB}/M2Crypto/m2xmlrpclib.pyo
diff --git a/security/py-m2crypto/distinfo b/security/py-m2crypto/distinfo
index f9ef9ec74fd..d3044375882 100644
--- a/security/py-m2crypto/distinfo
+++ b/security/py-m2crypto/distinfo
@@ -1,12 +1,6 @@
-$NetBSD: distinfo,v 1.5 2006/01/20 22:09:11 wiz Exp $
+$NetBSD: distinfo,v 1.6 2012/01/22 10:05:19 apb Exp $
 
-SHA1 (m2crypto-0.13.zip) = 53b722f6ca9a3661c42c18360b158f3e7ac5b5c2
-RMD160 (m2crypto-0.13.zip) = b2477dff6f49a80ab5508f18837009b4a634a0df
-Size (m2crypto-0.13.zip) = 410759 bytes
-SHA1 (0.13p1.patch) = e3a097459626f7f016d9f1e118776fa7c97d6328
-RMD160 (0.13p1.patch) = 3ed0aacb7f2d09208e9a6d70a69fbb96fe9c3ad0
-Size (0.13p1.patch) = 1645 bytes
-SHA1 (patch-aa) = bd3195f30548525ae8b3fa13010d39a63bb2abd7
-SHA1 (patch-ab) = 195f1de648c2c2d721aa241fa39eddcf03e89159
-SHA1 (patch-ac) = ec2d96afcd36157babeb7baa5f5d1c7e2102a57d
-SHA1 (patch-ad) = d19867bfe01323772de76dbe0711d29c33505d2d
+SHA1 (M2Crypto-0.21.1.tar.gz) = 3c7135b952092e4f2eee7a94c5153319cccba94e
+RMD160 (M2Crypto-0.21.1.tar.gz) = 313dcab450846a0363e7192a10364bdfd5dfae85
+Size (M2Crypto-0.21.1.tar.gz) = 413563 bytes
+SHA1 (patch-setup.py) = 9a1952e842353ab3ddf32482f34c7dbe705cd56d
diff --git a/security/py-m2crypto/patches/patch-aa b/security/py-m2crypto/patches/patch-aa
deleted file mode 100644
index f4e2cdafdab..00000000000
--- a/security/py-m2crypto/patches/patch-aa
+++ /dev/null
@@ -1,61 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2006/01/14 23:07:26 wiz Exp $
-
---- setup.py.orig	2004-03-28 11:06:59.000000000 +0000
-+++ setup.py
-@@ -12,56 +12,6 @@ import os, shutil
- from distutils.core import setup, Extension
- from distutils.command import build_ext
- 
--# This copy of swig_sources is from Python 2.2.
--
--def swig_sources (self, sources):
--
--    """Walk the list of source files in 'sources', looking for SWIG
--    interface (.i) files.  Run SWIG on all that are found, and
--    return a modified 'sources' list with SWIG source files replaced
--    by the generated C (or C++) files.
--    """
--
--    new_sources = []
--    swig_sources = []
--    swig_targets = {}
--
--    # XXX this drops generated C/C++ files into the source tree, which
--    # is fine for developers who want to distribute the generated
--    # source -- but there should be an option to put SWIG output in
--    # the temp dir.
--
--    if self.swig_cpp:
--        target_ext = '.cpp'
--    else:
--        target_ext = '.c'
--
--    for source in sources:
--        (base, ext) = os.path.splitext(source)
--        if ext == ".i":             # SWIG interface file
--            new_sources.append(base + target_ext)
--            swig_sources.append(source)
--            swig_targets[source] = new_sources[-1]
--        else:
--            new_sources.append(source)
--
--    if not swig_sources:
--        return new_sources
--
--    swig = self.find_swig()
--    swig_cmd = [swig, "-python", "-ISWIG"]
--    if self.swig_cpp:
--        swig_cmd.append("-c++")
--
--    for source in swig_sources:
--        target = swig_targets[source]
--        self.announce("swigging %s to %s" % (source, target))
--        self.spawn(swig_cmd + ["-o", target, source])
--
--    return new_sources
--
--build_ext.build_ext.swig_sources = swig_sources
--
- my_inc = os.path.join(os.getcwd(), 'SWIG')
- 
- if os.name == 'nt':
diff --git a/security/py-m2crypto/patches/patch-ab b/security/py-m2crypto/patches/patch-ab
deleted file mode 100644
index e0ad7e33cc0..00000000000
--- a/security/py-m2crypto/patches/patch-ab
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2006/01/20 22:09:11 wiz Exp $
-
---- SWIG/_asn1.i.orig	2004-03-21 12:34:38.000000000 +0000
-+++ SWIG/_asn1.i
-@@ -3,6 +3,7 @@
- 
- %{
- #include <openssl/asn1.h>
-+#include <time.h>
- %}
- 
- %apply Pointer NONNULL { BIO * };
-@@ -25,7 +26,7 @@
- %name(asn1_utctime_new) extern ASN1_UTCTIME *ASN1_UTCTIME_new( void );
- %name(asn1_utctime_free) extern void ASN1_UTCTIME_free(ASN1_UTCTIME *);
- %name(asn1_utctime_check) extern int ASN1_UTCTIME_check(ASN1_UTCTIME *);
--%name(asn1_utctime_set) extern ASN1_UTCTIME *ASN1_UTCTIME_set(ASN1_UTCTIME *, long);
-+%name(asn1_utctime_set) extern ASN1_UTCTIME *ASN1_UTCTIME_set(ASN1_UTCTIME *, time_t);
- %name(asn1_utctime_set_string) extern int ASN1_UTCTIME_set_string(ASN1_UTCTIME *, char *);
- %name(asn1_utctime_print) extern int ASN1_UTCTIME_print(BIO *, ASN1_UTCTIME *);
- 
diff --git a/security/py-m2crypto/patches/patch-ac b/security/py-m2crypto/patches/patch-ac
deleted file mode 100644
index 09c5c0d93c2..00000000000
--- a/security/py-m2crypto/patches/patch-ac
+++ /dev/null
@@ -1,74 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2006/01/14 23:07:26 wiz Exp $
-
---- SWIG/_ssl.i.orig	2004-03-25 04:41:11.000000000 +0000
-+++ SWIG/_ssl.i
-@@ -18,7 +18,7 @@
- %apply Pointer NONNULL { RSA * };
- %apply Pointer NONNULL { PyObject *pyfunc };
- 
--%name(ssl_get_error) extern int SSL_get_error(SSL *, int);
-+%name(ssl_get_error) extern int SSL_get_error(const SSL *, int);
- %name(ssl_get_state) extern const char *SSL_state_string(const SSL *);
- %name(ssl_get_state_v) extern const char *SSL_state_string_long(const SSL *);
- %name(ssl_get_alert_type) extern const char *SSL_alert_type_string(int);
-@@ -34,13 +34,13 @@
- %name(ssl_ctx_new) extern SSL_CTX *SSL_CTX_new(SSL_METHOD *);
- %name(ssl_ctx_free) extern void SSL_CTX_free(SSL_CTX *);
- %name(ssl_ctx_set_verify_depth) extern void SSL_CTX_set_verify_depth(SSL_CTX *, int);
--%name(ssl_ctx_get_verify_depth) extern int SSL_CTX_get_verify_depth(SSL_CTX *);
--%name(ssl_ctx_get_verify_mode) extern int SSL_CTX_get_verify_mode(SSL_CTX *);
-+%name(ssl_ctx_get_verify_depth) extern int SSL_CTX_get_verify_depth(const SSL_CTX *);
-+%name(ssl_ctx_get_verify_mode) extern int SSL_CTX_get_verify_mode(const SSL_CTX *);
- %name(ssl_ctx_set_cipher_list) extern int SSL_CTX_set_cipher_list(SSL_CTX *, const char *);
- %name(ssl_ctx_add_session) extern int SSL_CTX_add_session(SSL_CTX *, SSL_SESSION *);
- %name(ssl_ctx_remove_session) extern int SSL_CTX_remove_session(SSL_CTX *, SSL_SESSION *);
- %name(ssl_ctx_set_session_timeout) extern long SSL_CTX_set_timeout(SSL_CTX *, long);
--%name(ssl_ctx_get_session_timeout) extern long SSL_CTX_get_timeout(SSL_CTX *);
-+%name(ssl_ctx_get_session_timeout) extern long SSL_CTX_get_timeout(const SSL_CTX *);
- 
- %name(bio_new_ssl) extern BIO *BIO_new_ssl(SSL_CTX *, int);
- 
-@@ -54,29 +54,29 @@
- %name(ssl_shutdown) extern int SSL_shutdown(SSL *);
- %name(ssl_do_handshake) extern int SSL_do_handshake(SSL *);
- %name(ssl_renegotiate) extern int SSL_renegotiate(SSL *);
--%name(ssl_pending) extern int SSL_pending(SSL *);
-+%name(ssl_pending) extern int SSL_pending(const SSL *);
- 
--%name(ssl_get_peer_cert) extern X509 *SSL_get_peer_certificate(SSL *);
--%name(ssl_get_current_cipher) extern SSL_CIPHER *SSL_get_current_cipher(SSL *);
--%name(ssl_get_verify_mode) extern int SSL_get_verify_mode(SSL *);
--%name(ssl_get_verify_depth) extern int SSL_get_verify_depth(SSL *);
--%name(ssl_get_verify_result) extern long SSL_get_verify_result(SSL *);
--%name(ssl_get_ssl_ctx) extern SSL_CTX *SSL_get_SSL_CTX(SSL *);
--%name(ssl_get_default_session_timeout) extern long SSL_get_default_timeout(SSL *);
-+%name(ssl_get_peer_cert) extern X509 *SSL_get_peer_certificate(const SSL *);
-+%name(ssl_get_current_cipher) extern SSL_CIPHER *SSL_get_current_cipher(const SSL *);
-+%name(ssl_get_verify_mode) extern int SSL_get_verify_mode(const SSL *);
-+%name(ssl_get_verify_depth) extern int SSL_get_verify_depth(const SSL *);
-+%name(ssl_get_verify_result) extern long SSL_get_verify_result(const SSL *);
-+%name(ssl_get_ssl_ctx) extern SSL_CTX *SSL_get_SSL_CTX(const SSL *);
-+%name(ssl_get_default_session_timeout) extern long SSL_get_default_timeout(const SSL *);
- 
- %name(ssl_set_cipher_list) extern int SSL_set_cipher_list(SSL *, const char *);
--%name(ssl_get_cipher_list) extern const char *SSL_get_cipher_list(SSL *, int);
-+%name(ssl_get_cipher_list) extern const char *SSL_get_cipher_list(const SSL *, int);
- 
--%name(ssl_cipher_get_name) extern const char *SSL_CIPHER_get_name(SSL_CIPHER *);
--%name(ssl_cipher_get_version) extern char *SSL_CIPHER_get_version(SSL_CIPHER *);
-+%name(ssl_cipher_get_name) extern const char *SSL_CIPHER_get_name(const SSL_CIPHER *);
-+%name(ssl_cipher_get_version) extern char *SSL_CIPHER_get_version(const SSL_CIPHER *);
- 
--%name(ssl_get_session) extern SSL_SESSION *SSL_get_session(SSL *);
-+%name(ssl_get_session) extern SSL_SESSION *SSL_get_session(const SSL *);
- %name(ssl_get1_session) extern SSL_SESSION *SSL_get1_session(SSL *);
- %name(ssl_set_session) extern int SSL_set_session(SSL *, SSL_SESSION *);
- %name(ssl_session_free) extern void SSL_SESSION_free(SSL_SESSION *);
--%name(ssl_session_print) extern int SSL_SESSION_print(BIO *, SSL_SESSION *);
-+%name(ssl_session_print) extern int SSL_SESSION_print(BIO *, const SSL_SESSION *);
- %name(ssl_session_set_timeout) extern long SSL_SESSION_set_timeout(SSL_SESSION *, long);
--%name(ssl_session_get_timeout) extern long SSL_SESSION_get_timeout(SSL_SESSION *);
-+%name(ssl_session_get_timeout) extern long SSL_SESSION_get_timeout(const SSL_SESSION *);
- 
- %constant int ssl_error_none              = SSL_ERROR_NONE;
- %constant int ssl_error_ssl               = SSL_ERROR_SSL;
diff --git a/security/py-m2crypto/patches/patch-ad b/security/py-m2crypto/patches/patch-ad
deleted file mode 100644
index 026aa239dbe..00000000000
--- a/security/py-m2crypto/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2006/01/14 23:07:26 wiz Exp $
-
---- SWIG/_x509.i.orig	2004-03-21 12:37:46.000000000 +0000
-+++ SWIG/_x509.i
-@@ -43,7 +43,7 @@
- %name(x509_name_entry_free) extern void X509_NAME_ENTRY_free( X509_NAME_ENTRY *);
- %name(x509_name_entry_create_by_nid) extern X509_NAME_ENTRY *X509_NAME_ENTRY_create_by_NID( X509_NAME_ENTRY **, int, int, unsigned char *, int);
- %name(x509_name_entry_set_object) extern int X509_NAME_ENTRY_set_object( X509_NAME_ENTRY *, ASN1_OBJECT *);
--%name(x509_name_entry_set_data) extern int X509_NAME_ENTRY_set_data( X509_NAME_ENTRY *, int, unsigned char *, int);
-+%name(x509_name_entry_set_data) extern int X509_NAME_ENTRY_set_data( X509_NAME_ENTRY *, int, const unsigned char *, int);
- %name(x509_name_entry_get_object) extern ASN1_OBJECT *X509_NAME_ENTRY_get_object(X509_NAME_ENTRY *);
- %name(x509_name_entry_get_data) extern ASN1_STRING *X509_NAME_ENTRY_get_data(X509_NAME_ENTRY *);
- 
diff --git a/security/py-m2crypto/patches/patch-setup.py b/security/py-m2crypto/patches/patch-setup.py
new file mode 100644
index 00000000000..882a3953d94
--- /dev/null
+++ b/security/py-m2crypto/patches/patch-setup.py
@@ -0,0 +1,17 @@
+$NetBSD: patch-setup.py,v 1.1 2012/01/22 10:05:19 apb Exp $
+
+Don't pass "-includeall" to swig.  It causes compiler-dependent
+tests in system include files to break (e.g. "#ifdef __GNUC__"
+doesn't work properly.)
+
+--- setup.py.orig	2011-01-15 19:10:06.000000000 +0000
++++ setup.py
+@@ -54,7 +54,7 @@ class _M2CryptoBuildExt(build_ext.build_
+         
+         self.swig_opts = ['-I%s' % i for i in self.include_dirs + \
+                           [opensslIncludeDir]]
+-        self.swig_opts.append('-includeall')
++        #self.swig_opts.append('-includeall')
+         #self.swig_opts.append('-D__i386__') # Uncomment for early OpenSSL 0.9.7 versions, or on Fedora Core if build fails
+         #self.swig_opts.append('-DOPENSSL_NO_EC') # Try uncommenting if you can't build with EC disabled
+