net/quagga-unstable: Update to v0.99.17, refresh patches
git-svn-id: svn://svn.openwrt.org/openwrt/packages@22952 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
parent
1aa9191f34
commit
986bfabff7
@ -8,14 +8,14 @@
|
|||||||
include $(TOPDIR)/rules.mk
|
include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
PKG_NAME:=quagga-unstable
|
PKG_NAME:=quagga-unstable
|
||||||
PKG_VERSION:=0.99.16
|
PKG_VERSION:=0.99.17
|
||||||
PKG_RELEASE:=1
|
PKG_RELEASE:=1
|
||||||
|
|
||||||
PKG_SOURCE:=quagga-$(PKG_VERSION).tar.gz
|
PKG_SOURCE:=quagga-$(PKG_VERSION).tar.gz
|
||||||
PKG_SOURCE_URL:=http://www.quagga.net/download/ \
|
PKG_SOURCE_URL:=http://www.quagga.net/download/ \
|
||||||
http://www.de.quagga.net/download/ \
|
http://www.de.quagga.net/download/ \
|
||||||
http://www.uk.quagga.net/download/
|
http://www.uk.quagga.net/download/
|
||||||
PKG_MD5SUM:=350fb150be526cdfc4d2b093cb4d69a7
|
PKG_MD5SUM:=37b9022adca04b03863d2d79787e643f
|
||||||
|
|
||||||
PKG_BUILD_DIR:=$(BUILD_DIR)/quagga-$(PKG_VERSION)
|
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-libzebra))
|
||||||
$(eval $(call BuildPackage,quagga-unstable-libospf))
|
$(eval $(call BuildPackage,quagga-unstable-libospf))
|
||||||
$(eval $(call BuildPackage,quagga-unstable-bgpd))
|
$(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-ospfd))
|
||||||
$(eval $(call BuildPackage,quagga-unstable-ospf6d))
|
#$(eval $(call BuildPackage,quagga-unstable-ospf6d))
|
||||||
$(eval $(call BuildPackage,quagga-unstable-ripd))
|
$(eval $(call BuildPackage,quagga-unstable-ripd))
|
||||||
$(eval $(call BuildPackage,quagga-unstable-ripngd))
|
#$(eval $(call BuildPackage,quagga-unstable-ripngd))
|
||||||
$(eval $(call BuildPackage,quagga-unstable-vtysh))
|
$(eval $(call BuildPackage,quagga-unstable-vtysh))
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
--- a/bgpd/bgp_vty.c
|
--- a/bgpd/bgp_vty.c
|
||||||
+++ b/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;
|
return ZEBRA_ROUTE_STATIC;
|
||||||
else if (strncmp (str, "r", 1) == 0)
|
else if (strncmp (str, "r", 1) == 0)
|
||||||
return ZEBRA_ROUTE_RIP;
|
return ZEBRA_ROUTE_RIP;
|
||||||
@ -16,7 +16,7 @@
|
|||||||
}
|
}
|
||||||
if (afi == AFI_IP6)
|
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;
|
return ZEBRA_ROUTE_STATIC;
|
||||||
else if (strncmp (str, "r", 1) == 0)
|
else if (strncmp (str, "r", 1) == 0)
|
||||||
return ZEBRA_ROUTE_RIPNG;
|
return ZEBRA_ROUTE_RIPNG;
|
||||||
@ -435,7 +435,7 @@
|
|||||||
|
|
||||||
## help strings
|
## help strings
|
||||||
ZEBRA_ROUTE_SYSTEM, "Reserved route type, for internal use only"
|
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_ISIS, "Intermediate System to Intermediate System (IS-IS)"
|
||||||
ZEBRA_ROUTE_BGP, "Border Gateway Protocol (BGP)"
|
ZEBRA_ROUTE_BGP, "Border Gateway Protocol (BGP)"
|
||||||
ZEBRA_ROUTE_HSLS, "Hazy-Sighted Link State Protocol (HSLS)"
|
ZEBRA_ROUTE_HSLS, "Hazy-Sighted Link State Protocol (HSLS)"
|
||||||
@ -553,7 +553,7 @@
|
|||||||
ospf6_asbr_routemap_unset (type);
|
ospf6_asbr_routemap_unset (type);
|
||||||
--- a/ospfd/ospf_vty.c
|
--- a/ospfd/ospf_vty.c
|
||||||
+++ b/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;
|
*source = ZEBRA_ROUTE_STATIC;
|
||||||
else if (strncmp (str, "r", 1) == 0)
|
else if (strncmp (str, "r", 1) == 0)
|
||||||
*source = ZEBRA_ROUTE_RIP;
|
*source = ZEBRA_ROUTE_RIP;
|
||||||
@ -613,7 +613,7 @@
|
|||||||
if (! client->redist[type])
|
if (! client->redist[type])
|
||||||
{
|
{
|
||||||
client->redist[type] = 1;
|
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_OSPF:
|
||||||
case ZEBRA_ROUTE_OSPF6:
|
case ZEBRA_ROUTE_OSPF6:
|
||||||
case ZEBRA_ROUTE_BGP:
|
case ZEBRA_ROUTE_BGP:
|
||||||
|
@ -29,7 +29,7 @@
|
|||||||
dnl --------------------------
|
dnl --------------------------
|
||||||
--- a/lib/command.h
|
--- a/lib/command.h
|
||||||
+++ b/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. */
|
DUMP_NODE, /* Packet dump node. */
|
||||||
FORWARDING_NODE, /* IP forwarding node. */
|
FORWARDING_NODE, /* IP forwarding node. */
|
||||||
PROTOCOL_NODE, /* protocol filtering node */
|
PROTOCOL_NODE, /* protocol filtering node */
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
--- a/lib/command.c
|
--- a/lib/command.c
|
||||||
+++ b/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);
|
VTY_NEWLINE);
|
||||||
goto finished;
|
goto finished;
|
||||||
}
|
}
|
||||||
@ -14,7 +14,7 @@
|
|||||||
if (link (config_file, config_file_sav) != 0)
|
if (link (config_file, config_file_sav) != 0)
|
||||||
{
|
{
|
||||||
vty_out (vty, "Can't backup old configuration file %s.%s", config_file_sav,
|
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);
|
VTY_NEWLINE);
|
||||||
goto finished;
|
goto finished;
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user