- Update to the long-anticipated version 2.1

This commit is contained in:
Johann Visagie 2003-01-17 12:58:06 +00:00
parent ea485f28c6
commit 9c2dfc108b
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=73344
13 changed files with 1310 additions and 173 deletions

View File

@ -6,7 +6,7 @@
#
PORTNAME= mailman
PORTVERSION= 2.0.13
PORTVERSION= 2.1
CATEGORIES= mail
MASTER_SITES= http://www.list.org/ \
${MASTER_SITE_GNU} \
@ -16,10 +16,13 @@ EXTRACT_SUFX= .tgz
MAINTAINER= wjv@FreeBSD.org
.if defined(WITH_APACHE2)
RUN_DEPENDS= ${LOCALBASE}/sbin/httpd:${PORTSDIR}/www/apache2
.else
.if defined(WITH_APACHE13)
RUN_DEPENDS= ${LOCALBASE}/sbin/httpd:${PORTSDIR}/www/apache13
.else
RUN_DEPENDS= ${LOCALBASE}/sbin/httpd:${PORTSDIR}/www/apache2
.endif
.if defined(WITH_CHINESE)
RUN_DEPENDS+= ${PYTHONPREFIX_LIBDIR}/encodings/chinesecn/__init__.py:${PORTSDIR}/chinese/pycodec
.endif
HAS_CONFIGURE= yes
@ -55,7 +58,7 @@ MAILMANDIR= ${PREFIX}/${MM_DIR}
PKGMESSAGE= ${WRKDIR}/pkg-message
PKGINSTALL= ${WRKDIR}/pkg-install
PKGDEINSTALL= ${WRKDIR}/pkg-deinstall
PLIST_SUB= MMDIR=${MM_DIR} MMGRP=${MM_GROUPNAME} IMGDIR=${IMGDIR}
PLIST_SUB+= MMDIR=${MM_DIR} IMGDIR=${IMGDIR}
options:
@ ${ECHO_MSG} "===> Build options for ${PKGNAME}:"
@ -80,14 +83,15 @@ pre-configure:
@ ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
post-configure:
@ ${SED} -e 's#%%USER%%#${MM_USERNAME}#g' \
-e 's#%%GROUP%%#${MM_GROUPNAME}#g' \
-e 's#%%MAILMANDIR%%#${MAILMANDIR}#g' pkg-deinstall > \
${PKGDEINSTALL}
@ ${SED} \
-e 's#%%USER%%#${MM_USERNAME}#g' -e 's#%%GROUP%%#${MM_GROUPNAME}#g' \
-e 's#%%PREFIX%%#${PREFIX}#g' -e 's#%%MAILMANDIR%%#${MAILMANDIR}#g' \
pkg-deinstall > ${PKGDEINSTALL}
@ ${SED} -e 's#%%MAILMANDIR%%#${MAILMANDIR}#g' \
-e 's#%%DOCSDIR%%#${DOCSDIR}#g' pkg-message > ${PKGMESSAGE}
pre-install:
@ ${SH} ${PKGREQ} INSTALL
@ ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
post-install:
@ -108,6 +112,8 @@ post-install:
.endfor
.endif
@ ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
@ ${INSTALL_SCRIPT} ${WRKSRC}/misc/mailman \
${PREFIX}/etc/rc.d/mailman.sh
.if !defined(BATCH)
@ ${CAT} ${PKGMESSAGE}
.endif

View File

@ -1 +1 @@
MD5 (mailman-2.0.13.tgz) = 64419dca3669ea255a6758c6cc94ef33
MD5 (mailman-2.1.tgz) = d486abaa1404e2fe93d72d3cdd9c84af

View File

@ -1,26 +0,0 @@
--- Mailman/Defaults.py.in.orig Thu Nov 16 06:23:52 2000
+++ Mailman/Defaults.py.in Tue Feb 19 17:18:39 2002
@@ -47,8 +47,8 @@
# Don't change MAILMAN_URL, unless you want to point it at the list.org
# mirror.
-MAILMAN_URL = 'http://www.gnu.org/software/mailman/mailman.html'
-#MAILMAN_URL = 'http://www.list.org/'
+#MAILMAN_URL = 'http://www.gnu.org/software/mailman/mailman.html'
+MAILMAN_URL = 'http://www.list.org/'
# Site-specific settings
DEFAULT_HOST_NAME = '@FQDN@'
@@ -59,6 +59,12 @@
HOME_PAGE = 'index.html'
MAILMAN_OWNER = 'mailman-owner@%s' % DEFAULT_HOST_NAME
+
+# Should the operating system logo (and link) in the footer of Mailman's
+# web pages be for GNU or FreeBSD. Options are 'GNU' or 'FreeBSD', with
+# 'GNU' being the default. Note: This is not a standard Mailman
+# configuration option; it has been added by the FreeBSD port.
+LOGO_OS = 'FreeBSD'

View File

@ -1,11 +1,7 @@
--- Mailman/htmlformat.py.orig Wed Apr 3 00:28:59 2002
+++ Mailman/htmlformat.py Thu Apr 4 11:28:51 2002
@@ -503,15 +503,17 @@
# These are the URLs which the image logos link to. The Mailman home page now
# points at the gnu.org site instead of the www.list.org mirror.
#
-from mm_cfg import MAILMAN_URL
+from mm_cfg import MAILMAN_URL, LOGO_OS
--- Mailman/htmlformat.py.orig Sun Apr 21 17:27:02 2002
+++ Mailman/htmlformat.py Fri Sep 27 16:17:48 2002
@@ -600,12 +600,14 @@
from mm_cfg import MAILMAN_URL
PYTHON_URL = 'http://www.python.org/'
GNU_URL = 'http://www.gnu.org/'
+FREEBSD_URL = 'http://www.freebsd.org/'
@ -19,27 +15,26 @@
def MailmanLogo():
@@ -525,12 +527,21 @@
@@ -617,17 +619,17 @@
'<br>version %s' % (logo(DELIVERED_BY), mm_cfg.VERSION)
pylink = '<img src="%s" alt="Python Powered" border=0>' % \
logo(PYTHON_POWERED)
gnulink = '<img src="%s" alt="GNU\'s Not Unix" border=0>' % \
logo(GNU_HEAD)
- gnulink = '<img src="%s" alt="GNU\'s Not Unix" border=0>' % \
- logo(GNU_HEAD)
- t.AddRow([mmlink, pylink, gnulink])
+ freebsdlink = '<img src="%s" alt="Powered by FreeBSD" border=0>' % \
+ logo(FREEBSD_POWERED)
+ if LOGO_OS == 'FreeBSD':
+ t.AddRow([mmlink, pylink, freebsdlink])
+ else:
+ t.AddRow([mmlink, pylink, gnulink])
+ logo(FREEBSD_POWERED)
+ t.AddRow([mmlink, pylink, freebsdlink])
else:
# use only textual links
version = mm_cfg.VERSION
mmlink = Link(MAILMAN_URL,
'Delivered by Mailman<br>version %s' % mm_cfg.VERSION)
pylink = Link(PYTHON_URL, 'Python Powered')
gnulink = Link(GNU_URL, "Gnu's Not Unix")
_('Delivered by Mailman<br>version %(version)s'))
pylink = Link(PYTHON_URL, _('Python Powered'))
- gnulink = Link(GNU_URL, _("Gnu's Not Unix"))
- t.AddRow([mmlink, pylink, gnulink])
+ freebsdlink = Link(FREEBSD_URL, "Powered by FreeBSD")
+ if LOGO_OS == 'FreeBSD':
+ t.AddRow([mmlink, pylink, freebsdlink])
+ else:
+ t.AddRow([mmlink, pylink, gnulink])
+ t.AddRow([mmlink, pylink, freebsdlink])
return t

View File

@ -1,20 +0,0 @@
--- configure.orig Fri Sep 22 20:56:44 2000
+++ configure Mon Mar 12 12:38:13 2001
@@ -1034,7 +1034,7 @@
CFLAGS="$ac_save_CFLAGS"
elif test $ac_cv_prog_cc_g = yes; then
if test "$GCC" = yes; then
- CFLAGS="-g -O2"
+ CFLAGS=""
else
CFLAGS="-g"
fi
@@ -1055,7 +1055,7 @@
case $GCC in
yes)
case $ac_cv_prog_cc_g in
- yes) OPT="-g -O2";;
+ yes) OPT="";;
*) OPT="-O2";;
esac
;;

View File

@ -1,16 +0,0 @@
--- 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:

View File

@ -0,0 +1,24 @@
--- misc/mailman.in.orig Thu Mar 7 08:09:51 2002
+++ misc/mailman.in Fri Sep 27 15:56:40 2002
@@ -39,15 +39,19 @@
case "$1" in
'start')
#rm -f $MAILMANHOME/locks/*
- $PYTHON $MAILMANCTL -s -q start
+ $PYTHON $MAILMANCTL -s -q start && echo -n ' mailman'
;;
'stop')
- $PYTHON $MAILMANCTL -q stop
+ $PYTHON $MAILMANCTL -q stop && echo -n ' mailman'
;;
'restart')
$PYTHON $MAILMANCTL -q restart
+ ;;
+*)
+ echo "Usage: `basename $0` {start|stop|restart}" >&2
+ exit 64
;;
esac

View File

@ -25,24 +25,28 @@
with your MTA. By default this port works with sendmail. If you're
using an alternative MTA installed from ports, you should set MAIL_GID at
build time according to the following table. (Please contact this port's
maintainer if you can fill in the blanks, or to report mistakes!)
maintainer if you wish to fill in the blanks or report mistakes!)
----------------------------------------------
MTA | MAIL_GID | Submitted by
Exim | 65534 | <wjv>
Postfix | 65534 | <shamrock@cypherpunks.to>
Qmail | ??? |
----------------------------------------------
* CGI_GID [80]
The group id under which your web server executes CGI scripts
By default, this port works with the current port of Apache. If your
By default, this port works with the current port of Apache2. If your
WWW server executes CGI scripts under a different GID, you'll have to
set this at build time.
* IMGDIR [www/icons]
Icon images will be installed in ${PREFIX}/${IMGDIR}
* WITH_APACHE2 [undefined]
If defined, port depends on Apache 2.x instead of 1.3.x
* WITH_APACHE13 [undefined]
If defined, port depends on Apache 1.3.x instead of 2.x
* WITH_CHINESE [undefined]
Define to include support for Chinese mailing lists

View File

@ -1,4 +1,6 @@
#! /bin/sh
#
# $FreeBSD$
delete_account() {
local u g home
@ -31,8 +33,8 @@ case $2 in
DEINSTALL)
zero_crontab %%USER%%
if ps -axwU %%USER%% | grep -q python; then
echo 'Killing all running processes belonging to user "%%USER%%".'
killall -m -u %%USER%% python
echo "Stopping Mailman's qrunner daemon."
%%PREFIX%%/etc/rc.d/mailman.sh stop >/dev/null 2>&1
sleep 2
fi
;;

View File

@ -19,3 +19,5 @@ its website.
Author: Barry Warsaw <barry@zope.com> and the Mailman Cabal
WWW: http://www.list.org/
-- Johann Visagie <wjv@FreeBSD.org>

View File

@ -1,4 +1,6 @@
#! /bin/sh
#
# $FreeBSD$
make_account() {
local u uid g gid gcos home shell

File diff suppressed because it is too large Load Diff

17
mail/mailman/pkg-req Normal file
View File

@ -0,0 +1,17 @@
#!/bin/sh
PATH=$PATH:/usr/local/bin
if [ "x$1" = "xINSTALL" -o "x$2" = "xINSTALL" ]; then
PYTHON_GT=`python -c 'import string, sys; \
print string.split(sys.version)[0] >= "2.1"'`
if [ "x${PYTHON_GT}" = "x1" ]; then
exit 0
else
echo "-----------------------------------------------------------"
echo "Mailman requires Python version 2.1 or greater -"
echo " please update your Python installation before proceeding."
echo "-----------------------------------------------------------"
exit 1
fi
fi