From root@alaskaparadise.com  Wed May  3 12:45:15 2006
Return-Path: <root@alaskaparadise.com>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id C1A1116A405
	for <FreeBSD-gnats-submit@freebsd.org>; 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 <FreeBSD-gnats-submit@freebsd.org>; 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 <beech@mangohealth.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc: beech@mangohealth.org
Subject: [PATCH] ftp/proftpd: [SUMMARIZE CHANGES]
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         96713
>Category:       ports
>Synopsis:       [PATCH] ftp/proftpd: [SUMMARIZE CHANGES]
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    ehaupt
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Wed May 03 12:50:14 GMT 2006
>Closed-Date:    Wed May 10 23:32:40 CEST 2006
>Last-Modified:  Wed May 10 23:32:40 CEST 2006
>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:

From: Beech Rintoul <beech@mangohealth.org>
To: bug-followup@freebsd.org
Cc:  
Subject: Re: ports/96713 [PATCH] ftp/proftpd [SUMMERIZE CHANGES]
Date: Wed, 3 May 2006 05:07:56 -0800

 --nextPart2955761.Kv52Q5dIJq
 Content-Type: multipart/mixed;
   boundary="Boundary-01=_vsKWEN84xmeJLg3"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: inline
 
 --Boundary-01=_vsKWEN84xmeJLg3
 Content-Type: text/plain;
   charset="us-ascii"
 Content-Transfer-Encoding: quoted-printable
 Content-Disposition: inline
 
 I attached the proper file for ftp/proftpd/files/extra-patch-module-mod_lda=
 p.c
 
 Beech
 =2D-=20
 
 =2D------------------------------------------------------------------------=
 =2D-------------
 Beech Rintoul - Sys. Administrator - beech@mangohealth.org
 /"\   ASCII Ribbon Campaign  | Mangohealth
 \ / - NO HTML/RTF in e-mail  | 201 East 9Th Avenue Ste.310
  X  - NO Word docs in e-mail | Anchorage, AK 99501
 / \  - XanGo - http://www.mangohealth.org
 =2D------------------------------------------------------------------------=
 =2D-------------
 
 
 
 
 
 
 
 
 
 
 
 
 --Boundary-01=_vsKWEN84xmeJLg3
 Content-Type: text/x-csrc;
   charset="us-ascii";
   name="extra-patch-module-mod_ldap.c"
 Content-Transfer-Encoding: quoted-printable
 Content-Disposition: attachment;
 	filename="extra-patch-module-mod_ldap.c"
 
 =2D-- 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.
   */
 =2D/* #define USE_LDAP_TLS */
 +#define USE_LDAP_TLS
 =20
  /* Uncomment this if you have OpenSSL and wish to verify non-crypt()
   * password hashes locally with OpenSSL. You'll also need to edit
 
 --Boundary-01=_vsKWEN84xmeJLg3--
 
 --nextPart2955761.Kv52Q5dIJq
 Content-Type: application/pgp-signature
 
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (FreeBSD)
 
 iD8DBQBEWKs62TFLCHYGSF0RAjW+AJ9tFBueXPkacQW0lxATD7OUlASZHwCfXWsX
 VUgM4ZldIOmkqe3wkMHb7Sw=
 =7H14
 -----END PGP SIGNATURE-----
 
 --nextPart2955761.Kv52Q5dIJq--

From: Beech Rintoul <beech@mangohealth.org>
To: bug-followup@freebsd.org
Cc:  
Subject: Re: ports/96713
Date: Thu, 4 May 2006 18:41:26 -0800

 --nextPart2179190.ky9gdZX39M
 Content-Type: text/plain;
   charset="us-ascii"
 Content-Transfer-Encoding: quoted-printable
 Content-Disposition: inline
 
 Would one of the committers please grab and commit this?=20
 Also, the file in question is available at:=20
 http://www.alaskaparadise.com/freebsd/extra-patch-module-mod_ldap.c
 
 Thanks,
 
 Beech=20
 =2D-=20
 
 =2D------------------------------------------------------------------------=
 =2D-------------
 Beech Rintoul - Sys. Administrator - beech@mangohealth.org
 /"\   ASCII Ribbon Campaign  | Mangohealth
 \ / - NO HTML/RTF in e-mail  | 201 East 9Th Avenue Ste.310
  X  - NO Word docs in e-mail | Anchorage, AK 99501
 / \  - XanGo - http://www.mangohealth.org
 =2D------------------------------------------------------------------------=
 =2D-------------
 
 
 
 
 
 
 
 
 
 
 
 
 --nextPart2179190.ky9gdZX39M
 Content-Type: application/pgp-signature
 
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (FreeBSD)
 
 iD8DBQBEWrth2TFLCHYGSF0RAqCGAJ4uNrBysSoXcVOzkmDAhL17vxBPUACePAMe
 55zUh7nq/YV/CzJ2pcW/jk0=
 =uoRn
 -----END PGP SIGNATURE-----
 
 --nextPart2179190.ky9gdZX39M--
Responsible-Changed-From-To: freebsd-ports-bugs->ehaupt 
Responsible-Changed-By: ehaupt 
Responsible-Changed-When: Mon May 8 11:04:39 CEST 2006 
Responsible-Changed-Why:  
Take. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=96713 
State-Changed-From-To: open->feedback 
State-Changed-By: ehaupt 
State-Changed-When: Mon May 8 11:54:56 CEST 2006 
State-Changed-Why:  
Separate patch received [1]. This seems to break LDAP support on 4.x [2]. 
Can you please look into it? 

[1] http://people.freebsd.org/~ehaupt/snippets/96713/proftpd-1.3.0.patch 
[2] Build snip: 

ar rc libsupp.a pr_fnmatch.o sstrncpy.o strsep.o vsnprintf.o glibc-glob.o glibc-hstrerror.o glibc-mkstemp.o pr-syslog.o pwgrent.o getopt.o getopt1.o 
ranlib libsupp.a 
gmake[1]: Leaving directory `/usr/home/ehaupt/proftpd/work/proftpd-1.3.0/lib' 
cd src/ && gmake src 
gmake[1]: Entering directory `/usr/home/ehaupt/proftpd/work/proftpd-1.3.0/src' 
cc -DHAVE_CONFIG_H  -DFREEBSD4_11 -DFREEBSD4 -I.. -I../include -I/usr/local/include -O -pipe -DYESWERESPECTCFLAGS  -Wall -c main.c 
In file included from main.c:38: 
/usr/local/include/getopt.h:83: redefinition of `struct option' 
gmake[1]: *** [main.o] Error 1 
gmake[1]: Leaving directory `/usr/home/ehaupt/proftpd/work/proftpd-1.3.0/src' 
gmake: *** [src] Error 2 
*** Error code 2 

Stop in /usr/home/ehaupt/proftpd. 


http://www.freebsd.org/cgi/query-pr.cgi?pr=96713 
State-Changed-From-To: feedback->open 
State-Changed-By: ehaupt 
State-Changed-When: Tue May 9 10:37:06 CEST 2006 
State-Changed-Why:  
Feedback received. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=96713 

From: Emanuel Haupt <ehaupt@FreeBSD.org>
To: bug-followup@FreeBSD.org, beech@mangohealth.org
Cc:  
Subject: Re: ports/96713: [PATCH] ftp/proftpd: [SUMMARIZE CHANGES]
Date: Tue, 9 May 2006 23:19:59 +0200

 On Tue, 9 May 2006 10:44:41 -0800
 Beech Rintoul <beech@mangohealth.org> wrote:
 
 > On Tuesday 09 May 2006 09:38, you wrote:
 > > > > State-Changed-From-To: open->feedback
 > > > > State-Changed-By: ehaupt
 > > > > State-Changed-When: Mon May 8 11:54:56 CEST 2006
 > > > > State-Changed-Why:
 > > > > Seperate patch received [1]. This seems to break LDAP support on
 > > > > 4.x [2]. Can you please look into it?
 > > >
 > > > <snip>
 > > >
 > > > I removed the extra ldap/tls patch that was contributed by a user.
 > > > On closer  inspection this will also break ldap if tls is not
 > > > available on the server. I  will add a configure knob for this if
 > > > it's requested.  I have attached the  new diff. At this time I
 > > > don't have a 4x environment to test this on, but  hopefully it
 > > > will now build.
 > >
 > > The patch creates a garbage file (Makefile~) can it simply be
 > > ignored?
 > >
 > > Emanuel
 > 
 > Yes, as can the files/extra-patch after it's patched. I forgot to
 > remove the  backup file before I ran the diff.
 
 Sorry if I ask again but now I am a bit confused. What is wrong with the
 current version in the ports? Why exactly was PR 96713 filed?
 extra-patch-module-mod_ldap.c was mangled? It seems to apply just fine.
 What is wrong with it? Now you completely remove the extra patch. Won't
 that break ldap support? And what is with tls?
 
 All these issues need to be solved and tested properly. In the end I
 need a patch that applies without producing any garbage files.
 
 Thanks,
 Emanuel
 
 -- 
 GnuPG key id: 0x55E67774         Download: http://pgp.mit.edu:11371
 Key fingerprint: 17B3 FD8F BA68 4AB4 10FD  A9D1 AD52 6588 55E6 7774
State-Changed-From-To: open->closed 
State-Changed-By: ehaupt 
State-Changed-When: Wed May 10 23:32:38 CEST 2006 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=96713 
>Unformatted:
