Update pure-ftpd to version 1.0.21 and add an option for (experimental) utf8-

support, from unex@linija.org via PR pkg/32901.

Changes:

* When SHA1HANDSOFF is defined, we shouldn't cast a pointer to a large union to
  a char buffer, because of alignment required by some architectures.
* WITH_THROTTLING should actually be THROTTLING in src/log_extauth.c . It fixes
  throttling with extauth. Reported and fixed by Marcus Merighi <mcmer@tor.at>
  through Brad our beloved OpenBSD maintainer.
* Rendezvous has been renamed Bonjour.
* A double-close in the CHMOD command has been fixed.
* The old PAM sample has been removed.
* -F option added to pure-pw.
* MAX_USER_LENGTH has been bumped to 127 due to popular demand.
* pam/* can now be used if security/* doesn't exist. Fixes PAM detection on
  MacOS X.
* Call tzset() in chrooted apps in order to get correct time zones in syslog
  messages.
* simplify() simplifies paths ending by /. and /..
* MySQL's hash_password() needs 3 arguments since mySQL 4.1.
* Experimental support for RFC2640 (UTF-8 filename encoding) has been added,
  derived from code by Jui-Nan Lin  ===>  added as "utf8" pkgsrc option.
* The LDAP schema has been changed: FTPStatus should be a boolean.
* New switch: -p (--pidfile=) for pure-authd and pure-uploadscript, by Old
  Sparky.
* By popular request, even non-chrooted users are now denied access if their
  home directory is not mounted.
* If die() is called during a TLS-enabled session, encrypt the death message.
  Contributed by Cynix.
* Don't wrongly abort transfer during file upload. Fix by Patrick Gosling.
* WITH_LARGE_FILES is now defined by default.
* sendfile64() support on Linux.
* privsep and main processes were swapped out so that pure-ftpwho displays the
  right pid.
* OPTS MLST has been implemented.
* SITE UTIME has been implemented.
* TCP_CORK is on by default again. A new configure switch, --without-cork, can
  disable it.
* Correctly format %c and %% in fakesprintf().
* The connection socket is now created with the Nagle algorithm disabled.  It
  was the trick to dramatically improve performance when transfering a lot of
  small files.
* Updated getopt_long() and realpath() substitutes.
* Allow logging to named pipes (thanks to Steve Marple).
* Use CLIENT_MULTI_STATEMENTS while connecting to a MySQL server.
* Documentation updates.
* MySQL errors are now logged.

3 files changed, 14 insertions, 9 deletions

diff --git a/net/pure-ftpd/Makefile b/net/pure-ftpd/Makefile
index e508f6bb7ad..374b26063c2 100644
--- a/net/pure-ftpd/Makefile
+++ b/net/pure-ftpd/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.17 2006/01/24 22:46:48 ghen Exp $
+# $NetBSD: Makefile,v 1.18 2006/02/24 14:35:30 ghen Exp $
 
-DISTNAME=	pure-ftpd-1.0.20
-PKGREVISION=	3
+DISTNAME=	pure-ftpd-1.0.21
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.pureftpd.org/pub/pure-ftpd/releases/		\
 		ftp://ftp2.fr.pureftpd.org/pub/mirrors/ftp.fr.pureftpd.org/pub/pure-ftpd/releases/ \
diff --git a/net/pure-ftpd/distinfo b/net/pure-ftpd/distinfo
index 6655244914f..c5e43c6308b 100644
--- a/net/pure-ftpd/distinfo
+++ b/net/pure-ftpd/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.7 2005/02/24 12:14:02 agc Exp $
+$NetBSD: distinfo,v 1.8 2006/02/24 14:35:30 ghen Exp $
 
-SHA1 (pure-ftpd-1.0.20.tar.gz) = cf7ac48ebb720d718b314c23ce96c6976adbd617
-RMD160 (pure-ftpd-1.0.20.tar.gz) = f6161fdba94712b5b876738567fd22a669ca17e9
-Size (pure-ftpd-1.0.20.tar.gz) = 561412 bytes
+SHA1 (pure-ftpd-1.0.21.tar.gz) = 0374031beb847d6a9aa61627c3db26cb81a28e92
+RMD160 (pure-ftpd-1.0.21.tar.gz) = 5f5a86f118cf34dc52650cebc38e50130ab0c7cf
+Size (pure-ftpd-1.0.21.tar.gz) = 594394 bytes
diff --git a/net/pure-ftpd/options.mk b/net/pure-ftpd/options.mk
index df97f6de279..d6b7e7a32c6 100644
--- a/net/pure-ftpd/options.mk
+++ b/net/pure-ftpd/options.mk
@@ -1,7 +1,7 @@
-# $NetBSD: options.mk,v 1.4 2006/02/24 09:15:38 ghen Exp $
+# $NetBSD: options.mk,v 1.5 2006/02/24 14:35:30 ghen Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.pureftpd
-PKG_SUPPORTED_OPTIONS=	ldap mysql pgsql ssl virtualchroot
+PKG_SUPPORTED_OPTIONS=	ldap mysql pgsql ssl virtualchroot utf8
 
 PKG_OPTIONS_LEGACY_VARS+=	PURE_FTPD_USE_MYSQL:mysql
 PKG_OPTIONS_LEGACY_VARS+=	PURE_FTPD_USE_PGSQL:pgsql
@@ -33,3 +33,9 @@ CONFIGURE_ARGS+=	--with-tls
 .if !empty(PKG_OPTIONS:Mvirtualchroot)
 CONFIGURE_ARGS+=	--with-virtualchroot
 .endif
+
+.if !empty(PKG_OPTIONS:Mutf8)
+# Experimental
+.  include "../../converters/libiconv/buildlink3.mk"
+CONFIGURE_ARGS+=       --with-rfc2640
+.endif