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 5.1.0. Change...
details: https://anonhg.NetBSD.org/pkgsrc/rev/c0a2aed8b326
branches: trunk
changeset: 512013:c0a2aed8b326
user: jlam <jlam%pkgsrc.org@localhost>
date: Fri Apr 28 18:16:25 2006 +0000
description:
Update mail/sqwebmail to 5.1.0. Changes from version 5.0.7 include:
+ Add an INSTALL script that detects the presence of the old
sqwebmail state directory and that informs the admin to move it
to the new location.
+ Install some more of the HTML documentation in the location expected
by courier-mta.
* Complete re-implementation of the LDAP addressbook.
* Increase the maximum size of the CGI environment to avoid certain
classes of browser/website problems.
diffstat:
mail/sqwebmail/INSTALL | 22 ++++++++++++
mail/sqwebmail/MESSAGE | 31 +++++++----------
mail/sqwebmail/Makefile | 69 ++++++++++++++++++++------------------
mail/sqwebmail/PLIST | 14 +++----
mail/sqwebmail/distinfo | 14 +++---
mail/sqwebmail/files/sqwebmail.sh | 27 +++-----------
mail/sqwebmail/patches/patch-ad | 21 +++--------
mail/sqwebmail/patches/patch-ah | 6 +-
mail/sqwebmail/patches/patch-aj | 6 +-
9 files changed, 103 insertions(+), 107 deletions(-)
diffs (truncated from 427 to 300 lines):
diff -r 6a8d9075eb0d -r c0a2aed8b326 mail/sqwebmail/INSTALL
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/sqwebmail/INSTALL Fri Apr 28 18:16:25 2006 +0000
@@ -0,0 +1,22 @@
+# $NetBSD: INSTALL,v 1.3 2006/04/28 18:16:25 jlam Exp $
+
+case ${STAGE} in
+POST-INSTALL)
+ if ${TEST} -d "@VARBASE@/sqwebmail"; then
+ ${CAT} << EOF
+===========================================================================
+
+If you are upgrading SqWebMail from a previous version, please note
+that the Courier directory for keeping local state has moved. In
+order to preserve your existing users' calendar information, you will
+need to move:
+
+ @VARBASE@/sqwebmail
+to
+ @SQWEBMAIL_STATEDIR@/sqwebmail
+
+===========================================================================
+EOF
+ fi
+ ;;
+esac
diff -r 6a8d9075eb0d -r c0a2aed8b326 mail/sqwebmail/MESSAGE
--- a/mail/sqwebmail/MESSAGE Fri Apr 28 18:15:20 2006 +0000
+++ b/mail/sqwebmail/MESSAGE Fri Apr 28 18:16:25 2006 +0000
@@ -1,5 +1,5 @@
===========================================================================
-$NetBSD: MESSAGE,v 1.6 2005/02/18 22:12:56 jlam Exp $
+$NetBSD: MESSAGE,v 1.7 2006/04/28 18:16:25 jlam Exp $
You must create a cron job that runs at regular intervals (one hour is
fine) that executes the following Perl script to clean the SqWebMail
@@ -7,27 +7,22 @@
${PKG_SYSCONFDIR}/cleancache.pl
-You will need to make SqWebMail accessible through your HTTP server by
-making URLs with path "${IMAGEURL}/" resolve to the images in
-${IMAGEDIR}.
+There are two things which must be done to make SqWebMail accessible
+through your HTTP server:
-For Apache, you can add the following to httpd.conf:
-
- <IfModule mod_alias.c>
- Alias ${IMAGEURL}/ "${IMAGEDIR}/"
- </IfModule>
+ (1) Copy the ``sqwebmail'' CGI binary to the appropriate place in your
+ HTTP document root, e.g. ${PREFIX}/libexec/cgi-bin, then Maildir
+ accounts would be accessible through:
-Also, certain versions of Microsoft Internet Explorer have a bug in their
-HTTP/1.1 protocol implementation that results in errors when downloading
-attachments. You should configure your HTTP server to force a HTTP/1.0
-protocol response for MSIE clients, e.g. for Apache, add the following to
-httpd.conf:
+ http://your.domain.com/cgi-bin/sqwebmail
- BrowserMatch "MSIE [45]" nokeepalive downgrade-1.0 force-response-1.0
+ (2) Make URLs with path ``${IMAGEURL}/'' resolve to the images located
+ in the ${IMAGEDIR} directory.
+ For Apache, you can add the following to httpd.conf:
-Maildir accounts will be accessible through:
-
- http://www.domain.com/cgi-bin/sqwebmail
+ <IfModule mod_alias.c>
+ Alias ${IMAGEURL}/ "${IMAGEDIR}/"
+ </IfModule>
If you're using a non-default sendmail program, you will need to edit:
diff -r 6a8d9075eb0d -r c0a2aed8b326 mail/sqwebmail/Makefile
--- a/mail/sqwebmail/Makefile Fri Apr 28 18:15:20 2006 +0000
+++ b/mail/sqwebmail/Makefile Fri Apr 28 18:16:25 2006 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.47 2006/03/14 01:14:30 jlam Exp $
+# $NetBSD: Makefile,v 1.48 2006/04/28 18:16:25 jlam Exp $
-DISTNAME= sqwebmail-5.0.7
-PKGREVISION= 2
+DISTNAME= sqwebmail-5.1.1
CATEGORIES= mail www
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=courier/}
EXTRACT_SUFX= .tar.bz2
@@ -10,10 +9,10 @@
COMMENT= Webmail CGI for access to maildir-style mailboxes
HOMEPAGE= http://www.courier-mta.org/sqwebmail/
-DEPENDS+= courier-maildir>=0.52.1:../../mail/courier-maildir
-DEPENDS+= maildrop>=1.8.1:../../mail/maildrop
+DEPENDS+= courier-maildir>=0.53.1:../../mail/courier-maildir
+DEPENDS+= maildrop>=2.0.1:../../mail/maildrop
-USE_TOOLS+= env gmake perl:run
+USE_TOOLS+= env gmake gzip:run perl:run
USE_LANGUAGES= c c++
USE_LIBTOOL= yes
@@ -21,14 +20,12 @@
# PKGNAME is a parameter to the following file.
PKGNAME= ${DISTNAME}
-.include "../../mail/courier-maildir/Makefile.common"
-
-.include "../../security/courier-authlib/Makefile.common"
+.include "../../mail/courier-mta/Makefile.common"
INSTALL_AM_MAKEFLAGS= sysconfdir=${EGDIR}
INSTALL_MAKE_FLAGS= ${MAKE_FLAGS} AM_MAKEFLAGS=${INSTALL_AM_MAKEFLAGS:Q}
-SQWEBMAIL_STATEDIR= ${VARBASE}/sqwebmail
+SQWEBMAIL_STATEDIR= ${COURIER_STATEDIR}/sqwebmail
SQWEBMAIL_CACHEDIR= ${SQWEBMAIL_STATEDIR}/logincache
SQWEBMAIL_CALENDARDIR= ${SQWEBMAIL_STATEDIR}/calendar
SQWEBMAIL_IMAGEDIR= ${PREFIX}/share/courier/sqwebmail/images
@@ -49,7 +46,7 @@
CONFIGURE_ARGS+= --datadir=${PREFIX}/share/courier
CONFIGURE_ARGS+= --program-transform-name='s/\.rc$$//'
-CONFIGURE_ARGS+= --enable-cgibindir=${PREFIX}/libexec/cgi-bin
+CONFIGURE_ARGS+= --enable-cgibindir=${PREFIX}/libexec/courier/cgi-bin
CONFIGURE_ARGS+= --enable-https=auto
CONFIGURE_ARGS+= --enable-imagedir=${SQWEBMAIL_IMAGEDIR:Q}
CONFIGURE_ARGS+= --enable-imageurl=${SQWEBMAIL_IMAGEURL:Q}
@@ -62,11 +59,15 @@
CONFIGURE_ARGS+= --with-mailgroup=${COURIER_GROUP:Q}
CONFIGURE_ARGS+= --with-piddir=${VARBASE}/run
+CONFIGURE_ENV+= GZIP=${TOOLS_PATH.gzip:Q}
CONFIGURE_ENV+= GPG="${LOCALBASE}/bin/gpg"
CONFIGURE_ENV+= ldapsearch="${LOCALBASE}/bin/ldapsearch"
-MAKE_DIRS= ${VARBASE}/run
-OWN_DIRS= ${SQWEBMAIL_STATEDIR}
+REQD_DIRS+= ${DATADIR} ${DOCDIR} ${EGDIR} ${LIBEXECDIR}
+REQD_DIRS_PERMS+= ${LIBEXECDIR}/cgi-bin \
+ ${ROOT_USER} ${ROOT_GROUP} 0700
+MAKE_DIRS+= ${VARBASE}/run ${LOCALSTATEDIR}
+OWN_DIRS+= ${SQWEBMAIL_STATEDIR}
OWN_DIRS+= ${SQWEBMAIL_CACHEDIR}
OWN_DIRS_PERMS= ${SQWEBMAIL_CALENDARDIR} \
${ROOT_USER} ${COURIER_GROUP} 0755
@@ -77,24 +78,21 @@
OWN_DIRS_PERMS+= ${SQWEBMAIL_CALENDARDIR}/localcache \
${ROOT_USER} ${COURIER_GROUP} 0700
-GEN_FILES= ldapaddressbook sqwebmaild
-FILES_SUBST+= GEN_FILES=${GEN_FILES:Q}
-
-.for FILE in ${GEN_FILES}
-CONF_FILES+= ${EGDIR}/${FILE}.dist ${PKG_SYSCONFDIR}/${FILE}
+.for _file_ in calendarmode ldapaddressbook.dist sqwebmaild.dist
+CONF_FILES_PERMS+= ${EGDIR}/${_file_} \
+ ${PKG_SYSCONFDIR}/${_file_:S/.dist$//} \
+ ${COURIER_FILE_PERMS}
.endfor
-CONF_FILES+= ${EGDIR}/calendarmode ${PKG_SYSCONFDIR}/calendarmode
-CONF_FILES_PERMS= # empty
-.for FILE in cleancache.pl ldapsearch sendit.sh
-CONF_FILES_PERMS+= ${PREFIX}/share/courier/sqwebmail/${FILE} \
- ${PKG_SYSCONFDIR}/${FILE} \
- ${ROOT_USER} ${ROOT_GROUP} 0755
+.for _file_ in cleancache.pl ldapsearch sendit.sh
+CONF_FILES_PERMS+= ${PREFIX}/share/courier/sqwebmail/${_file_} \
+ ${PKG_SYSCONFDIR}/${_file_} \
+ ${COURIER_SCRIPT_PERMS}
.endfor
-SPECIAL_PERMS= libexec/courier/sqwebpasswd \
+SPECIAL_PERMS= ${LIBEXECDIR}/sqwebpasswd \
${COURIER_USER} ${COURIER_GROUP} 2755
+
RCD_SCRIPTS= sqwebmail
-
-INSTALLATION_DIRS= bin man/man1 sbin
+INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 sbin
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../security/courier-authlib/buildlink3.mk"
@@ -103,14 +101,21 @@
post-build:
${ECHO} "local" > ${WRKDIR}/calendarmode
-post-install:
- ${INSTALL_SCRIPT} ${WRKSRC}/gpglib/webgpg ${PREFIX}/sbin
+# The sqwebmail install target incorrectly overwrites the mode on
+# cgi-bin directory, so fix it back to the right value.
+#
+fix-perms:
+ ${CHMOD} 0700 ${LIBEXECDIR}/cgi-bin
+
+post-install: fix-perms
+ ${LN} -s ${PREFIX}/share/courier/sqwebmail/webgpg ${PREFIX}/sbin
${INSTALL_PROGRAM} ${WRKSRC}/gpglib/mimegpg ${PREFIX}/bin
- ${INSTALL_MAN} ${WRKSRC}/gpglib/mimegpg.1 ${PREFIX}/man/man1
+ ${INSTALL_MAN} ${WRKSRC}/gpglib/mimegpg.1 ${PREFIX}/${PKGMANDIR}/man1
+ ${INSTALL_DATA} ${WRKSRC}/gpglib/mimegpg.html ${DOCDIR}
${INSTALL_DATA_DIR} ${EGDIR}
${INSTALL_DATA} ${WRKDIR}/calendarmode ${EGDIR}
${INSTALL_DATA} ${WRKSRC}/sqwebmail/sqwebmail.pamconf \
- ${EGDIR}/webmail.pam
+ ${EGDIR}/webmail.authpam
${INSTALL_DATA_DIR} ${DOCDIR}/sqwebmail
${INSTALL_DATA} ${WRKSRC}/README.logindomainlist.html \
${DOCDIR}/sqwebmail
@@ -118,7 +123,7 @@
${INSTALL_DATA} ${WRKSRC}/gpglib/README.html \
${DOCDIR}/sqwebmail/README.gpg.html
${INSTALL_DATA} ${WRKSRC}/pcp/README.html \
- ${DOCDIR}/sqwebmail/README.pcp.html
+ ${DOCDIR}/pcp_README.html
${INSTALL_DATA} ${WRKSRC}/sqwebmail/BUGS.html ${DOCDIR}/sqwebmail
${INSTALL_DATA} ${WRKSRC}/sqwebmail/SECURITY.html ${DOCDIR}/sqwebmail
diff -r 6a8d9075eb0d -r c0a2aed8b326 mail/sqwebmail/PLIST
--- a/mail/sqwebmail/PLIST Fri Apr 28 18:15:20 2006 +0000
+++ b/mail/sqwebmail/PLIST Fri Apr 28 18:16:25 2006 +0000
@@ -1,6 +1,6 @@
-@comment $NetBSD: PLIST,v 1.6 2006/01/03 05:59:12 jlam Exp $
+@comment $NetBSD: PLIST,v 1.7 2006/04/28 18:16:25 jlam Exp $
bin/mimegpg
-libexec/cgi-bin/sqwebmail
+libexec/courier/cgi-bin/sqwebmail
libexec/courier/pcpd
libexec/courier/sqwebmaild
libexec/courier/sqwebpasswd
@@ -106,23 +106,21 @@
share/courier/sqwebmail/images/wikifmt.html
share/courier/sqwebmail/ldapsearch
share/courier/sqwebmail/sendit.sh
+share/courier/sqwebmail/webgpg
+share/doc/courier/mimegpg.html
+share/doc/courier/pcp_README.html
share/doc/courier/sqwebmail/BUGS.html
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.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.pam
+share/examples/courier/webmail.authpam
share/examples/rc.d/sqwebmail
-@unexec ${RMDIR} -p %D/share/examples/courier 2>/dev/null || ${TRUE}
@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
@dirrm share/courier/sqwebmail/html
@dirrm share/courier/sqwebmail
-@unexec ${RMDIR} -p %D/share/courier 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} -p %D/libexec/courier 2>/dev/null || ${TRUE}
diff -r 6a8d9075eb0d -r c0a2aed8b326 mail/sqwebmail/distinfo
--- a/mail/sqwebmail/distinfo Fri Apr 28 18:15:20 2006 +0000
+++ b/mail/sqwebmail/distinfo Fri Apr 28 18:16:25 2006 +0000
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.13 2006/01/03 05:59:12 jlam Exp $
+$NetBSD: distinfo,v 1.14 2006/04/28 18:16:25 jlam Exp $
-SHA1 (sqwebmail-5.0.7.tar.bz2) = 32c5a8b36e2a329ba28263491a165bab946c7c48
-RMD160 (sqwebmail-5.0.7.tar.bz2) = 81bfd353f52803436009962a07a571f6fc973b9a
-Size (sqwebmail-5.0.7.tar.bz2) = 3559891 bytes
+SHA1 (sqwebmail-5.1.1.tar.bz2) = e86038cba592be05d74aff71b63bed3e8d99d9d7
+RMD160 (sqwebmail-5.1.1.tar.bz2) = 08d0aca1d6fb512349532f6460202f35c32af3b4
+Size (sqwebmail-5.1.1.tar.bz2) = 3747059 bytes
SHA1 (patch-aa) = 5f263487244e8127845050a19d3b68356f846aa2
-SHA1 (patch-ad) = 5207b327b2e88bc75a820fcd7467a8ddf207bfb3
-SHA1 (patch-ah) = 8624f6bc7453ee2544a18e0bd1d7d2e0044c083f
+SHA1 (patch-ad) = abfadf45c5f85fea963ff18ca17fbee948e4572e
+SHA1 (patch-ah) = daf02c2c3de74b6e6a4ed0b077759ebc6775756e
SHA1 (patch-ai) = def2f4d30bf5f15ea78f401f3c4ca2f2ec8c0ad2
-SHA1 (patch-aj) = 9341a88e5b3894bbb9121083d2edcc14193308e7
+SHA1 (patch-aj) = 2ad7d2500a54ca4f94ba00aaab89df29adcf864e
diff -r 6a8d9075eb0d -r c0a2aed8b326 mail/sqwebmail/files/sqwebmail.sh
--- a/mail/sqwebmail/files/sqwebmail.sh Fri Apr 28 18:15:20 2006 +0000
+++ b/mail/sqwebmail/files/sqwebmail.sh Fri Apr 28 18:16:25 2006 +0000
@@ -1,11 +1,12 @@
#!@RCD_SCRIPTS_SHELL@
#
-# $NetBSD: sqwebmail.sh,v 1.3 2005/02/18 22:12:56 jlam Exp $
+# $NetBSD: sqwebmail.sh,v 1.4 2006/04/28 18:16:25 jlam Exp $
#
# Courier SqWebMail services daemon
#
# PROVIDE: sqwebmail
# REQUIRE: authdaemond
+# KEYWORD: shutdown
. /etc/rc.subr
@@ -15,7 +16,6 @@
ctl_command="@PREFIX@/sbin/sqwebmaild"
pidfile="@VARBASE@/run/sqwebmaild.pid"
required_files="@PKG_SYSCONFDIR@/calendarmode @PKG_SYSCONFDIR@/sqwebmaild"
Home |
Main Index |
Thread Index |
Old Index