summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsalo <salo@pkgsrc.org>2006-12-09 10:37:30 +0000
committersalo <salo@pkgsrc.org>2006-12-09 10:37:30 +0000
commitc519c5272facc481a4705bc1ecbe24e8017c268d (patch)
tree2d15ae65ea80eb5e8a847a93f10d266ca8815dce
parent97945a10604e5d035d5731cfe97969f1ad12b8bf (diff)
downloadpkgsrc-c519c5272facc481a4705bc1ecbe24e8017c268d.tar.gz
Pullup ticket 1949 - requested by wiz
security fix for tnftpd Revisions pulled up: - pkgsrc/net/tnftpd/Makefile 1.15 - pkgsrc/net/tnftpd/distinfo 1.7 - pkgsrc/net/tnftpd/patches/patch-aa 1.3 Module Name: pkgsrc Committed By: adrianp Date: Sat Dec 2 23:00:05 UTC 2006 Modified Files: pkgsrc/net/tnftpd: Makefile distinfo Added Files: pkgsrc/net/tnftpd/patches: patch-aa Log Message: Add a patch for: http://lists.grok.org.uk/pipermail/full-disclosure/2006-December/051009.html Bumb to nb1
-rw-r--r--net/tnftpd/Makefile3
-rw-r--r--net/tnftpd/distinfo3
-rw-r--r--net/tnftpd/patches/patch-aa15
3 files changed, 19 insertions, 2 deletions
diff --git a/net/tnftpd/Makefile b/net/tnftpd/Makefile
index d019c3d4401..6aa225f9ecc 100644
--- a/net/tnftpd/Makefile
+++ b/net/tnftpd/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2006/06/20 22:19:38 minskim Exp $
+# $NetBSD: Makefile,v 1.14.4.1 2006/12/09 10:37:30 salo Exp $
#
DISTNAME= tnftpd-20040810
+PKGREVISION= 1
CATEGORIES= net
MASTER_SITES= ftp://ftp.NetBSD.org/pub/NetBSD/misc/tnftp/
diff --git a/net/tnftpd/distinfo b/net/tnftpd/distinfo
index b1eb9114aff..f0a642c7537 100644
--- a/net/tnftpd/distinfo
+++ b/net/tnftpd/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.6 2005/02/24 12:14:05 agc Exp $
+$NetBSD: distinfo,v 1.6.14.1 2006/12/09 10:37:30 salo Exp $
SHA1 (tnftpd-20040810.tar.gz) = 1f00770edf0ae031183f9a940d9b776f6610e4ea
RMD160 (tnftpd-20040810.tar.gz) = 210736c475301c38896039c52287f01fb1b41636
Size (tnftpd-20040810.tar.gz) = 178638 bytes
+SHA1 (patch-aa) = 17abae4bd5bf26213539cdd5f160272ac1a39942
diff --git a/net/tnftpd/patches/patch-aa b/net/tnftpd/patches/patch-aa
new file mode 100644
index 00000000000..df6eb5d3ec6
--- /dev/null
+++ b/net/tnftpd/patches/patch-aa
@@ -0,0 +1,15 @@
+$NetBSD: patch-aa,v 1.2.18.1 2006/12/09 10:37:30 salo Exp $
+
+--- libnetbsd/glob.c.orig 2003-12-15 12:18:43.000000000 +0000
++++ libnetbsd/glob.c
+@@ -497,7 +497,9 @@ glob1(Char *pattern, glob_t *pglob, size
+ * we save one character so that we can use ptr >= limit,
+ * in the general case when we are appending non nul chars only.
+ */
+- return(glob2(pathbuf, pathbuf, pathbuf + sizeof(pathbuf) - 1, pattern,
++ return(glob2(pathbuf, pathbuf,
++ pathbuf + (sizeof(pathbuf) / sizeof(*pathbuf)) - 1,
++ pattern,
+ pglob, limit));
+ }
+