Date: Fri, 28 Nov 2003 17:18:51 +0100 (CET) From: Alex Dupre <sysadmin@alexdupre.com> To: FreeBSD-gnats-submit@FreeBSD.org Cc: oliver@FreeBSD.org Subject: ports/59763: [Update] Port: mail/sqwebmail Message-ID: <200311281618.hASGIpcp065291@armada.alexdupre.com> Resent-Message-ID: <200311281620.hASGKJcr082110@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 59763 >Category: ports >Synopsis: [Update] Port: mail/sqwebmail >Confidential: no >Severity: serious >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Fri Nov 28 08:20:19 PST 2003 >Closed-Date: >Last-Modified: >Originator: Alex Dupre >Release: FreeBSD 5.1-CURRENT i386 >Organization: >Environment: System: FreeBSD armada.alexdupre.com 5.1-CURRENT FreeBSD 5.1-CURRENT #0: Fri Nov 21 17:45:13 CET 2003 alex@armada.alexdupre.com:/usr/obj/usr/src/sys/ARMADA i386 >Description: Update sqWebMail to 3.6.2 release. Add WITHOUT_IMAP knob. Add startup script for the new sqwebmaild daemon. >How-To-Repeat: >Fix: --- sqwebmail.diff begins here --- diff -ruN sqwebmail.orig/Makefile sqwebmail/Makefile --- sqwebmail.orig/Makefile Fri Nov 28 16:28:19 2003 +++ sqwebmail/Makefile Fri Nov 28 17:09:48 2003 @@ -6,7 +6,7 @@ # PORTNAME= sqwebmail -PORTVERSION= 3.6.1 +PORTVERSION= 3.6.2 PORTREVISION= 0 CATEGORIES= mail www MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} @@ -47,6 +47,7 @@ # set WITH_TIMEOUTHARD to something other than 7200 seconds (2hr) # set WITH_TIMEOUTSOFT to something other than 1200 seconds (20m) # set WITHOUT_SENTRENAME to turn off periodic renaming of the Sent folder +# set WITHOUT_IMAP if you don't use the Courier IMAP server # set VCHKPW to the home of the vpopmail user, if necessary # # The following settings are in bytes: @@ -127,6 +128,10 @@ CONFIGURE_ARGS+= --disable-autorenamesent .endif +.if defined(WITHOUT_IMAP) +CONFIGURE_ARGS+= --disable-utf7-folder-encoding +.endif + .if defined(WITH_MYSQL) CONFIGURE_ARGS+= --with-authmysql PLIST_SUB+= MYSQLFLAG="" @@ -202,8 +207,10 @@ @${REINPLACE_CMD} -e 's|^case x$$lockmethod in|${TEST} \&\& &|g' \ ${WRKSRC}/liblock/configure -.if !defined(WITHOUT_AUTHDAEMON) post-install: + ${INSTALL_SCRIPT} ${FILESDIR}/sqwebmail-sqwebmaild.sh \ + ${PREFIX}/etc/rc.d/ +.if !defined(WITHOUT_AUTHDAEMON) ${INSTALL_SCRIPT} ${FILESDIR}/sqwebmail-authdaemond.sh \ ${PREFIX}/etc/rc.d/ .endif diff -ruN sqwebmail.orig/distinfo sqwebmail/distinfo --- sqwebmail.orig/distinfo Fri Nov 28 16:28:19 2003 +++ sqwebmail/distinfo Fri Nov 28 16:29:34 2003 @@ -1 +1 @@ -MD5 (sqwebmail-3.6.1.tar.bz2) = e0bd529a28798dcc9783377ddabdac6e +MD5 (sqwebmail-3.6.2.tar.bz2) = 7e5c19c4c1ba86e0c96408d5674c7f90 diff -ruN sqwebmail.orig/files/sqwebmail-sqwebmaild.sh sqwebmail/files/sqwebmail-sqwebmaild.sh --- sqwebmail.orig/files/sqwebmail-sqwebmaild.sh Thu Jan 1 01:00:00 1970 +++ sqwebmail/files/sqwebmail-sqwebmaild.sh Fri Nov 28 16:50:23 2003 @@ -0,0 +1,21 @@ +#!/bin/sh + +if ! PREFIX=$(expr $0 : "\(/.*\)/etc/rc\.d/$(basename $0)\$"); then + echo "$0: Cannot determine the PREFIX" >&2 + exit 1 +fi + +case "$1" in +start) + ${PREFIX}/libexec/sqwebmail/sqwebmail/sqwebmaild start > /dev/null && echo -n ' sqwebmaild' + ;; +stop) + ${PREFIX}/libexec/sqwebmail/sqwebmail/sqwebmaild stop > /dev/null && echo -n ' sqwebmaild' + ;; +*) + echo "Usage: `basename $0` {start|stop}" >&2 + ;; +esac + +exit 0 + diff -ruN sqwebmail.orig/pkg-plist sqwebmail/pkg-plist --- sqwebmail.orig/pkg-plist Fri Nov 28 16:28:19 2003 +++ sqwebmail/pkg-plist Fri Nov 28 16:51:06 2003 @@ -1,4 +1,5 @@ %%AUTHDFLAG%%etc/rc.d/sqwebmail-authdaemond.sh +etc/rc.d/sqwebmail-sqwebmaild.sh libexec/sqwebmail/authlib/authcram libexec/sqwebmail/authlib/authcustom %%AUTHDFLAG%%libexec/sqwebmail/authlib/authdaemon @@ -17,6 +18,7 @@ libexec/sqwebmail/sqwebmail/makemime libexec/sqwebmail/sqwebmail/pcpd libexec/sqwebmail/sqwebmail/reformime +libexec/sqwebmail/sqwebmail/sqwebmaild %%AUTHDFLAG%%share/sqwebmail/authdaemonrc.dist share/sqwebmail/authmodulelist %%MYSQLFLAG%%share/sqwebmail/authmysqlrc.dist @@ -69,6 +71,7 @@ share/sqwebmail/html/en-us/quickadd.html share/sqwebmail/html/en-us/readmsg.html share/sqwebmail/html/en-us/redirect.html +share/sqwebmail/html/en-us/smileys.txt share/sqwebmail/html/en-us/spellchk.html share/sqwebmail/ldapaddressbook.dist share/sqwebmail/ldapsearch @@ -99,37 +102,50 @@ %%CGIBINDIR%%/%%CGIBINSUBDIR%%/sqwebmail @unexec /bin/rmdir %D/%%CGIBINDIR%%/%%CGIBINSUBDIR%% 2> /dev/null || true @unexec /bin/rmdir %D/%%CGIBINDIR%% 2> /dev/null || true -%%WEBDATADIR%%/%%WEBDATASUBDIR%%/bg.gif -%%WEBDATADIR%%/%%WEBDATASUBDIR%%/bluebottomleft.gif -%%WEBDATADIR%%/%%WEBDATASUBDIR%%/bluebottomright.gif -%%WEBDATADIR%%/%%WEBDATASUBDIR%%/bluetopleft.gif -%%WEBDATADIR%%/%%WEBDATASUBDIR%%/bluetopright.gif -%%WEBDATADIR%%/%%WEBDATASUBDIR%%/calendar.gif -%%WEBDATADIR%%/%%WEBDATASUBDIR%%/cancel.gif -%%WEBDATADIR%%/%%WEBDATASUBDIR%%/folder.gif -%%WEBDATADIR%%/%%WEBDATASUBDIR%%/folder2.gif -%%WEBDATADIR%%/%%WEBDATASUBDIR%%/folders.gif -%%WEBDATADIR%%/%%WEBDATASUBDIR%%/forward.gif -%%WEBDATADIR%%/%%WEBDATASUBDIR%%/forwardatt.gif -%%WEBDATADIR%%/%%WEBDATASUBDIR%%/fullheaders.gif -%%WEBDATADIR%%/%%WEBDATASUBDIR%%/graybottomleft.gif -%%WEBDATADIR%%/%%WEBDATASUBDIR%%/graybottomright.gif -%%WEBDATADIR%%/%%WEBDATASUBDIR%%/graytopleft.gif -%%WEBDATADIR%%/%%WEBDATASUBDIR%%/graytopright.gif -%%WEBDATADIR%%/%%WEBDATASUBDIR%%/left.gif -%%WEBDATADIR%%/%%WEBDATASUBDIR%%/left2.gif -%%WEBDATADIR%%/%%WEBDATASUBDIR%%/logo.gif -%%WEBDATADIR%%/%%WEBDATASUBDIR%%/print.gif -%%WEBDATADIR%%/%%WEBDATASUBDIR%%/reply.gif -%%WEBDATADIR%%/%%WEBDATASUBDIR%%/replyall.gif -%%WEBDATADIR%%/%%WEBDATASUBDIR%%/replylist.gif -%%WEBDATADIR%%/%%WEBDATASUBDIR%%/right.gif -%%WEBDATADIR%%/%%WEBDATASUBDIR%%/right2.gif -%%WEBDATADIR%%/%%WEBDATASUBDIR%%/save.gif -%%WEBDATADIR%%/%%WEBDATASUBDIR%%/sep.gif -%%WEBDATADIR%%/%%WEBDATASUBDIR%%/signin.gif +%%WEBDATADIR%%/%%WEBDATASUBDIR%%/bg.png +%%WEBDATADIR%%/%%WEBDATASUBDIR%%/bluebottomleft.png +%%WEBDATADIR%%/%%WEBDATASUBDIR%%/bluebottomright.png +%%WEBDATADIR%%/%%WEBDATASUBDIR%%/bluetopleft.png +%%WEBDATADIR%%/%%WEBDATASUBDIR%%/bluetopright.png +%%WEBDATADIR%%/%%WEBDATASUBDIR%%/calendar.png +%%WEBDATADIR%%/%%WEBDATASUBDIR%%/cancel.png +%%WEBDATADIR%%/%%WEBDATASUBDIR%%/eventadd.png +%%WEBDATADIR%%/%%WEBDATASUBDIR%%/eventedit.png +%%WEBDATADIR%%/%%WEBDATASUBDIR%%/first.png +%%WEBDATADIR%%/%%WEBDATASUBDIR%%/folder.png +%%WEBDATADIR%%/%%WEBDATASUBDIR%%/folder2.png +%%WEBDATADIR%%/%%WEBDATASUBDIR%%/folders.png +%%WEBDATADIR%%/%%WEBDATASUBDIR%%/forward.png +%%WEBDATADIR%%/%%WEBDATASUBDIR%%/forwardatt.png +%%WEBDATADIR%%/%%WEBDATASUBDIR%%/fullheaders.png +%%WEBDATADIR%%/%%WEBDATASUBDIR%%/graybottomleft.png +%%WEBDATADIR%%/%%WEBDATASUBDIR%%/graybottomright.png +%%WEBDATADIR%%/%%WEBDATASUBDIR%%/graytopleft.png +%%WEBDATADIR%%/%%WEBDATASUBDIR%%/graytopright.png +%%WEBDATADIR%%/%%WEBDATASUBDIR%%/last.png +%%WEBDATADIR%%/%%WEBDATASUBDIR%%/left.png +%%WEBDATADIR%%/%%WEBDATASUBDIR%%/left2.png +%%WEBDATADIR%%/%%WEBDATASUBDIR%%/logo.png +%%WEBDATADIR%%/%%WEBDATASUBDIR%%/print.png +%%WEBDATADIR%%/%%WEBDATASUBDIR%%/reply.png +%%WEBDATADIR%%/%%WEBDATASUBDIR%%/replyall.png +%%WEBDATADIR%%/%%WEBDATASUBDIR%%/replylist.png +%%WEBDATADIR%%/%%WEBDATASUBDIR%%/right.png +%%WEBDATADIR%%/%%WEBDATASUBDIR%%/right2.png +%%WEBDATADIR%%/%%WEBDATASUBDIR%%/save.png +%%WEBDATADIR%%/%%WEBDATASUBDIR%%/sep.png +%%WEBDATADIR%%/%%WEBDATASUBDIR%%/signin.png +%%WEBDATADIR%%/%%WEBDATASUBDIR%%/sm-frowney.png +%%WEBDATADIR%%/%%WEBDATASUBDIR%%/sm-frowney2.png +%%WEBDATADIR%%/%%WEBDATASUBDIR%%/sm-notsmiley.png +%%WEBDATADIR%%/%%WEBDATASUBDIR%%/sm-notsmiley2.png +%%WEBDATADIR%%/%%WEBDATASUBDIR%%/sm-ohno.png +%%WEBDATADIR%%/%%WEBDATASUBDIR%%/sm-smiley.png +%%WEBDATADIR%%/%%WEBDATASUBDIR%%/sm-smiley2.png +%%WEBDATADIR%%/%%WEBDATASUBDIR%%/sm-wink.png +%%WEBDATADIR%%/%%WEBDATASUBDIR%%/sm-wink2.png %%WEBDATADIR%%/%%WEBDATASUBDIR%%/sqwebmail.css -%%WEBDATADIR%%/%%WEBDATASUBDIR%%/trash2.gif -%%WEBDATADIR%%/%%WEBDATASUBDIR%%/uncancel.gif +%%WEBDATADIR%%/%%WEBDATASUBDIR%%/trash2.png +%%WEBDATADIR%%/%%WEBDATASUBDIR%%/uncancel.png @unexec /bin/rmdir %D/%%WEBDATADIR%%/%%WEBDATASUBDIR%% 2> /dev/null || true @unexec /bin/rmdir %D/%%WEBDATADIR%% 2> /dev/null || true --- sqwebmail.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200311281618.hASGIpcp065291>