Update to 0.6.0.1206569328141510525648634803928199668821045408958.

(Yes, that ridiculous version number really is what upstream calls it.)

No NEWS entry, but announcement includes:

2012-03-13  Zooko Wilcox-O'Hearn  <zooko@zooko.com>

      * src/pycryptopp/_version.py: release pycryptopp-0.6.0
      * add Ed25519 signatures (#75)
      * add XSalsa20 cipher (#40)
      * switch from darcs to git for revision control
      * pycryptopp version numbers now include a decimal encoding of *
      * reorganize the source tree and the version number generation
      * aesmodule.cpp: validate size of IV and throw exception if it
        is not 16 (#70)
      * fixed compile errors with gcc-4.7.0 (#78)
      * fixed compile errors concerning "CryptoPP::g_nullNameValuePairs" (#77)
      * suppress warnings from valgrind with new OpenSSL 1.0.1 on Fedora (#82)
      * raise Python exception instead of uncaught C++ exception
        (resulting in abort) when deserializing malformed RSA keys (#83)

4 files changed, 36 insertions, 27 deletions

diff --git a/security/py-cryptopp/Makefile b/security/py-cryptopp/Makefile
index eef5e8bb47f..3141041608c 100644
--- a/security/py-cryptopp/Makefile
+++ b/security/py-cryptopp/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2012/02/18 21:18:02 gls Exp $
+# $NetBSD: Makefile,v 1.6 2012/03/16 00:12:35 gdt Exp $
 #
 
-VERSION=	0.5.29
+VERSION=	0.6.0.1206569328141510525648634803928199668821045408958
 DISTNAME=	pycryptopp-${VERSION}
 PKGNAME=	${PYPKGPREFIX}-cryptopp-${VERSION}
 CATEGORIES=	security python
@@ -20,5 +20,8 @@ REPLACE.python.old=    /usr/bin/env python
 REPLACE.python.new=    ${PYTHONBIN}
 REPLACE_FILES.python=  pycryptopp/test/*.py
 
+# It would be nice if egg.mk had support for this.
+#TEST_TARGET=	@python@ setup.py test
+
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/py-cryptopp/PLIST b/security/py-cryptopp/PLIST
index 34fbbe21337..cfb17b9252d 100644
--- a/security/py-cryptopp/PLIST
+++ b/security/py-cryptopp/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2012/02/18 21:18:02 gls Exp $
+@comment $NetBSD: PLIST,v 1.4 2012/03/16 00:12:35 gdt Exp $
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
 ${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
@@ -19,6 +19,9 @@ ${PYSITELIB}/pycryptopp/cipher/__init__.pyo
 ${PYSITELIB}/pycryptopp/cipher/aes.py
 ${PYSITELIB}/pycryptopp/cipher/aes.pyc
 ${PYSITELIB}/pycryptopp/cipher/aes.pyo
+${PYSITELIB}/pycryptopp/cipher/xsalsa20.py
+${PYSITELIB}/pycryptopp/cipher/xsalsa20.pyc
+${PYSITELIB}/pycryptopp/cipher/xsalsa20.pyo
 ${PYSITELIB}/pycryptopp/hash/__init__.py
 ${PYSITELIB}/pycryptopp/hash/__init__.pyc
 ${PYSITELIB}/pycryptopp/hash/__init__.pyo
@@ -31,6 +34,16 @@ ${PYSITELIB}/pycryptopp/publickey/__init__.pyo
 ${PYSITELIB}/pycryptopp/publickey/ecdsa.py
 ${PYSITELIB}/pycryptopp/publickey/ecdsa.pyc
 ${PYSITELIB}/pycryptopp/publickey/ecdsa.pyo
+${PYSITELIB}/pycryptopp/publickey/ed25519/__init__.py
+${PYSITELIB}/pycryptopp/publickey/ed25519/__init__.pyc
+${PYSITELIB}/pycryptopp/publickey/ed25519/__init__.pyo
+${PYSITELIB}/pycryptopp/publickey/ed25519/_ed25519.so
+${PYSITELIB}/pycryptopp/publickey/ed25519/_version.py
+${PYSITELIB}/pycryptopp/publickey/ed25519/_version.pyc
+${PYSITELIB}/pycryptopp/publickey/ed25519/_version.pyo
+${PYSITELIB}/pycryptopp/publickey/ed25519/keys.py
+${PYSITELIB}/pycryptopp/publickey/ed25519/keys.pyc
+${PYSITELIB}/pycryptopp/publickey/ed25519/keys.pyo
 ${PYSITELIB}/pycryptopp/publickey/rsa.py
 ${PYSITELIB}/pycryptopp/publickey/rsa.pyc
 ${PYSITELIB}/pycryptopp/publickey/rsa.pyo
@@ -43,6 +56,12 @@ ${PYSITELIB}/pycryptopp/test/test_aes.pyo
 ${PYSITELIB}/pycryptopp/test/test_ecdsa.py
 ${PYSITELIB}/pycryptopp/test/test_ecdsa.pyc
 ${PYSITELIB}/pycryptopp/test/test_ecdsa.pyo
+${PYSITELIB}/pycryptopp/test/test_ed25519.py
+${PYSITELIB}/pycryptopp/test/test_ed25519.pyc
+${PYSITELIB}/pycryptopp/test/test_ed25519.pyo
+${PYSITELIB}/pycryptopp/test/test_ed25519_kat.py
+${PYSITELIB}/pycryptopp/test/test_ed25519_kat.pyc
+${PYSITELIB}/pycryptopp/test/test_ed25519_kat.pyo
 ${PYSITELIB}/pycryptopp/test/test_from_Nikratio.py
 ${PYSITELIB}/pycryptopp/test/test_from_Nikratio.pyc
 ${PYSITELIB}/pycryptopp/test/test_from_Nikratio.pyo
@@ -52,9 +71,9 @@ ${PYSITELIB}/pycryptopp/test/test_rsa.pyo
 ${PYSITELIB}/pycryptopp/test/test_sha256.py
 ${PYSITELIB}/pycryptopp/test/test_sha256.pyc
 ${PYSITELIB}/pycryptopp/test/test_sha256.pyo
-${PYSITELIB}/pycryptopp/test/test_startup.py
-${PYSITELIB}/pycryptopp/test/test_startup.pyc
-${PYSITELIB}/pycryptopp/test/test_startup.pyo
+${PYSITELIB}/pycryptopp/test/test_xsalsa20.py
+${PYSITELIB}/pycryptopp/test/test_xsalsa20.pyc
+${PYSITELIB}/pycryptopp/test/test_xsalsa20.pyo
 ${PYSITELIB}/pycryptopp/testvectors/KAT_AES/ECBGFSbox128e.txt
 ${PYSITELIB}/pycryptopp/testvectors/KAT_AES/ECBGFSbox256e.txt
 ${PYSITELIB}/pycryptopp/testvectors/KAT_AES/ECBKeySbox128e.txt
@@ -66,6 +85,9 @@ ${PYSITELIB}/pycryptopp/testvectors/KAT_AES/ECBVarTxt256e.txt
 ${PYSITELIB}/pycryptopp/testvectors/SHA256LongMsg.txt
 ${PYSITELIB}/pycryptopp/testvectors/SHA256Monte.txt
 ${PYSITELIB}/pycryptopp/testvectors/SHA256ShortMsg.txt
+${PYSITELIB}/pycryptopp/testvectors/kat-ed25519-short.txt
+${PYSITELIB}/pycryptopp/testvectors/kat-ed25519.txt
+${PYSITELIB}/pycryptopp/testvectors/xsalsa20.txt
 share/doc/pycryptopp/COPYING.GPL
 share/doc/pycryptopp/COPYING.TGPPL.html
-share/doc/pycryptopp/README.txt
+share/doc/pycryptopp/README.rst
diff --git a/security/py-cryptopp/distinfo b/security/py-cryptopp/distinfo
index 90fbe1c1e64..1a7efdee8d9 100644
--- a/security/py-cryptopp/distinfo
+++ b/security/py-cryptopp/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.3 2012/02/18 21:18:02 gls Exp $
+$NetBSD: distinfo,v 1.4 2012/03/16 00:12:35 gdt Exp $
 
-SHA1 (pycryptopp-0.5.29.tar.gz) = 53127f9f9748c159f99700684c86098c2e96573d
-RMD160 (pycryptopp-0.5.29.tar.gz) = 99e081c5c21a735777f093965dbc5638a25f0749
-Size (pycryptopp-0.5.29.tar.gz) = 1114525 bytes
+SHA1 (pycryptopp-0.6.0.1206569328141510525648634803928199668821045408958.tar.gz) = 773008d41d5c135a5bd899cd4c4a51ee54a97e39
+RMD160 (pycryptopp-0.6.0.1206569328141510525648634803928199668821045408958.tar.gz) = 778816987bfc7ba26de35d5d8931a082b2531fcd
+Size (pycryptopp-0.6.0.1206569328141510525648634803928199668821045408958.tar.gz) = 2009822 bytes
 SHA1 (patch-aa) = 144552faf822cd224e30dd849a35505c70946a47
diff --git a/security/py-cryptopp/patches/patch-aa b/security/py-cryptopp/patches/patch-aa
deleted file mode 100644
index 747d0b9ea49..00000000000
--- a/security/py-cryptopp/patches/patch-aa
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2012/02/18 21:18:02 gls Exp $
-
-Don't install odd version file in a strange place.
-Reported to tahoe development mailinglist.
-
---- setup.py.orig	2011-01-16 04:24:28.000000000 +0000
-+++ setup.py
-@@ -260,7 +260,7 @@ data_files = [(doc_loc, data_fnames)]
- # Note that due to a bug in distutils we also have to maintain a
- # MANIFEST.in file specifying embeddedcryptopp/extraversion.h. This bug was
- # fixed in Python 2.7
--data_files.append((EMBEDDED_CRYPTOPP_DIR, [EMBEDDED_CRYPTOPP_DIR+'/extraversion.h']))
-+# data_files.append((EMBEDDED_CRYPTOPP_DIR, [EMBEDDED_CRYPTOPP_DIR+'/extraversion.h']))
- 
- if ECDSA:
-     long_description='RSA-PSS-SHA256 signatures, ECDSA(1363)/EMSA1(SHA-256) signatures, SHA-256 hashes, and AES-CTR encryption'