6 files changed, 56 insertions, 70 deletions

diff --git a/security/py-m2crypto/Makefile b/security/py-m2crypto/Makefile
index 858156d9206e..6ea55f140bd8 100644
--- a/security/py-m2crypto/Makefile
+++ b/security/py-m2crypto/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	m2crypto
-PORTVERSION=	0.06
+PORTVERSION=	0.11
 PORTREVISION=	1
 CATEGORIES=	security python
 MASTER_SITES=	http://www.post1.com/home/ngps/m2/
@@ -14,14 +14,12 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	ngps@post1.com
-COMMENT=	Python wrapper for OpenSSL
-
-BROKEN=		"Does not compile"
+COMMENT=	Crypto and SSL toolkit for Python
 
 BUILD_DEPENDS=	swig1.3:${PORTSDIR}/devel/swig13 \
 		pinstall:${PORTSDIR}/devel/pinstall
 
-WRKSRC=		${WRKDIR}/${DISTNAME}/swig
+WRKSRC=		${WRKDIR}/${DISTNAME}/SWIG
 USE_PYTHON=	yes
 USE_ZIP=	yes
 USE_OPENSSL=	yes
diff --git a/security/py-m2crypto/distinfo b/security/py-m2crypto/distinfo
index f77ec2366345..9b03cdc86a57 100644
--- a/security/py-m2crypto/distinfo
+++ b/security/py-m2crypto/distinfo
@@ -1 +1 @@
-MD5 (m2crypto-0.06.zip) = 58eefec00424bafe3a80bc1c9cf4e010
+MD5 (m2crypto-0.11.zip) = c018c94e00b33aac969fbbe02b244aba
diff --git a/security/py-m2crypto/files/patch-_evp.i b/security/py-m2crypto/files/patch-_evp.i
deleted file mode 100644
index 0d3f17bd1d65..000000000000
--- a/security/py-m2crypto/files/patch-_evp.i
+++ /dev/null
@@ -1,13 +0,0 @@
---- _evp.i.orig	Tue Mar 27 12:13:08 2001
-+++ _evp.i	Tue Mar 27 12:13:13 2001
-@@ -36,10 +36,6 @@
- %name(bf_cbc) extern EVP_CIPHER *EVP_bf_cbc(void);
- %name(bf_cfb) extern EVP_CIPHER *EVP_bf_cfb(void);
- %name(bf_ofb) extern EVP_CIPHER *EVP_bf_ofb(void);
--%name(idea_ecb) extern EVP_CIPHER *EVP_idea_ecb(void);
--%name(idea_cbc) extern EVP_CIPHER *EVP_idea_cbc(void);
--%name(idea_cfb) extern EVP_CIPHER *EVP_idea_cfb(void);
--%name(idea_ofb) extern EVP_CIPHER *EVP_idea_ofb(void);
- %name(cast5_ecb) extern EVP_CIPHER *EVP_cast5_ecb(void);
- %name(cast5_cbc) extern EVP_CIPHER *EVP_cast5_cbc(void);
- %name(cast5_cfb) extern EVP_CIPHER *EVP_cast5_cfb(void);
diff --git a/security/py-m2crypto/files/patch-demo::evp_ciph_test.py b/security/py-m2crypto/files/patch-demo::evp_ciph_test.py
deleted file mode 100644
index 0fcfbc27e398..000000000000
--- a/security/py-m2crypto/files/patch-demo::evp_ciph_test.py
+++ /dev/null
@@ -1,10 +0,0 @@
---- ../demo/evp_ciph_test.py.orig	Tue Mar 27 12:34:18 2001
-+++ ../demo/evp_ciph_test.py	Tue Mar 27 12:34:25 2001
-@@ -47,7 +47,6 @@
- 
- if __name__=='__main__':
-     ciphers=['bf_ecb', 'bf_cbc', 'bf_cfb', 'bf_ofb',\
--        'idea_ecb', 'idea_cbc', 'idea_cfb', 'idea_ofb',\
-         'cast5_ecb', 'cast5_cbc', 'cast5_cfb', 'cast5_ofb',\
-         'rc5_ecb', 'rc5_cbc', 'rc5_cfb', 'rc5_ofb',\
-         'des_ecb', 'des_cbc', 'des_cfb', 'des_ofb',\
diff --git a/security/py-m2crypto/pkg-descr b/security/py-m2crypto/pkg-descr
index 4d39fb06c93c..c5fd85b29daf 100644
--- a/security/py-m2crypto/pkg-descr
+++ b/security/py-m2crypto/pkg-descr
@@ -1,8 +1,15 @@
-M2Crypto is a Python wrapper for OpenSSL.
-It makes accessible to the Python programmer the following:
+M2Crypto is a crypto and SSL toolkit for Python:
 
-    - DH, RSA, DSA, symmetric ciphers, message digests, HMACs.
-    - SSL functionality to implement clients and servers.
+    - DH, RSA, DSA, symmetric ciphers including AES, message digests, HMACs.
+    - SSL functionality to implement clients and servers, with examples.
+    - HTTPS extensions to Python's httplib, urllib and xmlrpclib.
+    - Unforgeable HMAC'ing AuthCookies for web session management.
+    - FTP/TLS client and server.
     - S/MIME v2.
+    - ZServerSSL: A HTTPS server for Zope.
+    - ZSmime: An S/MIME messenger for Zope.
 
 WWW: http://www.post1.com/home/ngps/m2/
+
+Ng Pheng Siong
+ngps@post1.com
diff --git a/security/py-m2crypto/pkg-plist b/security/py-m2crypto/pkg-plist
index 289b1497d4a9..1fc9d895f1fa 100644
--- a/security/py-m2crypto/pkg-plist
+++ b/security/py-m2crypto/pkg-plist
@@ -1,27 +1,47 @@
 lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/ASN1.py
 lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/ASN1.pyc
+lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/AuthCookie.py
+lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/AuthCookie.pyc
 lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/BIO.py
 lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/BIO.pyc
-lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/callback.py
-lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/callback.pyc
 lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/DH.py
 lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/DH.pyc
 lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/DSA.py
 lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/DSA.pyc
-lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/Err.py
-lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/Err.pyc
 lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/EVP.py
 lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/EVP.pyc
+lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/Err.py
+lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/Err.pyc
+lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/RC4.py
+lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/RC4.pyc
+lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/RSA.py
+lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/RSA.pyc
+lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/Rand.py
+lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/Rand.pyc
+lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/SMIME.py
+lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/SMIME.pyc
+lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/X509.py
+lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/X509.pyc
+lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/__init__.py
+lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/__init__.pyc
+lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/__m2crypto.so
+lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/_m2crypto.py
+lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/callback.py
+lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/callback.pyc
+lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/ftpslib.py
+lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/ftpslib.pyc
 lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/httpslib.py
 lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/httpslib.pyc
 lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/m2.py
 lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/m2.pyc
 lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/m2urllib.py
 lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/m2urllib.pyc
-lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/PGP/constants.py
-lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/PGP/constants.pyc
-lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/PGP/packet.py
-lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/PGP/packet.pyc
+lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/m2xmlrpclib.py
+lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/m2xmlrpclib.pyc
+lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/threading.py
+lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/threading.pyc
+lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/util.py
+lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/util.pyc
 lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/PGP/PublicKey.py
 lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/PGP/PublicKey.pyc
 lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/PGP/PublicKeyRing.py
@@ -30,51 +50,35 @@ lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/PGP/RSA.py
 lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/PGP/RSA.pyc
 lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/PGP/__init__.py
 lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/PGP/__init__.pyc
-lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/Rand.py
-lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/Rand.pyc
-lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/RC4.py
-lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/RC4.pyc
-lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/RSA.py
-lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/RSA.pyc
-lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/SMIME.py
-lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/SMIME.pyc
-lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/SSL/cb.py
-lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/SSL/cb.pyc
+lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/PGP/constants.py
+lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/PGP/constants.pyc
+lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/PGP/packet.py
+lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/PGP/packet.pyc
 lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/SSL/Cipher.py
 lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/SSL/Cipher.pyc
 lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/SSL/Connection.py
 lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/SSL/Connection.pyc
 lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/SSL/Context.py
 lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/SSL/Context.pyc
-lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/SSL/Session.py
-lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/SSL/Session.pyc
+lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/SSL/Error.py
+lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/SSL/Error.pyc
 lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/SSL/SSLServer.py
 lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/SSL/SSLServer.pyc
+lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/SSL/Session.py
+lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/SSL/Session.pyc
+lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/SSL/__init__.py
+lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/SSL/__init__.pyc
+lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/SSL/cb.py
+lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/SSL/cb.pyc
 lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/SSL/ssl_dispatcher.py
 lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/SSL/ssl_dispatcher.pyc
 lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/SSL/timeout.py
 lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/SSL/timeout.pyc
-lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/SSL/__init__.py
-lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/SSL/__init__.pyc
-lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/SSL/Error.py
-lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/SSL/Error.pyc
-lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/threading.py
-lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/threading.pyc
-lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/util.py
-lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/util.pyc
-lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/X509.py
-lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/X509.pyc
 lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/XML/__init__.py
 lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/XML/__init__.pyc
-lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/m2xmlrpclib.py
-lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/m2xmlrpclib.pyc
-lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/__init__.py
-lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/__init__.pyc
-lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/_m2cryptoc.so
-lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/_m2crypto.py
-lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/_m2crypto.pyc
 @dirrm lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/PGP
 @dirrm lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/SSL
 @dirrm lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/XML/dsig
 @dirrm lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/XML
 @dirrm lib/%%PYTHON_VERSION%%/site-packages/M2Crypto
+