Pullup ticket 330 - requested by Lubomir Sedlacik

security fix for mailman

Revisions pulled up:
- pkgsrc/mail/mailman/Makefile		1.21
- pkgsrc/mail/mailman/PLIST		1.6
- pkgsrc/mail/mailman/distinfo		1.7
- pkgsrc/mail/mailman/patches/patch-ac	1.3


    Module Name:    pkgsrc
    Committed By:   kim
    Date:           Wed Mar  2 21:09:56 UTC 2005

    Modified Files:
            pkgsrc/mail/mailman: Makefile PLIST distinfo
            pkgsrc/mail/mailman/patches: patch-ac

    Log Message:
    Upgrade to 2.1.5 due to security issues:
    http://cve.mitre.org/cgi-bin/cvename.cgi?name=CAN-2004-1177
    http://cve.mitre.org/cgi-bin/cvename.cgi?name=CAN-2004-1143

4 files changed, 74 insertions, 17 deletions

diff --git a/mail/mailman/Makefile b/mail/mailman/Makefile
index 0fe4a863376..6ce7dceb507 100644
--- a/mail/mailman/Makefile
+++ b/mail/mailman/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.15.2.1 2005/02/22 22:13:28 snj Exp $
+# $NetBSD: Makefile,v 1.15.2.2 2005/03/05 18:43:13 snj Exp $
 
-DISTNAME=	mailman-2.1.4
-PKGREVISION=	3
+DISTNAME=	mailman-2.1.5
+PKGREVISION=	# empty
 CATEGORIES=	mail www
 MASTER_SITES=	http://www.list.org/ \
 		${MASTER_SITE_GNU:=mailman/}
@@ -34,6 +34,7 @@ MAILMAN_MAILGROUP?= 	guest # group of user 'daemon'
 MAILMAN_CGIEXT?=	.cgi
 
 MESSAGE_SUBST+=		EXECDIR=${EXECDIR}
+MESSAGE_SUBST+=		MAILMAN_USER=${MAILMAN_USER}
 FILES_SUBST+=		EXECDIR=${EXECDIR}
 FILES_SUBST+=		MAILMAN_USER=${MAILMAN_USER}
 FILES_SUBST+=		MAILMAN_GROUP=${MAILMAN_GROUP}
@@ -45,7 +46,7 @@ PKG_GROUPS=		${MAILMAN_GROUP}
 PKG_USERS=		${MAILMAN_USER}:${MAILMAN_GROUP}::Mailman\\ user::${SH}
 
 OWN_DIRS_PERMS+=	${EXECDIR} root ${MAILMAN_GROUP} 775
-OWN_DIRS_PERMS+=	${MAILMAN_DATADIR} ${MAILMAN_USER} ${MAILMAN_GROUP} 755
+OWN_DIRS_PERMS+=	${MAILMAN_DATADIR} ${MAILMAN_USER} ${MAILMAN_GROUP} 775
 MAKE_DIRS_PERMS+=	${MAILMAN_DATADIR}/archives ${MAILMAN_USER} ${MAILMAN_GROUP} 775
 MAKE_DIRS_PERMS+=	${MAILMAN_DATADIR}/archives/public ${MAILMAN_USER} ${MAILMAN_GROUP} 775
 MAKE_DIRS_PERMS+=	${MAILMAN_DATADIR}/archives/private ${MAILMAN_USER} ${MAILMAN_GROUP} 771
@@ -61,8 +62,8 @@ CONF_FILES+=		${EXECDIR}/Mailman/mm_cfg.py.dist ${EXECDIR}/Mailman/mm_cfg.py
 
 RCD_SCRIPTS=		mailman
 
-INSTALL_EXTRA_TMPL+=	${FILESDIR}/INSTALL
-DEINSTALL_EXTRA_TMPL+=	${FILESDIR}/DEINSTALL
+INSTALL_EXTRA_TMPL+=	${.CURDIR}/INSTALL
+DEINSTALL_EXTRA_TMPL+=	${.CURDIR}/DEINSTALL
 
 PYTHON_VERSIONS_ACCEPTED= 24 24pth 23 23pth 22 22pth 21 21pth
 PYTHON_PATCH_SCRIPTS+=	Mailman/Archiver/pipermail.py
@@ -113,6 +114,7 @@ post-install:
 	${CHOWN} -R root:${MAILMAN_GROUP} ${EXECDIR}
 	${CHMOD} -R g+w ${EXECDIR}
 	${CHMOD} g+s ${EXECDIR}/cgi-bin/*
+	${RM} -f ${EXECDIR}/Mailman/mm_cfg.pyc
 
 .include "../../lang/python/application.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/mailman/PLIST b/mail/mailman/PLIST
index c4a1d5922d9..0330b22c1c9 100644
--- a/mail/mailman/PLIST
+++ b/mail/mailman/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4.8.1 2005/02/22 22:13:28 snj Exp $
+@comment $NetBSD: PLIST,v 1.4.8.2 2005/03/05 18:43:13 snj Exp $
 lib/mailman/Mailman/Archiver/Archiver.py
 lib/mailman/Mailman/Archiver/Archiver.pyc
 lib/mailman/Mailman/Archiver/HyperArch.py
@@ -413,6 +413,8 @@ lib/mailman/messages/sr/LC_MESSAGES/mailman.po
 lib/mailman/messages/sv/LC_MESSAGES/mailman.mo
 lib/mailman/messages/sv/LC_MESSAGES/mailman.po
 lib/mailman/messages/sv/README.sv
+lib/mailman/messages/tr/LC_MESSAGES/mailman.mo
+lib/mailman/messages/tr/LC_MESSAGES/mailman.po
 lib/mailman/messages/uk/LC_MESSAGES/mailman.mo
 lib/mailman/messages/uk/LC_MESSAGES/mailman.po
 lib/mailman/pythonlib/email/Charset.py
@@ -761,6 +763,7 @@ lib/mailman/templates/en/postack.txt
 lib/mailman/templates/en/postauth.txt
 lib/mailman/templates/en/postheld.txt
 lib/mailman/templates/en/private.html
+lib/mailman/templates/en/probe.txt
 lib/mailman/templates/en/refuse.txt
 lib/mailman/templates/en/roster.html
 lib/mailman/templates/en/subauth.txt
@@ -1060,6 +1063,7 @@ lib/mailman/templates/hu/postack.txt
 lib/mailman/templates/hu/postauth.txt
 lib/mailman/templates/hu/postheld.txt
 lib/mailman/templates/hu/private.html
+lib/mailman/templates/hu/probe.txt
 lib/mailman/templates/hu/refuse.txt
 lib/mailman/templates/hu/roster.html
 lib/mailman/templates/hu/subauth.txt
@@ -1126,6 +1130,7 @@ lib/mailman/templates/ja/archlistend.html
 lib/mailman/templates/ja/archliststart.html
 lib/mailman/templates/ja/archtoc.html
 lib/mailman/templates/ja/archtocentry.html
+lib/mailman/templates/ja/archtocnombox.html
 lib/mailman/templates/ja/article.html
 lib/mailman/templates/ja/bounce.txt
 lib/mailman/templates/ja/checkdbs.txt
@@ -1629,6 +1634,49 @@ lib/mailman/templates/sv/unsub.txt
 lib/mailman/templates/sv/unsubauth.txt
 lib/mailman/templates/sv/userpass.txt
 lib/mailman/templates/sv/verify.txt
+lib/mailman/templates/tr/admindbdetails.html
+lib/mailman/templates/tr/admindbpreamble.html
+lib/mailman/templates/tr/admindbsummary.html
+lib/mailman/templates/tr/adminsubscribeack.txt
+lib/mailman/templates/tr/adminunsubscribeack.txt
+lib/mailman/templates/tr/admlogin.html
+lib/mailman/templates/tr/approve.txt
+lib/mailman/templates/tr/archidxentry.html
+lib/mailman/templates/tr/archidxfoot.html
+lib/mailman/templates/tr/archidxhead.html
+lib/mailman/templates/tr/archlistend.html
+lib/mailman/templates/tr/archliststart.html
+lib/mailman/templates/tr/archtoc.html
+lib/mailman/templates/tr/archtocentry.html
+lib/mailman/templates/tr/archtocnombox.html
+lib/mailman/templates/tr/article.html
+lib/mailman/templates/tr/bounce.txt
+lib/mailman/templates/tr/checkdbs.txt
+lib/mailman/templates/tr/convert.txt
+lib/mailman/templates/tr/cronpass.txt
+lib/mailman/templates/tr/disabled.txt
+lib/mailman/templates/tr/emptyarchive.html
+lib/mailman/templates/tr/headfoot.html
+lib/mailman/templates/tr/help.txt
+lib/mailman/templates/tr/invite.txt
+lib/mailman/templates/tr/listinfo.html
+lib/mailman/templates/tr/masthead.txt
+lib/mailman/templates/tr/newlist.txt
+lib/mailman/templates/tr/nomoretoday.txt
+lib/mailman/templates/tr/options.html
+lib/mailman/templates/tr/postack.txt
+lib/mailman/templates/tr/postauth.txt
+lib/mailman/templates/tr/postheld.txt
+lib/mailman/templates/tr/private.html
+lib/mailman/templates/tr/refuse.txt
+lib/mailman/templates/tr/roster.html
+lib/mailman/templates/tr/subauth.txt
+lib/mailman/templates/tr/subscribe.html
+lib/mailman/templates/tr/subscribeack.txt
+lib/mailman/templates/tr/unsub.txt
+lib/mailman/templates/tr/unsubauth.txt
+lib/mailman/templates/tr/userpass.txt
+lib/mailman/templates/tr/verify.txt
 lib/mailman/templates/uk/admindbdetails.html
 lib/mailman/templates/uk/admindbpreamble.html
 lib/mailman/templates/uk/admindbsummary.html
@@ -1764,6 +1812,7 @@ share/examples/mailman/mailman.conf
 @dirrm lib/mailman/tests/bounces
 @dirrm lib/mailman/tests
 @dirrm lib/mailman/templates/uk
+@dirrm lib/mailman/templates/tr
 @dirrm lib/mailman/templates/sv
 @dirrm lib/mailman/templates/sr
 @dirrm lib/mailman/templates/sl
@@ -1810,6 +1859,8 @@ share/examples/mailman/mailman.conf
 @dirrm lib/mailman/pythonlib
 @dirrm lib/mailman/messages/uk/LC_MESSAGES
 @dirrm lib/mailman/messages/uk
+@dirrm lib/mailman/messages/tr/LC_MESSAGES
+@dirrm lib/mailman/messages/tr
 @dirrm lib/mailman/messages/sv/LC_MESSAGES
 @dirrm lib/mailman/messages/sv
 @dirrm lib/mailman/messages/sr/LC_MESSAGES
@@ -1875,4 +1926,4 @@ share/examples/mailman/mailman.conf
 @dirrm lib/mailman/Mailman/Cgi
 @dirrm lib/mailman/Mailman/Bouncers
 @dirrm lib/mailman/Mailman/Archiver
-@dirrm lib/mailman/Mailman
+@unexec ${RMDIR} -p %D/lib/mailman/Mailman 2>/dev/null || ${TRUE}
diff --git a/mail/mailman/distinfo b/mail/mailman/distinfo
index b8ff3012c95..64d56413a5a 100644
--- a/mail/mailman/distinfo
+++ b/mail/mailman/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.4.4.1 2005/02/22 22:13:28 snj Exp $
+$NetBSD: distinfo,v 1.4.4.2 2005/03/05 18:43:13 snj Exp $
 
-SHA1 (mailman-2.1.4.tgz) = b77d22283d5780b6d8449f19f86c210e4e58a032
-Size (mailman-2.1.4.tgz) = 5779983 bytes
+SHA1 (mailman-2.1.5.tgz) = d3f9639c76d437c58e6fcc2f0efc96c043e2f2e4
+Size (mailman-2.1.5.tgz) = 5745912 bytes
 SHA1 (patch-aa) = f0bc550b28794008ea840a88a5b0053578f3ae0f
 SHA1 (patch-ab) = 39f6294e53110bd1fd09b1e90ab46820f4d48e3f
-SHA1 (patch-ac) = da26a9a02d0fc90e7a58edebdb3601a30c865821
+SHA1 (patch-ac) = 5e82879e14a72565cb44b11e6086abd3737b26d2
 SHA1 (patch-ad) = 665884b9dd1789e4abd430c762bdbfd707d48d30
 SHA1 (patch-ae) = 6c17de398014217be8f1c7a3b3a6f8d379fc0fb2
 SHA1 (patch-af) = 985a619a055151d998cefd0c1b7280a0d55f889e
diff --git a/mail/mailman/patches/patch-ac b/mail/mailman/patches/patch-ac
index 27e812ba41e..a2561c1b699 100644
--- a/mail/mailman/patches/patch-ac
+++ b/mail/mailman/patches/patch-ac
@@ -1,9 +1,13 @@
-$NetBSD: patch-ac,v 1.2 2003/12/23 11:02:13 xtraeme Exp $
+$NetBSD: patch-ac,v 1.2.8.1 2005/03/05 18:43:13 snj Exp $
 
---- INSTALL.orig	Mon Sep 15 15:01:56 2003
-+++ INSTALL
-@@ -331,7 +331,7 @@ upgrade.
-       for a generic site list in misc/sitelist.cfg to help you with
+--- INSTALL.orig	2004-02-17 18:05:32.000000000 -0500
++++ INSTALL	2005-03-01 19:41:09.000000000 -0500
+@@ -348,10 +348,10 @@
+       information.
+ 
+       Now configure your site list.  There is a convenient template
+-      for a generic site list in data/sitelist.cfg to help you with
++      for a generic site list in support/sitelist.cfg to help you with
        this.  The template can be applied to your site list by running:
  
 -          % bin/config_list -i data/sitelist.cfg mailman