Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 21 Apr 2006 16:52:29 +0400 (MSD)
From:      Dmitriy Kirhlarov <dkirhlarov@oilspace.com>
To:        FreeBSD-gnats-submit@FreeBSD.org, mharo@FreeBSD.org
Subject:   ports/96141: [PATCH] proftpd port update to 1.3.0 with fix from ports/96134
Message-ID:  <200604211252.k3LCqTRE003622@dimma.mow.oilspace.com>
Resent-Message-ID: <200604211300.k3LD0VcZ057773@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         96141
>Category:       ports
>Synopsis:       [PATCH] proftpd port update to 1.3.0 with fix from ports/96134
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Apr 21 13:00:30 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     Dmitriy Kirhlarov
>Release:        FreeBSD 5.4-STABLE i386
>Organization:
>Environment:
System: FreeBSD dimma.mow.oilspace.com 5.4-STABLE FreeBSD 5.4-STABLE #0: Sun Sep 25 23:26:13 MSD 2005 root@dimma.mow.oilspace.com:/usr/obj/usr/src/sys/dimma i386


	
>Description:
	Update port to current stable version -- 1.3.0 and add patch
	for ldap+tls authorization.
>How-To-Repeat:

>Fix:
diff -urNB proftpd.orig/Makefile proftpd/Makefile
--- proftpd.orig/Makefile	Fri Apr 21 10:34:47 2006
+++ proftpd/Makefile	Fri Apr 21 12:28:51 2006
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	proftpd
-DISTVERSION=	1.3.0rc3
+DISTVERSION=	1.3.0
 PORTREVISION=	0
 CATEGORIES=	ftp
 MASTER_SITES=	ftp://ftp.proftpd.org/distrib/source/ \
@@ -126,6 +126,9 @@
 .include <${PORTSDIR}/Mk/bsd.openssl.mk>
 PROFTPD_LIBS+=	-lssl -lcrypto -L${LOCALBASE}/lib
 MODULES:=${MODULES}:mod_tls
+.if defined(WITH_LDAP)
+EXTRA_PATCHES=${FILESDIR}/extra-patch-module-mod_ldap.c
+.endif
 .endif
 
 .if defined(WITH_CTRLS)
diff -urNB proftpd.orig/distinfo proftpd/distinfo
--- proftpd.orig/distinfo	Fri Apr 21 10:34:47 2006
+++ proftpd/distinfo	Fri Apr 21 12:30:44 2006
@@ -1,3 +1,3 @@
-MD5 (proftpd-1.3.0rc3.tar.bz2) = 050c3e2caec0d930f8a331e7b3ec0931
-SHA256 (proftpd-1.3.0rc3.tar.bz2) = ee181d7fe22b849589d9d886e5a4ed40fbe205cc14f8f4c95cc1db629c95ca97
-SIZE (proftpd-1.3.0rc3.tar.bz2) = 1377481
+MD5 (proftpd-1.3.0.tar.bz2) = fae47d01b52e035eb6b7190e74c17722
+SHA256 (proftpd-1.3.0.tar.bz2) = 83f220cba64455a2b1701b97ce9896f66a0020b179c50daf4860cdf362464ffe
+SIZE (proftpd-1.3.0.tar.bz2) = 1386086
diff -urNB proftpd.orig/files/extra-patch-module-mod_ldap.c proftpd/files/extra-patch-module-mod_ldap.c
--- proftpd.orig/files/extra-patch-module-mod_ldap.c	Thu Jan  1 00:00:00 1970
+++ proftpd/files/extra-patch-module-mod_ldap.c	Fri Apr 21 10:36:08 2006
@@ -0,0 +1,11 @@
+--- 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
+ 
+ /* Uncomment this if you have OpenSSL and wish to verify non-crypt()
+  * password hashes locally with OpenSSL. You'll also need to edit
>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200604211252.k3LCqTRE003622>