pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/mail/sqwebmail Update mail/sqwebmail to 4.0.5 (based o...
details: https://anonhg.NetBSD.org/pkgsrc/rev/0a085b9db1b3
branches: trunk
changeset: 478025:0a085b9db1b3
user: jlam <jlam%pkgsrc.org@localhost>
date: Wed Jul 14 20:07:22 2004 +0000
description:
Update mail/sqwebmail to 4.0.5 (based on the courier-0.45.6 distribution).
Changes from version 3.6.2 include:
* Honor ${VARBASE}.
* Remove pcpd and sqwebmaild rc.d scripts and replace them with a
single sqwebmail rc.d script that calls the Courier-provided control
script to start/stop the SqWebMail service daemons.
* Use sysconftool from courier-auth to merge config files.
* Move HTML documentation into ${PREFIX}/share/doc after discussion
with wiz.
* Support for the ACL IMAP extension.
* Improve support for MIME encodings.
* Fixes buffer overflow vulnerability (PR 25774):
http://www.securityfocus.com/bid/9845
http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=CAN-2004-0224
diffstat:
mail/sqwebmail/DEINSTALL | 23 ++++++---
mail/sqwebmail/DESCR | 4 +-
mail/sqwebmail/INSTALL | 19 --------
mail/sqwebmail/Makefile | 51 ++++++++++++----------
mail/sqwebmail/PLIST | 26 +++++++----
mail/sqwebmail/distinfo | 14 +++--
mail/sqwebmail/files/pcpd.sh | 51 -----------------------
mail/sqwebmail/files/sqwebmail.sh | 82 ++++++++++++++++++++++---------------
mail/sqwebmail/files/sqwebmaild.sh | 52 ------------------------
mail/sqwebmail/patches/patch-aa | 37 ++++++++++------
mail/sqwebmail/patches/patch-ab | 8 +-
mail/sqwebmail/patches/patch-ad | 12 ++--
12 files changed, 149 insertions(+), 230 deletions(-)
diffs (truncated from 583 to 300 lines):
diff -r 1a5f2e40eefb -r 0a085b9db1b3 mail/sqwebmail/DEINSTALL
--- a/mail/sqwebmail/DEINSTALL Wed Jul 14 20:07:16 2004 +0000
+++ b/mail/sqwebmail/DEINSTALL Wed Jul 14 20:07:22 2004 +0000
@@ -1,10 +1,17 @@
-# $NetBSD: DEINSTALL,v 1.2 2004/02/23 23:41:43 jlam Exp $
+# $NetBSD: DEINSTALL,v 1.3 2004/07/14 20:07:22 jlam Exp $
# Additional files that are may be created for sqwebmail.
-ALL_FILES="${ALL_FILES} /dev/null @PKG_SYSCONFDIR@/calendarmode"
-ALL_FILES="${ALL_FILES} /dev/null @PKG_SYSCONFDIR@/defaultdomain"
-ALL_FILES="${ALL_FILES} /dev/null @PKG_SYSCONFDIR@/hostname"
-ALL_FILES="${ALL_FILES} /dev/null @PKG_SYSCONFDIR@/logindomainlist"
-ALL_FILES="${ALL_FILES} /dev/null @PKG_SYSCONFDIR@/nochangingfrom"
-ALL_FILES="${ALL_FILES} /dev/null @PKG_SYSCONFDIR@/noimages"
-ALL_FILES="${ALL_FILES} /dev/null @PKG_SYSCONFDIR@/usexsender"
+ALL_FILES="${ALL_FILES} /dev/null ${PKG_SYSCONFDIR}/authcharset"
+ALL_FILES="${ALL_FILES} /dev/null ${PKG_SYSCONFDIR}/defaultdomain"
+ALL_FILES="${ALL_FILES} /dev/null ${PKG_SYSCONFDIR}/hostname"
+ALL_FILES="${ALL_FILES} /dev/null ${PKG_SYSCONFDIR}/logindomainlist"
+ALL_FILES="${ALL_FILES} /dev/null ${PKG_SYSCONFDIR}/maildirfilterconfig"
+ALL_FILES="${ALL_FILES} /dev/null ${PKG_SYSCONFDIR}/nochangingfrom"
+ALL_FILES="${ALL_FILES} /dev/null ${PKG_SYSCONFDIR}/noimages"
+ALL_FILES="${ALL_FILES} /dev/null ${PKG_SYSCONFDIR}/usexsender"
+
+case ${STAGE} in
+DEINSTALL)
+ # Unconditionally remove the SqWebMail socket.
+ ${RM} -f @SQWEBMAIL_STATEDIR@/sqwebmail.sock
+esac
diff -r 1a5f2e40eefb -r 0a085b9db1b3 mail/sqwebmail/DESCR
--- a/mail/sqwebmail/DESCR Wed Jul 14 20:07:16 2004 +0000
+++ b/mail/sqwebmail/DESCR Wed Jul 14 20:07:22 2004 +0000
@@ -1,3 +1,3 @@
SqWebMail is a web CGI client for sending and receiving E-mail using
-Maildir mailboxes. It is very lightweight -- it reads mail directly
-from Maildirs.
+maildir mailboxes. It is very lightweight -- it reads mail directly
+from maildirs.
diff -r 1a5f2e40eefb -r 0a085b9db1b3 mail/sqwebmail/INSTALL
--- a/mail/sqwebmail/INSTALL Wed Jul 14 20:07:16 2004 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-# $NetBSD: INSTALL,v 1.1 2002/01/24 20:52:20 jlam Exp $
-
-SYSCONFTOOL="@SYSCONFTOOL@"
-EGDIR=${PKG_PREFIX}/share/examples/courier
-GEN_FILES="@GEN_FILES@"
-
-case ${STAGE} in
-POST-INSTALL)
- eval set -- ${GEN_FILES}
- for file
- do
- # Merge new config files with the old ones.
- ${CP} ${EGDIR}/${file}.dist @PKG_SYSCONFDIR@/${file}.dist
- ${SYSCONFTOOL} @PKG_SYSCONFDIR@/${file}
- ${CHMOD} 0644 @PKG_SYSCONFDIR@/${file}
- ${RM} -f @PKG_SYSCONFDIR@/${file}.dist
- done
- ;;
-esac
diff -r 1a5f2e40eefb -r 0a085b9db1b3 mail/sqwebmail/Makefile
--- a/mail/sqwebmail/Makefile Wed Jul 14 20:07:16 2004 +0000
+++ b/mail/sqwebmail/Makefile Wed Jul 14 20:07:22 2004 +0000
@@ -1,27 +1,26 @@
-# $NetBSD: Makefile,v 1.23 2004/05/12 23:48:52 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2004/07/14 20:07:22 jlam Exp $
-DISTNAME= sqwebmail-3.6.2
+DISTNAME= sqwebmail-4.0.5
CATEGORIES= www
-COMMENT= webmail CGI for access to local Maildir-style mailboxes
+COMMENT= webmail CGI for access to local maildir-style mailboxes
HOMEPAGE= http://www.inter7.com/sqwebmail/
DEPENDS+= courier-auth>=${BASE_VERS}:../../mail/courier-auth
-DEPENDS+= courier-maildirmake>=${BASE_VERS}:../../mail/courier-maildirmake
+DEPENDS+= courier-maildir>=${BASE_VERS}:../../mail/courier-maildir
USE_BUILDLINK3= yes
USE_LANGUAGES= c c++
USE_PERL5= yes
-REPLACE_PERL= sysconftool
USE_PKGINSTALL= yes
DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL
-INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL
+INSTALL_EXTRA_TMPL+= ${.CURDIR}/../courier-auth/INSTALL
.include "../courier-auth/Makefile.common"
INSTALL_MAKE_FLAGS= ${MAKE_FLAGS} sysconfdir=${EGDIR}
-SQWEBMAIL_STATEDIR= /var/sqwebmail
+SQWEBMAIL_STATEDIR= ${VARBASE}/sqwebmail
SQWEBMAIL_CACHEDIR= ${SQWEBMAIL_STATEDIR}/cache
SQWEBMAIL_CALENDARDIR= ${SQWEBMAIL_STATEDIR}/calendar
SQWEBMAIL_HTMLDIR= ${DATADIR}/sqwebmail/html
@@ -33,7 +32,7 @@
SENDMAIL?= /usr/sbin/sendmail
# This is used by the sqwebmail configure script to set the location of
-# the sqwebmaild socket file, lockfile, and pidfile.
+# the sqwebmaild socket file, lockfile and pidfile.
#
CONFIGURE_ARGS+= --localstatedir=${SQWEBMAIL_STATEDIR}
@@ -63,14 +62,13 @@
OWN_DIRS_PERMS+= ${SQWEBMAIL_CALENDARDIR}/private ${ROOT_USER} ${MAIL_GROUP} 0750
OWN_DIRS_PERMS+= ${SQWEBMAIL_CALENDARDIR}/localcache ${ROOT_USER} ${MAIL_GROUP} 0700
-SYSCONFTOOL= ${PREFIX}/sbin/sqwebmail.sysconftool
GEN_FILES= ldapaddressbook
-FILES_SUBST+= SYSCONFTOOL=${SYSCONFTOOL:Q}
+GEN_FILES+= sqwebmaild
FILES_SUBST+= GEN_FILES=${GEN_FILES:Q}
MESSAGE_SUBST+= IMAGEDIR=${SQWEBMAIL_IMAGEDIR}
MESSAGE_SUBST+= IMAGEURL=${SQWEBMAIL_IMAGEURL}
-SUPPORT_FILES= ${EGDIR}/authmodulelist ${PKG_SYSCONFDIR}/authmodulelist
+SUPPORT_FILES= ${EGDIR}/calendarmode ${PKG_SYSCONFDIR}/calendarmode
SUPPORT_FILES+= /dev/null ${PKG_SYSCONFDIR}/nodsn
.for FILE in ${GEN_FILES}
CONF_FILES+= ${EGDIR}/${FILE}.dist ${PKG_SYSCONFDIR}/${FILE}
@@ -81,7 +79,7 @@
${PKG_SYSCONFDIR}/${FILE} \
${ROOT_USER} ${ROOT_GROUP} 0755
.endfor
-RCD_SCRIPTS= pcpd sqwebmail sqwebmaild
+RCD_SCRIPTS= sqwebmail
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../mk/bdb.buildlink3.mk"
@@ -94,20 +92,27 @@
$$file.bak > $$file; \
done
+# Default to non-groupware calendar-mode.
+post-build:
+ ${ECHO} "local" > ${WRKDIR}/calendarmode
+
post-install:
+ ${LN} -sf ${DATADIR}/sqwebmail/webgpg ${PREFIX}/sbin/webgpg
${INSTALL_DATA_DIR} ${EGDIR}
- ${INSTALL_DATA_DIR} ${HTMLDIR}
- ${INSTALL_DATA_DIR} ${HTMLDIR}/pcp
- ${INSTALL_DATA_DIR} ${HTMLDIR}/sqwebmail
- ${INSTALL_SCRIPT} ${WRKSRC}/sysconftool ${SYSCONFTOOL}
- ${INSTALL_DATA} ${WRKSRC}/COPYING ${HTMLDIR}/sqwebmail
- ${INSTALL_DATA} ${WRKSRC}/INSTALL.html ${HTMLDIR}/sqwebmail
+ ${INSTALL_DATA} ${WRKDIR}/calendarmode ${EGDIR}
+ ${INSTALL_DATA} ${WRKSRC}/sqwebmail/webmail.authpam ${EGDIR}
+ ${INSTALL_DATA_DIR} ${DOCDIR}/sqwebmail
+ ${INSTALL_DATA} ${WRKSRC}/COPYING ${DOCDIR}/sqwebmail
+ ${INSTALL_DATA} ${WRKSRC}/README.logindomainlist.html \
+ ${DOCDIR}/sqwebmail
+ ${INSTALL_DATA} ${WRKSRC}/INSTALL.html ${DOCDIR}/sqwebmail
${INSTALL_DATA} ${WRKSRC}/gpglib/README.html \
- ${HTMLDIR}/sqwebmail/README.gpg.html
+ ${DOCDIR}/sqwebmail/README.gpg.html
+ ${INSTALL_DATA} ${WRKSRC}/maildir/README.maildirfilter.html \
+ ${DOCDIR}/sqwebmail
${INSTALL_DATA} ${WRKSRC}/pcp/README.html \
- ${HTMLDIR}/sqwebmail/README.pcp.html
- ${INSTALL_DATA} ${WRKSRC}/sqwebmail/BUGS.html ${HTMLDIR}/sqwebmail
- ${INSTALL_DATA} ${WRKSRC}/sqwebmail/SECURITY.html ${HTMLDIR}/sqwebmail
- ${INSTALL_DATA} ${WRKSRC}/sqwebmail/webmail.authpam ${EGDIR}
+ ${DOCDIR}/sqwebmail/README.pcp.html
+ ${INSTALL_DATA} ${WRKSRC}/sqwebmail/BUGS.html ${DOCDIR}/sqwebmail
+ ${INSTALL_DATA} ${WRKSRC}/sqwebmail/SECURITY.html ${DOCDIR}/sqwebmail
.include "../../mk/bsd.pkg.mk"
diff -r 1a5f2e40eefb -r 0a085b9db1b3 mail/sqwebmail/PLIST
--- a/mail/sqwebmail/PLIST Wed Jul 14 20:07:16 2004 +0000
+++ b/mail/sqwebmail/PLIST Wed Jul 14 20:07:22 2004 +0000
@@ -1,10 +1,11 @@
-@comment $NetBSD: PLIST,v 1.2 2004/02/23 23:41:43 jlam Exp $
+@comment $NetBSD: PLIST,v 1.3 2004/07/14 20:07:22 jlam Exp $
libexec/cgi-bin/sqwebmail
libexec/courier/sqwebmail/makemime
libexec/courier/sqwebmail/pcpd
libexec/courier/sqwebmail/reformime
libexec/courier/sqwebmail/sqwebmaild
-sbin/sqwebmail.sysconftool
+libexec/courier/sqwebmaild.rc
+sbin/webgpg
share/courier/sqwebmail/cleancache.pl
share/courier/sqwebmail/html/en
share/courier/sqwebmail/html/en-us/CHARSET
@@ -14,6 +15,7 @@
share/courier/sqwebmail/html/en-us/LOCALE
share/courier/sqwebmail/html/en-us/TIMEZONELIST
share/courier/sqwebmail/html/en-us/abooklist.html
+share/courier/sqwebmail/html/en-us/acl.html
share/courier/sqwebmail/html/en-us/attachments.html
share/courier/sqwebmail/html/en-us/autoresponder.html
share/courier/sqwebmail/html/en-us/calendarlogin.inc.html
@@ -74,6 +76,7 @@
share/courier/sqwebmail/images/graybottomright.png
share/courier/sqwebmail/images/graytopleft.png
share/courier/sqwebmail/images/graytopright.png
+share/courier/sqwebmail/images/key.png
share/courier/sqwebmail/images/last.png
share/courier/sqwebmail/images/left.png
share/courier/sqwebmail/images/left2.png
@@ -102,17 +105,20 @@
share/courier/sqwebmail/ldapsearch
share/courier/sqwebmail/sendit.sh
share/courier/sqwebmail/webgpg
-share/doc/html/courier/sqwebmail/BUGS.html
-share/doc/html/courier/sqwebmail/COPYING
-share/doc/html/courier/sqwebmail/INSTALL.html
-share/doc/html/courier/sqwebmail/README.gpg.html
-share/doc/html/courier/sqwebmail/README.pcp.html
-share/doc/html/courier/sqwebmail/SECURITY.html
-share/examples/courier/authmodulelist
+share/doc/courier/sqwebmail/BUGS.html
+share/doc/courier/sqwebmail/COPYING
+share/doc/courier/sqwebmail/INSTALL.html
+share/doc/courier/sqwebmail/README.gpg.html
+share/doc/courier/sqwebmail/README.logindomainlist.html
+share/doc/courier/sqwebmail/README.maildirfilter.html
+share/doc/courier/sqwebmail/README.pcp.html
+share/doc/courier/sqwebmail/SECURITY.html
+share/examples/courier/calendarmode
share/examples/courier/ldapaddressbook.dist
+share/examples/courier/sqwebmaild.dist
share/examples/courier/webmail.authpam
@unexec ${RMDIR} -p %D/share/examples/courier 2>/dev/null || ${TRUE}
-@dirrm share/doc/html/courier/sqwebmail
+@dirrm share/doc/courier/sqwebmail
@unexec ${RMDIR} -p %D/share/doc/html/courier 2>/dev/null || ${TRUE}
@dirrm share/courier/sqwebmail/images
@dirrm share/courier/sqwebmail/html/en-us
diff -r 1a5f2e40eefb -r 0a085b9db1b3 mail/sqwebmail/distinfo
--- a/mail/sqwebmail/distinfo Wed Jul 14 20:07:16 2004 +0000
+++ b/mail/sqwebmail/distinfo Wed Jul 14 20:07:22 2004 +0000
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.3 2004/02/23 23:41:43 jlam Exp $
+$NetBSD: distinfo,v 1.4 2004/07/14 20:07:22 jlam Exp $
-SHA1 (sqwebmail-3.6.2.tar.bz2) = 718b4456c9429b37153e4d4e7a0801e4901aaa73
-Size (sqwebmail-3.6.2.tar.bz2) = 1649032 bytes
-SHA1 (patch-aa) = c879d95b44a9d7a02c8dd119ca5645add6f96e1e
-SHA1 (patch-ab) = a2cba8fbfd020e597a99111efc4a2522d68c2872
-SHA1 (patch-ad) = 47d4ae3b31e6765bf180155b7e7f1472ebf8966b
+SHA1 (sqwebmail-4.0.5.tar.bz2) = 46f9d56f7a4c41287ac487c057f42a678e41bdb4
+Size (sqwebmail-4.0.5.tar.bz2) = 1955841 bytes
+SHA1 (patch-aa) = 9bb3045b2048b40b37140d16fbd094f5c0c85087
+SHA1 (patch-ab) = d0325fa73df491819a590c6a18613a548a4ecd65
+SHA1 (patch-ad) = 9c43d45a1c00816827a7d2c543232bdefe73fe9b
+SHA1 (patch-ae) = 9962adec77332508c76e0c7a6ad5c0c0f33581e8
+SHA1 (patch-af) = 2d3aed6804f135ce3ca64c77aed90a9e6076907a
diff -r 1a5f2e40eefb -r 0a085b9db1b3 mail/sqwebmail/files/pcpd.sh
--- a/mail/sqwebmail/files/pcpd.sh Wed Jul 14 20:07:16 2004 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,51 +0,0 @@
-#!@RCD_SCRIPTS_SHELL@
-#
-# $NetBSD: pcpd.sh,v 1.2 2004/02/24 01:18:52 jlam Exp $
-#
-# Courier SqWebMail calendaring services daemon
-#
-# PROVIDE: pcpd
-# REQUIRE: authdaemond
-
-if [ -f /etc/rc.subr ]; then
- . /etc/rc.subr
-fi
-
-name="pcpd"
-rcvar=${name}
-command="@PREFIX@/libexec/courier/sqwebmail/pcpd"
-required_files="@PKG_SYSCONFDIR@/calendarmode"
-
-start_cmd="courier_doit start"
-stop_cmd="courier_doit stop"
-
-courier_doit()
-{
- action=$1
- case ${action} in
- start)
- for f in $required_files; do
- if [ ! -r "$f" ]; then
- @ECHO@ "$0: WARNING: $f is not readable"
- if [ -z $rc_force ]; then
- return 1
- fi
- fi
- done
- @ECHO@ "Starting ${name}."
- ;;
- stop)
- @ECHO@ "Stopping ${name}."
- ;;
- esac
-
- ${command} ${action}
-}
Home |
Main Index |
Thread Index |
Old Index