summaryrefslogtreecommitdiff
path: root/mail/mailman
diff options
context:
space:
mode:
Diffstat (limited to 'mail/mailman')
-rw-r--r--mail/mailman/MESSAGE12
-rw-r--r--mail/mailman/Makefile12
-rw-r--r--mail/mailman/PLIST177
-rw-r--r--mail/mailman/distinfo15
-rw-r--r--mail/mailman/patches/patch-aa15
-rw-r--r--mail/mailman/patches/patch-ag5
-rw-r--r--mail/mailman/patches/patch-ai18
-rw-r--r--mail/mailman/patches/patch-ak15
-rw-r--r--mail/mailman/patches/patch-al14
9 files changed, 104 insertions, 179 deletions
diff --git a/mail/mailman/MESSAGE b/mail/mailman/MESSAGE
index 3e25e829ce3..a7cbe2f6ba7 100644
--- a/mail/mailman/MESSAGE
+++ b/mail/mailman/MESSAGE
@@ -1,5 +1,5 @@
===========================================================================
-$NetBSD: MESSAGE,v 1.5 2011/04/07 13:57:23 hauke Exp $
+$NetBSD: MESSAGE,v 1.6 2011/04/07 15:45:37 hauke Exp $
Mailman needs to know your mail domain and Web server hostname. Edit
${PREFIX}/lib/mailman/Mailman/mm_cfg.py and insert your hostname
@@ -16,10 +16,12 @@ to make mailman and its archive accessible through, respectively,
http://www.domain.com/pipermail/
You will also need to add some crontab entries for the user ${MAILMAN_USER}.
-You can use ${EXECDIR}/cron/crontab.in as template.
+You can use ${EGDIR}/crontab.in as template.
-See the files in ${DOCDIR} for how to use mailman, especially
-the file ${DOCDIR}/mailman-install.txt and, if you are upgrading
-an existing mailman installation, ${DOCDIR}/UPGRADING.
+See the files in ${DOCDIR} for how to use mailman,
+especially the file ${DOCDIR}/mailman-install.txt.
+
+If you are upgrading an existing mailman installation,
+see ${DOCDIR}/UPGRADING.
===========================================================================
diff --git a/mail/mailman/Makefile b/mail/mailman/Makefile
index 68ce16de7bd..d56895d1239 100644
--- a/mail/mailman/Makefile
+++ b/mail/mailman/Makefile
@@ -1,14 +1,15 @@
-# $NetBSD: Makefile,v 1.62 2010/09/24 23:24:30 taca Exp $
+# $NetBSD: Makefile,v 1.63 2011/04/07 15:45:37 hauke Exp $
-DISTNAME= mailman-2.1.12
-PKGREVISION= 2
+DISTNAME= mailman-2.1.14-1
+PKGNAME= mailman-2.1.14.1
CATEGORIES= mail www
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mailman/}
+MASTER_SITES= http://launchpad.net/mailman/2.1/2.1.14/+download/
EXTRACT_SUFX= .tgz
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.list.org/
COMMENT= The GNU Mailing List Manager
+LICENSE= gnu-gpl-v2
PKG_DESTDIR_SUPPORT= destdir
@@ -33,7 +34,7 @@ MAILMAN_MAILGROUP?= daemon # group sendmail runs under;
# use 'nobody' for postfix
MAILMAN_CGIEXT?= .cgi
-MESSAGE_SUBST+= EXECDIR=${EXECDIR}
+MESSAGE_SUBST+= EGDIR=${EGDIR}
MESSAGE_SUBST+= MAILMAN_USER=${MAILMAN_USER}
PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX:Q}
PLIST_SUBST+= MAILMAN_CGIEXT=${MAILMAN_CGIEXT:S/none//}
@@ -125,6 +126,7 @@ post-install:
done
${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR}
${INSTALL_DATA} ${WRKDIR}/mailman.conf.dist ${DESTDIR}${EGDIR}/mailman.conf
+ ${INSTALL_DATA} ${WRKSRC}/cron/crontab.in ${DESTDIR}${EGDIR}/crontab.in
${CHOWN} -R root:${MAILMAN_GROUP} ${DESTDIR}${EXECDIR}
${CHMOD} -R g+w ${DESTDIR}${EXECDIR}
${CHMOD} g+s ${DESTDIR}${EXECDIR}/cgi-bin/*
diff --git a/mail/mailman/PLIST b/mail/mailman/PLIST
index f3fefed72b2..f941582529c 100644
--- a/mail/mailman/PLIST
+++ b/mail/mailman/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.20 2009/06/14 20:45:11 joerg Exp $
+@comment $NetBSD: PLIST,v 1.21 2011/04/07 15:45:37 hauke Exp $
lib/mailman/Mailman/Archiver/Archiver.py
lib/mailman/Mailman/Archiver/Archiver.pyc
lib/mailman/Mailman/Archiver/HyperArch.py
@@ -13,6 +13,8 @@ lib/mailman/Mailman/Autoresponder.py
lib/mailman/Mailman/Autoresponder.pyc
lib/mailman/Mailman/Bouncer.py
lib/mailman/Mailman/Bouncer.pyc
+lib/mailman/Mailman/Bouncers/AOL.py
+lib/mailman/Mailman/Bouncers/AOL.pyc
lib/mailman/Mailman/Bouncers/BouncerAPI.py
lib/mailman/Mailman/Bouncers/BouncerAPI.pyc
lib/mailman/Mailman/Bouncers/Caiwireless.py
@@ -347,7 +349,6 @@ lib/mailman/cgi-bin/roster${MAILMAN_CGIEXT}
lib/mailman/cgi-bin/subscribe${MAILMAN_CGIEXT}
lib/mailman/cron/bumpdigests
lib/mailman/cron/checkdbs
-lib/mailman/cron/crontab.in
lib/mailman/cron/cull_bad_shunt
lib/mailman/cron/disabled
lib/mailman/cron/gate_news
@@ -364,6 +365,8 @@ lib/mailman/icons/mm-icon.png
lib/mailman/mail/mailman
lib/mailman/messages/ar/LC_MESSAGES/mailman.mo
lib/mailman/messages/ar/LC_MESSAGES/mailman.po
+lib/mailman/messages/ast/LC_MESSAGES/mailman.mo
+lib/mailman/messages/ast/LC_MESSAGES/mailman.po
lib/mailman/messages/ca/LC_MESSAGES/mailman.mo
lib/mailman/messages/ca/LC_MESSAGES/mailman.po
lib/mailman/messages/cs/LC_MESSAGES/mailman.mo
@@ -445,127 +448,6 @@ lib/mailman/messages/zh_CN/LC_MESSAGES/mailman.mo
lib/mailman/messages/zh_CN/LC_MESSAGES/mailman.po
lib/mailman/messages/zh_TW/LC_MESSAGES/mailman.mo
lib/mailman/messages/zh_TW/LC_MESSAGES/mailman.po
-lib/mailman/pythonlib/japanese/__init__.py
-lib/mailman/pythonlib/japanese/__init__.pyc
-lib/mailman/pythonlib/japanese/aliases/__init__.py
-lib/mailman/pythonlib/japanese/aliases/__init__.pyc
-lib/mailman/pythonlib/japanese/c/__init__.py
-lib/mailman/pythonlib/japanese/c/__init__.pyc
-lib/mailman/pythonlib/japanese/c/_japanese_codecs.so
-lib/mailman/pythonlib/japanese/c/euc_jp.py
-lib/mailman/pythonlib/japanese/c/euc_jp.pyc
-lib/mailman/pythonlib/japanese/c/iso_2022_jp.py
-lib/mailman/pythonlib/japanese/c/iso_2022_jp.pyc
-lib/mailman/pythonlib/japanese/c/iso_2022_jp_1.py
-lib/mailman/pythonlib/japanese/c/iso_2022_jp_1.pyc
-lib/mailman/pythonlib/japanese/c/iso_2022_jp_ext.py
-lib/mailman/pythonlib/japanese/c/iso_2022_jp_ext.pyc
-lib/mailman/pythonlib/japanese/c/ms932.py
-lib/mailman/pythonlib/japanese/c/ms932.pyc
-lib/mailman/pythonlib/japanese/c/shift_jis.py
-lib/mailman/pythonlib/japanese/c/shift_jis.pyc
-lib/mailman/pythonlib/japanese/euc_jp.py
-lib/mailman/pythonlib/japanese/euc_jp.pyc
-lib/mailman/pythonlib/japanese/iso_2022_jp.py
-lib/mailman/pythonlib/japanese/iso_2022_jp.pyc
-lib/mailman/pythonlib/japanese/iso_2022_jp_1.py
-lib/mailman/pythonlib/japanese/iso_2022_jp_1.pyc
-lib/mailman/pythonlib/japanese/iso_2022_jp_ext.py
-lib/mailman/pythonlib/japanese/iso_2022_jp_ext.pyc
-lib/mailman/pythonlib/japanese/jis_7.py
-lib/mailman/pythonlib/japanese/jis_7.pyc
-lib/mailman/pythonlib/japanese/jis_x_0201_katakana.py
-lib/mailman/pythonlib/japanese/jis_x_0201_katakana.pyc
-lib/mailman/pythonlib/japanese/jis_x_0201_roman.py
-lib/mailman/pythonlib/japanese/jis_x_0201_roman.pyc
-lib/mailman/pythonlib/japanese/mappings/__init__.py
-lib/mailman/pythonlib/japanese/mappings/__init__.pyc
-lib/mailman/pythonlib/japanese/mappings/euc_jp.py
-lib/mailman/pythonlib/japanese/mappings/euc_jp.pyc
-lib/mailman/pythonlib/japanese/mappings/jis_x_0208.py
-lib/mailman/pythonlib/japanese/mappings/jis_x_0208.pyc
-lib/mailman/pythonlib/japanese/mappings/jis_x_0212.py
-lib/mailman/pythonlib/japanese/mappings/jis_x_0212.pyc
-lib/mailman/pythonlib/japanese/mappings/shift_jis.py
-lib/mailman/pythonlib/japanese/mappings/shift_jis.pyc
-lib/mailman/pythonlib/japanese/ms932.py
-lib/mailman/pythonlib/japanese/ms932.pyc
-lib/mailman/pythonlib/japanese/python/__init__.py
-lib/mailman/pythonlib/japanese/python/__init__.pyc
-lib/mailman/pythonlib/japanese/python/euc_jp.py
-lib/mailman/pythonlib/japanese/python/euc_jp.pyc
-lib/mailman/pythonlib/japanese/python/iso_2022_jp.py
-lib/mailman/pythonlib/japanese/python/iso_2022_jp.pyc
-lib/mailman/pythonlib/japanese/python/iso_2022_jp_1.py
-lib/mailman/pythonlib/japanese/python/iso_2022_jp_1.pyc
-lib/mailman/pythonlib/japanese/python/iso_2022_jp_ext.py
-lib/mailman/pythonlib/japanese/python/iso_2022_jp_ext.pyc
-lib/mailman/pythonlib/japanese/python/shift_jis.py
-lib/mailman/pythonlib/japanese/python/shift_jis.pyc
-lib/mailman/pythonlib/japanese/shift_jis.py
-lib/mailman/pythonlib/japanese/shift_jis.pyc
-lib/mailman/pythonlib/japanese/sjis.py
-lib/mailman/pythonlib/japanese/sjis.pyc
-lib/mailman/pythonlib/japanese/ujis.py
-lib/mailman/pythonlib/japanese/ujis.pyc
-lib/mailman/pythonlib/japanese/windows_31j.py
-lib/mailman/pythonlib/japanese/windows_31j.pyc
-lib/mailman/pythonlib/korean.pth
-lib/mailman/pythonlib/korean/__init__.py
-lib/mailman/pythonlib/korean/__init__.pyc
-lib/mailman/pythonlib/korean/aliases.py
-lib/mailman/pythonlib/korean/aliases.pyc
-lib/mailman/pythonlib/korean/c/__init__.py
-lib/mailman/pythonlib/korean/c/__init__.pyc
-lib/mailman/pythonlib/korean/c/_koco.so
-lib/mailman/pythonlib/korean/c/cp949.py
-lib/mailman/pythonlib/korean/c/cp949.pyc
-lib/mailman/pythonlib/korean/c/euc_kr.py
-lib/mailman/pythonlib/korean/c/euc_kr.pyc
-lib/mailman/pythonlib/korean/c/hangul.so
-lib/mailman/pythonlib/korean/cp949.py
-lib/mailman/pythonlib/korean/cp949.pyc
-lib/mailman/pythonlib/korean/euc_kr.py
-lib/mailman/pythonlib/korean/euc_kr.pyc
-lib/mailman/pythonlib/korean/hangul.py
-lib/mailman/pythonlib/korean/hangul.pyc
-lib/mailman/pythonlib/korean/iso_2022_kr.py
-lib/mailman/pythonlib/korean/iso_2022_kr.pyc
-lib/mailman/pythonlib/korean/johab.py
-lib/mailman/pythonlib/korean/johab.pyc
-lib/mailman/pythonlib/korean/mappings/__init__.py
-lib/mailman/pythonlib/korean/mappings/__init__.pyc
-lib/mailman/pythonlib/korean/mappings/johab_ideograph.py
-lib/mailman/pythonlib/korean/mappings/johab_ideograph.pyc
-lib/mailman/pythonlib/korean/mappings/ksc5601_hangul.py
-lib/mailman/pythonlib/korean/mappings/ksc5601_hangul.pyc
-lib/mailman/pythonlib/korean/mappings/ksc5601_ideograph.py
-lib/mailman/pythonlib/korean/mappings/ksc5601_ideograph.pyc
-lib/mailman/pythonlib/korean/mappings/ksc5601_misc.py
-lib/mailman/pythonlib/korean/mappings/ksc5601_misc.pyc
-lib/mailman/pythonlib/korean/mappings/uhc.py
-lib/mailman/pythonlib/korean/mappings/uhc.pyc
-lib/mailman/pythonlib/korean/python/__init__.py
-lib/mailman/pythonlib/korean/python/__init__.pyc
-lib/mailman/pythonlib/korean/python/cp949.py
-lib/mailman/pythonlib/korean/python/cp949.pyc
-lib/mailman/pythonlib/korean/python/euc_kr.py
-lib/mailman/pythonlib/korean/python/euc_kr.pyc
-lib/mailman/pythonlib/korean/python/hangul.py
-lib/mailman/pythonlib/korean/python/hangul.pyc
-lib/mailman/pythonlib/korean/python/iso_2022_kr.py
-lib/mailman/pythonlib/korean/python/iso_2022_kr.pyc
-lib/mailman/pythonlib/korean/python/johab.py
-lib/mailman/pythonlib/korean/python/johab.pyc
-lib/mailman/pythonlib/korean/python/qwerty2bul.py
-lib/mailman/pythonlib/korean/python/qwerty2bul.pyc
-lib/mailman/pythonlib/korean/python/unijohab.py
-lib/mailman/pythonlib/korean/python/unijohab.pyc
-lib/mailman/pythonlib/korean/qwerty2bul.py
-lib/mailman/pythonlib/korean/qwerty2bul.pyc
-lib/mailman/pythonlib/korean/unijohab.py
-lib/mailman/pythonlib/korean/unijohab.pyc
-lib/mailman/pythonlib/lib/python${PYVERSSUFFIX}/site-packages/japanese.pth
lib/mailman/scripts/admin
lib/mailman/scripts/bounces
lib/mailman/scripts/confirm
@@ -625,6 +507,50 @@ lib/mailman/templates/ar/unsub.txt
lib/mailman/templates/ar/unsubauth.txt
lib/mailman/templates/ar/userpass.txt
lib/mailman/templates/ar/verify.txt
+lib/mailman/templates/ast/admindbdetails.html
+lib/mailman/templates/ast/admindbpreamble.html
+lib/mailman/templates/ast/admindbsummary.html
+lib/mailman/templates/ast/adminsubscribeack.txt
+lib/mailman/templates/ast/adminunsubscribeack.txt
+lib/mailman/templates/ast/admlogin.html
+lib/mailman/templates/ast/approve.txt
+lib/mailman/templates/ast/archidxentry.html
+lib/mailman/templates/ast/archidxfoot.html
+lib/mailman/templates/ast/archidxhead.html
+lib/mailman/templates/ast/archlistend.html
+lib/mailman/templates/ast/archliststart.html
+lib/mailman/templates/ast/archtoc.html
+lib/mailman/templates/ast/archtocentry.html
+lib/mailman/templates/ast/archtocnombox.html
+lib/mailman/templates/ast/article.html
+lib/mailman/templates/ast/bounce.txt
+lib/mailman/templates/ast/checkdbs.txt
+lib/mailman/templates/ast/convert.txt
+lib/mailman/templates/ast/cronpass.txt
+lib/mailman/templates/ast/disabled.txt
+lib/mailman/templates/ast/emptyarchive.html
+lib/mailman/templates/ast/headfoot.html
+lib/mailman/templates/ast/help.txt
+lib/mailman/templates/ast/invite.txt
+lib/mailman/templates/ast/listinfo.html
+lib/mailman/templates/ast/masthead.txt
+lib/mailman/templates/ast/newlist.txt
+lib/mailman/templates/ast/nomoretoday.txt
+lib/mailman/templates/ast/options.html
+lib/mailman/templates/ast/postack.txt
+lib/mailman/templates/ast/postauth.txt
+lib/mailman/templates/ast/postheld.txt
+lib/mailman/templates/ast/private.html
+lib/mailman/templates/ast/probe.txt
+lib/mailman/templates/ast/refuse.txt
+lib/mailman/templates/ast/roster.html
+lib/mailman/templates/ast/subauth.txt
+lib/mailman/templates/ast/subscribe.html
+lib/mailman/templates/ast/subscribeack.txt
+lib/mailman/templates/ast/unsub.txt
+lib/mailman/templates/ast/unsubauth.txt
+lib/mailman/templates/ast/userpass.txt
+lib/mailman/templates/ast/verify.txt
lib/mailman/templates/ca/admindbdetails.html
lib/mailman/templates/ca/admindbpreamble.html
lib/mailman/templates/ca/admindbsummary.html
@@ -975,7 +901,6 @@ lib/mailman/templates/fi/postack.txt
lib/mailman/templates/fi/postauth.txt
lib/mailman/templates/fi/postheld.txt
lib/mailman/templates/fi/private.html
-lib/mailman/templates/fi/reenable.txt
lib/mailman/templates/fi/refuse.txt
lib/mailman/templates/fi/roster.html
lib/mailman/templates/fi/subauth.txt
@@ -2078,6 +2003,7 @@ lib/mailman/templates/zh_TW/userpass.txt
lib/mailman/templates/zh_TW/verify.txt
lib/mailman/tests/EmailBase.py
lib/mailman/tests/TestBase.py
+lib/mailman/tests/bounces/aol_01.txt
lib/mailman/tests/bounces/bounce_01.txt
lib/mailman/tests/bounces/bounce_02.txt
lib/mailman/tests/bounces/bounce_03.txt
@@ -2157,6 +2083,7 @@ lib/mailman/tests/bounces/simple_33.txt
lib/mailman/tests/bounces/simple_34.txt
lib/mailman/tests/bounces/simple_35.txt
lib/mailman/tests/bounces/simple_36.txt
+lib/mailman/tests/bounces/simple_37.txt
lib/mailman/tests/bounces/sina_01.txt
lib/mailman/tests/bounces/smtp32_01.txt
lib/mailman/tests/bounces/smtp32_02.txt
@@ -2215,5 +2142,7 @@ share/doc/mailman/mailman-member-es.txt
share/doc/mailman/mailman-member.pdf
share/doc/mailman/mailman-member.ps
share/doc/mailman/mailman-member.txt
+share/examples/mailman/crontab.in
share/examples/mailman/mailman.conf
share/examples/rc.d/mailman
+@pkgdir lib/mailman/pythonlib
diff --git a/mail/mailman/distinfo b/mail/mailman/distinfo
index d3777f2e6b6..c36eeb35aca 100644
--- a/mail/mailman/distinfo
+++ b/mail/mailman/distinfo
@@ -1,14 +1,13 @@
-$NetBSD: distinfo,v 1.19 2010/09/24 23:24:30 taca Exp $
+$NetBSD: distinfo,v 1.20 2011/04/07 15:45:37 hauke Exp $
-SHA1 (mailman-2.1.12.tgz) = 6d6281f7ce322e271f0259321f4d8931ff46e6ae
-RMD160 (mailman-2.1.12.tgz) = 94d8d132bb37180bf4c02ccd2a5fb3862ce13b94
-Size (mailman-2.1.12.tgz) = 8010027 bytes
-SHA1 (patch-aa) = 3f32d6de2e05c638b6915d64bbc7a70e12ce4470
+SHA1 (mailman-2.1.14-1.tgz) = 390874c1059878b33be9ab4cf57fdb719eac1819
+RMD160 (mailman-2.1.14-1.tgz) = 0d86e766e28aaab9703bfe530b72316a5b02beda
+Size (mailman-2.1.14-1.tgz) = 8201308 bytes
+SHA1 (patch-aa) = 9684b1caeb52f31ee6967eae3f9a464de214879e
SHA1 (patch-ab) = 39f6294e53110bd1fd09b1e90ab46820f4d48e3f
SHA1 (patch-ad) = 665884b9dd1789e4abd430c762bdbfd707d48d30
SHA1 (patch-ae) = 6c17de398014217be8f1c7a3b3a6f8d379fc0fb2
SHA1 (patch-af) = 985a619a055151d998cefd0c1b7280a0d55f889e
-SHA1 (patch-ag) = 5fda86a90ef17a08c304ae89f0934812601d5dfc
+SHA1 (patch-ag) = fac40640db483c2e9db3a79ec0696dc60596e453
SHA1 (patch-ah) = c7cde35f787c003ace550a98d8d5e166ba2d48dc
-SHA1 (patch-ak) = d010a4bb1d7468ddf02ff22dbb3662a41045f8a2
-SHA1 (patch-al) = e07e6b77b4fea57683f79807ad9b9b2677e56b9e
+SHA1 (patch-ai) = f3afeba664b0cca27f160fde3b94c7b7f8498e57
diff --git a/mail/mailman/patches/patch-aa b/mail/mailman/patches/patch-aa
index 5a27c628932..6179153aa4f 100644
--- a/mail/mailman/patches/patch-aa
+++ b/mail/mailman/patches/patch-aa
@@ -1,6 +1,8 @@
-$NetBSD: patch-aa,v 1.6 2010/06/28 09:29:40 joerg Exp $
+$NetBSD: patch-aa,v 1.7 2011/04/07 15:45:37 hauke Exp $
---- misc/Makefile.in.orig 2009-02-23 21:23:35.000000000 +0000
+Add missing DESTDIR bits.
+
+--- misc/Makefile.in.orig 2011-03-01 20:35:57.000000000 +0000
+++ misc/Makefile.in
@@ -41,7 +41,7 @@ DEFS= @DEFS@
OPT= @OPT@
@@ -11,17 +13,16 @@ $NetBSD: patch-aa,v 1.6 2010/06/28 09:29:40 joerg Exp $
ICONDIR= $(prefix)/icons
SCRIPTSDIR= $(prefix)/scripts
-@@ -91,14 +91,15 @@ install-other:
+@@ -91,7 +91,7 @@ install-other:
$(INSTALL) -m $(FILEMODE) sitelist.cfg $(DESTDIR)$(DATADIR)
install-packages:
-- if [ -z "$(EMAILPKG)" -a -d $(PYTHONLIBDIR)/email ] ; \
+- if [ -z "$(EMAILPKG)" -a -d $(DESTDIR)$(PYTHONLIBDIR)/email ] ; \
+ if [ -z "$(DESTDIR)$(EMAILPKG)" -a -d $(DESTDIR)$(PYTHONLIBDIR)/email ] ; \
then \
-- rm -rf $(PYTHONLIBDIR)/email* ; \
-+ rm -rf $(DESTDIR)$(PYTHONLIBDIR)/email* ; \
+ rm -rf $(DESTDIR)$(PYTHONLIBDIR)/email* ; \
fi
- for p in $(PACKAGES); \
+@@ -99,6 +99,7 @@ install-packages:
do \
gunzip -c $(srcdir)/$$p.tar.gz | (cd $(PKGDIR) ; tar xf -); \
(cd $(PKGDIR)/$$p ; umask 02 ; PYTHONPATH=$(PYTHONLIBDIR) $(PYTHON) $(SETUPCMD)); \
diff --git a/mail/mailman/patches/patch-ag b/mail/mailman/patches/patch-ag
index 26369ff12aa..23858801356 100644
--- a/mail/mailman/patches/patch-ag
+++ b/mail/mailman/patches/patch-ag
@@ -1,4 +1,7 @@
-$NetBSD: patch-ag,v 1.2 2008/06/29 07:47:03 kim Exp $
+$NetBSD: patch-ag,v 1.3 2011/04/07 15:45:37 hauke Exp $
+
+Mandate setgid bits on directories only when we install
+on !BSD
--- bin/check_perms.orig 2008-04-21 21:28:22.000000000 +0300
+++ bin/check_perms 2008-06-29 09:06:30.000000000 +0300
diff --git a/mail/mailman/patches/patch-ai b/mail/mailman/patches/patch-ai
new file mode 100644
index 00000000000..40245cac043
--- /dev/null
+++ b/mail/mailman/patches/patch-ai
@@ -0,0 +1,18 @@
+$NetBSD: patch-ai,v 1.5 2011/04/07 15:45:37 hauke Exp $
+
+Install the sample crontab under share/examples/mailman,
+not into a binaries directory.
+
+--- cron/Makefile.in.orig 2011-03-01 20:35:57.000000000 +0000
++++ cron/Makefile.in
+@@ -59,10 +59,6 @@ FILEMODE= 644
+ all:
+
+ install:
+- for f in $(FILES); \
+- do \
+- $(INSTALL) -m $(FILEMODE) $$f $(DESTDIR)$(CRONDIR); \
+- done
+ for f in $(PROGRAMS); \
+ do \
+ $(INSTALL) -m $(EXEMODE) $(BUILDDIR)/$$f $(DESTDIR)$(CRONDIR); \
diff --git a/mail/mailman/patches/patch-ak b/mail/mailman/patches/patch-ak
deleted file mode 100644
index 2821e77a31c..00000000000
--- a/mail/mailman/patches/patch-ak
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ak,v 1.1 2010/09/24 23:24:31 taca Exp $
-
-* Fix for CVE-2010-3089 (XSS).
-
---- Mailman/Cgi/listinfo.py.orig 2009-02-23 21:23:35.000000000 +0000
-+++ Mailman/Cgi/listinfo.py
-@@ -93,7 +93,7 @@ def listinfo_overview(msg=''):
- else:
- advertised.append((mlist.GetScriptURL('listinfo'),
- mlist.real_name,
-- mlist.description))
-+ Utils.websafe(mlist.description)))
- if msg:
- greeting = FontAttr(msg, color="ff5060", size="+1")
- else:
diff --git a/mail/mailman/patches/patch-al b/mail/mailman/patches/patch-al
deleted file mode 100644
index 45e9dc10a3f..00000000000
--- a/mail/mailman/patches/patch-al
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-al,v 1.1 2010/09/24 23:24:31 taca Exp $
-
-* Fix for CVE-2010-3089 (XSS).
-
---- Mailman/Utils.py.orig 2009-02-23 21:23:35.000000000 +0000
-+++ Mailman/Utils.py
-@@ -908,6 +908,7 @@ _badwords = [
- # Kludge to allow the specific tag that's in the options.html template.
- '<link(?! rel="SHORTCUT ICON" href="<mm-favicon>">)',
- '<meta',
-+ '<object',
- '<script',
- r'(?:^|\W)j(?:ava)?script(?:\W|$)',
- r'(?:^|\W)vbs(?:cript)?(?:\W|$)',