Attachment 123200 Details for Bug 166488 – ap22-mod_auth_imap-2.2.0_2.patch

[patch] ap22-mod_auth_imap-2.2.0_2.patch

ap22-mod_auth_imap-2.2.0_2.patch (text/plain), 1.98 KB, created by Radim Kolar on 2012-03-29 12:30:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Radim Kolar

Created: 2012-03-29 12:30:07 UTC

Size: 1.98 KB

patch

obsolete

>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 <bsd.port.options.mk>
>+
>+.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);

Actions: View | Diff

Attachments on bug 166488: 123200