From jnlin@Seattle.tamama.org  Tue Feb 21 15:03:36 2006
Return-Path: <jnlin@Seattle.tamama.org>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id D40D516A420
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 21 Feb 2006 15:03:36 +0000 (GMT)
	(envelope-from jnlin@Seattle.tamama.org)
Received: from Seattle.tamama.org (r21902.csie.nctu.edu.tw [140.113.214.12])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 85D8D43D45
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 21 Feb 2006 15:03:36 +0000 (GMT)
	(envelope-from jnlin@Seattle.tamama.org)
Received: by Seattle.tamama.org (Postfix, from userid 1001)
	id 05FBAC6A7; Tue, 21 Feb 2006 23:03:36 +0800 (CST)
Message-Id: <20060221150336.05FBAC6A7@Seattle.tamama.org>
Date: Tue, 21 Feb 2006 23:03:36 +0800 (CST)
From: Jui-Nan Lin <jnlin@csie.nctu.edu.tw>
To: FreeBSD-gnats-submit@freebsd.org
Cc: j@pureftpd.org
Subject: [PATCH] ftp/pure-ftpd: update to 1.0.21
X-Send-Pr-Version: 3.113
X-GNATS-Notify: j@pureftpd.org

>Number:         93646
>Category:       ports
>Synopsis:       [PATCH] ftp/pure-ftpd: update to 1.0.21
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    garga
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Feb 21 15:10:02 GMT 2006
>Closed-Date:    Tue Feb 21 16:05:37 GMT 2006
>Last-Modified:  Tue Feb 21 16:05:37 GMT 2006
>Originator:     Jui-Nan Lin
>Release:        FreeBSD 6.0-STABLE i386
>Organization:
>Environment:
System: FreeBSD Seattle.tamama.org 6.0-STABLE FreeBSD 6.0-STABLE #4: Wed Jan 25 20:59:54 CST 2006
>Description:
- Update to 1.0.21
- Add an option for charset conversion
- Add HTTP master site

Port maintainer (j@pureftpd.org) is cc'd.

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

--- pure-ftpd-1.0.21.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/ftp/pure-ftpd/Makefile /home/jnlin/ports/pure-ftpd/Makefile
--- /usr/ports/ftp/pure-ftpd/Makefile	Wed Sep 28 02:04:19 2005
+++ /home/jnlin/ports/pure-ftpd/Makefile	Tue Feb 21 23:01:07 2006
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	pure-ftpd
-PORTVERSION=	1.0.20
-PORTREVISION=	4
+PORTVERSION=	1.0.21
 CATEGORIES=	ftp ipv6
-MASTER_SITES=	ftp://ftp.pureftpd.org/pub/pure-ftpd/releases/ \
+MASTER_SITES=	http://download.pureftpd.org/pub/pure-ftpd/releases/ \
+		ftp://ftp.pureftpd.org/pub/pure-ftpd/releases/ \
 		ftp://ftp2.fr.pureftpd.org/pub/mirrors/ftp.fr.pureftpd.org/pub/pure-ftpd/releases/ \
 		ftp://ftp3.fr.pureftpd.org/pure-ftpd/releases/ \
 		ftp://ftp.dk.pureftpd.org/mirrors/pure-ftpd/releases/ \
@@ -47,7 +47,8 @@
 		PERUSERLIMITS	"Per-user concurrency limits" off \
 		THROTTLING	"Bandwidth throttling" off \
 		BANNER	"Show ${PORTNAME} welcome upon session start" on \
-		UPLOADSCRIPT "Support uploadscript daemon" off
+		UPLOADSCRIPT "Support uploadscript daemon" off \
+		UTF8	"Support for charset conversion (expreimental)" off
 
 .include <bsd.port.pre.mk>
 
@@ -107,6 +108,12 @@
 # support uploadscript?
 .if defined (WITH_UPLOADSCRIPT)
 CONFIGURE_ARGS+=	--with-uploadscript
+.endif
+
+# RFC 2640 charset conversion requested?
+.if defined(WITH_UTF8)
+USE_ICONV=	YES
+CONFIGURE_ARGS+=	--with-rfc2640
 .endif
 
 .if ${OSVERSION} > 500000
diff -ruN --exclude=CVS /usr/ports/ftp/pure-ftpd/distinfo /home/jnlin/ports/pure-ftpd/distinfo
--- /usr/ports/ftp/pure-ftpd/distinfo	Sun Jan 22 17:48:58 2006
+++ /home/jnlin/ports/pure-ftpd/distinfo	Tue Feb 21 22:58:43 2006
@@ -1,3 +1,3 @@
-MD5 (pure-ftpd-1.0.20.tar.bz2) = e928e9e15adf6b52bfe6183fdad20144
-SHA256 (pure-ftpd-1.0.20.tar.bz2) = 6b3fd0b7eca88a9ac7f9aba57d75ca6b20d363309be68f600a5a154db7bc24e9
-SIZE (pure-ftpd-1.0.20.tar.bz2) = 470915
+MD5 (pure-ftpd-1.0.21.tar.bz2) = ca8a8dbec0cd9c8ea92fc4c37ea9c410
+SHA256 (pure-ftpd-1.0.21.tar.bz2) = f2f03e5bb42325b470b88e8ee7e6014226518b620beb5dd8cf1f07bcdb64559c
+SIZE (pure-ftpd-1.0.21.tar.bz2) = 476117
--- pure-ftpd-1.0.21.patch ends here ---

>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Tue Feb 21 15:12:09 UTC 2006 
State-Changed-Why:  
Awaiting maintainers feedback 

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

From: Frank Denis <j@pureftpd.org>
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/93646: [PATCH] ftp/pure-ftpd: update to 1.0.21
Date: Tue, 21 Feb 2006 16:15:20 +0100

 Le Tue, Feb 21, 2006 at 03:12:03PM +0000, Edwin Groothuis ecrivait :
 >Please note that PR ports/93646 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/93646
 
   Looks fine.

Adding to audit trail from misfiled PR ports/93647:

Date: Tue, 21 Feb 2006 16:14:44 +0100
From: Frank Denis <j@pureftpd.org>

 Le Tue, Feb 21, 2006 at 11:03:36PM +0800, Jui-Nan Lin ecrivait :
 
 >+		UTF8	"Support for charset conversion (expreimental)" off
 
 s/expreimental/experimental/
State-Changed-From-To: feedback->open 
State-Changed-By: linimon 
State-Changed-When: Tue Feb 21 15:26:34 UTC 2006 
State-Changed-Why:  
Maintainer approved.  (Also see feedback added to Audit-Trail). 

http://www.freebsd.org/cgi/query-pr.cgi?pr=93646 
Responsible-Changed-From-To: freebsd-ports-bugs->garga 
Responsible-Changed-By: garga 
Responsible-Changed-When: Tue Feb 21 15:41:19 UTC 2006 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=93646 
State-Changed-From-To: open->closed 
State-Changed-By: garga 
State-Changed-When: Tue Feb 21 16:05:36 UTC 2006 
State-Changed-Why:  
Committed. Thanks! 

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