Update ftpproxy package to 1.2.1.

Version 1.2.1 - 19082003asg
- --------------------------------

  * Fixed a bug in dologin.
    Now the use of ftp.proxy with a fixed server works again.

Version 1.2.0 - 11072003asg
- --------------------------------

  * Looking in this file this numbering scheme displeased me.
    From now on every beta release get a subnumber and official
    releases a major number.
    So this new release will start with 1.2.0

Version 1.1.7.pre3 - 09072003asg
- --------------------------------

  * Fixed missing line in the do_login function. Could solve unexpected
    behaviour of ftp.proxy.
    Mentioned by Michael A. Meiszl and Rasca Gmelch.

Version 1.1.7.pre2 - 06042003asg
- --------------------------------

  * Another attempt to deal with an old problem: Suppose the client
    lists an almost empty directory (or does any other small data
    transmission with the remote server) is might happen that the
    proxy receives and spools the data before the 150 response is
    send to the client.  ftp.proxy uses the TCP_NODELAY socket
    options since version 1.1.4 but what if the server (or upstream
    proxy) causes the problem?

    The proxy does now track if the 150 response arrived already and
    the data transmission between client and server is delayed until
    it has been received.


Version 1.1.7.pre1 - 04042003asg
- --------------------------------

  * Introducing `dynamic configuration programs' aka DCP's.  In short
    a DCP receives username and remote server as supplied by the user
    and sends the proxy server the real FTP server the proxy should
    connect to with perhaps different username and password.

    Everything of this is optional.  Furthermore there is yet no
    documentation because DCPs are work in progress and even the DCP
    scheme is not fixed yet.  There is however a sample DCP named
    operator.dcp showing how things basically work.

    DCP's required changes to the source code.  Even if you do not
    use DCP's the changes may influence the way ftp.proxy is working.

    The DCP's are based on the idea of 'connection translation program'
    from Damian Ivereigh and replaces this feature introduced in 1.1.6.beta6

Version 1.1.6.beta8 - 25MAR2003asg
- ----------------------------------

  * Changed -D option: the proxy server port number must now be set
    with the -D option.


Version 1.1.6.beta7 - 10FEB2003asg
- ----------------------------------

  * Added compile-help in src/Makefile for solaris and a putenv
    workaround for the missing function.
    Hope ftp.proxy will now compile on solaris without errors.
    Mentioned by Gregoire Barbier, Lefteris Giakoumatos,
    Christophe Giraud-Briquet, Neil McCalden and others.

  * Complete rewrite of multiline server response handling.
    Handling is now much more RFC conform in this point.


Version 1.1.6.beta6 - 22JAN2003asg
- ----------------------------------

  * Added sample script to start ftp.proxy in debug mode.

  * Added sample trp script.

  * Do not fork ftp.proxy in daemon mode when debug option is set.

  * Changed syslog calls to be more ANSI-C conform.

  * Source code compatibility: changed the syslog's `%m' to `%s' with
    a `strerror(errno)' argument.

  * Added support connection translation program (short: trp's), mentioned
    by Damian Ivereigh.

  * Introduced version variable in Makefile.

  * Added new command line option '-u' to allow usernames with a '@'
    in it. Mentioned by Paul Dragicevich.

  * Changed GPL to current version.

  * Changed getc_fd to handle servers that close the data connection.

  * Changed proxy response on PASV because mozilla does not like it.

  * Added daemon mode. Now you can start ftp.proxy as daemon using '-D'.
    This is still experimental do not use this on productive environments.
    The feature will be added official in the next release.
    Additional parameters are required.

  * Applied patch which fixes problems with multi-line server greetings,
    as it appears on 'AppleShare IP FTP Server'. Mentioned by Menno Smits.

  * Changed default log facility to LOG_DAEMON. On Linux, FreeBSD and NetBSD
    it is still LOG_FTP.

  * Modified cfputs() to send the line together with the CR/LF in one
    packet to make broken firewalls happy.

6 files changed, 32 insertions, 56 deletions

diff --git a/net/ftpproxy/Makefile b/net/ftpproxy/Makefile
index 6c65eb4afd2..4d9ffef8dec 100644
--- a/net/ftpproxy/Makefile
+++ b/net/ftpproxy/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.5 2003/07/21 17:10:37 martti Exp $
+# $NetBSD: Makefile,v 1.6 2003/09/02 17:27:16 taca Exp $
 #
 
-DISTNAME=	ftpproxy-1.1.5
+DISTNAME=	ftpproxy-1.2.1
 CATEGORIES=	net
 MASTER_SITES=	http://www.ftpproxy.org/download/ \
 		http://www.ftpproxy.org/download/older_releases/
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	package@NetBSD.org
+MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.ftpproxy.org/
 COMMENT=	Application level gateway for FTP
 
diff --git a/net/ftpproxy/distinfo b/net/ftpproxy/distinfo
index 9622ec490c8..86b1b196ee3 100644
--- a/net/ftpproxy/distinfo
+++ b/net/ftpproxy/distinfo
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.2 2002/05/09 16:55:52 taca Exp $
+$NetBSD: distinfo,v 1.3 2003/09/02 17:27:16 taca Exp $
 
-SHA1 (ftpproxy-1.1.5.tgz) = 5796cdf8cc9965c37e4edd0efe4e3d9693cbbbb2
-Size (ftpproxy-1.1.5.tgz) = 148035 bytes
-SHA1 (patch-aa) = 7b2a27861266e230a982e47f6af9855b6ba95f39
-SHA1 (patch-ab) = d5cf9e8ae746ffc27f1bcb9ac10216c01f43aee7
-SHA1 (patch-ac) = 888745f4220e18b7595bc06d8b5912e7b7fbde2c
-SHA1 (patch-ad) = 9a1ed2222e51f6a57fd98806055ee839934cec95
+SHA1 (ftpproxy-1.2.1.tgz) = fd095ef5b17e47226a9dfda7b25c39912bb46cc6
+Size (ftpproxy-1.2.1.tgz) = 78618 bytes
+SHA1 (patch-aa) = bb9d75d843d3855e7f7fa20181abc7ded500ce47
+SHA1 (patch-ab) = 1d982575a96e06f2908f1c2ec7f837570c5b1a09
diff --git a/net/ftpproxy/patches/patch-aa b/net/ftpproxy/patches/patch-aa
index 4af8ecfd456..51639cec4fb 100644
--- a/net/ftpproxy/patches/patch-aa
+++ b/net/ftpproxy/patches/patch-aa
@@ -1,17 +1,17 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/05/09 16:20:58 taca Exp $
+$NetBSD: patch-aa,v 1.2 2003/09/02 17:27:18 taca Exp $
 
---- doc/ftp.proxy.1.orig	Tue Feb  5 02:57:01 2002
+--- doc/ftp.proxy.1.orig	2003-01-24 01:18:47.000000000 +0900
 +++ doc/ftp.proxy.1
 @@ -13,7 +13,7 @@
  .in -0.5i
  .sp
  ..
--.TH FTP.PROXY 1 "04 FEBRUARY 2002"
-+.TH FTP.PROXY 8 "04 FEBRUARY 2002"
+-.TH FTP.PROXY 1 "23 JANUARY 2003"
++.TH FTP.PROXY 8 "23 JANUARY 2003"
  .SH NAME
  ftp.proxy \- FTP proxy server
  .SH SYNOPSIS
-@@ -29,7 +29,7 @@
+@@ -29,7 +29,7 @@ client.
  .PP
  .I ftp.proxy
  must be started from a TCP superserver like
@@ -20,12 +20,12 @@ $NetBSD: patch-aa,v 1.1.1.1 2002/05/09 16:20:58 taca Exp $
  or
  .IR tcpproxy (1).
  It can't bind to a TCP/IP port on it's own.
-@@ -254,7 +254,7 @@
+@@ -291,7 +291,7 @@ Daemon log facility on other.
  .SH "AUTHOR"
  Andreas Schoenberg <asg@ftpproxy.org>
  .SH "SEE ALSO"
 -.IR inetd (1),
 +.IR inetd (8),
- .IR tcpproxy (1).
- .IR syslogd (8).
+ .IR tcpproxy (1),
+ .IR syslogd (8),
  .IR syslog.conf (5).
diff --git a/net/ftpproxy/patches/patch-ab b/net/ftpproxy/patches/patch-ab
index f8ac8f85330..5bd4193984c 100644
--- a/net/ftpproxy/patches/patch-ab
+++ b/net/ftpproxy/patches/patch-ab
@@ -1,13 +1,20 @@
-$NetBSD: patch-ab,v 1.1 2002/05/09 16:55:52 taca Exp $
+$NetBSD: patch-ab,v 1.2 2003/09/02 17:27:18 taca Exp $
 
---- src/Makefile.orig	Tue Jan 22 00:46:03 2002
-+++ src/Makefile
-@@ -12,7 +12,7 @@
+--- Makefile.orig	2003-08-19 23:32:15.000000000 +0900
++++ Makefile
+@@ -3,13 +3,11 @@ VERSION =	1.2.1
+ DIR =		ftpproxy-$(VERSION)
+ TAR =		ftpproxy-$(VERSION)
  
+-export VERSION
+-
+ TARGETS =	ftp.proxy
  
- ftp.proxy:	$(FTPPROXY)
--	$(CC) -o $@ $(FTPPROXY)
-+	$(CC) -o $@ $(FTPPROXY) $(LIBS)
  
- 	
- clean:
+-all:	$(TARGETS)
+-	cd src; make all 
++all:
++	cd src; make VERSION=${VERSION} all 
+ 
+ 
+ install:	all
diff --git a/net/ftpproxy/patches/patch-ac b/net/ftpproxy/patches/patch-ac
deleted file mode 100644
index ebdc905fc12..00000000000
--- a/net/ftpproxy/patches/patch-ac
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2002/05/09 16:55:53 taca Exp $
-
---- src/ftp.c.orig	Tue Feb  5 02:11:21 2002
-+++ src/ftp.c
-@@ -848,8 +848,8 @@
- {
- 	char	varname[200];
- 
--	snprintf (varname, sizeof(varname) - 2, "%s%s", x->config->varname, var);
--	setenv(varname, value != NULL? value: "", 1);
-+	snprintf (varname, sizeof(varname) - 2, "%s%s=%s", x->config->varname,
-+			var, (value != NULL)? value: "");
- 
- 	return (0);
- }
diff --git a/net/ftpproxy/patches/patch-ad b/net/ftpproxy/patches/patch-ad
deleted file mode 100644
index 67373118a18..00000000000
--- a/net/ftpproxy/patches/patch-ad
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2002/05/09 16:55:53 taca Exp $
-
---- src/main.c.orig	Tue Feb  5 03:00:27 2002
-+++ src/main.c
-@@ -46,6 +46,9 @@
- #include "ip-lib.h"
- #include "lib.h"
- 
-+#ifndef	LOG_FTP
-+#define	LOG_FTP	LOG_DAEMON
-+#endif
- 
- char	*program =		"";
- char	progname[80] =		"";