diff options
| -rw-r--r-- | net/ftpproxy/Makefile | 6 | ||||
| -rw-r--r-- | net/ftpproxy/distinfo | 12 | ||||
| -rw-r--r-- | net/ftpproxy/patches/patch-aa | 16 | ||||
| -rw-r--r-- | net/ftpproxy/patches/patch-ab | 25 | ||||
| -rw-r--r-- | net/ftpproxy/patches/patch-ac | 15 | ||||
| -rw-r--r-- | net/ftpproxy/patches/patch-ad | 14 |
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] = ""; |