summaryrefslogtreecommitdiff
path: root/net/wu-ftpd
diff options
context:
space:
mode:
authorrh <rh@pkgsrc.org>2000-06-26 20:09:33 +0000
committerrh <rh@pkgsrc.org>2000-06-26 20:09:33 +0000
commit0e85fa926f763205cc3b434d440a70a6f7edb9b2 (patch)
treede5bca3b4d5c26e5692e89009370f48721749164 /net/wu-ftpd
parentbb4f72ac6937a70f98c12b76ae4cf93a7735b7c6 (diff)
downloadpkgsrc-0e85fa926f763205cc3b434d440a70a6f7edb9b2.tar.gz
Add patches to fix a possible buffer overflow attacks with the "SITE EXEC"
command. Bump revision to 2.6.0nb1
Diffstat (limited to 'net/wu-ftpd')
-rw-r--r--net/wu-ftpd/Makefile7
-rw-r--r--net/wu-ftpd/files/patch-sum5
-rw-r--r--net/wu-ftpd/patches/patch-ae20
-rw-r--r--net/wu-ftpd/patches/patch-ai6
4 files changed, 30 insertions, 8 deletions
diff --git a/net/wu-ftpd/Makefile b/net/wu-ftpd/Makefile
index 5fa4d11d7ab..a891a4f342a 100644
--- a/net/wu-ftpd/Makefile
+++ b/net/wu-ftpd/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.12 2000/04/27 03:53:49 kim Exp $
+# $NetBSD: Makefile,v 1.13 2000/06/26 20:09:33 rh Exp $
# FreeBSD Id: Makefile,v 1.16 1997/12/24 17:45:28 ache Exp
#
-DISTNAME= wu-ftpd-2.6.0
+DISTNAME= wu-ftpd-2.6.0
+PKGNAME= ${DISTNAME}nb1
CATEGORIES= net
MASTER_SITES= ftp://ftp.wu-ftpd.org/pub/wu-ftpd/ \
ftp://ftp.landfield.com/wu-ftpd/wu-ftpd.org/wu-ftpd/ \
@@ -25,7 +26,7 @@ MASTER_SITES= ftp://ftp.wu-ftpd.org/pub/wu-ftpd/ \
ftp://sunsite.cnlab-switch.ch/mirror/wu-ftpd/wu-ftpd/ \
ftp://ftp.ox.ac.uk/pub/comp/security/COAST/mirrors/ftp.vr.net/wu-ftpd/
-MAINTAINER= rh@netbsd.org
+MAINTAINER= rh@netbsd.org
HOMEPAGE= http://www.wu-ftpd.org/
CONFLICTS+= wu-ftpd-vr-* beroftpd-*
diff --git a/net/wu-ftpd/files/patch-sum b/net/wu-ftpd/files/patch-sum
index cabeecdb0fb..bdcf28a3eb2 100644
--- a/net/wu-ftpd/files/patch-sum
+++ b/net/wu-ftpd/files/patch-sum
@@ -1,9 +1,10 @@
-$NetBSD: patch-sum,v 1.4 2000/06/19 00:28:36 kim Exp $
+$NetBSD: patch-sum,v 1.5 2000/06/26 20:09:34 rh Exp $
MD5 (patch-aa) = 4365668d156c10867e9ca700b4fdb8b7
MD5 (patch-ab) = 972bad15ee6b2487196d6c86c2fa0081
MD5 (patch-ac) = 25f0b246d679a3139896e7d29e2073be
MD5 (patch-ad) = 1c030b87e02b0636892f2f63dba516b6
+MD5 (patch-ae) = 38cb444f21b8518ec3e74c3d32b1616f
MD5 (patch-af) = 2d21677acf70f895a9fcb6327f6fae78
MD5 (patch-ag) = 0cc37eeffd18e73ee0cfb888fba5f2b6
-MD5 (patch-ai) = b0a7e561425e018f6a2344b5c091b064
+MD5 (patch-ai) = e80be8c8d788f821c0cc2491f053db29
diff --git a/net/wu-ftpd/patches/patch-ae b/net/wu-ftpd/patches/patch-ae
new file mode 100644
index 00000000000..707c7a6976f
--- /dev/null
+++ b/net/wu-ftpd/patches/patch-ae
@@ -0,0 +1,20 @@
+$NetBSD: patch-ae,v 1.5 2000/06/26 20:09:35 rh Exp $
+
+--- src/ftpcmd.y.orig Wed Oct 13 08:15:28 1999
++++ src/ftpcmd.y Thu Jun 22 22:44:41 2000
+@@ -1926,13 +1926,13 @@
+ }
+ if (!maxfound)
+ maxlines = defmaxlines;
+- lreply(200, cmd);
++ lreply(200, "%s", cmd);
+ while (fgets(buf, sizeof buf, cmdf)) {
+ size_t len = strlen(buf);
+
+ if (len > 0 && buf[len - 1] == '\n')
+ buf[--len] = '\0';
+- lreply(200, buf);
++ lreply(200, "%s", buf);
+ if (maxlines <= 0)
+ ++lines;
+ else if (++lines >= maxlines) {
diff --git a/net/wu-ftpd/patches/patch-ai b/net/wu-ftpd/patches/patch-ai
index a02d1ab8398..e747fa5c3db 100644
--- a/net/wu-ftpd/patches/patch-ai
+++ b/net/wu-ftpd/patches/patch-ai
@@ -1,7 +1,7 @@
-$NetBSD: patch-ai,v 1.6 2000/06/19 00:28:37 kim Exp $
+$NetBSD: patch-ai,v 1.7 2000/06/26 20:09:35 rh Exp $
---- src/ftpd.c.orig Thu Oct 14 10:41:47 1999
-+++ src/ftpd.c Sun Jun 18 20:24:20 2000
+--- src/ftpd.c.orig Mon Jun 26 21:52:06 2000
++++ src/ftpd.c Mon Jun 26 21:52:06 2000
@@ -75,6 +75,7 @@
#include <grp.h>
#endif