ports/166488: [PATCH] www/mod_auth_imap2: add dovecot patch

[Radim Kolar]

The following reply was made to PR ports/166488; it has been noted by GNATS.

From: Radim Kolar <hsn at filez.com>
To: bug-followup at FreeBSD.org, hsn at filez.com
Cc:  
Subject: Re: ports/166488: [PATCH] www/mod_auth_imap2: add dovecot patch
Date: Sat, 14 Jul 2012 18:30:00 +0200

 Here is reworked patch.
 Difference between this and old version is that we apply dovecot patch 
 anyway because it follows IMAP4 protocol and
 will not break non dovecot system.
 
 ===> Viewing diff with more
 diff -ruN --exclude=CVS /usr/ports/www/mod_auth_imap2/Makefile ./Makefile
 --- /usr/ports/www/mod_auth_imap2/Makefile      2011-08-20 
 19:27:39.000000000 +0200
 +++ ./Makefile  2012-07-14 18:14:19.337700139 +0200
 @@ -7,7 +7,7 @@
 
   PORTNAME=      mod_auth_imap
   PORTVERSION=   2.2.0
 -PORTREVISION=  1
 +PORTREVISION=  2
   CATEGORIES=    www
   MASTER_SITES= http://ben.brillat.net/files/projects/mod_auth_imap2/
   DISTNAME=      mod_auth_imap2-${PORTVERSION}
 @@ -16,7 +16,9 @@
   MAINTAINER=    apache at FreeBSD.org
   COMMENT=       An Apache 2 module to provide authentication via an 
 IMAP mail server
 
 -MAKE_JOBS_SAFE=  yes
 +LICENSE=       GPLv2
 +
 +MAKE_JOBS_SAFE=        yes
 
   WRKSRC=                ${WRKDIR}/${PORTNAME}2-${PORTVERSION}
   USE_APACHE=    20+
 diff -ruN --exclude=CVS 
 /usr/ports/www/mod_auth_imap2/files/patch-dovecot ./files/patch-dovecot
 --- /usr/ports/www/mod_auth_imap2/files/patch-dovecot   1970-01-01 
 01:00:00.000000000 +0100
 +++ ./files/patch-dovecot       2012-03-29 12:40:09.000000000 +0200
 @@ -0,0 +1,23 @@
 +--- mod_auth_imap.c.orig       2006-05-08 01:22:43.000000000 +0200
 ++++ mod_auth_imap.c    2012-03-29 12:38:30.911364281 +0200
 +@@ -170,7 +170,7 @@
 +     tcp_gets(Sock,result,500);
 +
 +     //skip lines that start with "*"
 +-    if (strncmp(result,"* ",2 == 0)) {
 ++    if (strncmp(result,"* ",2) == 0) {
 +       tcp_gets(Sock,result,500);
 +     }
 +
 +@@ -188,6 +188,11 @@
 +     tcp_puts(Sock,buf);
 +     tcp_gets(Sock,result,500);
 +
 ++    //skip lines that start with "*"
 ++    if (strncmp(result,"* ",2) == 0) {
 ++       tcp_gets(Sock,result,500);
 ++    }
 ++
 +     if (strncmp(result,"A002 OK",7) == 0) {
 +         if (logflag) {
 + 
 ap_log_rerror(APLOG_MARK,APLOG_WARNING|APLOG_NOERRNO,0,r,"mod_auth_imap: 
 Verified login for user %s.", username);
 ===> Done