summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsnj <snj@pkgsrc.org>2005-03-01 20:47:50 +0000
committersnj <snj@pkgsrc.org>2005-03-01 20:47:50 +0000
commitdc822cae21454ac59f0c548177c6b552957d82b9 (patch)
tree05097aa4ec9fc428b02b171db2cc63bf2177bfbd
parente15849f3801420731dc8327ab2a78981ea0563ff (diff)
downloadpkgsrc-dc822cae21454ac59f0c548177c6b552957d82b9.tar.gz
Pullup ticket 324 - requested by Thomas Klausner
security fix for wu-ftpd Revisions pulled up: - pkgsrc/net/wu-ftpd/Makefile 1.26 - pkgsrc/net/wu-ftpd/distinfo 1.13 - pkgsrc/net/wu-ftpd/patches/patch-ak 1.4 Module Name: pkgsrc Committed By: wiz Date: Tue Mar 1 16:06:37 UTC 2005 Modified Files: pkgsrc/net/wu-ftpd: Makefile distinfo Added Files: pkgsrc/net/wu-ftpd/patches: patch-ak Log Message: Apply patch from Rainer Schoepf in http://marc.theaimsgroup.com/?l=bugtraq&m=110960890901497&w=2 to fix http://www.idefense.com/application/poi/display?id=207&type=vulnerabilities Bump PKGREVISION.
-rw-r--r--net/wu-ftpd/Makefile4
-rw-r--r--net/wu-ftpd/distinfo3
-rw-r--r--net/wu-ftpd/patches/patch-ak13
3 files changed, 17 insertions, 3 deletions
diff --git a/net/wu-ftpd/Makefile b/net/wu-ftpd/Makefile
index 33b69657fca..819db45f8f1 100644
--- a/net/wu-ftpd/Makefile
+++ b/net/wu-ftpd/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.25 2004/02/14 00:54:45 grant Exp $
+# $NetBSD: Makefile,v 1.25.8.1 2005/03/01 20:47:50 snj Exp $
# FreeBSD Id: Makefile,v 1.16 1997/12/24 17:45:28 ache Exp
#
DISTNAME= wu-ftpd-2.6.2
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= net
MASTER_SITES= ftp://ftp.wu-ftpd.org/pub/wu-ftpd/ \
ftp://ftp.landfield.com/wu-ftpd/wu-ftpd.org/wu-ftpd/ \
diff --git a/net/wu-ftpd/distinfo b/net/wu-ftpd/distinfo
index bfe9feb1006..29aa64ebad9 100644
--- a/net/wu-ftpd/distinfo
+++ b/net/wu-ftpd/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2004/09/12 21:34:21 kristerw Exp $
+$NetBSD: distinfo,v 1.11.4.1 2005/03/01 20:47:50 snj Exp $
SHA1 (wu-ftpd/wu-ftpd-2.6.2.tar.gz) = e39112bd8a67f189b6a8da8dd81ceb00a910e271
Size (wu-ftpd/wu-ftpd-2.6.2.tar.gz) = 354784 bytes
@@ -16,3 +16,4 @@ SHA1 (patch-ag) = 59cc211f4770e5e447b2cd9ca7bd5ab3dc07fc3d
SHA1 (patch-ah) = a5305d6b9f8d3e1145e6951eaf37f0cdd5c98edc
SHA1 (patch-ai) = 2c866946d003fe474c74a2c1b90b87953bd99902
SHA1 (patch-aj) = 65eef2815b2364aaa243cb93ce4a99fdf2eb9f10
+SHA1 (patch-ak) = 6dd173ab0121859bcfa21858762bbad727e98f32
diff --git a/net/wu-ftpd/patches/patch-ak b/net/wu-ftpd/patches/patch-ak
new file mode 100644
index 00000000000..17197d9a872
--- /dev/null
+++ b/net/wu-ftpd/patches/patch-ak
@@ -0,0 +1,13 @@
+$NetBSD: patch-ak,v 1.3.10.1 2005/03/01 20:47:51 snj Exp $
+
+--- src/glob.c.orig 2001-11-29 18:01:38.000000000 +0100
++++ src/glob.c
+@@ -437,6 +437,8 @@ static int amatch(char *s, char *p)
+ continue;
+
+ case '*':
++ while (*p == '*')
++ p++;
+ if (!*p)
+ return (1);
+ if (*p == '/') {