ports/97214: UPDATE ftp/proftpd: Added option

[Beech Rintoul]

>Number:         97214
>Category:       ports
>Synopsis:       UPDATE ftp/proftpd: Added option
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sat May 13 17:40:11 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     Beech Rintoul
>Release:        FreeBSD 7.0-CURRENT i386
>Organization:
NorthWind Communications
>Environment:
System: FreeBSD stargate.alaskaparadise.com 7.0-CURRENT FreeBSD 7.0-CURRENT #63: Tue May  9 05:11:56 AKDT
>Description:
- Added LDAP TLS option

Added file(s):
- files/extra_patch-ldap-tls-mod_ldap.c

Port maintainer (beech at mangohealth.org) is cc'd.

Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:

--- proftpd-1.3.0_2.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/ftp/proftpd.orig/Makefile /usr/ports/ftp/proftpd/Makefile
--- /usr/ports/ftp/proftpd.orig/Makefile	Wed May 10 13:32:16 2006
+++ /usr/ports/ftp/proftpd/Makefile	Sat May 13 09:25:31 2006
@@ -2,12 +2,12 @@
 # Date created:		26 January 1998
 # Whom:			Stephane Legrand
 #
-# $FreeBSD: ports/ftp/proftpd/Makefile,v 1.85 2006/05/10 21:32:16 ehaupt Exp $
+# $FreeBSD: ports/ftp/proftpd/Makefile,v 1.84 2006/05/03 07:49:02 az Exp $
 #
 
 PORTNAME=	proftpd
 DISTVERSION=	1.3.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	ftp
 MASTER_SITES=	ftp://ftp.proftpd.org/distrib/source/ \
 		ftp://ftp.fastorama.com/mirrors/ftp.proftpd.org/distrib/source/ \
@@ -37,10 +37,11 @@
 
 CONFIGURE_ARGS=	--localstatedir=/var/run \
 		--sysconfdir=${EXAMPLESDIR}/etc \
-		--disable-sendfile
+		--disable-sendfile \
 
 OPTIONS=	IPV6 "Use IPv6" off \
 		LDAP "Use LDAP" off \
+		LDAP_TLS "Use LDAP TLS (Requires LDAP)" off\
 		MYSQL "Use MySQL" off \
 		POSTGRESQL "Use Postgres" off \
 		OPENSSL "Include mod_tls" off \
@@ -52,10 +53,10 @@
 		WRAP "Include mod_wrap" on \
 		RADIUS "Include mod_radius" off
 
-.include <bsd.port.pre.mk>
-
 MODULES?=
 
+.include <bsd.port.pre.mk>	
+
 .if defined(WITH_RATIO)
 MODULES:=${MODULES}:mod_ratio
 .endif
@@ -125,6 +126,9 @@
 .include <${PORTSDIR}/Mk/bsd.openssl.mk>
 PROFTPD_LIBS+=	-lssl -lcrypto -L${LOCALBASE}/lib
 MODULES:=${MODULES}:mod_tls
+.if defined(WITH_LDAP_TLS)
+EXTRA_PATCHES=${FILESDIR}/extra_patch-ldap-tls-mod_ldap.c
+.endif
 .endif
 
 .if defined(WITH_CTRLS)
diff -ruN --exclude=CVS /usr/ports/ftp/proftpd.orig/files/extra_patch-ldap-tls-mod_ldap.c /usr/ports/ftp/proftpd/files/extra_patch-ldap-tls-mod_ldap.c
--- /usr/ports/ftp/proftpd.orig/files/extra_patch-ldap-tls-mod_ldap.c	Wed Dec 31 14:00:00 1969
+++ /usr/ports/ftp/proftpd/files/extra_patch-ldap-tls-mod_ldap.c	Mon May  8 13:34:45 2006
@@ -0,0 +1,8 @@
+--- contrib/mod_ldap.c	Fri Apr 21 10:31:23 2006
++++ contrib/mod_ldap.c	Fri Apr 21 10:31:43 2006
+@@ -55,7 +55,7 @@
+  * after connecting to the LDAP server. If TLS cannot be enabled, the LDAP
+  * connection will fail.
+  */
+-/* #define USE_LDAP_TLS */
++#define USE_LDAP_TLS
--- proftpd-1.3.0_2.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted: