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 version 5.0.0....
details: https://anonhg.NetBSD.org/pkgsrc/rev/f645c0f9ee4b
branches: trunk
changeset: 489235:f645c0f9ee4b
user: jlam <jlam%pkgsrc.org@localhost>
date: Fri Feb 18 22:12:56 2005 +0000
description:
Update mail/sqwebmail to version 5.0.0. Changes from version 4.0.5
include:
* log login failures.
* Replace 'nodsn' control file with 'wbnodsn' account option. Replace
'nochangepass' control file with 'wbnochangepass' account option.
Replace 'nochangingfrom' control file with 'wbnochangingfrom' account
option. Replace usexsender with 'wbusexsender' and noimages with
'wbnoimages'.
* Fix off-by 1 in GPG key export.
diffstat:
mail/sqwebmail/DEINSTALL | 38 +++++++----
mail/sqwebmail/DESCR | 6 +-
mail/sqwebmail/MESSAGE | 6 +-
mail/sqwebmail/Makefile | 123 ++++++++++++++++++++-----------------
mail/sqwebmail/PLIST | 19 ++---
mail/sqwebmail/distinfo | 18 +++--
mail/sqwebmail/files/sqwebmail.sh | 19 +----
mail/sqwebmail/patches/patch-aa | 94 +++++++---------------------
mail/sqwebmail/patches/patch-ab | 13 ----
mail/sqwebmail/patches/patch-ad | 44 +++++++++++--
mail/sqwebmail/patches/patch-af | 20 ++++++
mail/sqwebmail/patches/patch-ag | 13 ++++
mail/sqwebmail/patches/patch-ah | 13 ++++
mail/sqwebmail/patches/patch-ai | 38 +++++++++++
mail/sqwebmail/patches/patch-aj | 13 ++++
15 files changed, 280 insertions(+), 197 deletions(-)
diffs (truncated from 690 to 300 lines):
diff -r 3ce67397a1ce -r f645c0f9ee4b mail/sqwebmail/DEINSTALL
--- a/mail/sqwebmail/DEINSTALL Fri Feb 18 22:12:53 2005 +0000
+++ b/mail/sqwebmail/DEINSTALL Fri Feb 18 22:12:56 2005 +0000
@@ -1,17 +1,29 @@
-# $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}/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"
+# $NetBSD: DEINSTALL,v 1.4 2005/02/18 22:12:56 jlam Exp $
case ${STAGE} in
DEINSTALL)
- # Unconditionally remove the SqWebMail socket.
- ${RM} -f @SQWEBMAIL_STATEDIR@/sqwebmail.sock
+ #
+ # Note some additional files that may be created by the sysadmin
+ # that can probably be removed.
+ #
+ if ${TEST} -x ./+FILES; then
+ for file in \
+ ${PKG_SYSCONFDIR}/authcharset \
+ ${PKG_SYSCONFDIR}/autoresponsesquota \
+ ${PKG_SYSCONFDIR}/defaultdomain \
+ ${PKG_SYSCONFDIR}/logindomainlist \
+ ${PKG_SYSCONFDIR}/maildirfilterconfig
+ do
+ ${ECHO} "# FILE: $file . /dev/null" >> ./+FILES
+ done
+ fi
+
+ sockfile="@SQWEBMAIL_STATEDIR@/sqwebmail.sock"
+ if ${TEST} -f "$sockfile"; then
+ # Unconditionally remove the SqWebMail socket.
+ ${ECHO} "Removing sqwebmail socket file:"
+ ${ECHO} " $sockfile"
+ ${RM} -f $sockfile
+ fi
+ ;;
esac
diff -r 3ce67397a1ce -r f645c0f9ee4b mail/sqwebmail/DESCR
--- a/mail/sqwebmail/DESCR Fri Feb 18 22:12:53 2005 +0000
+++ b/mail/sqwebmail/DESCR Fri Feb 18 22:12:56 2005 +0000
@@ -1,3 +1,7 @@
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.
+from maildirs. It also contains a web-based calendar application.
+
+This package differs from a vanilla SqWebMail installation in that
+the files are installed at locations that more closely correspond to
+a Courier installation.
diff -r 3ce67397a1ce -r f645c0f9ee4b mail/sqwebmail/MESSAGE
--- a/mail/sqwebmail/MESSAGE Fri Feb 18 22:12:53 2005 +0000
+++ b/mail/sqwebmail/MESSAGE Fri Feb 18 22:12:56 2005 +0000
@@ -1,11 +1,11 @@
===========================================================================
-$NetBSD: MESSAGE,v 1.5 2004/02/23 23:41:43 jlam Exp $
+$NetBSD: MESSAGE,v 1.6 2005/02/18 22:12:56 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
user cache:
- ${PREFIX}/share/courier/sqwebmail/cleancache.pl
+ ${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
@@ -36,6 +36,6 @@
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
+ ${PREFIX}/share/doc/courier/sqwebmail/README.gpg.html
===========================================================================
diff -r 3ce67397a1ce -r f645c0f9ee4b mail/sqwebmail/Makefile
--- a/mail/sqwebmail/Makefile Fri Feb 18 22:12:53 2005 +0000
+++ b/mail/sqwebmail/Makefile Fri Feb 18 22:12:56 2005 +0000
@@ -1,116 +1,125 @@
-# $NetBSD: Makefile,v 1.26 2004/12/28 02:47:45 reed Exp $
+# $NetBSD: Makefile,v 1.27 2005/02/18 22:12:56 jlam Exp $
+
+DISTNAME= sqwebmail-5.0.0
+PKGBASE= ${DISTNAME:C/-[^-]*$//}
+CATEGORIES= mail www
+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=courier/}
+EXTRACT_SUFX= .tar.bz2
-DISTNAME= sqwebmail-4.0.5
-PKGREVISION= 2
-CATEGORIES= www
-COMMENT= webmail CGI for access to local maildir-style mailboxes
-HOMEPAGE= http://www.inter7.com/sqwebmail/
+MAINTAINER= jlam%NetBSD.org@localhost
+COMMENT= webmail CGI for access to maildir-style mailboxes
+HOMEPAGE= http://www.courier-mta.org/sqwebmail/
-DEPENDS+= courier-auth>=${BASE_VERS}:../../mail/courier-auth
-DEPENDS+= courier-maildir>=${BASE_VERS}:../../mail/courier-maildir
+DEPENDS+= courier-maildir>=0.48.2:../../mail/courier-maildir
+DEPENDS+= maildrop>=1.8.0:../../mail/maildrop
+USE_GNU_TOOLS+= make
+USE_LANGUAGES= c c++
USE_BUILDLINK3= yes
-USE_LANGUAGES= c c++
+USE_LIBTOOL= yes
USE_PERL5= yes
-USE_PKGINSTALL= yes
-DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL
-INSTALL_EXTRA_TMPL+= ${.CURDIR}/../courier-auth/INSTALL
-
-.include "../courier-auth/Makefile.common"
+.include "../../mail/courier-maildir/Makefile.common"
+.include "../../security/courier-authlib/Makefile.common"
INSTALL_MAKE_FLAGS= ${MAKE_FLAGS} sysconfdir=${EGDIR}
SQWEBMAIL_STATEDIR= ${VARBASE}/sqwebmail
-SQWEBMAIL_CACHEDIR= ${SQWEBMAIL_STATEDIR}/cache
+SQWEBMAIL_CACHEDIR= ${SQWEBMAIL_STATEDIR}/logincache
SQWEBMAIL_CALENDARDIR= ${SQWEBMAIL_STATEDIR}/calendar
-SQWEBMAIL_HTMLDIR= ${DATADIR}/sqwebmail/html
-SQWEBMAIL_IMAGEDIR= ${DATADIR}/sqwebmail/images
+SQWEBMAIL_IMAGEDIR= ${PREFIX}/share/courier/sqwebmail/images
SQWEBMAIL_IMAGEURL?= /sqwebmail
BUILD_DEFS+= SQWEBMAIL_IMAGEURL
FILES_SUBST+= SQWEBMAIL_STATEDIR=${SQWEBMAIL_STATEDIR:Q}
+MESSAGE_SUBST+= IMAGEDIR=${SQWEBMAIL_IMAGEDIR}
+MESSAGE_SUBST+= IMAGEURL=${SQWEBMAIL_IMAGEURL}
SENDMAIL?= /usr/sbin/sendmail
+MIME_TYPES= ${PKG_SYSCONFDIR}/mime.types:${PKG_SYSCONFBASEDIR}/httpd/mime.types:${PREFIX}/etc/mime.types:/etc/mime.types
# This is used by the sqwebmail configure script to set the location of
-# the sqwebmaild socket file, lockfile and pidfile.
+# the sqwebmaild socket file and lockfile.
#
CONFIGURE_ARGS+= --localstatedir=${SQWEBMAIL_STATEDIR}
-CONFIGURE_ARGS+= --with-cachedir=${SQWEBMAIL_CACHEDIR}
-CONFIGURE_ARGS+= --with-calendardir=${SQWEBMAIL_CALENDARDIR}
-CONFIGURE_ARGS+= --with-cacheowner=${ROOT_USER}
-CONFIGURE_ARGS+= --with-mailer=${SENDMAIL}
+CONFIGURE_ARGS+= --datadir=${PREFIX}/share/courier
+CONFIGURE_ARGS+= --program-transform-name='s/\.rc$$//'
+
+CONFIGURE_ARGS+= --enable-cgibindir=${PREFIX}/libexec/cgi-bin
CONFIGURE_ARGS+= --enable-https=auto
-CONFIGURE_ARGS+= --enable-cgibindir=${PREFIX}/libexec/cgi-bin
-CONFIGURE_ARGS+= --with-htmldir=${SQWEBMAIL_HTMLDIR}
CONFIGURE_ARGS+= --enable-imagedir=${SQWEBMAIL_IMAGEDIR}
CONFIGURE_ARGS+= --enable-imageurl=${SQWEBMAIL_IMAGEURL}
+CONFIGURE_ARGS+= --enable-mimetypes="${MIME_TYPES}"
+CONFIGURE_ARGS+= --with-cachedir=${SQWEBMAIL_CACHEDIR}
+CONFIGURE_ARGS+= --with-cacheowner=${ROOT_USER}
+CONFIGURE_ARGS+= --with-calendardir=${SQWEBMAIL_CALENDARDIR}
+CONFIGURE_ARGS+= --with-ispell="${LOCALBASE}/bin/ispell"
+CONFIGURE_ARGS+= --with-mailer=${SENDMAIL}
+CONFIGURE_ARGS+= --with-mailgroup=${COURIER_GROUP}
+CONFIGURE_ARGS+= --with-piddir=${VARBASE}/run
-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}
-
+MAKE_DIRS= ${VARBASE}/run
OWN_DIRS= ${SQWEBMAIL_STATEDIR}
-OWN_DIRS_PERMS= ${SQWEBMAIL_CACHEDIR} ${ROOT_USER} ${ROOT_GROUP} 0755
-OWN_DIRS_PERMS+= ${SQWEBMAIL_CALENDARDIR} ${ROOT_USER} ${MAIL_GROUP} 0755
-OWN_DIRS_PERMS+= ${SQWEBMAIL_CALENDARDIR}/public ${ROOT_USER} ${MAIL_GROUP} 0755
-OWN_DIRS_PERMS+= ${SQWEBMAIL_CALENDARDIR}/private ${ROOT_USER} ${MAIL_GROUP} 0750
-OWN_DIRS_PERMS+= ${SQWEBMAIL_CALENDARDIR}/localcache ${ROOT_USER} ${MAIL_GROUP} 0700
+OWN_DIRS+= ${SQWEBMAIL_CACHEDIR}
+OWN_DIRS_PERMS= ${SQWEBMAIL_CALENDARDIR} \
+ ${ROOT_USER} ${COURIER_GROUP} 0755
+OWN_DIRS_PERMS+= ${SQWEBMAIL_CALENDARDIR}/public \
+ ${ROOT_USER} ${COURIER_GROUP} 0755
+OWN_DIRS_PERMS+= ${SQWEBMAIL_CALENDARDIR}/private \
+ ${ROOT_USER} ${COURIER_GROUP} 0750
+OWN_DIRS_PERMS+= ${SQWEBMAIL_CALENDARDIR}/localcache \
+ ${ROOT_USER} ${COURIER_GROUP} 0700
-GEN_FILES= ldapaddressbook
-GEN_FILES+= sqwebmaild
+GEN_FILES= ldapaddressbook sqwebmaild
FILES_SUBST+= GEN_FILES=${GEN_FILES:Q}
-MESSAGE_SUBST+= IMAGEDIR=${SQWEBMAIL_IMAGEDIR}
-MESSAGE_SUBST+= IMAGEURL=${SQWEBMAIL_IMAGEURL}
-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}
.endfor
+CONF_FILES+= ${EGDIR}/calendarmode ${PKG_SYSCONFDIR}/calendarmode
CONF_FILES_PERMS= # empty
-.for FILE in ldapsearch sendit.sh
-CONF_FILES_PERMS+= ${DATADIR}/sqwebmail/${FILE} \
+.for FILE in cleancache.pl ldapsearch sendit.sh
+CONF_FILES_PERMS+= ${PREFIX}/share/courier/sqwebmail/${FILE} \
${PKG_SYSCONFDIR}/${FILE} \
${ROOT_USER} ${ROOT_GROUP} 0755
.endfor
+SPECIAL_PERMS= libexec/courier/sqwebpasswd \
+ ${COURIER_USER} ${COURIER_GROUP} 2755
RCD_SCRIPTS= sqwebmail
+SUBST_CLASSES+= courier
+SUBST_MESSAGE.courier= "Substituting for @mailuser@ and @mailgroup@."
+SUBST_FILES.courier= sqwebmail/Makefile.in
+SUBST_SED.courier= -e "s|@mailuser@|${COURIER_USER}|g" \
+ -e "s|@mailgroup@|${COURIER_GROUP}|g"
+SUBST_STAGE.courier= pre-configure
+
+INSTALLATION_DIRS= bin man/man1 sbin
+
.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../mk/bdb.buildlink3.mk"
-
-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
+.include "../../security/courier-authlib/buildlink3.mk"
# Default to non-groupware calendar-mode.
post-build:
${ECHO} "local" > ${WRKDIR}/calendarmode
post-install:
- ${LN} -sf ${DATADIR}/sqwebmail/webgpg ${PREFIX}/sbin/webgpg
+ ${INSTALL_SCRIPT} ${WRKSRC}/gpglib/webgpg ${PREFIX}/sbin
+ ${INSTALL_PROGRAM} ${WRKSRC}/gpglib/mimegpg ${PREFIX}/bin
+ ${INSTALL_MAN} ${WRKSRC}/gpglib/mimegpg.1 ${PREFIX}/man/man1
${INSTALL_DATA_DIR} ${EGDIR}
${INSTALL_DATA} ${WRKDIR}/calendarmode ${EGDIR}
- ${INSTALL_DATA} ${WRKSRC}/sqwebmail/webmail.authpam ${EGDIR}
+ ${INSTALL_DATA} ${WRKSRC}/sqwebmail/sqwebmail.pamconf \
+ ${EGDIR}/webmail.pam
${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 \
${DOCDIR}/sqwebmail/README.gpg.html
- ${INSTALL_DATA} ${WRKSRC}/maildir/README.maildirfilter.html \
- ${DOCDIR}/sqwebmail
${INSTALL_DATA} ${WRKSRC}/pcp/README.html \
${DOCDIR}/sqwebmail/README.pcp.html
${INSTALL_DATA} ${WRKSRC}/sqwebmail/BUGS.html ${DOCDIR}/sqwebmail
diff -r 3ce67397a1ce -r f645c0f9ee4b mail/sqwebmail/PLIST
--- a/mail/sqwebmail/PLIST Fri Feb 18 22:12:53 2005 +0000
+++ b/mail/sqwebmail/PLIST Fri Feb 18 22:12:56 2005 +0000
@@ -1,10 +1,11 @@
-@comment $NetBSD: PLIST,v 1.3 2004/07/14 20:07:22 jlam Exp $
+@comment $NetBSD: PLIST,v 1.4 2005/02/18 22:12:56 jlam Exp $
+bin/mimegpg
libexec/cgi-bin/sqwebmail
-libexec/courier/sqwebmail/makemime
-libexec/courier/sqwebmail/pcpd
-libexec/courier/sqwebmail/reformime
-libexec/courier/sqwebmail/sqwebmaild
-libexec/courier/sqwebmaild.rc
+libexec/courier/pcpd
+libexec/courier/sqwebmaild
+libexec/courier/sqwebpasswd
+man/man1/mimegpg.1
+sbin/sqwebmaild
sbin/webgpg
share/courier/sqwebmail/cleancache.pl
share/courier/sqwebmail/html/en
@@ -104,19 +105,16 @@
share/courier/sqwebmail/images/uncancel.png
share/courier/sqwebmail/ldapsearch
share/courier/sqwebmail/sendit.sh
-share/courier/sqwebmail/webgpg
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
Home |
Main Index |
Thread Index |
Old Index