From owner-freebsd-ports-bugs@FreeBSD.ORG Wed May 3 12:50:27 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C043A16A420 for ; Wed, 3 May 2006 12:50:26 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 67CB443D95 for ; Wed, 3 May 2006 12:50:15 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k43CoFQ6058581 for ; Wed, 3 May 2006 12:50:15 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k43CoFou058579; Wed, 3 May 2006 12:50:15 GMT (envelope-from gnats) Resent-Date: Wed, 3 May 2006 12:50:15 GMT Resent-Message-Id: <200605031250.k43CoFou058579@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Beech Rintoul Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C1A1116A405 for ; Wed, 3 May 2006 12:45:15 +0000 (UTC) (envelope-from root@alaskaparadise.com) Received: from pinnacle.akherb.com (60-105-237-24.gci.net [24.237.105.60]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2F5F743D53 for ; Wed, 3 May 2006 12:45:15 +0000 (GMT) (envelope-from root@alaskaparadise.com) Received: by pinnacle.akherb.com (Postfix, from userid 1007) id B51035D9C; Wed, 3 May 2006 04:45:14 -0800 (AKDT) Received: from stargate.alaskaparadise.com (114-103-74-65.gci.net [65.74.103.114]) by pinnacle.akherb.com (Postfix) with ESMTP id 7CAF25C92; Wed, 3 May 2006 04:45:12 -0800 (AKDT) Received: by stargate.alaskaparadise.com (Postfix, from userid 0) id 493044005; Wed, 3 May 2006 04:45:11 -0800 (AKDT) Message-Id: <20060503124511.493044005@stargate.alaskaparadise.com> Date: Wed, 3 May 2006 04:45:11 -0800 (AKDT) From: Beech Rintoul To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: beech@mangohealth.org Subject: ports/96713: [PATCH] ftp/proftpd: [SUMMARIZE CHANGES] X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 May 2006 12:50:28 -0000 >Number: 96713 >Category: ports >Synopsis: [PATCH] ftp/proftpd: [SUMMARIZE CHANGES] >Confidential: no >Severity: serious >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Wed May 03 12:50:14 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 #60: Sun Apr 30 11:36:56 AKDT 2006 >Description: [DESCRIBE CHANGES] Mangled patch last commit - extra-patch-module-mod_ldap.c (ref: pr/96709). Port maintainer (beech@mangohealth.org) is cc'd. Generated with FreeBSD Port Tools 0.75 >How-To-Repeat: >Fix: --- proftpd-1.3.0.patch begins here --- diff -ruN --exclude=CVS /usr/ports/ftp/proftpd.orig/files/extra-patch-module-mod_ldap.c /usr/ports/ftp/proftpd/files/extra-patch-module-mod_ldap.c --- files/extra-patch-module-mod_ldap.c. Tue May 2 23:49:03 2006 +++ files/extra-patch-module-mod_ldap.c Wed May 3 03:11:51 2006 @@ -1,26 +1,6 @@ ---- 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--- 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--- 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 @@ +--- contrib/mod_ldap.c Fri Dec 2 09:34:03 2005 ++++ contrib/mod_ldap.c Wed May 3 03:01:39 2006 +@@ -56,7 +56,7 @@ * after connecting to the LDAP server. If TLS cannot be enabled, the LDAP * connection will fail. */ --- proftpd-1.3.0.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: