--- enemies-of-carlotta-1.2.6.orig/cleaning-woman-cronjob +++ enemies-of-carlotta-1.2.6/cleaning-woman-cronjob @@ -0,0 +1,24 @@ +#!/bin/sh + +# Enemies of Carlotta routine clean-up cronjob +# +# from the manual page: +# --cleaning-woman +# Deal with bouncing addresses and do other cleanup. You must run +# enemies-of-carlotta --cleaning-woman periodically, such as once +# per hour. It will clean up all your lists. + +# There are implications in running this system-wide; therefore this +# cronjob is not installed by default, but it can be edited to taste +# and copied to /etc/cron.hourly/enemies-of-carlotta (say). +# Alternatively you can simply add "enemies-of-carlotta +# --cleaning-woman" to the crontab of the system user that runs your +# lists. + +cd /home +for user in *; do + if [ -d "/home/$user/.enemies-of-carlotta" ]; then + echo $user + su $user -s /bin/sh -c "enemies-of-carlotta --cleaning-woman" + fi +done --- enemies-of-carlotta-1.2.6.orig/enemies-of-carlotta.1 +++ enemies-of-carlotta-1.2.6/enemies-of-carlotta.1 @@ -445,8 +445,8 @@ .PP If you are running a virtual domain configured so that all mail to the domain @example.com is delivered to joe-exampledotcom, you need to -create the files .courier-exampledotcom-fans and -.courier-exampledotcom-fans-default containing the two following lines: +create the files .courier-exampledotcom-fans and .courier-exampledotcom-fans-default +containing the two following lines: .sp 1 .RS |enemies-of-carlotta --is-list --name $RECIPIENT --skip-prefix=joe-exampledotcom || exit 67 --- enemies-of-carlotta-1.2.6.orig/eoc.py +++ enemies-of-carlotta-1.2.6/eoc.py @@ -8,7 +8,7 @@ PLUGIN_INTERFACE_VERSION = "1" import getopt -import md5 +import hashlib import os import shutil import smtplib @@ -78,7 +78,7 @@ def md5sum_as_hex(s): - return md5.new(s).hexdigest() + return hashlib.md5(s).hexdigest() def forkexec(argv, text): @@ -1694,7 +1694,17 @@ debug("Not a mailing list: <%s>" % list_name) sys.exit(1) elif operation == "--incoming": - mlm.incoming_message(skip_prefix, domain, moderate, post) + try: + mlm.incoming_message(skip_prefix, domain, moderate, post) + except BadCommandAddress: + sys.stderr.write("Bad command address.\n") + sys.exit(os.EX_NOUSER) + except BadSignature: + sys.stderr.write("Bad signature.\n") + sys.exit(os.EX_NOPERM) + except UnknownList: + sys.stderr.write("Unknown list\n") + sys.exit(os.EX_NOUSER) elif operation == "--cleaning-woman": mlm.cleaning_woman() elif operation == "--show-lists": --- enemies-of-carlotta-1.2.6.orig/templates/bounce-warning +++ enemies-of-carlotta-1.2.6/templates/bounce-warning @@ -11,7 +11,7 @@ Hello, -You are subscribed to the %(list)s mailig list. +You are subscribed to the %(list)s mailing list. Mail sent to you by the mailing list software has bounced at least once in the past week or so. If this was a temporary error, you can ignore --- enemies-of-carlotta-1.2.6.orig/debian/prerm +++ enemies-of-carlotta-1.2.6/debian/prerm @@ -0,0 +1,4 @@ +#!/bin/sh + +set -e +update-python-modules -c enemies-of-carlotta.dirs --- enemies-of-carlotta-1.2.6.orig/debian/rules +++ enemies-of-carlotta-1.2.6/debian/rules @@ -0,0 +1,49 @@ +#!/usr/bin/make -f + +package=enemies-of-carlotta + +build: + $(MAKE) check + +binary: binary-arch binary-indep + +binary-indep: + rm -rf debian/tmp + install -d debian/tmp debian/tmp/DEBIAN + install -d debian/tmp/usr/bin + install -d debian/tmp/usr/share/$(package) + install -d debian/tmp/usr/share/doc/$(package) + install -d debian/tmp/usr/share/man/man1 + $(MAKE) prefix=debian/tmp/usr \ + mandir=debian/tmp/usr/share/man \ + sharedir=debian/tmp/usr/share/$(package) \ + command=$(package) \ + install + rm debian/tmp/usr/share/$(package)/*.py[co] + install -d debian/tmp/usr/share/python-support/ + echo /usr/share/$(package) \ + > debian/tmp/usr/share/python-support/$(package).dirs + sed 's,^SHAREDIR=.*,SHAREDIR="/usr/share/$(package)",' \ + enemies-of-carlotta > debian/tmp/usr/bin/$(package) + sh fix-config /usr/share/$(package) < eoc.py \ + > debian/tmp/usr/share/$(package)/eoc.py + cp debian/changelog \ + debian/tmp/usr/share/doc/$(package)/changelog.Debian + cp ChangeLog debian/tmp/usr/share/doc/$(package)/changelog + cp NEWS README debian/tmp/usr/share/doc/$(package)/ + gzip -9 debian/tmp/usr/share/doc/$(package)/* + gzip -9 debian/tmp/usr/share/man/man1/* + gzip -9 debian/tmp/usr/share/man/*/man1/* + cp debian/copyright debian/tmp/usr/share/doc/$(package)/. + install -d debian/tmp/usr/share/doc/$(package)/examples + cp cleaning-woman-cronjob debian/tmp/usr/share/doc/$(package)/examples + install -m 0755 debian/postinst debian/prerm debian/tmp/DEBIAN + dpkg-gencontrol -isp + chown -R root.root debian/tmp + chmod -R o-s,go=u,go-ws debian/tmp + dpkg --build debian/tmp .. + +binary-arch: + +clean: + rm -rf debian/tmp debian/files *.pyc --- enemies-of-carlotta-1.2.6.orig/debian/debhelper.log +++ enemies-of-carlotta-1.2.6/debian/debhelper.log @@ -0,0 +1 @@ +dh_installexamples --- enemies-of-carlotta-1.2.6.orig/debian/control +++ enemies-of-carlotta-1.2.6/debian/control @@ -0,0 +1,20 @@ +Source: enemies-of-carlotta +Maintainer: Dave Holland +Uploaders: Tollef Fog Heen +Section: mail +Priority: optional +Standards-Version: 3.7.2 +Build-Depends-Indep: python (>= 2.1), python-support (>= 0.2) +XS-Python-Version: all + +Package: enemies-of-carlotta +Architecture: all +Depends: python (>= 2.1), procmail, python-support (>= 0.2) +Description: mailing list manager + Enemies of Carlotta is a simple manager for mailing lists that mimics the + ezmlm (http://www.ezmlm.org/) mail commands, but does not rely on Qmail + to work. + . + Supports English, Finnish, French, Spanish, and Swedish: messages the list + manager sends are in one of these languages. Language is configurable + per list. --- enemies-of-carlotta-1.2.6.orig/debian/copyright +++ enemies-of-carlotta-1.2.6/debian/copyright @@ -0,0 +1,9 @@ +This is Enemies of Carlotta, originally packaged for Debian by Lars +Wirzenius . The original author is also Lars Wirzenius. + +Copyright 2002-2009 Lars Wirzenius, Jaakko Niemi, Pascal Hakim + +Homepage is http://www.e-o-c.org/ (previously http://liw.iki.fi/liw/eoc/ ) + +Enemies of Carlotta is licensed under GPL2, +/usr/share/common-licenses/GPL-2 . --- enemies-of-carlotta-1.2.6.orig/debian/postinst +++ enemies-of-carlotta-1.2.6/debian/postinst @@ -0,0 +1,7 @@ +#!/bin/sh + +set -e + +if [ "$1" = "configure" ]; then + update-python-modules enemies-of-carlotta.dirs +fi --- enemies-of-carlotta-1.2.6.orig/debian/changelog +++ enemies-of-carlotta-1.2.6/debian/changelog @@ -0,0 +1,261 @@ +enemies-of-carlotta (1.2.6-4) unstable; urgency=high + + * Switched from deprecated md5 to hashlib (closes: #596623) + + -- Dave Holland Mon, 13 Sep 2010 10:33:49 +0100 + +enemies-of-carlotta (1.2.6-3) unstable; urgency=low + + * Updated/corrected copyright file. + + -- Dave Holland Wed, 14 Oct 2009 15:33:44 +0100 + +enemies-of-carlotta (1.2.6-2) unstable; urgency=low + + * New maintainers - Dave Holland and Tollef Fog Heen (closes: #544441) + * Fixed typo in templates/bounce-warning (closes: #506991) + * Example cleaning-woman cronjob included (closes: #261037) - thanks + to Simon Huggins. + * Return short error messages and standard exit codes in "incoming" + mode (closes: #345998) - thanks to Erich Schubert. + + -- Dave Holland Wed, 07 Oct 2009 14:21:01 +0100 + +enemies-of-carlotta (1.2.6-1) unstable; urgency=low + + * New upstream version. Fixes Debian bug: + - setlistsilently fails when used from wrong address (Closes: #414903) + + -- Lars Wirzenius Mon, 19 Mar 2007 11:11:54 +0200 + +enemies-of-carlotta (1.2.5-1) unstable; urgency=low + + * New upstream version. Fixes Debian bug: + - traceback with NameError: global name 'warning' is not defined + (Closes: #405349) + + -- Lars Wirzenius Wed, 3 Jan 2007 22:53:33 +0200 + +enemies-of-carlotta (1.2.4-1) unstable; urgency=high + + * Security fix for CVE-2006-5875. There is no bug report for this, the + problem was reported privately to me by Antti-Juhani Kaijanaho. + * EoC did not correctly deal with SMTP level e-mail addresses that contain + shell meta characters. This has been fixed by running /usr/sbin/sendmail + via fork and exec, instead of os.popen. + + -- Lars Wirzenius Sun, 9 Dec 2006 15:49:22 +0200 + +enemies-of-carlotta (1.2.3-1) unstable; urgency=low + + * New upstream version: + - Fix problems with mails with broken MIME header encodings killing EoC. + (Closes: #396275) + + -- Lars Wirzenius Fri, 10 Nov 2006 19:29:11 +0200 + +enemies-of-carlotta (1.2.2-1) unstable; urgency=low + + * New upstream version. Fixes the following bugs reported to Debian: + - Mail with UTF-8 headers produces data-loss (Closes: #378244) + - incorrectly handles folded header lines (Closes: #353127) + - fails to check sendmail exit code (Closes: #354151) + - Manpage/Documentation should explain moderation=auto (Closes: #345995) + - not \r\n clean (Closes: #353125) + - should remove/rename any List-* header lines that are present already + (Closes: #353126) + - Spelling mistake in package description (Closes: #363390) + - Typo in french template (Closes: #376690) + - reassure people who get moderation wait messages due to false + sender addresses (Close: #306436) + - Courier-MTA instructions (Closes: #368706) + * debian/{control,rules,prerm,postinst}: Updated for new Python policy + (or the pathetic attempt at one, by people who think mandating debhelper + is acceptable). Closes: #380786. + * debian/control: Updated the Standards-Version field. No other changes + required. + * debian/control: Typo fix. + + -- Lars Wirzenius Sat, 12 Aug 2006 19:46:30 +0300 + +enemies-of-carlotta (1.2.1-2) unstable; urgency=low + + * debian/control: Fixed typo. Thanks to Simon Waters. Closes: #363390. + + -- Lars Wirzenius Wed, 19 Apr 2006 15:23:05 +0300 + +enemies-of-carlotta (1.2.1-1) unstable; urgency=low + + * New upstream version. Fixes a bug that crashes the program by using a + non-existent method call. + + -- Lars Wirzenius Thu, 22 Dec 2005 01:58:19 +0200 + +enemies-of-carlotta (1.2-1) unstable; urgency=low + + * New upstream version. Fixes bugs in Debian: + - List addresses with "incorrect" capitalization cause errors + (Closes: #256995) + - requires ENV vars in order to handle incoming mail (Closes: #269030) + - Delivery mysteries (Closes: #270211) + - man page has an incorrect separator for the Postfix example + (Closes: #317424) + - Appending footer breaks base64-encoded message (Closes: #334875) + - --show-lists not mention in manpage (Closes: #317816) + - Header addition / removal (Closes: #223599) + - Documentation fixup (#223611) + * Bumped Standards-Version. No changes required. + * debian/rules: Build package in binary-indep, since the arch is "all". + * debian/control: made short description start with a lower case letter + (because I think it is better that way, so there) + + -- Lars Wirzenius Mon, 19 Dec 2005 14:18:52 +0200 + +enemies-of-carlotta-cvs (1.1.5-1) unstable; urgency=low + + * New upstream version. + * Bumped Standards-Version to 3.6.1. + + -- Lars Wirzenius Sun, 10 Apr 2005 17:19:00 +0300 + +enemies-of-carlotta-cvs (1.1.4-1) unstable; urgency=low + + * New upstream version. This version is packaged as enemies-of-carlotta-cvs + to allow it to be co-installed with the stable series. + + -- Lars Wirzenius Sun, 10 Apr 2005 10:57:00 +0300 + +enemies-of-carlotta (1.0.3-1) unstable; urgency=low + + * New upstream release: + o adds --post option to bypass moderation + o document command addresses in the manual page + o fixes Qmail examples + o fixes logfile output (only the first message was output to the file, + though everything did go to stderr) + * Added home page to debian/copyright + * No longer shipping a .deb with compiled Python modules (which means + that the compilation invoked by postinst actually happens). + Closes: #206388. + + -- Lars Wirzenius Sun, 07 Sep 2003 15:07:15 +0300 + +enemies-of-carlotta (1.0.2-1) unstable; urgency=low + + * New upstream release: + o adds --show-lists option + o fixes manual page example for creating a list; closes: ##193108 + + -- Lars Wirzenius Mon, 14 Jul 2003 15:18:01 +0300 + +enemies-of-carlotta (1.0.1-1) unstable; urgency=low + + * New upstream release with bug fixes only: + o --help option implemented. + o --create: If ~/.enemies-of-carlotta exists, but a file named + "secret" inside it doesn't, create the file instead of crashing. + o Bounce handling fixed. + + -- Lars Wirzenius Sun, 11 May 2003 15:28:47 +0300 + +enemies-of-carlotta (1.0-1) unstable; urgency=low + + * New upstream release. No changes, except version number and an + official "stable" label. + + * Added a build dependency on Python, since we run the unit tests + at build time. Closes: #189631. + + -- Lars Wirzenius Thu, 24 Apr 2003 21:52:37 +0300 + +enemies-of-carlotta (0.23-1) unstable; urgency=low + + * New upstream release. -setlist now welcomes new subscribers and says + goodbye to removed ones. New command -setlistsilently does not. -reject + removes rejected message from moderation box. + + -- Lars Wirzenius Sun, 13 Apr 2003 18:35:00 +0300 + +enemies-of-carlotta (0.22-1) unstable; urgency=low + + * New upstream release. EoC now sends messages with a real SMTP sender + address instead of an empty one. + + -- Lars Wirzenius Sat, 22 Mar 2003 13:29:50 +0200 + +enemies-of-carlotta (0.21-1) unstable; urgency=low + + * New upstream release. The rest of this entry lists upstream changes. + + * List owners can subscribe and unsubscribe other people via the + mail interface and no longer need to use the command line interface. + Also, they can replace the current subscriber list with a new one in + one operation, instead of having to add and delete a single address + at a time. + + * When the subscribers or posters needs to wait for the moderator, + they are informed of this. This avoids confusion on their part + and results in fewer statements of the type "the list software is + broken *again*?". + + * footer templates re-worded to use 7 bit ASCII characters only to + avoid mixed character set problems. Also, French templates got a + Content-type header specifying the character set. + + * Benchmarks have been run and benchmark scripts have been included. + It took about 12 hours to deliver 1000 messages to a list of 1000 + subscribers (a total of one million messages delivered). + + -- Lars Wirzenius Sun, 16 Mar 2003 13:55:26 +0200 + +enemies-of-carlotta (0.20-1) unstable; urgency=low + + * New upstream release: translations to French and Spanish. + + -- Lars Wirzenius Tue, 25 Feb 2003 23:34:20 +0200 + +enemies-of-carlotta (0.19-1) unstable; urgency=low + + * New upstream release: list specific choosing of translations for + templates, English and Finnish provided now. + * Now Depends on python, instead of python2.2. Actually tested with + Python 2.1, 2.2, and 2.3. + * Now also depends on procmail, since EoC uses lockfile from that + package. + + -- Lars Wirzenius Sat, 22 Feb 2003 22:41:16 +0200 + +enemies-of-carlotta (0.18-1) unstable; urgency=low + + * New upstream release: list owners can be notified of subscriptions, + unsubscriptions, and people kicked off the list for bouncing, and + some command line options allow list name to be abbreviated. + + -- Lars Wirzenius Sun, 16 Feb 2003 20:00:45 +0200 + +enemies-of-carlotta (0.17-1) unstable; urgency=low + + * New upstream release: "auto" option allows messages from subscribers + to be sent automatically, others to be sent to moderators. + + -- Lars Wirzenius Sun, 9 Feb 2003 22:16:02 +0200 + +enemies-of-carlotta (0.16.1-1) unstable; urgency=low + + * New upstream release: bounce message formatting bugfix. + + -- Lars Wirzenius Sun, 12 Jan 2003 01:11:04 +0200 + +enemies-of-carlotta (0.16-1) unstable; urgency=low + + * New upstream release: bounce messages are saved and reported, boucing + is logged, duplicate subscription is no longer possible. + + -- Lars Wirzenius Sun, 12 Jan 2003 00:27:04 +0200 + +enemies-of-carlotta (0.15-1) unstable; urgency=low + + * First Debian release. + + -- Lars Wirzenius Sat, 4 Jan 2003 19:21:01 +0200 +