[pkgsrc/pkgsrc-2006Q3]: pkgsrc/net/tnftpd Pullup ticket 1949 - requested by wiz

[salo <salo%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/da1bef1af4fb
branches:  pkgsrc-2006Q3
changeset: 519252:da1bef1af4fb
user:      salo <salo%pkgsrc.org@localhost>
date:      Sat Dec 09 10:37:30 2006 +0000

description:
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

diffstat:

 net/tnftpd/Makefile         |   3 ++-
 net/tnftpd/distinfo         |   3 ++-
 net/tnftpd/patches/patch-aa |  15 +++++++++++++++
 3 files changed, 19 insertions(+), 2 deletions(-)

diffs (43 lines):

diff -r 3c92c02f9187 -r da1bef1af4fb net/tnftpd/Makefile
--- a/net/tnftpd/Makefile       Sat Dec 09 10:21:44 2006 +0000
+++ b/net/tnftpd/Makefile       Sat Dec 09 10:37:30 2006 +0000
@@ -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 -r 3c92c02f9187 -r da1bef1af4fb net/tnftpd/distinfo
--- a/net/tnftpd/distinfo       Sat Dec 09 10:21:44 2006 +0000
+++ b/net/tnftpd/distinfo       Sat Dec 09 10:37:30 2006 +0000
@@ -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 -r 3c92c02f9187 -r da1bef1af4fb net/tnftpd/patches/patch-aa
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/tnftpd/patches/patch-aa       Sat Dec 09 10:37:30 2006 +0000
@@ -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));
+ }
+