Update to Mixminion-0.0.8alpha3.

- support for newer Python versions
- various bug fixes and security improvements
- moved from LGPL to MIT license

Based on the update by Christian Sturm in wip with additional fixes from
me.

6 files changed, 48 insertions, 110 deletions

diff --git a/security/mixminion/Makefile b/security/mixminion/Makefile
index 7e6c26028cb..6e516bc6a8a 100644
--- a/security/mixminion/Makefile
+++ b/security/mixminion/Makefile
@@ -1,32 +1,22 @@
-# $NetBSD: Makefile,v 1.12 2009/02/09 21:09:22 joerg Exp $
+# $NetBSD: Makefile,v 1.13 2009/08/14 14:09:28 joerg Exp $
 #
 
-DISTNAME=		Mixminion-0.0.7.1
+DISTNAME=		Mixminion-0.0.8alpha3
 PKGNAME=		${DISTNAME:S/M/m/}
-PKGREVISION=		3
 CATEGORIES=		security mail
-MASTER_SITES=		http://mixminion.net/dist/0.0.7.1/
+MASTER_SITES=		http://mixminion.net/dist/0.0.8alpha3/
 
-MAINTAINER=		pdh@wiredyne.com
+MAINTAINER=		athaba@inode.at
 HOMEPAGE=		http://mixminion.net/
-COMMENT=		Mixminion impedes message traffic analysis
+COMMENT=		Anonymous Type 3 remailer
+LICENSE=		mit
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-BUILDLINK_API_DEPENDS.openssl+=	openssl>=0.9.7d
+PYDISTUTILSPKG=	yes
 
-CRYPTO=				YES
-PYTHON_VERSIONS_ACCEPTED=	23
-PYDISTUTILSPKG=			YES
+TEST_TARGET=		test
 
-TEST_TARGET=			test
-
-SUBST_CLASSES+=		paths
-SUBST_FILES.paths=	setup.py
-SUBST_SED.paths+=	-e 's,@PREFIX@,${PREFIX},g'
-SUBST_STAGE.paths=	post-patch
-
-.include "../../lang/python/application.mk"
 .include "../../lang/python/extension.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/mixminion/PLIST b/security/mixminion/PLIST
index 8ed7d02aec2..b3adeda849c 100644
--- a/security/mixminion/PLIST
+++ b/security/mixminion/PLIST
@@ -1,9 +1,12 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 18:13:33 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2009/08/14 14:09:28 joerg Exp $
 bin/mixminion
 bin/mixminiond
 ${PYSITELIB}/mixminion/BuildMessage.py
 ${PYSITELIB}/mixminion/BuildMessage.pyc
 ${PYSITELIB}/mixminion/BuildMessage.pyo
+${PYSITELIB}/mixminion/ClientAPI.py
+${PYSITELIB}/mixminion/ClientAPI.pyc
+${PYSITELIB}/mixminion/ClientAPI.pyo
 ${PYSITELIB}/mixminion/ClientDirectory.py
 ${PYSITELIB}/mixminion/ClientDirectory.pyc
 ${PYSITELIB}/mixminion/ClientDirectory.pyo
@@ -40,6 +43,12 @@ ${PYSITELIB}/mixminion/NetUtils.pyo
 ${PYSITELIB}/mixminion/Packet.py
 ${PYSITELIB}/mixminion/Packet.pyc
 ${PYSITELIB}/mixminion/Packet.pyo
+${PYSITELIB}/mixminion/SExpression.py
+${PYSITELIB}/mixminion/SExpression.pyc
+${PYSITELIB}/mixminion/SExpression.pyo
+${PYSITELIB}/mixminion/ScheduleUtils.py
+${PYSITELIB}/mixminion/ScheduleUtils.pyc
+${PYSITELIB}/mixminion/ScheduleUtils.pyo
 ${PYSITELIB}/mixminion/ServerInfo.py
 ${PYSITELIB}/mixminion/ServerInfo.pyc
 ${PYSITELIB}/mixminion/ServerInfo.pyo
@@ -53,15 +62,15 @@ ${PYSITELIB}/mixminion/__init__.py
 ${PYSITELIB}/mixminion/__init__.pyc
 ${PYSITELIB}/mixminion/__init__.pyo
 ${PYSITELIB}/mixminion/_minionlib.so
-${PYSITELIB}/mixminion/_textwrap.py
-${PYSITELIB}/mixminion/_textwrap.pyc
-${PYSITELIB}/mixminion/_textwrap.pyo
 ${PYSITELIB}/mixminion/benchmark.py
 ${PYSITELIB}/mixminion/benchmark.pyc
 ${PYSITELIB}/mixminion/benchmark.pyo
 ${PYSITELIB}/mixminion/directory/DirCGI.py
 ${PYSITELIB}/mixminion/directory/DirCGI.pyc
 ${PYSITELIB}/mixminion/directory/DirCGI.pyo
+${PYSITELIB}/mixminion/directory/DirFormats.py
+${PYSITELIB}/mixminion/directory/DirFormats.pyc
+${PYSITELIB}/mixminion/directory/DirFormats.pyo
 ${PYSITELIB}/mixminion/directory/DirMain.py
 ${PYSITELIB}/mixminion/directory/DirMain.pyc
 ${PYSITELIB}/mixminion/directory/DirMain.pyo
@@ -95,6 +104,9 @@ ${PYSITELIB}/mixminion/server/Modules.pyo
 ${PYSITELIB}/mixminion/server/PacketHandler.py
 ${PYSITELIB}/mixminion/server/PacketHandler.pyc
 ${PYSITELIB}/mixminion/server/PacketHandler.pyo
+${PYSITELIB}/mixminion/server/Pinger.py
+${PYSITELIB}/mixminion/server/Pinger.pyc
+${PYSITELIB}/mixminion/server/Pinger.pyo
 ${PYSITELIB}/mixminion/server/ServerConfig.py
 ${PYSITELIB}/mixminion/server/ServerConfig.pyc
 ${PYSITELIB}/mixminion/server/ServerConfig.pyo
diff --git a/security/mixminion/distinfo b/security/mixminion/distinfo
index c5de0cf1abe..1164ffae7c3 100644
--- a/security/mixminion/distinfo
+++ b/security/mixminion/distinfo
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.4 2006/01/27 17:13:56 joerg Exp $
+$NetBSD: distinfo,v 1.5 2009/08/14 14:09:28 joerg Exp $
 
-SHA1 (Mixminion-0.0.7.1.tar.gz) = 62df7fea95e88267215ed7dc07a1715e099f5312
-RMD160 (Mixminion-0.0.7.1.tar.gz) = e94f23a1e119c77a64893f935d49849958968cde
-Size (Mixminion-0.0.7.1.tar.gz) = 437539 bytes
-SHA1 (patch-aa) = fe3eed950f09db4aa54865ee99bf0965289dac09
-SHA1 (patch-ab) = 28a3fc5e298c64f1bc9822ed8bc0d9fd3c371452
-SHA1 (patch-ac) = e6f1dbc080e50feb9174d09df7b22c053c50e540
+SHA1 (Mixminion-0.0.8alpha3.tar.gz) = 543235e96ccde34e2db20fe79aad32412db3ccac
+RMD160 (Mixminion-0.0.8alpha3.tar.gz) = d321c45f86a363f29f92d3130e38b1608be27459
+Size (Mixminion-0.0.8alpha3.tar.gz) = 483281 bytes
+SHA1 (patch-aa) = 3b9a4ab8bd12f69cb03c28ea1be25b4a807391cd
diff --git a/security/mixminion/patches/patch-aa b/security/mixminion/patches/patch-aa
index ed6597c8322..aec58e02b90 100644
--- a/security/mixminion/patches/patch-aa
+++ b/security/mixminion/patches/patch-aa
@@ -1,14 +1,20 @@
-$NetBSD: patch-aa,v 1.2 2005/01/30 21:56:24 wiz Exp $
+$NetBSD: patch-aa,v 1.3 2009/08/14 14:09:28 joerg Exp $
 
---- Makefile.orig	2004-04-04 20:43:33.000000000 +0200
-+++ Makefile
-@@ -12,8 +12,7 @@
- 
- # XXXX This fails when PYTHON is set to a version of Python earlier than 1.3
- 
--PYTHON_CANDIDATES = python python2.3 python2.3x python2.2 python2.2x python2.1\
--        python2.1x python2.0 python2.0x python2
-+PYTHON_CANDIDATES = python2.3 python2.2 python2.1
- FINDPYTHON = \
-    if [ "x`which which`" = "x" ]; then                                       \
-         echo "Ouch!  I couldn't run 'which' on your system.";                \
+--- setup.py.orig	2009-08-14 15:48:39.000000000 +0200
++++ setup.py
+@@ -525,11 +525,12 @@ if 'py2exe' in sys.argv:
+                              "etc/mixminiond.conf"])],
+         }
+ elif sys.platform != 'win32':
++    import os
+     EXTRA = {
+-        'data_files' : [("share/man/man1", ["doc/mixminion.1"]),
+-                        ("share/man/man5", ["doc/mixminionrc.5",
++        'data_files' : [( os.environ["PKGMANDIR"] + "/man1", ["doc/mixminion.1"]),
++                        ( os.environ["PKGMANDIR"] + "/man5", ["doc/mixminionrc.5",
+                                       "doc/mixminiond.conf.5"]),
+-                        ("share/man/man8", ["doc/mixminiond.8"])]
++                        ( os.environ["PKGMANDIR"] + "/man8", ["doc/mixminiond.8"])]
+         }
+ else:
+     EXTRA = {}
diff --git a/security/mixminion/patches/patch-ab b/security/mixminion/patches/patch-ab
deleted file mode 100644
index 12589381e9f..00000000000
--- a/security/mixminion/patches/patch-ab
+++ /dev/null
@@ -1,54 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2006/01/27 17:13:56 joerg Exp $
-
---- setup.py.orig	2004-05-10 19:36:22.000000000 +0200
-+++ setup.py
-@@ -492,6 +492,9 @@ if os.path.exists("/usr/kerberos/include
- 
- INCLUDE_DIRS.append("src")
- 
-+INCLUDE_DIRS.append('/usr/pkg/include')
-+INCLUDE_DIRS.append('/usr/include')
-+
- EXTRA_CFLAGS = []
- if sys.platform != 'win32':
-     EXTRA_CFLAGS += [ '-Wno-strict-prototypes' ]
-@@ -534,6 +537,30 @@ elif sys.platform != 'win32':
- else:
-     EXTRA = {}
- 
-+EXTRA = {'data_files':
-+         [('man/man1', ['etc/mixminion.1']),
-+          ('man/man5', ['etc/mixminionrc.5', 'etc/mixminiond.conf.5']),
-+          ('man/man8', ['etc/mixminiond.8'])]}
-+
-+orig_opts = sysconfig.get_config_vars('OPT')
-+if orig_opts == ['-DNDEBUG -O2 -I@PREFIX@/include -I/usr/include']:
-+    sysconfig._config_vars['OPT'] = '-DNDEBUG -O2'
-+elif orig_opts == ['-DNDEBUG -O2 -I/usr/include -I@PREFIX@/include']:
-+    sysconfig._config_vars['OPT'] = '-DNDEBUG -O2'
-+elif orig_opts == ['-DNDEBUG -O2 -I/usr/include']:
-+    sysconfig._config_vars['OPT'] = '-DNDEBUG -O2'
-+elif orig_opts == ['-O2 -I/usr/include']:
-+    sysconfig._config_vars['OPT'] = '-O2'
-+elif orig_opts == ['-DNDEBUG -g -O3 -Wall -Wstrict-prototypes']:
-+    pass
-+elif orig_opts == ['-g -O2 -Wall -Wstrict-prototypes']:
-+    pass
-+else:
-+    # The package defines the Python packages it can rely upon.
-+    # If we get here, this assumption is invalid.
-+    print "Looks like the Python we are using has unexpected properties."
-+    sys.exit(1)
-+
- setup(name='Mixminion',
-       version=VERSION,
-       license="LGPL",
-@@ -550,6 +575,8 @@ setup(name='Mixminion',
-       **EXTRA
- )
- 
-+sysconfig._config_vars['OPT'] = orig_opts
-+
- try:
-     for s in SCRIPTS:
-         os.unlink(s)
diff --git a/security/mixminion/patches/patch-ac b/security/mixminion/patches/patch-ac
deleted file mode 100644
index b753b32d8fc..00000000000
--- a/security/mixminion/patches/patch-ac
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2004/12/27 22:58:57 wiz Exp $
-
---- lib/mixminion/test.py.orig	Sun Apr  4 10:43:12 2004
-+++ lib/mixminion/test.py
-@@ -4272,7 +4272,8 @@ IntRS=5
-             self.assert_(os.path.exists(c[0]) and c[0].endswith("/rm"))
-             self.assertEquals(c[1], [])
-             self.assertEquals(C._parseCommand("/bin/ls"), ("/bin/ls", []))
--            self.failUnless(C._parseCommand("python")[0] is not None)
-+            # "python" does not have to be in the path.
-+#            self.failUnless(C._parseCommand("python")[0] is not None)
- 
-         # Base64
-         self.assertEquals(C._parseBase64(" YW\nJj"), "abc")