- Interim update to version 2.0.8 (which contains important security fixes),

  maintaining most of the port's existing structure.  A more comprehensive
  restructuring of this port is in the works.
- Assume maintainership, pending any objections from -ports.

6 files changed, 107 insertions, 77 deletions

diff --git a/mail/mailman/Makefile b/mail/mailman/Makefile
index eb618a300636..a19cde077ae8 100644
--- a/mail/mailman/Makefile
+++ b/mail/mailman/Makefile
@@ -6,29 +6,40 @@
 #
 
 PORTNAME=	mailman
-PORTVERSION=	2.0.5
+PORTVERSION=	2.0.8
 CATEGORIES=	mail
-MASTER_SITES=   ${MASTER_SITE_GNU} \
+MASTER_SITES=	http://www.list.org/ \
+		${MASTER_SITE_GNU} \
 		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	mailman
+EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	wjv@FreeBSD.org
 
 RUN_DEPENDS=	${LOCALBASE}/sbin/httpd:${PORTSDIR}/www/apache13
 
 HAS_CONFIGURE=	yes
-CONFIGURE_ARGS= --prefix=${MAILMANDIR} \
+CONFIGURE_ARGS=	--prefix=${MAILMANDIR} \
+		--with-python=${PYTHON_CMD} \
 		--with-mail-gid=${MAIL_GID} --with-cgi-gid=${CGI_GID}
 USE_PYTHON=	yes
 
 USERNAME?=	mailman
 USERID?=	89
 
-CGI_GID?=	nogroup
-MAIL_GID?=	daemon
+# The default value of '1' for MAIL_GID works with sendmail.  If you're
+# using installed from ports, you should set MAIL_GID at build time
+# according to the following table:
+#
+# MTA		| MAIL_GID
+# Exim		| 6
+# Postfix	| ???
 
+MAIL_GID?=	1
+CGI_GID?=	80
 MMDIR?=		mailman
 MAILMANDIR=	${PREFIX}/${MMDIR}
+PKGMESSAGE=	${WRKDIR}/pkg-message
 
 pre-configure:
 	# Add the username, uid, group and gid
@@ -39,6 +50,20 @@ pre-configure:
 	${CHOWN} ${USERNAME}:${USERNAME} ${MAILMANDIR}
 	${CHMOD} 2775 ${MAILMANDIR}
 
+post-configure:
+	@ ${SED} -e 's#%%MAILMANDIR%%#${MAILMANDIR}#g' \
+	  -e 's#%%DOCSDIR%%#${DOCSDIR}#g' pkg-message > \
+	  ${PKGMESSAGE}
+
+pre-build:
+.if !defined(BATCH)
+	@ ${ECHO_MSG} "-------------------------------------------------------"
+	@ ${ECHO_MSG} "  If you're using an alternative MTA (not Sendmail),"
+	@ ${ECHO_MSG} "  you may have to set MAIL_GID to the gid under which"
+	@ ${ECHO_MSG} "  your MTA is executing."
+	@ ${ECHO_MSG} "-------------------------------------------------------"
+.endif
+
 post-install:
 	@${CHOWN} -R :${USERNAME} ${MAILMANDIR}
 .if !defined(NOPORTDOCS)
@@ -47,13 +72,8 @@ post-install:
 	@${INSTALL_DATA} ${WRKSRC}/$f ${DOCSDIR}
 .endfor
 .endif
-	@echo All related binaries have been installed in ${MAILMANDIR}/bin
-	@echo See ${DOCSDIR}/INSTALL for installation instructions \(prefix == ${MAILMANDIR}\).
-	@echo 'Sample entry for httpd.conf for Apache:'
-	@echo '  ScriptAlias /mailman/ ${MAILMANDIR}/cgi-bin/'
-	@echo '  <Directory ${MAILMANDIR}/cgi-bin/>'
-	@echo '     Options FollowSymLinks ExecCGI'
-	@echo '	   ... other options ...'
-	@echo '  </Directory>'
+.if !defined(BATCH)
+	@ ${CAT} ${PKGMESSAGE}
+.endif
 
 .include <bsd.port.mk>
diff --git a/mail/mailman/distinfo b/mail/mailman/distinfo
index 0b5e79c5e10e..0e3e1b191f2d 100644
--- a/mail/mailman/distinfo
+++ b/mail/mailman/distinfo
@@ -1 +1 @@
-MD5 (mailman-2.0.5.tar.gz) = 93f85006a524828927d9ec8ca0b9ae44
+MD5 (mailman-2.0.8.tgz) = 18b8db0cceeb8e03384a03d96fa3f0d8
diff --git a/mail/mailman/files/patch-aa b/mail/mailman/files/patch-aa
index ec6b5df8cca3..07a0269314cf 100644
--- a/mail/mailman/files/patch-aa
+++ b/mail/mailman/files/patch-aa
@@ -1,26 +1,16 @@
-*** Mailman/Utils.py.orig	Thu Nov 16 22:43:11 2000
---- Mailman/Utils.py	Thu Feb 15 19:42:10 2001
-***************
-*** 407,413 ****
-          f = open(mm_cfg.SITE_PW_FILE)
-          pw2 = f.read()
-          f.close()
-!         return Crypt.crypt(pw1, pw2[:2]) == pw2
-      # There probably is no site admin password if there was an exception
-      except IOError:
-          return 0
---- 407,420 ----
-          f = open(mm_cfg.SITE_PW_FILE)
-          pw2 = f.read()
-          f.close()
-!         # First we check for the Modular Crypt Format
-!         mcf = re.match(r'\$\d\$(\w+)\$', pw2)
-!         if mcf:     # Is it MCF?
-!             salt=mcf.group(1)
-!         else:       # No, it's traditional DES.
-!             salt=pw2[:2]
-!             
-!         return Crypt.crypt(pw1, salt) == pw2
-      # There probably is no site admin password if there was an exception
-      except IOError:
-          return 0
\ No newline at end of file
+--- Mailman/Utils.py.orig	Wed Jul 25 20:06:46 2001
++++ Mailman/Utils.py	Fri Sep 21 16:46:16 2001
+@@ -405,7 +405,12 @@
+         f = open(mm_cfg.SITE_PW_FILE)
+         pw2 = f.read()
+         f.close()
+-        salt = pw2[:2]
++        # First we check for the Modular Crypt Format
++        mcf = re.match(r'\$\d\$(\w+)\$', pw2)
++        if mcf:     # Is it MCF?
++            salt=mcf.group(1)
++        else:       # No, it's traditional DES.
++            salt=pw2[:2]
+         # crypt() has a bug in that if the salt is the empty string, it will
+         # always return the empty string, regardless of the key. :(
+         if len(salt) < 2:
diff --git a/mail/mailman/pkg-comment b/mail/mailman/pkg-comment
index 4140acceb9ab..7de33bc9a017 100644
--- a/mail/mailman/pkg-comment
+++ b/mail/mailman/pkg-comment
@@ -1 +1 @@
-Software to help manage email discussion lists
+A mailing list manager (MLM) with a user-friendly web front-end
diff --git a/mail/mailman/pkg-message b/mail/mailman/pkg-message
new file mode 100644
index 000000000000..95c7f18dbe84
--- /dev/null
+++ b/mail/mailman/pkg-message
@@ -0,0 +1,20 @@
+---------------------------------------------------------------------------
+All related binaries have been installed in %%MAILMANDIR%%/bin.
+
+See %%DOCSDIR%%/INSTALL for post-installation instructions,
+with "prefix" being "%%MAILMANDIR%%".
+
+In particular, you'll need to set up the mailman user's crontab(5) entry:
+As root:
+
+  # crontab -u mailman %%MAILMANDIR%%/cron/crontab.in
+
+A sample entry for Apache's httpd.conf to enable use of Mailman's web
+interface:
+
+  ScriptAlias /mailman/ %%MAILMANDIR%%/cgi-bin/
+  <Directory %%MAILMANDIR%%/cgi-bin/>
+     Options FollowSymLinks ExecCGI
+	   ... other options ...
+  </Directory>
+---------------------------------------------------------------------------
diff --git a/mail/mailman/pkg-plist b/mail/mailman/pkg-plist
index 8b300ddb3ef6..3cf168965a9d 100644
--- a/mail/mailman/pkg-plist
+++ b/mail/mailman/pkg-plist
@@ -1,3 +1,15 @@
+%%PORTDOCS%%share/doc/mailman/BUGS
+%%PORTDOCS%%share/doc/mailman/FAQ
+%%PORTDOCS%%share/doc/mailman/INSTALL
+%%PORTDOCS%%share/doc/mailman/NEWS
+%%PORTDOCS%%share/doc/mailman/README
+%%PORTDOCS%%share/doc/mailman/README.BSD
+%%PORTDOCS%%share/doc/mailman/README.EXIM
+%%PORTDOCS%%share/doc/mailman/README.LINUX
+%%PORTDOCS%%share/doc/mailman/README.NETSCAPE
+%%PORTDOCS%%share/doc/mailman/README.QMAIL
+%%PORTDOCS%%share/doc/mailman/README.SENDMAIL
+%%PORTDOCS%%share/doc/mailman/UPGRADING
 mailman/Mailman/Archiver/Archiver.py
 mailman/Mailman/Archiver/Archiver.pyc
 mailman/Mailman/Archiver/HyperArch.py
@@ -258,41 +270,29 @@ mailman/templates/subscribe.html
 mailman/templates/subscribeack.txt
 mailman/templates/userpass.txt
 mailman/templates/verify.txt
-share/doc/mailman/BUGS
-share/doc/mailman/FAQ
-share/doc/mailman/INSTALL
-share/doc/mailman/NEWS
-share/doc/mailman/README
-share/doc/mailman/README.BSD
-share/doc/mailman/README.EXIM
-share/doc/mailman/README.LINUX
-share/doc/mailman/README.NETSCAPE
-share/doc/mailman/README.QMAIL
-share/doc/mailman/README.SENDMAIL
-share/doc/mailman/UPGRADING
-@dirrm mailman/Mailman/Archiver
-@dirrm mailman/Mailman/Bouncers
-@dirrm mailman/Mailman/Cgi
-@dirrm mailman/Mailman/Handlers
-@dirrm mailman/Mailman/Logging
-@dirrm mailman/Mailman/pythonlib
-@dirrm mailman/Mailman
-@dirrm mailman/archives/private
+@dirrm mailman/templates
+@dirrm mailman/spam
+@dirrm mailman/scripts
+@dirrm mailman/qfiles
+@dirrm mailman/mail
+@dirrm mailman/logs
+@dirrm mailman/locks
+@dirrm mailman/lists
+@dirrm mailman/icons
+@dirrm mailman/filters
+@dirrm mailman/data
+@dirrm mailman/cron
+@dirrm mailman/cgi-bin
+@dirrm mailman/bin
 @dirrm mailman/archives/public
+@dirrm mailman/archives/private
 @dirrm mailman/archives
-@dirrm mailman/bin
-@dirrm mailman/cgi-bin
-@dirrm mailman/cron
-@dirrm mailman/data
-@dirrm mailman/filters
-@dirrm mailman/icons
-@dirrm mailman/lists
-@dirrm mailman/locks
-@dirrm mailman/logs
-@dirrm mailman/mail
-@dirrm mailman/qfiles
-@dirrm mailman/scripts
-@dirrm mailman/spam
-@dirrm mailman/templates
+@dirrm mailman/Mailman/pythonlib
+@dirrm mailman/Mailman/Logging
+@dirrm mailman/Mailman/Handlers
+@dirrm mailman/Mailman/Cgi
+@dirrm mailman/Mailman/Bouncers
+@dirrm mailman/Mailman/Archiver
+@dirrm mailman/Mailman
 @dirrm mailman
-@dirrm share/doc/mailman
+%%PORTDOCS%%@dirrm share/doc/mailman