pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc Update mail/sqwebmail to 3.6.2. Changes from version ...
details: https://anonhg.NetBSD.org/pkgsrc/rev/12b92f37b0ff
branches: trunk
changeset: 469476:12b92f37b0ff
user: jlam <jlam%pkgsrc.org@localhost>
date: Mon Feb 23 23:41:42 2004 +0000
description:
Update mail/sqwebmail to 3.6.2. Changes from version 3.3.1 include:
Split sqwebmail into sqwebmail and sqwebmaild. sqwebmaild is now a
root daemon process that listens on a UNIX domain socket. sqwebmail
is a tiny, unprivileged cgi-bin stub that forwards the HTTP request
to the daemon process. The stub passes the client's file descriptor
to sqwebmaild, on platforms that support passing file descriptors,
else it proxies http traffic in both directions.
Replace GIFs with PNGs
Do GPG functions via a library instead of invoking mimegpg.
RFC 2231 support
diffstat:
doc/CHANGES | 3 +-
mail/sqwebmail/DEINSTALL | 3 +-
mail/sqwebmail/MESSAGE | 22 +++++--
mail/sqwebmail/Makefile | 90 ++++++++++++++++++++------------
mail/sqwebmail/PLIST | 100 +++++++++++++++++++++---------------
mail/sqwebmail/distinfo | 14 ++--
mail/sqwebmail/files/pcpd.sh | 39 ++++++++++++++
mail/sqwebmail/files/sqwebmaild.sh | 39 ++++++++++++++
mail/sqwebmail/patches/patch-aa | 62 +++++++++-------------
mail/sqwebmail/patches/patch-ab | 33 ++---------
mail/sqwebmail/patches/patch-ac | 12 ----
mail/sqwebmail/patches/patch-ad | 10 +-
mail/sqwebmail/patches/patch-ae | 10 ---
13 files changed, 254 insertions(+), 183 deletions(-)
diffs (truncated from 646 to 300 lines):
diff -r b3bc3c62e7b9 -r 12b92f37b0ff doc/CHANGES
--- a/doc/CHANGES Mon Feb 23 23:28:37 2004 +0000
+++ b/doc/CHANGES Mon Feb 23 23:41:42 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.4980 2004/02/23 23:28:37 wulf Exp $
+$NetBSD: CHANGES,v 1.4981 2004/02/23 23:41:42 jlam Exp $
Changes to the packages collection and infrastructure in 2004:
@@ -1006,3 +1006,4 @@
Updated libxml2 to 2.6.7 [xtraeme 2004-02-23]
Updated aspell to 0.50.5 [snj 2004-02-23]
Added xdx-1.1 [wulf 2004-02-24]
+ Updated sqwebmail to 3.6.2 [snj 2004-02-24]
diff -r b3bc3c62e7b9 -r 12b92f37b0ff mail/sqwebmail/DEINSTALL
--- a/mail/sqwebmail/DEINSTALL Mon Feb 23 23:28:37 2004 +0000
+++ b/mail/sqwebmail/DEINSTALL Mon Feb 23 23:41:42 2004 +0000
@@ -1,8 +1,9 @@
-# $NetBSD: DEINSTALL,v 1.1.1.1 2002/01/24 07:23:44 jlam Exp $
+# $NetBSD: DEINSTALL,v 1.2 2004/02/23 23:41:43 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"
diff -r b3bc3c62e7b9 -r 12b92f37b0ff mail/sqwebmail/MESSAGE
--- a/mail/sqwebmail/MESSAGE Mon Feb 23 23:28:37 2004 +0000
+++ b/mail/sqwebmail/MESSAGE Mon Feb 23 23:41:42 2004 +0000
@@ -1,17 +1,20 @@
===========================================================================
-$NetBSD: MESSAGE,v 1.4 2002/09/24 12:30:15 wiz Exp $
+$NetBSD: MESSAGE,v 1.5 2004/02/23 23:41:43 jlam Exp $
-You must create a cron job that runs at regular intervals to clean the
-SqWebMail user cache that executes the following script:
+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
+user cache:
${PREFIX}/share/courier/sqwebmail/cleancache.pl
You will need to make SqWebMail accessible through your HTTP server by
-making URLs with path "/images/sqwebmail/" resolve to the images in
-${IMAGEDIR}, e.g. for Apache, add the following to httpd.conf:
+making URLs with path "${IMAGEURL}/" resolve to the images in
+${IMAGEDIR}.
+
+For Apache, you can add the following to httpd.conf:
<IfModule mod_alias.c>
- Alias /images/sqwebmail/ "${IMAGEDIR}/"
+ Alias ${IMAGEURL}/ "${IMAGEDIR}/"
</IfModule>
Also, certain versions of Microsoft Internet Explorer have a bug in their
@@ -26,8 +29,13 @@
http://www.domain.com/cgi-bin/sqwebmail
-If you're using a non-default mailer, you will need to edit:
+If you're using a non-default sendmail program, you will need to edit:
${PKG_SYSCONFDIR}/sendit.sh
+To use GPG with SqWebMail, you will need to install the security/gnupg
+package and you should read the documentation at:
+
+ ${PREFIX}/share/doc/html/courier/sqwebmail/README.gpg.html
+
===========================================================================
diff -r b3bc3c62e7b9 -r 12b92f37b0ff mail/sqwebmail/Makefile
--- a/mail/sqwebmail/Makefile Mon Feb 23 23:28:37 2004 +0000
+++ b/mail/sqwebmail/Makefile Mon Feb 23 23:41:42 2004 +0000
@@ -1,13 +1,15 @@
-# $NetBSD: Makefile,v 1.15 2004/01/07 02:21:16 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2004/02/23 23:41:43 jlam Exp $
-DISTNAME= sqwebmail-3.3.1
-CATEGORIES= www
-COMMENT= Webmail CGI for access to local Maildir-style mailboxes
+DISTNAME= sqwebmail-3.6.2
+CATEGORIES= mail www
+COMMENT= webmail CGI for access to local Maildir-style mailboxes
HOMEPAGE= http://www.inter7.com/sqwebmail/
-DEPENDS+= courier-auth>=0.37.1nb1:../../mail/courier-auth
-DEPENDS+= courier-maildirmake>=0.37.1nb1:../../mail/courier-maildirmake
+DEPENDS+= courier-auth>=${BASE_VERS}:../../mail/courier-auth
+DEPENDS+= courier-maildirmake>=${BASE_VERS}:../../mail/courier-maildirmake
+USE_BUILDLINK3= yes
+USE_LANGUAGES= c c++
USE_PERL5= yes
REPLACE_PERL= sysconftool
@@ -15,33 +17,45 @@
DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL
INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL
-.include "../../mail/courier-auth/Makefile.common"
+.include "../courier-auth/Makefile.common"
.if defined(_STRIPFLAG_INSTALL) && !empty(_STRIPFLAG_INSTALL:M-s)
INSTALL_TARGET= install-strip
.endif
-
-MAIL_GROUP?= mail
+INSTALL_MAKE_FLAGS= ${MAKE_FLAGS} sysconfdir=${EGDIR}
STATEDIR= /var/sqwebmail
CACHEDIR= ${STATEDIR}/cache
CALENDARDIR= ${STATEDIR}/calendar
-IMAGEDIR= ${DATADIR}/sqwebmail/images
-HTMLDIR= ${PREFIX}/share/doc/html/sqwebmail
+SQWEBMAIL_HTMLDIR= ${DATADIR}/sqwebmail/html
+SQWEBMAIL_IMAGEDIR= ${DATADIR}/sqwebmail/images
+SQWEBMAIL_IMAGEURL?= /sqwebmail
+BUILD_DEFS+= SQWEBMAIL_IMAGEURL
+
+SENDMAIL?= /usr/sbin/sendmail
+
+# This is used by the sqwebmail configure script to set the location of
+# the sqwebmaild socket file, lockfile, and pidfile.
+#
+CONFIGURE_ARGS+= --localstatedir=${STATEDIR}
CONFIGURE_ARGS+= --with-cachedir=${CACHEDIR}
CONFIGURE_ARGS+= --with-calendardir=${CALENDARDIR}
CONFIGURE_ARGS+= --with-cacheowner=${ROOT_USER}
-CONFIGURE_ARGS+= --with-mailer=/usr/sbin/sendmail
+CONFIGURE_ARGS+= --with-mailer=${SENDMAIL}
CONFIGURE_ARGS+= --enable-https=auto
CONFIGURE_ARGS+= --enable-cgibindir=${PREFIX}/libexec/cgi-bin
-CONFIGURE_ARGS+= --enable-imagedir=${IMAGEDIR}
-CONFIGURE_ARGS+= --enable-imageurl=/images/sqwebmail
+CONFIGURE_ARGS+= --with-htmldir=${SQWEBMAIL_HTMLDIR}
+CONFIGURE_ARGS+= --enable-imagedir=${SQWEBMAIL_IMAGEDIR}
+CONFIGURE_ARGS+= --enable-imageurl=${SQWEBMAIL_IMAGEURL}
MIME_TYPES= ${PKG_SYSCONFDIR}/mime.types:${PKG_SYSCONFBASEDIR}/httpd/mime.types:${PREFIX}/etc/mime.types:/etc/mime.types
CONFIGURE_ARGS+= --enable-mimetypes="${MIME_TYPES}"
CONFIGURE_ARGS+= --with-ispell="${LOCALBASE}/bin/ispell"
+CONFIGURE_ENV+= GPG="${LOCALBASE}/bin/gpg"
+CONFIGURE_ENV+= ldapsearch="${LOCALBASE}/bin/ldapsearch"
+MAIL_GROUP?= mail
PKG_GROUPS= ${MAIL_GROUP}
OWN_DIRS= ${STATEDIR}
@@ -53,8 +67,13 @@
SYSCONFTOOL= ${PREFIX}/sbin/sqwebmail.sysconftool
GEN_FILES= ldapaddressbook
+FILES_SUBST+= SYSCONFTOOL=${SYSCONFTOOL:Q}
+FILES_SUBST+= GEN_FILES=${GEN_FILES:Q}
+MESSAGE_SUBST+= IMAGEDIR=${SQWEBMAIL_IMAGEDIR}
+MESSAGE_SUBST+= IMAGEURL=${SQWEBMAIL_IMAGEURL}
-CONF_FILES= ${EGDIR}/authmodulelist ${PKG_SYSCONFDIR}/authmodulelist
+SUPPORT_FILES= ${EGDIR}/authmodulelist ${PKG_SYSCONFDIR}/authmodulelist
+SUPPORT_FILES+= /dev/null ${PKG_SYSCONFDIR}/nodsn
.for FILE in ${GEN_FILES}
CONF_FILES+= ${EGDIR}/${FILE}.dist ${PKG_SYSCONFDIR}/${FILE}
.endfor
@@ -64,31 +83,32 @@
${PKG_SYSCONFDIR}/${FILE} \
${ROOT_USER} ${ROOT_GROUP} 0755
.endfor
+RCD_SCRIPTS= pcpd sqwebmaild
-FILES_SUBST+= SYSCONFTOOL=${SYSCONFTOOL:Q}
-FILES_SUBST+= GEN_FILES=${GEN_FILES:Q}
-MESSAGE_SUBST+= IMAGEDIR=${IMAGEDIR}
+.include "../../devel/gettext-lib/buildlink3.mk"
-pre-configure: configure-init
-
-post-configure:
- cd ${WRKSRC}/ldapaddressbook; for file in ldapsearch; do \
- ${SED} -e "s|@SED@|${SED}|g" $${file} > $${file}.new; \
- ${MV} -f $${file}.new $${file}; \
+pre-configure:
+ for file in ${WRKSRC}/sqwebmail/Makefile.in; do \
+ ${MV} -f $$file $$file.bak; \
+ ${SED} -e "s|@htmldir@|${SQWEBMAIL_HTMLDIR}|g" \
+ -e "s|@scriptdir@|@datadir@/sqwebmail|g" \
+ $$file.bak > $$file; \
done
post-install:
+ ${INSTALL_DATA_DIR} ${EGDIR}
+ ${INSTALL_DATA_DIR} ${HTMLDIR}
+ ${INSTALL_DATA_DIR} ${HTMLDIR}/pcp
+ ${INSTALL_DATA_DIR} ${HTMLDIR}/sqwebmail
${INSTALL_SCRIPT} ${WRKSRC}/sysconftool ${SYSCONFTOOL}
- for file in ldapaddressbook.dist; do \
- ${INSTALL_DATA} ${PKG_SYSCONFDIR}/$${file} ${EGDIR}; \
- ${RM} -f ${PKG_SYSCONFDIR}/$${file}; \
- done
- cd ${WRKSRC}; ${INSTALL_DATA} sqwebmail/webmail.authpam \
- ${EGDIR}/webmail.pam
- ${INSTALL_DATA_DIR} ${HTMLDIR} ${HTMLDIR}/sqwebmail ${HTMLDIR}/pcp
- cd ${WRKSRC}; ${INSTALL_DATA} COPYING INSTALL.html ${HTMLDIR}
- cd ${WRKSRC}/pcp; ${INSTALL_DATA} README.html ${HTMLDIR}/pcp
- cd ${WRKSRC}/sqwebmail; ${INSTALL_DATA} BUGS.html SECURITY.html \
- ${HTMLDIR}/sqwebmail
+ ${INSTALL_DATA} ${WRKSRC}/COPYING ${HTMLDIR}/sqwebmail
+ ${INSTALL_DATA} ${WRKSRC}/INSTALL.html ${HTMLDIR}/sqwebmail
+ ${INSTALL_DATA} ${WRKSRC}/gpglib/README.html \
+ ${HTMLDIR}/sqwebmail/README.gpg.html
+ ${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}
.include "../../mk/bsd.pkg.mk"
diff -r b3bc3c62e7b9 -r 12b92f37b0ff mail/sqwebmail/PLIST
--- a/mail/sqwebmail/PLIST Mon Feb 23 23:28:37 2004 +0000
+++ b/mail/sqwebmail/PLIST Mon Feb 23 23:41:42 2004 +0000
@@ -1,7 +1,9 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/01/24 07:23:44 jlam Exp $
+@comment $NetBSD: PLIST,v 1.2 2004/02/23 23:41:43 jlam Exp $
libexec/cgi-bin/sqwebmail
-libexec/courier/sqwebmail/mimegpg
+libexec/courier/sqwebmail/makemime
libexec/courier/sqwebmail/pcpd
+libexec/courier/sqwebmail/reformime
+libexec/courier/sqwebmail/sqwebmaild
sbin/sqwebmail.sysconftool
share/courier/sqwebmail/cleancache.pl
share/courier/sqwebmail/html/en
@@ -50,54 +52,68 @@
share/courier/sqwebmail/html/en-us/quickadd.html
share/courier/sqwebmail/html/en-us/readmsg.html
share/courier/sqwebmail/html/en-us/redirect.html
+share/courier/sqwebmail/html/en-us/smileys.txt
share/courier/sqwebmail/html/en-us/spellchk.html
-share/courier/sqwebmail/images/bg.gif
-share/courier/sqwebmail/images/bluebottomleft.gif
-share/courier/sqwebmail/images/bluebottomright.gif
-share/courier/sqwebmail/images/bluetopleft.gif
-share/courier/sqwebmail/images/bluetopright.gif
-share/courier/sqwebmail/images/calendar.gif
-share/courier/sqwebmail/images/cancel.gif
-share/courier/sqwebmail/images/folder.gif
-share/courier/sqwebmail/images/folder2.gif
-share/courier/sqwebmail/images/folders.gif
-share/courier/sqwebmail/images/forward.gif
-share/courier/sqwebmail/images/forwardatt.gif
-share/courier/sqwebmail/images/fullheaders.gif
-share/courier/sqwebmail/images/graybottomleft.gif
-share/courier/sqwebmail/images/graybottomright.gif
-share/courier/sqwebmail/images/graytopleft.gif
-share/courier/sqwebmail/images/graytopright.gif
-share/courier/sqwebmail/images/left.gif
-share/courier/sqwebmail/images/left2.gif
-share/courier/sqwebmail/images/logo.gif
-share/courier/sqwebmail/images/print.gif
-share/courier/sqwebmail/images/reply.gif
-share/courier/sqwebmail/images/replyall.gif
-share/courier/sqwebmail/images/replylist.gif
-share/courier/sqwebmail/images/right.gif
-share/courier/sqwebmail/images/right2.gif
-share/courier/sqwebmail/images/save.gif
-share/courier/sqwebmail/images/sep.gif
-share/courier/sqwebmail/images/signin.gif
+share/courier/sqwebmail/images/bg.png
+share/courier/sqwebmail/images/bluebottomleft.png
+share/courier/sqwebmail/images/bluebottomright.png
+share/courier/sqwebmail/images/bluetopleft.png
+share/courier/sqwebmail/images/bluetopright.png
+share/courier/sqwebmail/images/calendar.png
+share/courier/sqwebmail/images/cancel.png
+share/courier/sqwebmail/images/eventadd.png
+share/courier/sqwebmail/images/eventedit.png
+share/courier/sqwebmail/images/first.png
+share/courier/sqwebmail/images/folder.png
+share/courier/sqwebmail/images/folder2.png
+share/courier/sqwebmail/images/folders.png
+share/courier/sqwebmail/images/forward.png
+share/courier/sqwebmail/images/forwardatt.png
+share/courier/sqwebmail/images/fullheaders.png
+share/courier/sqwebmail/images/graybottomleft.png
+share/courier/sqwebmail/images/graybottomright.png
+share/courier/sqwebmail/images/graytopleft.png
+share/courier/sqwebmail/images/graytopright.png
+share/courier/sqwebmail/images/last.png
+share/courier/sqwebmail/images/left.png
+share/courier/sqwebmail/images/left2.png
+share/courier/sqwebmail/images/logo.png
+share/courier/sqwebmail/images/print.png
+share/courier/sqwebmail/images/reply.png
+share/courier/sqwebmail/images/replyall.png
+share/courier/sqwebmail/images/replylist.png
+share/courier/sqwebmail/images/right.png
+share/courier/sqwebmail/images/right2.png
Home |
Main Index |
Thread Index |
Old Index