From olivleh1@dill.salatschuessel.net  Fri Feb  7 14:58:46 2003
Return-Path: <olivleh1@dill.salatschuessel.net>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 7A6E337B401
	for <FreeBSD-gnats-submit@freebsd.org>; Fri,  7 Feb 2003 14:58:46 -0800 (PST)
Received: from dill.salatschuessel.net (pD9E21054.dip.t-dialin.net [217.226.16.84])
	by mx1.FreeBSD.org (Postfix) with SMTP id B732F43F3F
	for <FreeBSD-gnats-submit@freebsd.org>; Fri,  7 Feb 2003 14:58:34 -0800 (PST)
	(envelope-from olivleh1@dill.salatschuessel.net)
Received: (qmail 3520 invoked by uid 0); 7 Feb 2003 22:58:32 -0000
Message-Id: <20030207225832.3519.qmail@dill.salatschuessel.net>
Date: 7 Feb 2003 22:58:32 -0000
From: Oliver Lehmann <lehmann@ans-netz.de>
Reply-To: Oliver Lehmann <lehmann@ans-netz.de>
To: FreeBSD-gnats-submit@freebsd.org
Cc: Oliver Lehmann <lehmann@ans-netz.de>
Subject: update-port: mail/sqwebmail
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         48072
>Category:       ports
>Synopsis:       update-port: mail/sqwebmail
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    nbm
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Feb 07 15:00:28 PST 2003
>Closed-Date:    Tue Apr 15 07:28:16 PDT 2003
>Last-Modified:  Tue Apr 15 07:28:16 PDT 2003
>Originator:     Oliver Lehmann
>Release:        FreeBSD 4.7-STABLE alpha
>Organization:
>Environment:
System: FreeBSD dill.salatschuessel.net 4.7-STABLE FreeBSD 4.7-STABLE #0: Sat Nov 23 21:30:45 CET 2002 olivleh1@dill.salatschuessel.net:/usr/obj/alpha/usr/src/sys/DILL alpha


>Description:
	sqwebmail 3.3.7 -> 3.5.0
	pkg-list takes now care about CGIBINDIR and WEBDATADIR (which can be 
	differ from /usr/local/(data|cgi-bin).default)
	add a WITH_HTTPS knob for peoples who are using it with an SSL httpd
>How-To-Repeat:
>Fix:


--- sqwebmail.patch begins here ---
diff -ruN sqwebmail.old/Makefile /usr/ports/mail/sqwebmail/Makefile
--- sqwebmail.old/Makefile	Fri Feb  7 23:05:57 2003
+++ /usr/ports/mail/sqwebmail/Makefile	Fri Feb  7 23:55:03 2003
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	sqwebmail
-PORTVERSION=	3.3.7
+PORTVERSION=	3.5.0
 CATEGORIES=	mail www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR= courier
@@ -36,6 +36,7 @@
 # set CACHEOWNER to who you'd like to own the cache files
 # set CACHEDIR to where you'd like your cache directory to be
 # set WITH_LDAP for LDAP authentication and addressbook support
+# set WITH_HTTPS to generate https:// URLs for all accesses
 # set WITH_VCHKPW for vpopmail authentication
 # set WITH_ISPELL to provide spell-checking
 # set WITH_MIMETYPES to enable the search for a mime.types file
@@ -57,6 +58,7 @@
 
 USE_PERL5=	yes
 HAS_CONFIGURE=	YES
+USE_BZIP2=	YES
 
 CONFIGURE_ARGS= \
 	--enable-cgibindir=${CGIBINDIR}/${CGIBINSUBDIR} \
@@ -67,6 +69,8 @@
 	--prefix=${PREFIX}/share/sqwebmail \
 	--enable-imageurl=/${IMAGEURL}/
 
+PLIST_SUB+=	CGIDIR=${CGIBINDIR} HTDOCSDIR=${WEBDATADIR}
+
 .if defined(WITHOUT_CACHEDIR)
 PLIST_SUB+=		CACHE="@comment "
 CONFIGURE_ARGS+=	--without-cachedir
@@ -96,6 +100,10 @@
 PLIST_SUB+=		VPOPMAILFLAG="@comment "
 .endif
 
+.if defined(WITH_HTTPS)
+CONFIGURE_ARGS+=	--enable-https
+.endif
+
 .if defined(WITH_MYSQL)
 CONFIGURE_ARGS+=	--with-authmysql
 PLIST_SUB+=		MYSQLFLAG=""
@@ -159,6 +167,7 @@
 		authlib.7 authshadow.7 \
 		authlib.7 authuserdb.7 \
 		authlib.7 authvchkpw.7 \
+		authlib.7 authmysql.7 \
 		makeuserdb.8 pw2userdb.8 \
 		makeuserdb.8 vchkpw2userdb.8
 
diff -ruN sqwebmail.old/crontab /usr/ports/mail/sqwebmail/crontab
--- sqwebmail.old/crontab	Thu Jan  1 01:00:00 1970
+++ /usr/ports/mail/sqwebmail/crontab	Fri Feb  7 23:23:41 2003
@@ -0,0 +1,5 @@
+*/15 * * * * /usr/local/bin/badmailfrom.sh
+40 * * * * /usr/local/vpopmail/bin/clearopensmtp 2>&1 >/dev/null
+40 * * * * su -c "/usr/local/share/sqwebmail/cleancache.pl" bin
+40 * * * * su -c /usr/local/share/sqwebmail/cleancache.pl bin >/dev/null 2>&1 
+40 * * * * su -c "/usr/local/share/sqwebmail/cleancache.pl" bin >/dev/null 2>&1
diff -ruN sqwebmail.old/distinfo /usr/ports/mail/sqwebmail/distinfo
--- sqwebmail.old/distinfo	Fri Feb  7 23:05:57 2003
+++ /usr/ports/mail/sqwebmail/distinfo	Fri Feb  7 23:32:14 2003
@@ -1 +1 @@
-MD5 (sqwebmail-3.3.7.tar.gz) = 07b7c5aabda5cc25ced3bcdb4f681225
+MD5 (sqwebmail-3.5.0.tar.bz2) = 7c95890cd0ffcd374b843810efac07d3
diff -ruN sqwebmail.old/pkg-plist /usr/ports/mail/sqwebmail/pkg-plist
--- sqwebmail.old/pkg-plist	Fri Feb  7 23:05:57 2003
+++ /usr/ports/mail/sqwebmail/pkg-plist	Fri Feb  7 23:46:00 2003
@@ -68,6 +68,7 @@
 share/sqwebmail/ldapaddressbook.dist
 share/sqwebmail/ldapsearch
 share/sqwebmail/lib/charset.alias
+share/sqwebmail/nodsn
 share/sqwebmail/sbin/makeuserdb
 share/sqwebmail/sbin/pw2userdb
 share/sqwebmail/sbin/userdb
@@ -76,44 +77,6 @@
 share/sqwebmail/sendit.sh
 share/sqwebmail/share/locale/locale.alias
 share/sqwebmail/webgpg
-www/cgi-bin.default/sqwebmail/sqwebmail
-www/data.default/sqwebmail/bg.gif
-www/data.default/sqwebmail/bluebottomleft.gif
-www/data.default/sqwebmail/bluebottomright.gif
-www/data.default/sqwebmail/bluetopleft.gif
-www/data.default/sqwebmail/bluetopright.gif
-www/data.default/sqwebmail/calendar.gif
-www/data.default/sqwebmail/cancel.gif
-www/data.default/sqwebmail/folder.gif
-www/data.default/sqwebmail/folder2.gif
-www/data.default/sqwebmail/folders.gif
-www/data.default/sqwebmail/forward.gif
-www/data.default/sqwebmail/forwardatt.gif
-www/data.default/sqwebmail/fullheaders.gif
-www/data.default/sqwebmail/graybottomleft.gif
-www/data.default/sqwebmail/graybottomright.gif
-www/data.default/sqwebmail/graytopleft.gif
-www/data.default/sqwebmail/graytopright.gif
-www/data.default/sqwebmail/left.gif
-www/data.default/sqwebmail/left2.gif
-www/data.default/sqwebmail/logo.gif
-www/data.default/sqwebmail/print.gif
-www/data.default/sqwebmail/reply.gif
-www/data.default/sqwebmail/replyall.gif
-www/data.default/sqwebmail/replylist.gif
-www/data.default/sqwebmail/right.gif
-www/data.default/sqwebmail/right2.gif
-www/data.default/sqwebmail/save.gif
-www/data.default/sqwebmail/sep.gif
-www/data.default/sqwebmail/signin.gif
-www/data.default/sqwebmail/sqwebmail.css
-www/data.default/sqwebmail/trash2.gif
-www/data.default/sqwebmail/uncancel.gif
-@dirrm www/data.default/sqwebmail
-@unexec /bin/rmdir %D/www/data.default 2> /dev/null || true
-@dirrm www/cgi-bin.default/sqwebmail
-@unexec /bin/rmdir %D/www/cgi-bin.default 2> /dev/null || true
-@unexec /bin/rmdir %D/www 2> /dev/null || true
 @dirrm share/sqwebmail/var/calendar/public
 @dirrm share/sqwebmail/var/calendar/private
 @dirrm share/sqwebmail/var/calendar/localcache
@@ -136,3 +99,42 @@
 @dirrm libexec/sqwebmail
 %%CACHE%%@unexec rmdir /var/sqwebmail/cache 2> /dev/null || true
 %%CACHE%%@unexec rmdir /var/sqwebmail 2> /dev/null || true
+@cwd %%CGIDIR%%
+sqwebmail/sqwebmail
+@dirrm sqwebmail
+@unexec cd .. && /bin/rmdir %%CGIDIR%% 2> /dev/null || true
+@cwd %%HTDOCSDIR%%
+sqwebmail/bg.gif
+sqwebmail/bluebottomleft.gif
+sqwebmail/bluebottomright.gif
+sqwebmail/bluetopleft.gif
+sqwebmail/bluetopright.gif
+sqwebmail/calendar.gif
+sqwebmail/cancel.gif
+sqwebmail/folder.gif
+sqwebmail/folder2.gif
+sqwebmail/folders.gif
+sqwebmail/forward.gif
+sqwebmail/forwardatt.gif
+sqwebmail/fullheaders.gif
+sqwebmail/graybottomleft.gif
+sqwebmail/graybottomright.gif
+sqwebmail/graytopleft.gif
+sqwebmail/graytopright.gif
+sqwebmail/left.gif
+sqwebmail/left2.gif
+sqwebmail/logo.gif
+sqwebmail/print.gif
+sqwebmail/reply.gif
+sqwebmail/replyall.gif
+sqwebmail/replylist.gif
+sqwebmail/right.gif
+sqwebmail/right2.gif
+sqwebmail/save.gif
+sqwebmail/sep.gif
+sqwebmail/signin.gif
+sqwebmail/sqwebmail.css
+sqwebmail/trash2.gif
+sqwebmail/uncancel.gif
+@dirrm sqwebmail
+@unexec cd .. && /bin/rmdir %%HTDOCSDIR%% 2> /dev/null || true
--- sqwebmail.patch ends here ---


>Release-Note:
>Audit-Trail:

From: Oliver Lehmann <lehmann@ans-netz.de>
To: freebsd-gnats-submit@FreeBSD.org
Cc: lehmann@ans-netz.de
Subject: Re: ports/48072: update-port: mail/sqwebmail
Date: Thu, 13 Feb 2003 14:23:36 +0100

 The file named "crontab" is not part of this port, but part of this patch.
 Please remove it after applying the patch and don't commit it to the CVS
 Repository.
 
   Greetings
 
 -- 
  Oliver Lehmann
         @home: lehmann@ans-netz.de
       @office: oliver.lehmann@mgi.de
          @www: http://www.pofo.de/  |  http://wishlist.ans-netz.de/

From: Scott Lampert <scott@lampert.org>
To: freebsd-gnats-submit@FreeBSD.org, lehmann@ans-netz.de
Cc:  
Subject: Re: ports/48072: update-port: mail/sqwebmail
Date: Fri, 14 Feb 2003 15:27:52 -0800

 Applying this patch after the original adds the ability to specify using 
   https:// only for pages that require a password, and a second option 
 to disable the periodic renaming of the users' Sent folder.
 
 --- Makefile.old        Fri Feb 14 15:16:54 2003
 +++ Makefile    Fri Feb 14 15:24:40 2003
 @@ -37,11 +37,13 @@
   # set CACHEDIR to where you'd like your cache directory to be
   # set WITH_LDAP for LDAP authentication and addressbook support
   # set WITH_HTTPS to generate https:// URLs for all accesses
 +# set WITH_HTTPS=login to generate https:// URLs for only password access
   # set WITH_VCHKPW for vpopmail authentication
   # set WITH_ISPELL to provide spell-checking
   # set WITH_MIMETYPES to enable the search for a mime.types file
   # set WITH_TIMEOUTHARD to something other than 7200 seconds (2hr)
   # set WITH_TIMEOUTSOFT to something other than 1200 seconds (20m)
 +# set WITHOUT_AUTOSENTRENAME to turn off periodic renaming of the Sent 
 folder
   # set VCHKPW to the home of the vpopmail user, if necessary
   #
   # The following settings are in bytes:
 @@ -101,7 +103,15 @@
   .endif
 
   .if defined(WITH_HTTPS)
 +.if ${WITH_HTTPS} == "login"
 +CONFIGURE_ARGS+=       --enable-https=login
 +.else
   CONFIGURE_ARGS+=       --enable-https
 +.endif
 +.endif
 +
 +.if defined(WITHOUT_AUTORENAMESENT)
 +CONFIGURE_ARGS+=       --disable-autorenamesent
   .endif
 
   .if defined(WITH_MYSQL)
 
Responsible-Changed-From-To: freebsd-ports-bugs->nbm 
Responsible-Changed-By: leeym 
Responsible-Changed-When: Sun Feb 16 06:42:43 PST 2003 
Responsible-Changed-Why:  
Over to maintainer. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=48072 

From: Oliver Lehmann <lehmann@ans-netz.de>
To: freebsd-gnats-submit@FreeBSD.org
Cc: nbm@FreeBSD.org
Subject: Re: ports/48072: update-port: mail/sqwebmail
Date: Wed, 9 Apr 2003 14:22:36 +0200

 Hi,
 
 are you alive Neil Blakey-Milner? These PR is neary 2 month old now, and
 you nerver responded to any emails (not only about this PR) sent by me. -
 May I ask why?
 
    Greetings, Oliver
 
 -- 
  Oliver Lehmann
         @home: lehmann@ans-netz.de
       @office: oliver.lehmann@mgi.de
          @www: http://www.pofo.de/  |  http://wishlist.ans-netz.de/
State-Changed-From-To: open->closed 
State-Changed-By: arved 
State-Changed-When: Tue Apr 15 07:28:00 PDT 2003 
State-Changed-Why:  
Superseded by 50910 

http://www.freebsd.org/cgi/query-pr.cgi?pr=48072 
>Unformatted:
