From: Alexandros C. Couloumbis <alex@ozo.com>
Date: Mon, 6 Sep 2010 07:01:55 +0000 (+0000)
Subject: net/quagga-unstable: Update to v0.99.17, refresh patches
X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=d9c4a15483604e43e9c8d1e14b696e7bc6bd0b5e;hp=fd02bb611a218618e3a7bcfee0ed8a3af054fe34;p=openwrt%2Fsvn-archive%2Farchive.git

net/quagga-unstable: Update to v0.99.17, refresh patches


SVN-Revision: 22952
---

diff --git a/net/quagga-unstable/Makefile b/net/quagga-unstable/Makefile
index 6d28d31f6f..1365314eab 100644
--- a/net/quagga-unstable/Makefile
+++ b/net/quagga-unstable/Makefile
@@ -8,14 +8,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=quagga-unstable
-PKG_VERSION:=0.99.16
+PKG_VERSION:=0.99.17
 PKG_RELEASE:=1
 
 PKG_SOURCE:=quagga-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.quagga.net/download/ \
                 http://www.de.quagga.net/download/ \
                 http://www.uk.quagga.net/download/
-PKG_MD5SUM:=350fb150be526cdfc4d2b093cb4d69a7
+PKG_MD5SUM:=37b9022adca04b03863d2d79787e643f
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/quagga-$(PKG_VERSION)
 
@@ -274,9 +274,9 @@ $(eval $(call BuildPackage,quagga-unstable))
 $(eval $(call BuildPackage,quagga-unstable-libzebra))
 $(eval $(call BuildPackage,quagga-unstable-libospf))
 $(eval $(call BuildPackage,quagga-unstable-bgpd))
-$(eval $(call BuildPackage,quagga-unstable-isisd))
+#$(eval $(call BuildPackage,quagga-unstable-isisd))
 $(eval $(call BuildPackage,quagga-unstable-ospfd))
-$(eval $(call BuildPackage,quagga-unstable-ospf6d))
+#$(eval $(call BuildPackage,quagga-unstable-ospf6d))
 $(eval $(call BuildPackage,quagga-unstable-ripd))
-$(eval $(call BuildPackage,quagga-unstable-ripngd))
+#$(eval $(call BuildPackage,quagga-unstable-ripngd))
 $(eval $(call BuildPackage,quagga-unstable-vtysh))
diff --git a/net/quagga-unstable/patches/002-quagga_manet.patch b/net/quagga-unstable/patches/002-quagga_manet.patch
index d2a30c50b7..abbcd489fe 100644
--- a/net/quagga-unstable/patches/002-quagga_manet.patch
+++ b/net/quagga-unstable/patches/002-quagga_manet.patch
@@ -1,6 +1,6 @@
 --- a/bgpd/bgp_vty.c
 +++ b/bgpd/bgp_vty.c
-@@ -8228,8 +8228,14 @@ bgp_str2route_type (int afi, const char 
+@@ -8228,8 +8228,14 @@ bgp_str2route_type (int afi, const char
  	return ZEBRA_ROUTE_STATIC;
        else if (strncmp (str, "r", 1) == 0)
  	return ZEBRA_ROUTE_RIP;
@@ -16,7 +16,7 @@
      }
    if (afi == AFI_IP6)
      {
-@@ -8241,21 +8247,30 @@ bgp_str2route_type (int afi, const char 
+@@ -8241,21 +8247,30 @@ bgp_str2route_type (int afi, const char
  	return ZEBRA_ROUTE_STATIC;
        else if (strncmp (str, "r", 1) == 0)
  	return ZEBRA_ROUTE_RIPNG;
@@ -435,7 +435,7 @@
  
  ## help strings
  ZEBRA_ROUTE_SYSTEM, "Reserved route type, for internal use only"
-@@ -71,4 +67,5 @@ ZEBRA_ROUTE_OSPF6,  "Open Shortest Path 
+@@ -71,4 +67,5 @@ ZEBRA_ROUTE_OSPF6,  "Open Shortest Path
  ZEBRA_ROUTE_ISIS,   "Intermediate System to Intermediate System (IS-IS)"
  ZEBRA_ROUTE_BGP,    "Border Gateway Protocol (BGP)"
  ZEBRA_ROUTE_HSLS,   "Hazy-Sighted Link State Protocol (HSLS)"
@@ -553,7 +553,7 @@
    ospf6_asbr_routemap_unset (type);
 --- a/ospfd/ospf_vty.c
 +++ b/ospfd/ospf_vty.c
-@@ -107,8 +107,14 @@ str2distribute_source (const char *str, 
+@@ -107,8 +107,14 @@ str2distribute_source (const char *str,
      *source = ZEBRA_ROUTE_STATIC;
    else if (strncmp (str, "r", 1) == 0)
      *source = ZEBRA_ROUTE_RIP;
@@ -613,7 +613,7 @@
        if (! client->redist[type])
  	{
  	  client->redist[type] = 1;
-@@ -283,6 +286,9 @@ zebra_redistribute_delete (int command, 
+@@ -283,6 +286,9 @@ zebra_redistribute_delete (int command,
      case ZEBRA_ROUTE_OSPF:
      case ZEBRA_ROUTE_OSPF6:
      case ZEBRA_ROUTE_BGP:
diff --git a/net/quagga-unstable/patches/100-quagga_multipath_caching_policy.patch b/net/quagga-unstable/patches/100-quagga_multipath_caching_policy.patch
index 8b76832373..dae45e2087 100644
--- a/net/quagga-unstable/patches/100-quagga_multipath_caching_policy.patch
+++ b/net/quagga-unstable/patches/100-quagga_multipath_caching_policy.patch
@@ -29,7 +29,7 @@
  dnl --------------------------
 --- a/lib/command.h
 +++ b/lib/command.h
-@@ -101,6 +101,7 @@ enum node_type 
+@@ -101,6 +101,7 @@ enum node_type
    DUMP_NODE,			/* Packet dump node. */
    FORWARDING_NODE,		/* IP forwarding node. */
    PROTOCOL_NODE,                /* protocol filtering node */
diff --git a/net/quagga-unstable/patches/150-no-cross-fs-link.patch b/net/quagga-unstable/patches/150-no-cross-fs-link.patch
index 2d253b76bf..c3f29c35f8 100644
--- a/net/quagga-unstable/patches/150-no-cross-fs-link.patch
+++ b/net/quagga-unstable/patches/150-no-cross-fs-link.patch
@@ -1,6 +1,6 @@
 --- a/lib/command.c
 +++ b/lib/command.c
-@@ -2601,6 +2601,13 @@ DEFUN (config_write_file, 
+@@ -2601,6 +2601,13 @@ DEFUN (config_write_file,
  		 VTY_NEWLINE);
          goto finished;
        }
@@ -14,7 +14,7 @@
    if (link (config_file, config_file_sav) != 0)
      {
        vty_out (vty, "Can't backup old configuration file %s.%s", config_file_sav,
-@@ -2614,7 +2621,23 @@ DEFUN (config_write_file, 
+@@ -2614,7 +2621,23 @@ DEFUN (config_write_file,
  	        VTY_NEWLINE);
        goto finished;
      }