security: Remove mixminion - in alpha since 2007, fails with OpenSSL 1.1

8 files changed, 1 insertions, 371 deletions

diff --git a/security/Makefile b/security/Makefile
index 11e1b0488fe..5871b1c00a0 100644
--- a/security/Makefile
+++ b/security/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.743 2020/03/01 17:35:29 nia Exp $
+# $NetBSD: Makefile,v 1.744 2020/03/01 17:40:05 nia Exp $
 #
 
 COMMENT=	Security tools
@@ -219,7 +219,6 @@ SUBDIR+=	minisign
 SUBDIR+=	mirrordir
 SUBDIR+=	mit-krb5
 SUBDIR+=	mit-krb5-appl
-SUBDIR+=	mixminion
 SUBDIR+=	monocypher
 SUBDIR+=	mozilla-rootcerts
 SUBDIR+=	mozilla-rootcerts-openssl
diff --git a/security/mixminion/DESCR b/security/mixminion/DESCR
deleted file mode 100644
index 19a12bbc89c..00000000000
--- a/security/mixminion/DESCR
+++ /dev/null
@@ -1,18 +0,0 @@
-Mixminion is a communication security application for electronic mail
-messages.  Its purpose is to deny an adversary the ability to
-determine who is communicating with whom and to provide the closely
-related service of anonymous communication.
-
-It does this by sending messages through a series of servers.
-Messages going into and out of each server are encrypted.  Each server
-keeps a pool of messages.  When a message comes in it is placed in the
-pool.  Messages sent out from the pool are difficult to correlate with
-the messages going in.  This process is called "mixing."
-
-Each server reduces the ability of the adversary to determine the
-origin of a message.  Chaining the servers further reduces this
-ability and contains the damage caused by compromised servers.  The
-chain of servers is chosen by the Mixminion software running on the
-user's machine.
-
-See http://mixminion.net for a complete description.
diff --git a/security/mixminion/Makefile b/security/mixminion/Makefile
deleted file mode 100644
index 29020b026f6..00000000000
--- a/security/mixminion/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-# $NetBSD: Makefile,v 1.34 2020/01/18 21:50:40 jperkin Exp $
-
-DISTNAME=		Mixminion-0.0.8alpha3
-PKGNAME=		${DISTNAME:S/M/m/}
-PKGREVISION=		9
-CATEGORIES=		security mail
-MASTER_SITES=		https://mixminion.net/dist/0.0.8alpha3/
-
-MAINTAINER=		athaba@inode.at
-HOMEPAGE=		https://mixminion.net/
-COMMENT=		Anonymous Type 3 remailer
-LICENSE=		mit
-
-REPLACE_PYTHON=	lib/mixminion/Main.py
-PYTHON_VERSIONS_ACCEPTED= 27 # not yet ported as of 0.0.8alpha3
-
-TEST_TARGET=		test
-
-MAKE_ENV+=		OPENSSL_PREFIX=${BUILDLINK_PREFIX.openssl:Q}
-
-.include "../../lang/python/application.mk"
-.include "../../lang/python/distutils.mk"
-.include "../../security/openssl/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/security/mixminion/PLIST b/security/mixminion/PLIST
deleted file mode 100644
index d252d2fd51a..00000000000
--- a/security/mixminion/PLIST
+++ /dev/null
@@ -1,135 +0,0 @@
-@comment $NetBSD: PLIST,v 1.4 2014/01/23 17:45:48 wiz Exp $
-bin/mixminion
-bin/mixminiond
-${PYSITELIB}/${EGG_FILE}
-${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
-${PYSITELIB}/mixminion/ClientMain.py
-${PYSITELIB}/mixminion/ClientMain.pyc
-${PYSITELIB}/mixminion/ClientMain.pyo
-${PYSITELIB}/mixminion/ClientUtils.py
-${PYSITELIB}/mixminion/ClientUtils.pyc
-${PYSITELIB}/mixminion/ClientUtils.pyo
-${PYSITELIB}/mixminion/Common.py
-${PYSITELIB}/mixminion/Common.pyc
-${PYSITELIB}/mixminion/Common.pyo
-${PYSITELIB}/mixminion/Config.py
-${PYSITELIB}/mixminion/Config.pyc
-${PYSITELIB}/mixminion/Config.pyo
-${PYSITELIB}/mixminion/Crypto.py
-${PYSITELIB}/mixminion/Crypto.pyc
-${PYSITELIB}/mixminion/Crypto.pyo
-${PYSITELIB}/mixminion/Filestore.py
-${PYSITELIB}/mixminion/Filestore.pyc
-${PYSITELIB}/mixminion/Filestore.pyo
-${PYSITELIB}/mixminion/Fragments.py
-${PYSITELIB}/mixminion/Fragments.pyc
-${PYSITELIB}/mixminion/Fragments.pyo
-${PYSITELIB}/mixminion/MMTPClient.py
-${PYSITELIB}/mixminion/MMTPClient.pyc
-${PYSITELIB}/mixminion/MMTPClient.pyo
-${PYSITELIB}/mixminion/Main.py
-${PYSITELIB}/mixminion/Main.pyc
-${PYSITELIB}/mixminion/Main.pyo
-${PYSITELIB}/mixminion/NetUtils.py
-${PYSITELIB}/mixminion/NetUtils.pyc
-${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
-${PYSITELIB}/mixminion/TLSConnection.py
-${PYSITELIB}/mixminion/TLSConnection.pyc
-${PYSITELIB}/mixminion/TLSConnection.pyo
-${PYSITELIB}/mixminion/ThreadUtils.py
-${PYSITELIB}/mixminion/ThreadUtils.pyc
-${PYSITELIB}/mixminion/ThreadUtils.pyo
-${PYSITELIB}/mixminion/__init__.py
-${PYSITELIB}/mixminion/__init__.pyc
-${PYSITELIB}/mixminion/__init__.pyo
-${PYSITELIB}/mixminion/_minionlib.so
-${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
-${PYSITELIB}/mixminion/directory/Directory.py
-${PYSITELIB}/mixminion/directory/Directory.pyc
-${PYSITELIB}/mixminion/directory/Directory.pyo
-${PYSITELIB}/mixminion/directory/ServerInbox.py
-${PYSITELIB}/mixminion/directory/ServerInbox.pyc
-${PYSITELIB}/mixminion/directory/ServerInbox.pyo
-${PYSITELIB}/mixminion/directory/ServerList.py
-${PYSITELIB}/mixminion/directory/ServerList.pyc
-${PYSITELIB}/mixminion/directory/ServerList.pyo
-${PYSITELIB}/mixminion/directory/__init__.py
-${PYSITELIB}/mixminion/directory/__init__.pyc
-${PYSITELIB}/mixminion/directory/__init__.pyo
-${PYSITELIB}/mixminion/server/DNSFarm.py
-${PYSITELIB}/mixminion/server/DNSFarm.pyc
-${PYSITELIB}/mixminion/server/DNSFarm.pyo
-${PYSITELIB}/mixminion/server/EventStats.py
-${PYSITELIB}/mixminion/server/EventStats.pyc
-${PYSITELIB}/mixminion/server/EventStats.pyo
-${PYSITELIB}/mixminion/server/HashLog.py
-${PYSITELIB}/mixminion/server/HashLog.pyc
-${PYSITELIB}/mixminion/server/HashLog.pyo
-${PYSITELIB}/mixminion/server/MMTPServer.py
-${PYSITELIB}/mixminion/server/MMTPServer.pyc
-${PYSITELIB}/mixminion/server/MMTPServer.pyo
-${PYSITELIB}/mixminion/server/Modules.py
-${PYSITELIB}/mixminion/server/Modules.pyc
-${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
-${PYSITELIB}/mixminion/server/ServerKeys.py
-${PYSITELIB}/mixminion/server/ServerKeys.pyc
-${PYSITELIB}/mixminion/server/ServerKeys.pyo
-${PYSITELIB}/mixminion/server/ServerMain.py
-${PYSITELIB}/mixminion/server/ServerMain.pyc
-${PYSITELIB}/mixminion/server/ServerMain.pyo
-${PYSITELIB}/mixminion/server/ServerQueue.py
-${PYSITELIB}/mixminion/server/ServerQueue.pyc
-${PYSITELIB}/mixminion/server/ServerQueue.pyo
-${PYSITELIB}/mixminion/server/__init__.py
-${PYSITELIB}/mixminion/server/__init__.pyc
-${PYSITELIB}/mixminion/server/__init__.pyo
-${PYSITELIB}/mixminion/test.py
-${PYSITELIB}/mixminion/test.pyc
-${PYSITELIB}/mixminion/test.pyo
-${PYSITELIB}/mixminion/testSupport.py
-${PYSITELIB}/mixminion/testSupport.pyc
-${PYSITELIB}/mixminion/testSupport.pyo
-man/man1/mixminion.1
-man/man5/mixminiond.conf.5
-man/man5/mixminionrc.5
-man/man8/mixminiond.8
diff --git a/security/mixminion/distinfo b/security/mixminion/distinfo
deleted file mode 100644
index ed81903258a..00000000000
--- a/security/mixminion/distinfo
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: distinfo,v 1.7 2015/11/04 01:17:51 agc Exp $
-
-SHA1 (Mixminion-0.0.8alpha3.tar.gz) = 543235e96ccde34e2db20fe79aad32412db3ccac
-RMD160 (Mixminion-0.0.8alpha3.tar.gz) = d321c45f86a363f29f92d3130e38b1608be27459
-SHA512 (Mixminion-0.0.8alpha3.tar.gz) = 3e29b73fafab0182403ee526f524380bcdf0a1f6ebe86d0e123e1f6917ffdad6263432812c32490e11be9f039b5864e5961c24d9d6c798338cee12dc115baf3a
-Size (Mixminion-0.0.8alpha3.tar.gz) = 483281 bytes
-SHA1 (patch-aa) = 3b9a4ab8bd12f69cb03c28ea1be25b4a807391cd
-SHA1 (patch-ab) = fbad0097f4eed0b377dc30e765674e2135830d44
-SHA1 (patch-ac) = 66a356002fded22d1b8fdb67676c13f84e61dd58
diff --git a/security/mixminion/patches/patch-aa b/security/mixminion/patches/patch-aa
deleted file mode 100644
index aec58e02b90..00000000000
--- a/security/mixminion/patches/patch-aa
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2009/08/14 14:09:28 joerg Exp $
-
---- 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 8faf7131b9e..00000000000
--- a/security/mixminion/patches/patch-ab
+++ /dev/null
@@ -1,77 +0,0 @@
-$NetBSD: patch-ab,v 1.4 2010/02/15 15:57:44 joerg Exp $
-
---- lib/mixminion/server/ServerQueue.py.orig	2010-02-15 15:46:36.000000000 +0000
-+++ lib/mixminion/server/ServerQueue.py
-@@ -617,16 +617,16 @@ class PerAddressDeliveryQueue(DeliveryQu
-         try:
-             for ds in self.store._metadata_cache.values():
-                 if not self.addressStateDB.has_key(str(ds.address)):
--                    as = _AddressState(ds.address)
--                    self.addressStateDB[str(ds.address)] = as
-+                    as_ = _AddressState(ds.address)
-+                    self.addressStateDB[str(ds.address)] = as_
-             if not self.retrySchedule:
-                 rs = [3600]
-                 self.totalLifetime = 3600
-             else:
-                 rs = self.retrySchedule
-                 self.totalLifetime = reduce(operator.add,self.retrySchedule,0)
--            for as in self.addressStateDB.values():
--                as.setNextAttempt(rs, now)
-+            for as_ in self.addressStateDB.values():
-+                as_.setNextAttempt(rs, now)
-             self._repOK()
-         finally:
-             self._lock.release()
-@@ -643,10 +643,10 @@ class PerAddressDeliveryQueue(DeliveryQu
-                 else:
-                     have[ds.address]=1
- 
--            for k, as in self.addressStateDB.items():
--                if have.has_key(as.address):
-+            for k, as_ in self.addressStateDB.items():
-+                if have.has_key(as_.address):
-                     continue
--                lastActivity = as.getLastActivity()
-+                lastActivity = as_.getLastActivity()
-                 if lastActivity and (
-                     lastActivity + self.totalLifetime < now):
-                     del self.addressStateDB[k]
-@@ -655,11 +655,11 @@ class PerAddressDeliveryQueue(DeliveryQu
- 
-     def _getAddressState(self, address, now=None):
-         try:
--            as = self.addressStateDB[str(address)]
-+            as_ = self.addressStateDB[str(address)]
-         except KeyError:
--            as = self.addressStateDB[str(address)] = _AddressState(address)
--            as.setNextAttempt(self.retrySchedule, now)
--        return as
-+            as_ = self.addressStateDB[str(address)] = _AddressState(address)
-+            as_.setNextAttempt(self.retrySchedule, now)
-+        return as_
- 
-     def queueDeliveryMessage(self, msg, address, now=None):
-         self._getAddressState(address, now=now)
-@@ -767,8 +767,8 @@ class PerAddressDeliveryQueue(DeliveryQu
-         self._repOK()
-         o = self.store.getObject(handle)
-         ds = self.store.getMetadata(handle)
--        as = self._getAddressState(ds.address)
--        return (o, ds, as)
-+        as_ = self._getAddressState(ds.address)
-+        return (o, ds, as_)
- 
-     def _repOK(self):
-         """Raise an assertion error if the internal state of this object is
-@@ -780,8 +780,8 @@ class PerAddressDeliveryQueue(DeliveryQu
-             DeliveryQueue._repOK(self)
-             for h in self.store._metadata_cache.keys():
-                 ds = self.store._metadata_cache[h]
--                as = self._getAddressState(ds.address)
--                assert as.address == ds.address
-+                as_ = self._getAddressState(ds.address)
-+                assert as_.address == ds.address
-         finally:
-             self._lock.release()
- 
diff --git a/security/mixminion/patches/patch-ac b/security/mixminion/patches/patch-ac
deleted file mode 100644
index 26dea510631..00000000000
--- a/security/mixminion/patches/patch-ac
+++ /dev/null
@@ -1,86 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2010/02/15 15:57:45 joerg Exp $
-
---- lib/mixminion/test.py.orig	2010-02-15 15:50:06.000000000 +0000
-+++ lib/mixminion/test.py
-@@ -3444,15 +3444,15 @@ class QueueTests(FStoreTestBase):
-         h3 = q.queueDeliveryMessage("Message number three", A1, start)
-         q._repOK()
- 
--        m, ds, as = q._inspect(h1)
-+        m, ds, as_ = q._inspect(h1)
-         self.assertEquals(m, "Message number one")
-         self.assertEquals(ds.address, A1)
--        self.assertEquals(as.address, A1)
-+        self.assertEquals(as_.address, A1)
-         self.assert_(not ds.isPending())
-         self.assertEquals(ds.lastAttempt, None)
--        self.assertEquals(as.lastSuccess, None)
--        self.assertEquals(as.lastFailure, None)
--        self.assertEquals(as.firstFailure, None)
-+        self.assertEquals(as_.lastSuccess, None)
-+        self.assertEquals(as_.lastFailure, None)
-+        self.assertEquals(as_.firstFailure, None)
-         q.removeExpiredMessages(start)
-         self.assertEquals(q.store.count(), 3)
- 
-@@ -3470,16 +3470,16 @@ class QueueTests(FStoreTestBase):
-         msgs[h3].failed(now=start+40, retriable=1)
-         self.assert_(not q._inspect(h3)[1].isPending())
- 
--        as = q.addressStateDB[str(A1)]
--        self.assertIEquals(as.lastSuccess-start, 30)
--        self.assertIEquals(as.firstFailure-start, 10)
--        self.assertIEquals(as.lastFailure-start, 10)
--        self.assertIEquals(as.nextAttempt-start, 10+HOUR)
--        as = q.addressStateDB[str(A2)]
--        self.assertIEquals(as.lastSuccess-start, 20)
--        self.assertEquals(as.firstFailure, None)
--        self.assertEquals(as.lastFailure, None)
--        self.assertIEquals(as.nextAttempt-start, 20)
-+        as_ = q.addressStateDB[str(A1)]
-+        self.assertIEquals(as_.lastSuccess-start, 30)
-+        self.assertIEquals(as_.firstFailure-start, 10)
-+        self.assertIEquals(as_.lastFailure-start, 10)
-+        self.assertIEquals(as_.nextAttempt-start, 10+HOUR)
-+        as_ = q.addressStateDB[str(A2)]
-+        self.assertIEquals(as_.lastSuccess-start, 20)
-+        self.assertEquals(as_.firstFailure, None)
-+        self.assertEquals(as_.lastFailure, None)
-+        self.assertIEquals(as_.nextAttempt-start, 20)
- 
-         # Queue two more messages; the one on A2 gets tried; the ones on
-         # A1 doesn't get tried for a while.
-@@ -3495,13 +3495,13 @@ class QueueTests(FStoreTestBase):
-         q.sendReadyMessages(start+HOUR+MIN)
-         msgs = self._pendingMsgDict(q._msgs)
-         self.assertUnorderedEq(msgs.keys(), [h3, h4])
--        as = q.addressStateDB[str(A1)]
-+        as_ = q.addressStateDB[str(A1)]
-         msgs[h3].failed(now=start+HOUR+MIN+5, retriable=1)
-         msgs[h4].failed(now=start+HOUR+MIN+5, retriable=1)
- 
--        self.assertIEquals(as.firstFailure-start, 10)
--        self.assertIEquals(as.lastFailure-start, HOUR+MIN)
--        self.assertIEquals(as.nextAttempt-start, 10+2*HOUR)
-+        self.assertIEquals(as_.firstFailure-start, 10)
-+        self.assertIEquals(as_.lastFailure-start, HOUR+MIN)
-+        self.assertIEquals(as_.nextAttempt-start, 10+2*HOUR)
- 
-         h6 = q.queueDeliveryMessage("The sixth message", A1,
-                                     now=start+HOUR*17-MIN)
-@@ -3525,13 +3525,13 @@ class QueueTests(FStoreTestBase):
-         self.assertUnorderedEq(q.addressStateDB.keys(), [str(A1)])
- 
-         # Make sure that messages keep getting retried...
--        as = q.addressStateDB[str(A1)]
-+        as_ = q.addressStateDB[str(A1)]
-         # (Reset nextDelivery on A1, since not all the delivery attempts
-         # have really happened.)
-         q.sendReadyMessages(now=start+HOUR*17+MIN*15)
-         msgs = self._pendingMsgDict(q._msgs)
-         msgs[h6].failed(now=start+HOUR*17+MIN*16, retriable=0)
--        self.assertEquals(as.nextAttempt - start, 25*HOUR+10)
-+        self.assertEquals(as_.nextAttempt - start, 25*HOUR+10)
-         self.assertEquals([], q.store.getAllMessages())
- 
-         # Test reloading.