diff options
Diffstat (limited to 'mail/mailman')
| -rw-r--r-- | mail/mailman/MESSAGE | 7 | ||||
| -rw-r--r-- | mail/mailman/Makefile | 10 | ||||
| -rw-r--r-- | mail/mailman/PLIST | 35 | ||||
| -rw-r--r-- | mail/mailman/distinfo | 10 | ||||
| -rw-r--r-- | mail/mailman/patches/patch-ai | 17 | ||||
| -rw-r--r-- | mail/mailman/patches/patch-aj | 17 |
6 files changed, 46 insertions, 50 deletions
diff --git a/mail/mailman/MESSAGE b/mail/mailman/MESSAGE index b7ff5f5eea4..6fac068e9c0 100644 --- a/mail/mailman/MESSAGE +++ b/mail/mailman/MESSAGE @@ -1,5 +1,5 @@ =========================================================================== -$NetBSD: MESSAGE,v 1.3 2003/12/23 11:02:13 xtraeme Exp $ +$NetBSD: MESSAGE,v 1.4 2006/04/10 20:33:12 bouyer Exp $ Mailman needs to know your mail domain and Web server hostname. Edit ${PREFIX}/lib/mailman/Mailman/mm_cfg.py and insert your hostname @@ -19,9 +19,6 @@ You will also need to add some crontab entries for the user ${MAILMAN_USER}. You can use ${EXECDIR}/cron/crontab.in as template. See the files in ${DOCDIR} for how to use mailman, -especially the sections: - - 4, starting with 'Create a "site-wide" mailing list'. - 5, 'Customizing Mailman' +especially the file ${DOCDIR}/mailman-install.txt =========================================================================== diff --git a/mail/mailman/Makefile b/mail/mailman/Makefile index 9814625bb0e..9e65da3eb41 100644 --- a/mail/mailman/Makefile +++ b/mail/mailman/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.32 2006/03/14 01:14:30 jlam Exp $ +# $NetBSD: Makefile,v 1.33 2006/04/10 20:33:12 bouyer Exp $ -DISTNAME= mailman-2.1.7 -PKGREVISION= 2 +DISTNAME= mailman-2.1.8rc1 CATEGORIES= mail www MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mailman/} EXTRACT_SUFX= .tgz @@ -20,7 +19,6 @@ GNU_CONFIGURE= yes GNU_CONFIGURE_PREFIX= ${EXECDIR} MAKE_FLAGS+= DIRSETGID=${TRUE:Q} - EXECDIR= ${PREFIX}/lib/mailman MAILMAN_DATADIR?= ${VARBASE}/db/mailman EGDIR= ${PREFIX}/share/examples/mailman @@ -112,6 +110,10 @@ post-install: cd ${WRKSRC} && for i in [A-IN-U]*; do \ ${INSTALL_DATA} $$i ${DOCDIR}/; \ done + cd ${WRKSRC}/admin/www && for i in \ + mailman-*.ps mailman-*.pdf mailman-*.txt; do \ + ${INSTALL_DATA} $$i ${DOCDIR}/; \ + done ${INSTALL_DATA_DIR} ${EGDIR} ${INSTALL_DATA} ${WRKDIR}/mailman.conf.dist ${EGDIR}/mailman.conf ${CHOWN} -R root:${MAILMAN_GROUP} ${EXECDIR} diff --git a/mail/mailman/PLIST b/mail/mailman/PLIST index c45def91c7b..06106d38414 100644 --- a/mail/mailman/PLIST +++ b/mail/mailman/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.9 2006/01/21 16:14:24 bouyer Exp $ +@comment $NetBSD: PLIST,v 1.10 2006/04/10 20:33:12 bouyer Exp $ lib/mailman/Mailman/Archiver/Archiver.py lib/mailman/Mailman/Archiver/Archiver.pyc lib/mailman/Mailman/Archiver/HyperArch.py @@ -163,6 +163,8 @@ lib/mailman/Mailman/Handlers/CalcRecips.py lib/mailman/Mailman/Handlers/CalcRecips.pyc lib/mailman/Mailman/Handlers/Cleanse.py lib/mailman/Mailman/Handlers/Cleanse.pyc +lib/mailman/Mailman/Handlers/CleanseDKIM.py +lib/mailman/Mailman/Handlers/CleanseDKIM.pyc lib/mailman/Mailman/Handlers/CookHeaders.py lib/mailman/Mailman/Handlers/CookHeaders.pyc lib/mailman/Mailman/Handlers/Decorate.py @@ -1869,6 +1871,9 @@ lib/mailman/tests/bounces/dsn_08.txt lib/mailman/tests/bounces/dsn_09.txt lib/mailman/tests/bounces/dsn_10.txt lib/mailman/tests/bounces/dsn_11.txt +lib/mailman/tests/bounces/dsn_12.txt +lib/mailman/tests/bounces/dsn_13.txt +lib/mailman/tests/bounces/dsn_14.txt lib/mailman/tests/bounces/dumbass_01.txt lib/mailman/tests/bounces/exim_01.txt lib/mailman/tests/bounces/groupwise_01.txt @@ -1877,6 +1882,7 @@ lib/mailman/tests/bounces/hotpop_01.txt lib/mailman/tests/bounces/llnl_01.txt lib/mailman/tests/bounces/microsoft_01.txt lib/mailman/tests/bounces/microsoft_02.txt +lib/mailman/tests/bounces/microsoft_03.txt lib/mailman/tests/bounces/netscape_01.txt lib/mailman/tests/bounces/newmailru_01.txt lib/mailman/tests/bounces/postfix_01.txt @@ -1885,15 +1891,32 @@ lib/mailman/tests/bounces/postfix_03.txt lib/mailman/tests/bounces/postfix_04.txt lib/mailman/tests/bounces/postfix_05.txt lib/mailman/tests/bounces/qmail_01.txt +lib/mailman/tests/bounces/qmail_02.txt +lib/mailman/tests/bounces/qmail_03.txt lib/mailman/tests/bounces/sendmail_01.txt lib/mailman/tests/bounces/simple_01.txt lib/mailman/tests/bounces/simple_02.txt lib/mailman/tests/bounces/simple_03.txt lib/mailman/tests/bounces/simple_04.txt +lib/mailman/tests/bounces/simple_05.txt +lib/mailman/tests/bounces/simple_06.txt +lib/mailman/tests/bounces/simple_07.txt +lib/mailman/tests/bounces/simple_08.txt +lib/mailman/tests/bounces/simple_09.txt +lib/mailman/tests/bounces/simple_10.txt +lib/mailman/tests/bounces/simple_11.txt +lib/mailman/tests/bounces/simple_12.txt +lib/mailman/tests/bounces/simple_13.txt +lib/mailman/tests/bounces/simple_14.txt +lib/mailman/tests/bounces/simple_15.txt +lib/mailman/tests/bounces/simple_16.txt lib/mailman/tests/bounces/sina_01.txt lib/mailman/tests/bounces/smtp32_01.txt lib/mailman/tests/bounces/smtp32_02.txt lib/mailman/tests/bounces/smtp32_03.txt +lib/mailman/tests/bounces/smtp32_04.txt +lib/mailman/tests/bounces/smtp32_05.txt +lib/mailman/tests/bounces/smtp32_06.txt lib/mailman/tests/bounces/yahoo_01.txt lib/mailman/tests/bounces/yahoo_02.txt lib/mailman/tests/bounces/yahoo_03.txt @@ -1903,6 +1926,7 @@ lib/mailman/tests/bounces/yahoo_06.txt lib/mailman/tests/bounces/yahoo_07.txt lib/mailman/tests/bounces/yahoo_08.txt lib/mailman/tests/bounces/yahoo_09.txt +lib/mailman/tests/bounces/yahoo_10.txt lib/mailman/tests/bounces/yale_01.txt lib/mailman/tests/fblast.py lib/mailman/tests/msgs/bad_01.txt @@ -1931,6 +1955,15 @@ share/doc/mailman/README.USERAGENT share/doc/mailman/STYLEGUIDE.txt share/doc/mailman/TODO share/doc/mailman/UPGRADING +share/doc/mailman/mailman-admin.pdf +share/doc/mailman/mailman-admin.ps +share/doc/mailman/mailman-admin.txt +share/doc/mailman/mailman-install.pdf +share/doc/mailman/mailman-install.ps +share/doc/mailman/mailman-install.txt +share/doc/mailman/mailman-member.pdf +share/doc/mailman/mailman-member.ps +share/doc/mailman/mailman-member.txt share/examples/mailman/mailman.conf share/examples/rc.d/mailman @dirrm share/examples/mailman diff --git a/mail/mailman/distinfo b/mail/mailman/distinfo index 1c9e4c639be..05927b29328 100644 --- a/mail/mailman/distinfo +++ b/mail/mailman/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.10 2006/01/21 16:14:24 bouyer Exp $ +$NetBSD: distinfo,v 1.11 2006/04/10 20:33:12 bouyer Exp $ -SHA1 (mailman-2.1.7.tgz) = f84b465dc03227f384ea902fca3d8396035bd9e2 -RMD160 (mailman-2.1.7.tgz) = 05eb4119c7fd4d1a3af00dc5b60601f4ee2896df -Size (mailman-2.1.7.tgz) = 6736536 bytes +SHA1 (mailman-2.1.8rc1.tgz) = bbed7bbca363dfdce7915ac63d72f1d93f9ebc11 +RMD160 (mailman-2.1.8rc1.tgz) = 853e31435a6c9d5a35776d534a9ffe4991c0fd94 +Size (mailman-2.1.8rc1.tgz) = 6856298 bytes SHA1 (patch-aa) = f0bc550b28794008ea840a88a5b0053578f3ae0f SHA1 (patch-ab) = 39f6294e53110bd1fd09b1e90ab46820f4d48e3f SHA1 (patch-ad) = 665884b9dd1789e4abd430c762bdbfd707d48d30 @@ -10,5 +10,3 @@ SHA1 (patch-ae) = 6c17de398014217be8f1c7a3b3a6f8d379fc0fb2 SHA1 (patch-af) = 985a619a055151d998cefd0c1b7280a0d55f889e SHA1 (patch-ag) = f94f190e69ce892841b88574ec8e9f100b182ed9 SHA1 (patch-ah) = 42296c52e30b1fcc1d42ef0f1b89c83414ca85df -SHA1 (patch-ai) = 9b54bd2326bd9e0bbce588fda2bf287a4c480295 -SHA1 (patch-aj) = eb4e78f817f6d2ddab9e60b4b1cf902e28391689 diff --git a/mail/mailman/patches/patch-ai b/mail/mailman/patches/patch-ai deleted file mode 100644 index 4669dc70fd1..00000000000 --- a/mail/mailman/patches/patch-ai +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-ai,v 1.3 2006/01/21 16:14:24 bouyer Exp $ - -Fix for http://secunia.com/advisories/18449/. Adapted from -Adapted from -http://security.ubuntu.com/ubunt...mailman_2.1.5-8ubuntu2.1.diff.gz - ---- Mailman/Queue/ArchRunner.py.orig Sat Jan 21 15:51:14 2006 -+++ Mailman/Queue/ArchRunner.py Sat Jan 21 15:51:50 2006 -@@ -49,7 +49,7 @@ - elif abs(now - mktime_tz(tup)) > \ - mm_cfg.ARCHIVER_ALLOWABLE_SANE_DATE_SKEW: - clobber = 1 -- except ValueError: -+ except (OverflowError, ValueError): - # The likely cause of this is that the year in the Date: field - # is horribly incorrect, e.g. (from SF bug # 571634): - # Date: Tue, 18 Jun 0102 05:12:09 +0500 diff --git a/mail/mailman/patches/patch-aj b/mail/mailman/patches/patch-aj deleted file mode 100644 index dad31c74855..00000000000 --- a/mail/mailman/patches/patch-aj +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-aj,v 1.1 2006/01/21 16:14:24 bouyer Exp $ - -Fix for http://secunia.com/advisories/18449/. Adapted from -Adapted from -http://security.ubuntu.com/ubunt...mailman_2.1.5-8ubuntu2.1.diff.gz - ---- Mailman/Handlers/Scrubber.py.orig Sat Jan 21 15:49:01 2006 -+++ Mailman/Handlers/Scrubber.py Sat Jan 21 15:50:36 2006 -@@ -143,7 +143,7 @@ - }.get(parts[3], 0) - day = int(parts[4]) - year = int(parts[6]) -- except (IndexError, ValueError): -+ except (OverflowError, IndexError, ValueError): - # Best we can do I think - month = day = year = 0 - datedir = '%04d%02d%02d' % (year, month, day) |