From b3dc32412f78da03192e0ddae9648012620c444d Mon Sep 17 00:00:00 2001 From: Kali Kaneko Date: Fri, 10 May 2013 00:58:50 +0900 Subject: bump version moved tac file to pkg --- MANIFEST.in | 1 - mx.tac | 84 ------------------------------------------------- pkg/mx.tac | 84 +++++++++++++++++++++++++++++++++++++++++++++++++ setup.py | 4 +-- src/leap/mx/__init__.py | 2 +- 5 files changed, 87 insertions(+), 88 deletions(-) delete mode 100755 mx.tac create mode 100755 pkg/mx.tac diff --git a/MANIFEST.in b/MANIFEST.in index 2e20cce..6bb33b5 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,4 +1,3 @@ include data/* include pkg/* include pkg/utils/* -include mx.tac diff --git a/mx.tac b/mx.tac deleted file mode 100755 index cdebba7..0000000 --- a/mx.tac +++ /dev/null @@ -1,84 +0,0 @@ -# -*- encoding: utf-8 -*- -# mx.tac -# Copyright (C) 2013 LEAP -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . - -import sys -import ConfigParser - -from functools import partial - -from leap.mx import couchdbhelper -from leap.mx.mail_receiver import MailReceiver -from leap.mx.alias_resolver import AliasResolverFactory -from leap.mx.check_recipient_access import CheckRecipientAccessFactory - -try: - from twisted.application import service, internet - from twisted.internet import inotify - from twisted.internet.endpoints import TCP4ServerEndpoint - from twisted.python import filepath, log - from twisted.python import usage -except ImportError, ie: - print "This software requires Twisted>=12.0.2, please see the README for" - print "help on using virtualenv and pip to obtain requirements." - -config_file = "/etc/leap/mx.conf" - -config = ConfigParser.ConfigParser() -config.read(config_file) - -user = config.get("couchdb", "user") -password = config.get("couchdb", "password") - -server = config.get("couchdb", "server") -port = config.get("couchdb", "port") - -alias_port = config.getint("alias map", "port") -check_recipient_port = config.getint("check recipient", "port") - -cdb = couchdbhelper.ConnectedCouchDB(server, - port=port, - dbName="users", - username=user, - password=password) - - -application = service.Application("LEAP MX") - -# Alias map -alias_map = internet.TCPServer(alias_port, AliasResolverFactory(couchdb=cdb)) -alias_map.setServiceParent(application) - -# Check recipient access -check_recipient = internet.TCPServer(check_recipient_port, - CheckRecipientAccessFactory(couchdb=cdb)) -check_recipient.setServiceParent(application) - -# Mail receiver -mail_couch_url_prefix = "http://%s:%s@%s:%s" % (user, - password, - server, - port) -directories = [] -for section in config.sections(): - if section in ("couchdb", "alias map", "check recipient"): - continue - to_watch = config.get(section, "path") - recursive = config.getboolean(section, "recursive") - directories.append([to_watch, recursive]) - -mr = MailReceiver(mail_couch_url_prefix, cdb, directories) -mr.setServiceParent(application) diff --git a/pkg/mx.tac b/pkg/mx.tac new file mode 100755 index 0000000..cdebba7 --- /dev/null +++ b/pkg/mx.tac @@ -0,0 +1,84 @@ +# -*- encoding: utf-8 -*- +# mx.tac +# Copyright (C) 2013 LEAP +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +import sys +import ConfigParser + +from functools import partial + +from leap.mx import couchdbhelper +from leap.mx.mail_receiver import MailReceiver +from leap.mx.alias_resolver import AliasResolverFactory +from leap.mx.check_recipient_access import CheckRecipientAccessFactory + +try: + from twisted.application import service, internet + from twisted.internet import inotify + from twisted.internet.endpoints import TCP4ServerEndpoint + from twisted.python import filepath, log + from twisted.python import usage +except ImportError, ie: + print "This software requires Twisted>=12.0.2, please see the README for" + print "help on using virtualenv and pip to obtain requirements." + +config_file = "/etc/leap/mx.conf" + +config = ConfigParser.ConfigParser() +config.read(config_file) + +user = config.get("couchdb", "user") +password = config.get("couchdb", "password") + +server = config.get("couchdb", "server") +port = config.get("couchdb", "port") + +alias_port = config.getint("alias map", "port") +check_recipient_port = config.getint("check recipient", "port") + +cdb = couchdbhelper.ConnectedCouchDB(server, + port=port, + dbName="users", + username=user, + password=password) + + +application = service.Application("LEAP MX") + +# Alias map +alias_map = internet.TCPServer(alias_port, AliasResolverFactory(couchdb=cdb)) +alias_map.setServiceParent(application) + +# Check recipient access +check_recipient = internet.TCPServer(check_recipient_port, + CheckRecipientAccessFactory(couchdb=cdb)) +check_recipient.setServiceParent(application) + +# Mail receiver +mail_couch_url_prefix = "http://%s:%s@%s:%s" % (user, + password, + server, + port) +directories = [] +for section in config.sections(): + if section in ("couchdb", "alias map", "check recipient"): + continue + to_watch = config.get(section, "path") + recursive = config.getboolean(section, "recursive") + directories.append([to_watch, recursive]) + +mr = MailReceiver(mail_couch_url_prefix, cdb, directories) +mr.setServiceParent(application) diff --git a/setup.py b/setup.py index 136d7b4..cc4c759 100644 --- a/setup.py +++ b/setup.py @@ -44,11 +44,11 @@ else: # be automatically # placed by distutils, using whatever interpreter is # available. - data_files = [("/usr/local/bin/", ["mx.tac"]), + data_files = [("/usr/local/bin/", ["pkg/mx.tac"]), ("/etc/init.d/", ["pkg/leap_mx"])] setup( name='leap.mx', - version="0.2.1-dev", + version="0.2.2-dev", # bump also src/leap/mx/__init__ url="http://github.com/leapcode/leap_mx", license='AGPLv3+', diff --git a/src/leap/mx/__init__.py b/src/leap/mx/__init__.py index e8c7a5f..e3efc24 100644 --- a/src/leap/mx/__init__.py +++ b/src/leap/mx/__init__.py @@ -17,4 +17,4 @@ """ Module initialization file for leap.mx . """ -__version__ = "0.2.1-dev" +__version__ = "0.2.2-dev" -- cgit v1.2.3 From 2198696c369d53bcaeb32cd5d25c526f76808ab4 Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Thu, 6 Jun 2013 16:33:05 -0400 Subject: initial debian packaging --- changes/bug_fix-pip-install | 1 - debian/changelog | 5 +++ debian/clean | 1 + debian/compat | 1 + debian/control | 12 ++++++ debian/leap-mx.doc | 3 ++ debian/rules | 6 +++ debian/source/format | 1 + .../gpg-keys/generated-2013-02-15_19-15-001.pub | Bin 2779 -> 0 bytes .../gpg-keys/generated-2013-02-15_19-15-001.sec | Bin 5453 -> 0 bytes .../gpg-keys/generated-2013-02-15_19-15-002.pub | Bin 2779 -> 0 bytes .../gpg-keys/generated-2013-02-15_19-15-002.sec | Bin 5453 -> 0 bytes .../gpg-keys/generated-2013-02-15_19-15-003.pub | Bin 2779 -> 0 bytes .../gpg-keys/generated-2013-02-15_19-15-003.sec | Bin 5453 -> 0 bytes pkg/utils/gpg-keys/gpg-batch-key-script | 45 --------------------- 15 files changed, 29 insertions(+), 46 deletions(-) delete mode 100644 changes/bug_fix-pip-install create mode 100644 debian/changelog create mode 100644 debian/clean create mode 100644 debian/compat create mode 100644 debian/control create mode 100644 debian/leap-mx.doc create mode 100755 debian/rules create mode 100644 debian/source/format delete mode 100644 pkg/utils/gpg-keys/generated-2013-02-15_19-15-001.pub delete mode 100644 pkg/utils/gpg-keys/generated-2013-02-15_19-15-001.sec delete mode 100644 pkg/utils/gpg-keys/generated-2013-02-15_19-15-002.pub delete mode 100644 pkg/utils/gpg-keys/generated-2013-02-15_19-15-002.sec delete mode 100644 pkg/utils/gpg-keys/generated-2013-02-15_19-15-003.pub delete mode 100644 pkg/utils/gpg-keys/generated-2013-02-15_19-15-003.sec delete mode 100644 pkg/utils/gpg-keys/gpg-batch-key-script diff --git a/changes/bug_fix-pip-install b/changes/bug_fix-pip-install deleted file mode 100644 index fcb5829..0000000 --- a/changes/bug_fix-pip-install +++ /dev/null @@ -1 +0,0 @@ - o Fix broken pip install diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..4340754 --- /dev/null +++ b/debian/changelog @@ -0,0 +1,5 @@ +leap-mx (0.2.2) unstable; urgency=low + + * Initial Debian package + + -- Micah Anderson Thu, 06 Jun 2013 16:20:55 -0400 diff --git a/debian/clean b/debian/clean new file mode 100644 index 0000000..4a664ba --- /dev/null +++ b/debian/clean @@ -0,0 +1 @@ +src/leap.mx.egg-info/* diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000..ec63514 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +9 diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..78528af --- /dev/null +++ b/debian/control @@ -0,0 +1,12 @@ +Source: leap-mx +Maintainer: Micah Anderson +Section: python +Priority: optional +Build-Depends: python-setuptools (>= 0.6b3), python-all (>= 2.6.6-3), debhelper (>= 9) +Standards-Version: 3.9.4 + +Package: python-leap-mx +Architecture: all +Depends: ${misc:Depends}, ${python:Depends} +Description: An asynchronous, transparently-encrypting remailer for the L + An asynchronous, transparently-encrypting remailer using BigCouch/CouchDB and PGP/GnuPG, written in Twisted Python. diff --git a/debian/leap-mx.doc b/debian/leap-mx.doc new file mode 100644 index 0000000..875a55c --- /dev/null +++ b/debian/leap-mx.doc @@ -0,0 +1,3 @@ +../doc +../README.md +../VERSION.md diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..bcebae9 --- /dev/null +++ b/debian/rules @@ -0,0 +1,6 @@ +#!/usr/bin/make -f + +%: + dh $@ --with python2 --buildsystem=python_distutils + + diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..89ae9db --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/pkg/utils/gpg-keys/generated-2013-02-15_19-15-001.pub b/pkg/utils/gpg-keys/generated-2013-02-15_19-15-001.pub deleted file mode 100644 index 1c8fd34..0000000 Binary files a/pkg/utils/gpg-keys/generated-2013-02-15_19-15-001.pub and /dev/null differ diff --git a/pkg/utils/gpg-keys/generated-2013-02-15_19-15-001.sec b/pkg/utils/gpg-keys/generated-2013-02-15_19-15-001.sec deleted file mode 100644 index 97a60e7..0000000 Binary files a/pkg/utils/gpg-keys/generated-2013-02-15_19-15-001.sec and /dev/null differ diff --git a/pkg/utils/gpg-keys/generated-2013-02-15_19-15-002.pub b/pkg/utils/gpg-keys/generated-2013-02-15_19-15-002.pub deleted file mode 100644 index 1cbf8d8..0000000 Binary files a/pkg/utils/gpg-keys/generated-2013-02-15_19-15-002.pub and /dev/null differ diff --git a/pkg/utils/gpg-keys/generated-2013-02-15_19-15-002.sec b/pkg/utils/gpg-keys/generated-2013-02-15_19-15-002.sec deleted file mode 100644 index f89cd97..0000000 Binary files a/pkg/utils/gpg-keys/generated-2013-02-15_19-15-002.sec and /dev/null differ diff --git a/pkg/utils/gpg-keys/generated-2013-02-15_19-15-003.pub b/pkg/utils/gpg-keys/generated-2013-02-15_19-15-003.pub deleted file mode 100644 index bc0ac12..0000000 Binary files a/pkg/utils/gpg-keys/generated-2013-02-15_19-15-003.pub and /dev/null differ diff --git a/pkg/utils/gpg-keys/generated-2013-02-15_19-15-003.sec b/pkg/utils/gpg-keys/generated-2013-02-15_19-15-003.sec deleted file mode 100644 index 397f44a..0000000 Binary files a/pkg/utils/gpg-keys/generated-2013-02-15_19-15-003.sec and /dev/null differ diff --git a/pkg/utils/gpg-keys/gpg-batch-key-script b/pkg/utils/gpg-keys/gpg-batch-key-script deleted file mode 100644 index 7e48db0..0000000 --- a/pkg/utils/gpg-keys/gpg-batch-key-script +++ /dev/null @@ -1,45 +0,0 @@ -%echo Generating keypair 001/003... -Key-Type: RSA -Key-Length: 4096 -Subkey-Type: RSA -Subkey-Length: 4096 -Name-Real: Louis Lingg -Name-Email: blackhole@leap.se -Name-Comment: Test Key 001/003 -Expire-Date: 2013-03-15 -Passphrase: leap -%pubring generated-2013-02-15_19-15-001.pub -%secring generated-2013-02-15_19-15-001.sec -%commit -%echo done. 001 keys out of 003 completed. - -%echo Generating keypair 002/003... -Key-Type: RSA -Key-Length: 4096 -Subkey-Type: RSA -Subkey-Length: 4096 -Name-Real: Louis Lingg -Name-Email: blackhole@leap.se -Name-Comment: Test Key 002/003 -Expire-Date: 2013-03-15 -Passphrase: leap -%pubring generated-2013-02-15_19-15-002.pub -%secring generated-2013-02-15_19-15-002.sec -%commit -%echo done. 002 keys out of 003 completed. - -%echo Generating keypair 003/003... -Key-Type: RSA -Key-Length: 4096 -Subkey-Type: RSA -Subkey-Length: 4096 -Name-Real: Louis Lingg -Name-Email: blackhole@leap.se -Name-Comment: Test Key 003/003 -Expire-Date: 2013-03-15 -Passphrase: leap -%pubring generated-2013-02-15_19-15-003.pub -%secring generated-2013-02-15_19-15-003.sec -%commit -%echo done. 003 keys out of 003 completed. - -- cgit v1.2.3