[pkgsrc/trunk]: pkgsrc/net/quagga Fix a security problem wrt telnet control c...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/4918d42d47d6
branches:  trunk
changeset: 463581:4918d42d47d6
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Tue Nov 18 16:34:49 2003 +0000

description:
Fix a security problem wrt telnet control characters. Bump PKGREVISION.
Patch from RedHat Source RPM via itojun (same for zebra commit a minute ago).
While here, fix PLIST.

diffstat:

 net/quagga/Makefile         |   3 ++-
 net/quagga/PLIST            |  22 +++++++++++++++++-----
 net/quagga/distinfo         |   3 ++-
 net/quagga/patches/patch-ah |  25 +++++++++++++++++++++++++
 4 files changed, 46 insertions(+), 7 deletions(-)

diffs (92 lines):

diff -r fe01076ac468 -r 4918d42d47d6 net/quagga/Makefile
--- a/net/quagga/Makefile       Tue Nov 18 16:34:13 2003 +0000
+++ b/net/quagga/Makefile       Tue Nov 18 16:34:49 2003 +0000
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2003/10/17 05:32:38 itojun Exp $
+# $NetBSD: Makefile,v 1.8 2003/11/18 16:34:49 wiz Exp $
 # Based on KAME Id: Makefile,v 1.1.2.1.2.1.10.2 1999/01/05 11:03:50 itojun Exp
 #
 
 DISTNAME=      quagga-0.96.3
+PKGREVISION=   1
 CATEGORIES=    net
 MASTER_SITES=  http://www.quagga.net/download/
 
diff -r fe01076ac468 -r 4918d42d47d6 net/quagga/PLIST
--- a/net/quagga/PLIST  Tue Nov 18 16:34:13 2003 +0000
+++ b/net/quagga/PLIST  Tue Nov 18 16:34:49 2003 +0000
@@ -1,5 +1,20 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/08/13 07:26:57 itojun Exp $
+@comment $NetBSD: PLIST,v 1.2 2003/11/18 16:34:49 wiz Exp $
+include/ospfd/ospf_api.h
+include/ospfd/ospf_asbr.h
+include/ospfd/ospf_dump.h
+include/ospfd/ospf_ism.h
+include/ospfd/ospf_lsa.h
+include/ospfd/ospf_lsdb.h
+include/ospfd/ospf_nsm.h
+include/ospfd/ospf_opaque.h
+include/ospfd/ospfd.h
 info/quagga.info
+info/quagga.info-1
+info/quagga.info-2
+info/quagga.info-3
+info/quagga.info-4
+lib/libospf.a
+lib/libzebra.a
 man/man1/vtysh.1
 man/man8/bgpd.8
 man/man8/ospfd.8
@@ -13,8 +28,5 @@
 share/examples/quagga/bgpd.conf.sample2
 share/examples/quagga/ripd.conf.sample
 share/examples/quagga/zebra.conf.sample
-info/quagga.info-1
-info/quagga.info-2
-info/quagga.info-3
-info/quagga.info-4
 @dirrm share/examples/quagga
+@dirrm include/ospfd
diff -r fe01076ac468 -r 4918d42d47d6 net/quagga/distinfo
--- a/net/quagga/distinfo       Tue Nov 18 16:34:13 2003 +0000
+++ b/net/quagga/distinfo       Tue Nov 18 16:34:49 2003 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2003/10/17 05:32:38 itojun Exp $
+$NetBSD: distinfo,v 1.4 2003/11/18 16:34:49 wiz Exp $
 
 SHA1 (quagga-0.96.3.tar.gz) = 0be8baf3c175ef8df31ec254009d8d7ac4ba412f
 Size (quagga-0.96.3.tar.gz) = 1464239 bytes
@@ -9,3 +9,4 @@
 SHA1 (patch-ae) = bd96350270d0bb09a549af02fd706a59f1dd6002
 SHA1 (patch-af) = 5b0e15f21e874273fbd120829708d7fd8d744605
 SHA1 (patch-ag) = 7f0265cd88e78b1b7e938a6d446f788242f7e886
+SHA1 (patch-ah) = a714f939352caca3ec60934532a6561d85446b3a
diff -r fe01076ac468 -r 4918d42d47d6 net/quagga/patches/patch-ah
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/quagga/patches/patch-ah       Tue Nov 18 16:34:49 2003 +0000
@@ -0,0 +1,25 @@
+$NetBSD: patch-ah,v 1.1 2003/11/18 16:34:49 wiz Exp $
+
+--- lib/vty.c.orig     Tue Jul 15 14:52:22 2003
++++ lib/vty.c
+@@ -1140,13 +1140,16 @@ vty_telnet_option (struct vty *vty, unsi
+       break;
+     case SE: 
+       {
+-      char *buffer = (char *)vty->sb_buffer->head->data;
+-      int length = vty->sb_buffer->length;
++      char *buffer;
++      int length;
+ 
+-      if (buffer == NULL)
++      if (!vty->iac_sb_in_progress)
+         return 0;
+ 
+-      if (!vty->iac_sb_in_progress)
++      buffer = (char *)vty->sb_buffer->head->data;
++      length = vty->sb_buffer->length;
++
++      if (buffer == NULL)
+         return 0;
+ 
+       if (buffer[0] == '\0')