head 1.5; access; symbols pkgsrc-2019Q4:1.4.0.84 pkgsrc-2019Q4-base:1.4 pkgsrc-2019Q3:1.4.0.80 pkgsrc-2019Q3-base:1.4 pkgsrc-2019Q2:1.4.0.78 pkgsrc-2019Q2-base:1.4 pkgsrc-2019Q1:1.4.0.76 pkgsrc-2019Q1-base:1.4 pkgsrc-2018Q4:1.4.0.74 pkgsrc-2018Q4-base:1.4 pkgsrc-2018Q3:1.4.0.72 pkgsrc-2018Q3-base:1.4 pkgsrc-2018Q2:1.4.0.70 pkgsrc-2018Q2-base:1.4 pkgsrc-2018Q1:1.4.0.68 pkgsrc-2018Q1-base:1.4 pkgsrc-2017Q4:1.4.0.66 pkgsrc-2017Q4-base:1.4 pkgsrc-2017Q3:1.4.0.64 pkgsrc-2017Q3-base:1.4 pkgsrc-2017Q2:1.4.0.60 pkgsrc-2017Q2-base:1.4 pkgsrc-2017Q1:1.4.0.58 pkgsrc-2017Q1-base:1.4 pkgsrc-2016Q4:1.4.0.56 pkgsrc-2016Q4-base:1.4 pkgsrc-2016Q3:1.4.0.54 pkgsrc-2016Q3-base:1.4 pkgsrc-2016Q2:1.4.0.52 pkgsrc-2016Q2-base:1.4 pkgsrc-2016Q1:1.4.0.50 pkgsrc-2016Q1-base:1.4 pkgsrc-2015Q4:1.4.0.48 pkgsrc-2015Q4-base:1.4 pkgsrc-2015Q3:1.4.0.46 pkgsrc-2015Q3-base:1.4 pkgsrc-2015Q2:1.4.0.44 pkgsrc-2015Q2-base:1.4 pkgsrc-2015Q1:1.4.0.42 pkgsrc-2015Q1-base:1.4 pkgsrc-2014Q4:1.4.0.40 pkgsrc-2014Q4-base:1.4 pkgsrc-2014Q3:1.4.0.38 pkgsrc-2014Q3-base:1.4 pkgsrc-2014Q2:1.4.0.36 pkgsrc-2014Q2-base:1.4 pkgsrc-2014Q1:1.4.0.34 pkgsrc-2014Q1-base:1.4 pkgsrc-2013Q4:1.4.0.32 pkgsrc-2013Q4-base:1.4 pkgsrc-2013Q3:1.4.0.30 pkgsrc-2013Q3-base:1.4 pkgsrc-2013Q2:1.4.0.28 pkgsrc-2013Q2-base:1.4 pkgsrc-2013Q1:1.4.0.26 pkgsrc-2013Q1-base:1.4 pkgsrc-2012Q4:1.4.0.24 pkgsrc-2012Q4-base:1.4 pkgsrc-2012Q3:1.4.0.22 pkgsrc-2012Q3-base:1.4 pkgsrc-2012Q2:1.4.0.20 pkgsrc-2012Q2-base:1.4 pkgsrc-2012Q1:1.4.0.18 pkgsrc-2012Q1-base:1.4 pkgsrc-2011Q4:1.4.0.16 pkgsrc-2011Q4-base:1.4 pkgsrc-2011Q3:1.4.0.14 pkgsrc-2011Q3-base:1.4 pkgsrc-2011Q2:1.4.0.12 pkgsrc-2011Q2-base:1.4 pkgsrc-2011Q1:1.4.0.10 pkgsrc-2011Q1-base:1.4 pkgsrc-2010Q4:1.4.0.8 pkgsrc-2010Q4-base:1.4 pkgsrc-2010Q3:1.4.0.6 pkgsrc-2010Q3-base:1.4 pkgsrc-2010Q2:1.4.0.4 pkgsrc-2010Q2-base:1.4 pkgsrc-2010Q1:1.4.0.2 pkgsrc-2010Q1-base:1.4 pkgsrc-2009Q4:1.3.0.2 pkgsrc-2009Q4-base:1.3 pkgsrc-2009Q2:1.2.0.32 pkgsrc-2009Q2-base:1.2 pkgsrc-2009Q1:1.2.0.30 pkgsrc-2009Q1-base:1.2 pkgsrc-2008Q4:1.2.0.28 pkgsrc-2008Q4-base:1.2 pkgsrc-2008Q3:1.2.0.26 pkgsrc-2008Q3-base:1.2 cube-native-xorg:1.2.0.24 cube-native-xorg-base:1.2 pkgsrc-2008Q2:1.2.0.22 pkgsrc-2008Q2-base:1.2 cwrapper:1.2.0.20 pkgsrc-2008Q1:1.2.0.18 pkgsrc-2008Q1-base:1.2 pkgsrc-2007Q4:1.2.0.16 pkgsrc-2007Q4-base:1.2 pkgsrc-2007Q3:1.2.0.14 pkgsrc-2007Q3-base:1.2 pkgsrc-2007Q2:1.2.0.12 pkgsrc-2007Q2-base:1.2 pkgsrc-2007Q1:1.2.0.10 pkgsrc-2007Q1-base:1.2 pkgsrc-2006Q4:1.2.0.8 pkgsrc-2006Q4-base:1.2 pkgsrc-2006Q3:1.2.0.6 pkgsrc-2006Q3-base:1.2 pkgsrc-2006Q2:1.2.0.4 pkgsrc-2006Q2-base:1.2 pkgsrc-2006Q1:1.2.0.2 pkgsrc-2006Q1-base:1.2 pkgsrc-2005Q4:1.1.1.1.0.8 pkgsrc-2005Q4-base:1.1.1.1 pkgsrc-2005Q3:1.1.1.1.0.6 pkgsrc-2005Q3-base:1.1.1.1 pkgsrc-2005Q2:1.1.1.1.0.4 pkgsrc-2005Q2-base:1.1.1.1 pkgsrc-2005Q1:1.1.1.1.0.2 pkgsrc-2005Q1-base:1.1.1.1 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.5 date 2020.03.01.17.40.06; author nia; state dead; branches; next 1.4; commitid rKpgtUQlMNREVIYB; 1.4 date 2010.02.15.15.57.44; author joerg; state Exp; branches; next 1.3; 1.3 date 2009.08.14.14.09.28; author joerg; state dead; branches; next 1.2; 1.2 date 2006.01.27.17.13.56; author joerg; state Exp; branches; next 1.1; 1.1 date 2004.12.27.22.58.57; author wiz; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2004.12.27.22.58.57; author wiz; state Exp; branches; next ; desc @@ 1.5 log @security: Remove mixminion - in alpha since 2007, fails with OpenSSL 1.1 @ text @$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() @ 1.4 log @"as" is a reserved word in Python 2.6+, so don't use it as variable. Fix a Python interpreter path while here. @ text @d1 1 a1 1 $NetBSD$ @ 1.3 log @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. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.2 2006/01/27 17:13:56 joerg Exp $ d3 26 a28 3 --- setup.py.orig 2004-05-10 19:36:22.000000000 +0200 +++ setup.py @@@@ -492,6 +492,9 @@@@ if os.path.exists("/usr/kerberos/include d30 11 a40 1 INCLUDE_DIRS.append("src") d42 11 a52 9 +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 = {} d54 23 a76 30 +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 ) a77 5 +sysconfig._config_vars['OPT'] = orig_opts + try: for s in SCRIPTS: os.unlink(s) @ 1.2 log @Make the setup.py hack a bit more likely to work: /usr/pkg/include and /usr/include can appear in any order, PREFIX can be != /usr/pkg. XXX Why this hack and not split + filter to remove the include pathes? @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.1.1.1 2004/12/27 22:58:57 wiz Exp $ @ 1.1 log @Initial revision @ text @d1 1 a1 1 $NetBSD$ d15 1 a15 1 @@@@ -534,6 +537,28 @@@@ elif sys.platform != 'win32': d25 3 a27 1 +if orig_opts == ['-DNDEBUG -O2 -I/usr/pkg/include -I/usr/include']: @ 1.1.1.1 log @Initial import of mixminion-0.0.7.1, provided by Peter Hendrickson in PR 25573, with some cleanup by me. 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. @ text @@