OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 25-Nov-2003 14:37:05
Branch: OPENPKG_1_2_SOLID HEAD Handle: 2003112513370302
Added files: (Branch: OPENPKG_1_2_SOLID)
openpkg-src/zebra zebra.patch
Modified files:
openpkg-web news.txt
Modified files: (Branch: OPENPKG_1_2_SOLID)
openpkg-src/zebra zebra.spec
Log:
SA-2003.049-zebra; CAN-2003-0795, CAN-2003-0858
Summary:
Revision Changes Path
1.5.2.1 +99 -0 openpkg-src/zebra/zebra.patch
1.27.2.1.2.2+3 -1 openpkg-src/zebra/zebra.spec
1.7530 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/zebra/zebra.patch
============================================================================
$ cvs diff -u -r0 -r1.5.2.1 zebra.patch
--- /dev/null 2003-11-25 14:37:05.000000000 +0100
+++ zebra.patch 2003-11-25 14:37:05.000000000 +0100
@@ -0,0 +1,99 @@
+zebra-0.91a-can-2003-0795.patch taken from
+zebra-0.93b-27301U90_1cl.src.rpm mentioned in CLA-2003:786
+--- lib/vty.c.orig Thu Feb 1 02:18:05 2001
++++ lib/vty.c Wed Oct 15 19:50:34 2003
+@@ -1103,13 +1103,16 @@
+ 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')
+
+zebra-0.91a-can-2003-0858.patch taken from
+zebra-0.93b-27301U90_1cl.src.rpm mentioned in CLA-2003:786
+--- zebra/rt_netlink.c.netlink Tue Jan 23 03:10:04 2001
++++ zebra/rt_netlink.c Wed Oct 29 22:46:44 2003
+@@ -46,9 +46,8 @@
+ int seq;
+ struct sockaddr_nl snl;
+ char *name;
+-} netlink = { -1, 0, {0}, "netlink-listen" }, /* kernel messages */
+- netlink_cmd = { -1, 0, {0}, "netlink-cmd" }, /* command channel */
+- netlink_addr = {-1, 0, {0}, "netlink-addr" }; /* address channel */
++} netlink_sock ={ -1, 0, {0}, "netlink-listen" }, /* kernel messages */
++ netlink_cmd = { -1, 0, {0}, "netlink-cmd" }; /* command channel */
+
+ struct message nlmsg_str[] =
+ {
+@@ -206,6 +205,13 @@
+ return -1;
+ }
+
++ /* JF: Ignore messages that aren't from the kernel */
++ if ( snl.nl_pid != 0 )
++ {
++ zlog ( NULL, LOG_ERR, "Ignoring message from pid %u", snl.nl_pid );
++ continue;
++ }
++
+ for (h = (struct nlmsghdr *) buf; NLMSG_OK (h, status);
+ h = NLMSG_NEXT (h, status))
+ {
+@@ -1052,7 +1058,7 @@
+ snl.nl_family = AF_NETLINK;
+
+ /* Talk to netlink socket. */
+- ret = netlink_talk (&req.n, &netlink);
++ ret = netlink_talk (&req.n, &netlink_sock);
+ if (ret < 0)
+ return -1;
+
+@@ -1270,7 +1276,7 @@
+ if (family == AF_INET)
+ nl = &netlink_cmd;
+ else
+- nl = &netlink;
++ nl = &netlink_sock;
+
+ /* Talk to netlink socket. */
+ return netlink_talk (&req.n, nl);
+@@ -1384,8 +1390,8 @@
+ int sock;
+
+ sock = THREAD_FD (thread);
+- ret = netlink_parse_info (netlink_information_fetch, &netlink);
+- thread_add_read (master, kernel_read, NULL, netlink.sock);
++ ret = netlink_parse_info (netlink_information_fetch, &netlink_sock);
++ thread_add_read (master, kernel_read, NULL, netlink_sock.sock);
+
+ return 0;
+ }
+@@ -1401,10 +1407,10 @@
+ #ifdef HAVE_IPV6
+ groups |= RTMGRP_IPV6_ROUTE|RTMGRP_IPV6_IFADDR;
+ #endif /* HAVE_IPV6 */
+- netlink_socket (&netlink, groups);
++ netlink_socket (&netlink_sock, groups);
+ netlink_socket (&netlink_cmd, 0);
+
+ /* Register kernel socket. */
+- if (netlink.sock > 0)
+- thread_add_read (master, kernel_read, NULL, netlink.sock);
++ if (netlink_sock.sock > 0)
++ thread_add_read (master, kernel_read, NULL, netlink_sock.sock);
+ }
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/zebra/zebra.spec
============================================================================
$ cvs diff -u -r1.27.2.1.2.1 -r1.27.2.1.2.2 zebra.spec
--- openpkg-src/zebra/zebra.spec 18 Jan 2003 17:23:46 -0000 1.27.2.1.2.1
+++ openpkg-src/zebra/zebra.spec 25 Nov 2003 13:37:05 -0000 1.27.2.1.2.2
@@ -33,7 +33,7 @@
Group: Network
License: GPL
Version: 0.93b
-Release: 1.2.0
+Release: 1.2.1
# list of sources
Source0: ftp://ftp.zebra.org/pub/zebra/zebra-%{version}.tar.gz
@@ -42,6 +42,7 @@
Source3: ospfd.conf
Source4: ripd.conf
Source5: zebra.conf
+Patch0: zebra.patch
# build information
Prefix: %{l_prefix}
@@ -63,6 +64,7 @@
%prep
%setup -q
+ %patch -p0
%build
# patch configure script for correct pid directory
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.7529 -r1.7530 news.txt
--- openpkg-web/news.txt 25 Nov 2003 13:32:40 -0000 1.7529
+++ openpkg-web/news.txt 25 Nov 2003 13:37:03 -0000 1.7530
@@ -1,3 +1,4 @@
+25-Nov-2003: Upgraded package: P<zebra-0.93b-1.2.1>
25-Nov-2003: Upgraded package: P<zebra-0.93b-1.3.1>
25-Nov-2003: Upgraded package: P<honeyd-0.7-20031125>
24-Nov-2003: Upgraded package: P<openpkg-20031124-20031124>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
