From flo@tb.smeets.im  Tue Feb 28 16:39:51 2012
Return-Path: <flo@tb.smeets.im>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id DCF71106564A
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 28 Feb 2012 16:39:51 +0000 (UTC)
	(envelope-from flo@tb.smeets.im)
Received: from mail.solomo.de (mail.solomo.de [IPv6:2a01:238:42c7:9a00::2])
	by mx1.freebsd.org (Postfix) with ESMTP id 7484F8FC13
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 28 Feb 2012 16:39:51 +0000 (UTC)
Received: from mail.solomo.de (localhost [127.0.0.1])
	by mail.solomo.de (Postfix) with ESMTP id 44F06C388B;
	Tue, 28 Feb 2012 17:39:50 +0100 (CET)
Received: from mail.solomo.de ([127.0.0.1])
	by mail.solomo.de (mail.solomo.de [127.0.0.1]) (amavisd-new, port 10024)
	with LMTP id UkiDAlLe6zoB; Tue, 28 Feb 2012 17:39:49 +0100 (CET)
Received: from tb.smeets.im (tb.smeets.im [88.198.62.195])
	by mail.solomo.de (Postfix) with ESMTP id 71D88C38C6;
	Tue, 28 Feb 2012 17:39:49 +0100 (CET)
Received: by tb.smeets.im (Postfix, from userid 1001)
	id A042F6705; Tue, 28 Feb 2012 17:39:38 +0100 (CET)
Message-Id: <20120228163949.A042F6705@tb.smeets.im>
Date: Tue, 28 Feb 2012 17:39:38 +0100 (CET)
From: Florian Smeets <flo@FreeBSD.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc: gelraen.ua@gmail.com
Subject: [PATCH] ftp/vsftpd-ext: look for vsftpd.conf in the correct directory
X-Send-Pr-Version: 3.113
X-GNATS-Notify: gelraen.ua@gmail.com

>Number:         165534
>Category:       ports
>Synopsis:       [PATCH] ftp/vsftpd-ext: look for vsftpd.conf in the correct directory
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    flo
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Tue Feb 28 16:40:11 UTC 2012
>Closed-Date:    Tue Feb 28 21:33:03 UTC 2012
>Last-Modified:  Tue Feb 28 21:33:03 UTC 2012
>Originator:     Florian Smeets
>Release:        FreeBSD 10.0-CURRENT amd64
>Organization:
>Environment:
System: FreeBSD tb.smeets.im 10.0-CURRENT FreeBSD 10.0-CURRENT #5 r232166M: Sat Feb 25 22:51:00 CET
>Description:
the previous patch was supposed to fix vsftpd so that it would look for the configuration
file in /usr/local/etc/vsftpd.conf but it did not, currently it is looking for the file in
/usr/local/etc/vsftpd//usr/local/etc/vsftpd.conf, the attached patch fixes that.

Port maintainer (gelraen.ua@gmail.com) is cc'd.

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

--- vsftpd-ext-2.3.5.1_1.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/flo/dev/cvs/ports/ftp/vsftpd-ext/Makefile,v
retrieving revision 1.7
diff -u -u -r1.7 Makefile
--- Makefile	9 Jan 2012 16:39:53 -0000	1.7
+++ Makefile	28 Feb 2012 13:43:47 -0000
@@ -7,6 +7,7 @@
 
 PORTNAME=	vsftpd-ext
 PORTVERSION=	${UPSTREAMVERSION}.${EXTVERSION}
+PORTREVISION=	1
 CATEGORIES=	ftp ipv6
 MASTER_SITES=	http://vsftpd.devnet.ru/files/${UPSTREAMVERSION}/ext.${EXTVERSION}/
 PKGNAMESUFFIX?=	${SSL_SUFFIX}${PKGNAMESUFFIX2}
@@ -49,9 +50,7 @@
 .endif
 
 do-configure:
-	${REINPLACE_CMD} -e "s|vsftpd.conf|${PREFIX}/etc/vsftpd.conf|" \
-		${WRKSRC}/defs.h ${WRKSRC}/vsftpd.conf
-	${REINPLACE_CMD} -e "s|/etc/vsftpd|${PREFIX}/etc/vsftpd|" \
+	${REINPLACE_CMD} -e "s|/etc/vsftpd|${PREFIX}/etc|" \
 		${WRKSRC}/builddefs.h
 	${REINPLACE_CMD} \
 		-e '/^CC/s/=/?=/' \
--- vsftpd-ext-2.3.5.1_1.patch ends here ---

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->flo 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Tue Feb 28 16:40:20 UTC 2012 
Responsible-Changed-Why:  
Submitter has GNATS access (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=165534 
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Tue Feb 28 16:40:24 UTC 2012 
State-Changed-Why:  
Awaiting maintainers feedback (via the GNATS Auto Assign Tool) 

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

From: Edwin Groothuis <edwin@FreeBSD.org>
To: gelraen.ua@gmail.com
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/165534: [PATCH] ftp/vsftpd-ext: look for vsftpd.conf in the correct directory
Date: Tue, 28 Feb 2012 16:40:22 UT

 Maintainer of ftp/vsftpd-ext,
 
 Please note that PR ports/165534 has just been submitted.
 
 If it contains a patch for an upgrade, an enhancement or a bug fix
 you agree on, reply to this email stating that you approve the patch
 and a committer will take care of it.
 
 The full text of the PR can be found at:
     http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/165534
 
 -- 
 Edwin Groothuis via the GNATS Auto Assign Tool
 edwin@FreeBSD.org

From: Maxim Ignatenko <gelraen.ua@gmail.com>
To: bug-followup@freebsd.org
Cc:  
Subject: Re: ports/165534: [PATCH] ftp/vsftpd-ext: look for vsftpd.conf in the correct directory
Date: Tue, 28 Feb 2012 18:45:02 +0200

 Looks fine, commit it, please.
State-Changed-From-To: feedback->closed 
State-Changed-By: flo 
State-Changed-When: Tue Feb 28 21:33:01 UTC 2012 
State-Changed-Why:  
Committed. 

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