From owner-freebsd-apache@FreeBSD.ORG Thu Mar 29 11:26:04 2012 Return-Path: Delivered-To: apache@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 20CC810656B0; Thu, 29 Mar 2012 11:26:04 +0000 (UTC) (envelope-from hsn@filez.com) Received: from ponto.amerinoc.com (ponto.amerinoc.com [64.6.108.239]) by mx1.freebsd.org (Postfix) with ESMTP id F36078FC15; Thu, 29 Mar 2012 11:26:03 +0000 (UTC) Received: from ponto.amerinoc.com (localhost [127.0.0.1]) by ponto.amerinoc.com (8.14.5/8.14.5) with ESMTP id q2TB6YCV033053; Thu, 29 Mar 2012 13:06:34 +0200 (CEST) (envelope-from hsn@ponto.amerinoc.com) Received: (from hsn@localhost) by ponto.amerinoc.com (8.14.5/8.14.5/Submit) id q2TB6YPB033052; Thu, 29 Mar 2012 13:06:34 +0200 (CEST) (envelope-from hsn) Date: Thu, 29 Mar 2012 13:06:34 +0200 (CEST) Message-Id: <201203291106.q2TB6YPB033052@ponto.amerinoc.com> To: FreeBSD-gnats-submit@freebsd.org From: Radim Kolar X-send-pr-version: 3.113 X-GNATS-Notify: Cc: apache@freebsd.org, hsn@filez.com Subject: [PATCH] www/mod_auth_imap2: add dovecot patch X-BeenThere: freebsd-apache@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Support of apache-related ports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 29 Mar 2012 11:26:04 -0000 >Submitter-Id: current-users >Originator: Radim Kolar >Organization: >Confidential: no >Synopsis: [PATCH] www/mod_auth_imap2: add dovecot patch >Severity: non-critical >Priority: low >Category: ports >Class: change-request >Release: FreeBSD 8.2-STABLE amd64 >Environment: System: FreeBSD ponto.amerinoc.com 8.2-STABLE FreeBSD 8.2-STABLE #0: Mon Sep 5 02:49:21 PDT >Description: Make this module to work with Dovecot Tested against dovecot 2.0 branch Added file(s): - files/dovecot.patch Port maintainer (apache@FreeBSD.org) is cc'd. Generated with FreeBSD Port Tools 0.99_4 (mode: change, diff: ports) >How-To-Repeat: >Fix: --- ap22-mod_auth_imap-2.2.0_2.patch begins here --- 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-03-29 13:05:09.564911966 +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@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+ @@ -24,6 +26,14 @@ AP_FAST_BUILD= YES AP_GENPLIST= YES +OPTIONS = DOVECOT "Patch for dovecot" Off +.include + +.ifdef (WITH_DOVECOT) +post-patch: + cd ${WRKSRC} && ${PATCH} ${PATCH_ARGS} <${PATCHDIR}/dovecot.patch +.endif + PORTDOCS= htaccess-example httpd.conf-append-example .if !defined(NOPORTDOCS) diff -ruN --exclude=CVS /usr/ports/www/mod_auth_imap2/files/dovecot.patch ./files/dovecot.patch --- /usr/ports/www/mod_auth_imap2/files/dovecot.patch 1970-01-01 01:00:00.000000000 +0100 +++ ./files/dovecot.patch 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); --- ap22-mod_auth_imap-2.2.0_2.patch ends here ---