From: acoul <acoul@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Thu, 14 Oct 2010 09:22:39 +0000 (+0000)
Subject: net/quagga-unstable: add some upstream patches
X-Git-Url: http://git.archive.openwrt.org/?a=commitdiff_plain;h=af97f980e68b99055ae3953f7b325f4a98e0d899;p=packages.git

net/quagga-unstable: add some upstream patches


git-svn-id: svn://svn.openwrt.org/openwrt/packages@23436 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/net/quagga-unstable/patches/000-upstream-bogus_cond.patch b/net/quagga-unstable/patches/000-upstream-bogus_cond.patch
new file mode 100644
index 000000000..c35ffdb7d
--- /dev/null
+++ b/net/quagga-unstable/patches/000-upstream-bogus_cond.patch
@@ -0,0 +1,11 @@
+--- a/zebra/zserv.c
++++ b/zebra/zserv.c
+@@ -451,7 +451,7 @@ zsend_route_multipath (int cmd, struct zserv *client, struct prefix *p,
+     }
+ 
+   /* Metric */
+-  if (cmd == ZEBRA_IPV4_ROUTE_ADD || ZEBRA_IPV6_ROUTE_ADD)
++  if (cmd == ZEBRA_IPV4_ROUTE_ADD || cmd == ZEBRA_IPV6_ROUTE_ADD)
+     {
+       SET_FLAG (zapi_flags, ZAPI_MESSAGE_DISTANCE);
+       stream_putc (s, rib->distance);
diff --git a/net/quagga-unstable/patches/000-upstream-miss_str.patch b/net/quagga-unstable/patches/000-upstream-miss_str.patch
new file mode 100644
index 000000000..6ad357530
--- /dev/null
+++ b/net/quagga-unstable/patches/000-upstream-miss_str.patch
@@ -0,0 +1,11 @@
+--- a/lib/vty.c
++++ b/lib/vty.c
+@@ -250,7 +250,7 @@ vty_hello (struct vty *vty)
+ 	vty_out (vty, "MOTD file not found%s", VTY_NEWLINE);
+     }
+   else if (host.motd)
+-    vty_out (vty, host.motd);
++    vty_out (vty, "%s", host.motd);
+ }
+ 
+ /* Put out prompt and wait input from user. */
diff --git a/net/quagga-unstable/patches/000-upstream-set_null.patch b/net/quagga-unstable/patches/000-upstream-set_null.patch
new file mode 100644
index 000000000..3d0eaebd8
--- /dev/null
+++ b/net/quagga-unstable/patches/000-upstream-set_null.patch
@@ -0,0 +1,16 @@
+--- a/bgpd/bgp_packet.c
++++ b/bgpd/bgp_packet.c
+@@ -177,10 +177,11 @@ bgp_update_packet (struct peer *peer, afi_t afi, safi_t safi)
+ 	  
+ 	  if (rn->prn)
+ 	    prd = (struct prefix_rd *) &rn->prn->p;
+-          if (binfo && binfo->extra)
++          if (binfo)
+             {
+-              tag = binfo->extra->tag;
+               from = binfo->peer;
++              if (binfo->extra)
++                tag = binfo->extra->tag;
+             }
+           
+ 	  bgp_packet_set_marker (s, BGP_MSG_UPDATE);