pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/mail/courier-mta Update mail/courier-mta to 0.56.0. C...
details: https://anonhg.NetBSD.org/pkgsrc/rev/85875201ce13
branches: trunk
changeset: 532045:85875201ce13
user: jlam <jlam%pkgsrc.org@localhost>
date: Fri Aug 10 17:57:03 2007 +0000
description:
Update mail/courier-mta to 0.56.0. Changes from version 0.53.2 include:
+ Drop the uucp module from the default option set.
+ Patch the webmlm sources to not use "stdin" and "stdout" as function or
member names as they can be macros according to the C standards.
* webadmin: Remove check that prevents multiple virtual domains to
be aliased to the same account.
* webmlmd: new CGI module that can manage a Courier mailing list
created with couriermlm.
* Rewrite and code cleanup of couriermlm.
* Use domain name, not MX hostname, for looking up authenticated
SMTP passwords in esmtpauthclient
diffstat:
mail/courier-mta/MESSAGE | 17 +++-
mail/courier-mta/Makefile | 19 ++--
mail/courier-mta/Makefile.common | 4 +-
mail/courier-mta/PLIST | 33 +++++++-
mail/courier-mta/distinfo | 32 ++++---
mail/courier-mta/files/courier.sh | 5 +-
mail/courier-mta/files/courierd.sh | 18 ++--
mail/courier-mta/files/courieresmtp.sh | 6 +-
mail/courier-mta/files/courieresmtpmsa.sh | 6 +-
mail/courier-mta/files/courieresmtps.sh | 6 +-
mail/courier-mta/files/courierfilter.sh | 16 ++-
mail/courier-mta/files/courierldapaliasd.sh | 13 +-
mail/courier-mta/files/webmlm.sh | 67 ++++++++++++++++++
mail/courier-mta/options.mk | 7 +-
mail/courier-mta/patches/patch-aa | 101 +++++++++++++++++++--------
mail/courier-mta/patches/patch-ab | 6 +-
mail/courier-mta/patches/patch-ac | 27 +++---
mail/courier-mta/patches/patch-ad | 13 ++-
mail/courier-mta/patches/patch-ae | 8 +-
mail/courier-mta/patches/patch-af | 9 +-
mail/courier-mta/patches/patch-ag | 12 ---
mail/courier-mta/patches/patch-ah | 8 +-
mail/courier-mta/patches/patch-aj | 20 +++--
mail/courier-mta/patches/patch-ak | 13 ---
mail/courier-mta/patches/patch-al | 13 +++
mail/courier-mta/patches/patch-am | 14 +++
mail/courier-mta/patches/patch-an | 42 +++++++++++
mail/courier-mta/patches/patch-ao | 15 ++++
mail/courier-mta/patches/patch-ap | 30 ++++++++
mail/courier-mta/patches/patch-aq | 22 ++++++
mail/courier-mta/pkginstall.mk | 11 ++-
31 files changed, 440 insertions(+), 173 deletions(-)
diffs (truncated from 1204 to 300 lines):
diff -r d3ee17af00bb -r 85875201ce13 mail/courier-mta/MESSAGE
--- a/mail/courier-mta/MESSAGE Fri Aug 10 17:57:00 2007 +0000
+++ b/mail/courier-mta/MESSAGE Fri Aug 10 17:57:03 2007 +0000
@@ -1,5 +1,5 @@
===========================================================================
-$NetBSD: MESSAGE,v 1.1.1.1 2006/04/28 18:10:21 jlam Exp $
+$NetBSD: MESSAGE,v 1.2 2007/08/10 17:57:03 jlam Exp $
It is recommended that Courier-MTA be installed together with Courier-IMAP
and SqWebMail -- together, they form an integrated mail/groupware
@@ -10,11 +10,11 @@
There are two things which must be done to make the Courier ``webadmin''
CGI application accessible through your HTTP server:
- (1) Copy the ``courierwebadmin'' CGI binary to the appropriate place in
- your HTTP document root, e.g. ${PREFIX}/libexec/cgi-bin, then
- Courier webadmin would be accessible through:
+ (1) Copy the ``webadmin'' CGI binary to the appropriate place in
+ your HTTP document root, e.g. ${PREFIX}/libexec/cgi-bin. The
+ Courier webadmin would be accessible through, e.g.:
- http://your.domain.com/cgi-bin/courierwebadmin
+ http://your.domain.com/cgi-bin/webadmin
(2) Install a password to protect the ``webadmin'' CGI application by
creating a one-line file containing the plaintext password at:
@@ -24,4 +24,11 @@
This file should be owned by ${COURIER_USER}:${COURIER_GROUP} with
read-only permissions restricted to the owner (mode 0400).
+Courier mailing lists may be managed through the ``webmlm'' CGI
+application. Copy the ``webmlm'' CGI binary to the appropriate place
+in your HTTP document root, e.g. ${PREFIX}/libexc/cgi-bin. The Courier
+webmlm would be accessible through, e.g.:
+
+ http://your.domain.com/cgi-bin/webmlm
+
===========================================================================
diff -r d3ee17af00bb -r 85875201ce13 mail/courier-mta/Makefile
--- a/mail/courier-mta/Makefile Fri Aug 10 17:57:00 2007 +0000
+++ b/mail/courier-mta/Makefile Fri Aug 10 17:57:03 2007 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2007/08/02 22:07:32 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2007/08/10 17:57:03 jlam Exp $
DISTNAME= courier-${COURIER_VERSION}
-PKGREVISION= 4
+PKGNAME= ${DISTNAME:S/-/-mta-/}
CATEGORIES= mail
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=courier/}
EXTRACT_SUFX= .tar.bz2
@@ -13,8 +13,8 @@
HOMEPAGE= http://www.courier-mta.org/
DEPENDS+= courier-maildir>=${COURIER_VERSION}:../../mail/courier-maildir
-DEPENDS+= couriertcpd>=${COURIER_VERSION}nb2:../../net/couriertcpd
-DEPENDS+= maildrop>=2.0.2:../../mail/maildrop
+DEPENDS+= couriertcpd>=${COURIER_VERSION}:../../net/couriertcpd
+DEPENDS+= maildrop>=2.0.4:../../mail/maildrop
USE_TOOLS+= gmake openssl:run perl:run
USE_LANGUAGES= c c++
@@ -69,7 +69,8 @@
SUBST_CLASSES+= perms
SUBST_FILES.perms= courier/perms.sh.in
-SUBST_SED.perms+= -e "s,@ROOT_USER@,"${ROOT_USER:Q}",g" \
+SUBST_SED.perms+= -e "s,@REAL_ROOT_USER@,"${REAL_ROOT_USER:Q}",g" \
+ -e "s,@ROOT_USER@,"${ROOT_USER:Q}",g" \
-e "s,@ROOT_GROUP@,"${ROOT_GROUP:Q}",g"
SUBST_STAGE.perms= pre-configure
@@ -87,14 +88,12 @@
${CP} ${FILESDIR}/mailer.conf ${WRKDIR}/mailer.conf
post-build:
- ${CAT} /dev/null > ${WRKDIR}/locallowercase
- ${ECHO} ${PREFIX:Q}"/bin/maildrop" > ${WRKDIR}/maildropfilter
+ ${TOUCH} ${WRKDIR}/locallowercase
post-install:
- cd ${WRKSRC}/courier && \
- ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} install-permissions
+ cd ${WRKSRC}/courier && \
+ ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} install-permissions
${INSTALL_DATA} ${WRKDIR}/mailer.conf ${EGDIR}
${INSTALL_DATA} ${WRKDIR}/locallowercase ${EGDIR}/locallowercase
- ${INSTALL_DATA} ${WRKDIR}/maildropfilter ${EGDIR}/maildropfilter
.include "../../mk/bsd.pkg.mk"
diff -r d3ee17af00bb -r 85875201ce13 mail/courier-mta/Makefile.common
--- a/mail/courier-mta/Makefile.common Fri Aug 10 17:57:00 2007 +0000
+++ b/mail/courier-mta/Makefile.common Fri Aug 10 17:57:03 2007 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.common,v 1.5 2007/08/02 22:07:32 jlam Exp $
+# $NetBSD: Makefile.common,v 1.6 2007/08/10 17:57:03 jlam Exp $
-COURIER_VERSION= 0.53.2
+COURIER_VERSION= 0.56.0
.include "../../mk/bsd.prefs.mk"
diff -r d3ee17af00bb -r 85875201ce13 mail/courier-mta/PLIST
--- a/mail/courier-mta/PLIST Fri Aug 10 17:57:00 2007 +0000
+++ b/mail/courier-mta/PLIST Fri Aug 10 17:57:03 2007 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2006/06/09 22:12:18 jlam Exp $
+@comment $NetBSD: PLIST,v 1.4 2007/08/10 17:57:03 jlam Exp $
bin/cancelmsg
bin/courier-config
bin/couriermlm
@@ -7,15 +7,18 @@
bin/rmail
bin/sendmail
bin/testmxlookup
+bin/webmlmd
+bin/webmlmd.rc
libexec/courier/aliascombine
libexec/courier/aliascreate
libexec/courier/aliasexp
-libexec/courier/cgi-bin/courierwebadmin
libexec/courier/courierd
libexec/courier/filters/dupfilter
libexec/courier/filters/perlfilter
libexec/courier/submit
libexec/courier/submitmkdir
+libexec/courier/webmail/webadmin
+libexec/courier/webmail/webmlm
man/man1/cancelmsg.1
man/man1/couriermlm.1
man/man1/dot-forward.1
@@ -43,7 +46,6 @@
man/man8/makesmtpaccess-msa.8
man/man8/makesmtpaccess.8
man/man8/mkesmtpdcert.8
-man/man8/pop3d.8
man/man8/submit.8
sbin/aliaslookup
sbin/courier
@@ -51,8 +53,8 @@
sbin/filterctl
sbin/makealiases
sbin/makehosteddomains
-sbin/showconfig
-sbin/showmodules
+sbin/courier-showconfig
+sbin/courier-showmodules
share/courier/courierctl.start
share/courier/couriermlm/adminrequest.tmpl
share/courier/couriermlm/confsubj.tmpl
@@ -65,16 +67,18 @@
share/courier/couriermlm/idxheadertxt.tmpl
share/courier/couriermlm/idxsubject.tmpl
share/courier/couriermlm/modrejbody.tmpl
-share/courier/couriermlm/modreject.tmpl
share/courier/couriermlm/modrejheader.tmpl
share/courier/couriermlm/modsubject.tmpl
share/courier/couriermlm/modtext.tmpl
share/courier/couriermlm/modtext2.tmpl
+share/courier/couriermlm/style.css.tmpl
share/courier/couriermlm/sub.tmpl
share/courier/couriermlm/sub2.tmpl
share/courier/couriermlm/sub3.tmpl
share/courier/couriermlm/sub4.tmpl
share/courier/couriermlm/sub5.tmpl
+share/courier/couriermlm/suback.tmpl
+share/courier/couriermlm/subjrequest.tmpl
share/courier/couriermlm/subreportfooter.tmpl
share/courier/couriermlm/subreporthdr.tmpl
share/courier/couriermlm/subreporthdr1.tmpl
@@ -87,6 +91,21 @@
share/courier/couriermlm/warn1text.tmpl
share/courier/couriermlm/warn1text2.tmpl
share/courier/couriermlm/warn2msg.tmpl
+share/courier/couriermlm/webmlm.tmpl
+share/courier/couriermlm/webmlm.tmpl.html
+share/courier/couriermlm/webmlmconfirm.html
+share/courier/couriermlm/webmlmerror.tmpl.html
+share/courier/couriermlm/webmlmidx.html
+share/courier/couriermlm/webmlmlistadmin.tmpl.html
+share/courier/couriermlm/webmlmlistadminmod.tmpl.html
+share/courier/couriermlm/webmlmlistadminpw.tmpl.html
+share/courier/couriermlm/webmlmlistindex.tmpl.html
+share/courier/couriermlm/webmlmnotprocessed.html
+share/courier/couriermlm/webmlmpleasewait.tmpl.html
+share/courier/couriermlm/webmlmprocessed.html
+share/courier/couriermlm/webmlmrequestreceived.tmpl.html
+share/courier/couriermlm/webmlmsubinfo.tmpl.html
+share/courier/couriermlm/webmlmsublist.tmpl.html
share/courier/courierwebadmin/admin-00machine.html
share/courier/courierwebadmin/admin-00machine.pl
share/courier/courierwebadmin/admin-05local.html
@@ -154,7 +173,6 @@
share/doc/courier/documentation.html
share/doc/courier/dot-courier.html
share/doc/courier/dot-forward.html
-share/doc/courier/download.php
share/doc/courier/draft-varshavchik-exdata-smtpext.txt
share/doc/courier/draft-varshavchik-security-smtpext.txt
share/doc/courier/draft-varshavchik-verp-smtpext.txt
@@ -205,6 +223,7 @@
share/examples/courier/rfcerr2047.txt
share/examples/courier/rfcerrheader.txt
share/examples/courier/smtpaccess/default
+share/examples/courier/webmlmrc.dist
share/examples/rc.d/courier
share/examples/rc.d/courierd
share/examples/rc.d/courierfilter
diff -r d3ee17af00bb -r 85875201ce13 mail/courier-mta/distinfo
--- a/mail/courier-mta/distinfo Fri Aug 10 17:57:00 2007 +0000
+++ b/mail/courier-mta/distinfo Fri Aug 10 17:57:03 2007 +0000
@@ -1,16 +1,20 @@
-$NetBSD: distinfo,v 1.2 2006/06/09 22:12:18 jlam Exp $
+$NetBSD: distinfo,v 1.3 2007/08/10 17:57:03 jlam Exp $
-SHA1 (courier-0.53.2.tar.bz2) = 89c6a9a57467adf8c1ac815a5ffacf47e5e694a3
-RMD160 (courier-0.53.2.tar.bz2) = a6efce3a8d6572923190ea49ed6085906317ebd8
-Size (courier-0.53.2.tar.bz2) = 6942557 bytes
-SHA1 (patch-aa) = 13c353d22a0c14fb0f769658223795c1d4d8fcf4
-SHA1 (patch-ab) = d02d396512cec5be8e3cedceb36da0127461a533
-SHA1 (patch-ac) = e20e3af10138adf53628fcb08c1657386b93edd3
-SHA1 (patch-ad) = b0e88586d90e071ac135443634153131f548e05f
-SHA1 (patch-ae) = 5a5d6b6aea3cca9d9f577d8da9ba463dd64e6902
-SHA1 (patch-af) = e17ce772bc92ec45507fed340d33856f71fbe3f6
-SHA1 (patch-ag) = 9044e5f36e9604d4d7b751bcc9042149080d61d2
-SHA1 (patch-ah) = 9f2001e1e309b2557640d8ecc9187ed793d0c5dd
+SHA1 (courier-0.56.0.tar.bz2) = 536f24db9f33f8d93445c03dd4edb50c7ec2f6b2
+RMD160 (courier-0.56.0.tar.bz2) = ce8e2d99f5b7baf500d748c18fbd126df8331398
+Size (courier-0.56.0.tar.bz2) = 7022057 bytes
+SHA1 (patch-aa) = 53b2fbf9414f3a853ec32006affdab66217ae85f
+SHA1 (patch-ab) = 42aa037beab3b57a2e470f1587274ef797b2a770
+SHA1 (patch-ac) = d220279beaff057b74bdf9b50a0c99f21afd7f7b
+SHA1 (patch-ad) = c0fcc00a60102782c315ac3e847b565adaa7b73d
+SHA1 (patch-ae) = e52ab2f6a4e253dc4a28291db6744ea2593f2fc3
+SHA1 (patch-af) = 446b4db2e6e22461c243481bd5c39ffba68fd4b6
+SHA1 (patch-ah) = 78e0db8d5319d985d7e8aec4c1240561fead3a00
SHA1 (patch-ai) = 5324b99ebc0492c77f67a8c627ceb3c3efa9d852
-SHA1 (patch-aj) = 4b2901f200f6d68a8377a85f7c3962cf9851ca8f
-SHA1 (patch-ak) = 8ba39a1ef912399e5f5fc224a43d36142780d09c
+SHA1 (patch-aj) = 0ec994bfb79ca133555a3d300f8a264648591e1b
+SHA1 (patch-al) = 8c37ddbb5e3c358ee0920adc27441e38b4efa143
+SHA1 (patch-am) = be7557ba7c4e282a40e8baee62f425a203ac26bb
+SHA1 (patch-an) = 1afb599c8f5289dda9f060f0aa97f7e0ef49e776
+SHA1 (patch-ao) = c859c61370fbc4a774456b629fb3f05ee1a32621
+SHA1 (patch-ap) = 8696818dc2994f8dbe523034ed1c713101693291
+SHA1 (patch-aq) = 26b3c6ed014673af035f7d38e479e318fc447157
diff -r d3ee17af00bb -r 85875201ce13 mail/courier-mta/files/courier.sh
--- a/mail/courier-mta/files/courier.sh Fri Aug 10 17:57:00 2007 +0000
+++ b/mail/courier-mta/files/courier.sh Fri Aug 10 17:57:03 2007 +0000
@@ -1,6 +1,6 @@
#!@RCD_SCRIPTS_SHELL@
#
-# $NetBSD: courier.sh,v 1.1.1.1 2006/04/28 18:10:21 jlam Exp $
+# $NetBSD: courier.sh,v 1.2 2007/08/10 17:57:04 jlam Exp $
#
# KEYWORD: nostart
#
@@ -42,7 +42,7 @@
COMMAND_LIST=
COMMAND_LIST="$COMMAND_LIST courierfilter"
-COMMAND_LIST="$COMMAND_LIST courierldapaliasd"
+COMMAND_LIST="$COMMAND_LIST @COURIERLDAPALIASD@"
COMMAND_LIST="$COMMAND_LIST courierd"
COMMAND_LIST="$COMMAND_LIST courieresmtp"
COMMAND_LIST="$COMMAND_LIST courieresmtpmsa"
@@ -52,6 +52,7 @@
COMMAND_LIST="$COMMAND_LIST courierpop"
COMMAND_LIST="$COMMAND_LIST courierpops"
COMMAND_LIST="$COMMAND_LIST sqwebmail"
+COMMAND_LIST="$COMMAND_LIST webmlm"
name="courier"
start_cmd="forward_commands"
diff -r d3ee17af00bb -r 85875201ce13 mail/courier-mta/files/courierd.sh
--- a/mail/courier-mta/files/courierd.sh Fri Aug 10 17:57:00 2007 +0000
+++ b/mail/courier-mta/files/courierd.sh Fri Aug 10 17:57:03 2007 +0000
@@ -1,11 +1,11 @@
#!@RCD_SCRIPTS_SHELL@
#
-# $NetBSD: courierd.sh,v 1.3 2006/06/17 19:38:43 jlam Exp $
+# $NetBSD: courierd.sh,v 1.4 2007/08/10 17:57:04 jlam Exp $
#
# Courier core processes
#
# PROVIDE: courierd
-# REQUIRE: courierfilter courierldapaliasd
+# REQUIRE: authdaemond courierfilter @COURIERLDAPALIASD@
# KEYWORD: shutdown
. /etc/rc.subr
@@ -15,12 +15,13 @@
command="@PREFIX@/sbin/${name}"
ctl_command="@PREFIX@/sbin/courier"
-restart_cmd="courierd_doit restart"
-start_precmd="courierd_prestart"
-start_cmd="courierd_doit start"
-stop_cmd="courierd_doit stop"
+restart_cmd="${name}_doit restart"
Home |
Main Index |
Thread Index |
Old Index