From: Vasilis Tsiligiannis Date: Sun, 28 Jun 2009 12:27:36 +0000 (+0000) Subject: [packages] quagga-unstable: Update to v0.99.13 X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=commitdiff_plain;h=73fd54858b39c481d2d346239465b8e216082159 [packages] quagga-unstable: Update to v0.99.13 SVN-Revision: 16603 --- diff --git a/net/quagga-unstable/Makefile b/net/quagga-unstable/Makefile index ca39352bda..16198e41ce 100644 --- a/net/quagga-unstable/Makefile +++ b/net/quagga-unstable/Makefile @@ -8,9 +8,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:=quagga-unstable -PKG_VERSION:=0.99.12 -PKG_RELEASE:=2 -PKG_MD5SUM:=d2bb513f4ac113dbb300c15a0bd0a241 +PKG_VERSION:=0.99.13 +PKG_RELEASE:=1 +PKG_MD5SUM:=55a7d2dcf016580a7c7412b3518cd942 PKG_SOURCE_URL:=http://www.quagga.net/download/ \ http://www.de.quagga.net/download/ \ @@ -30,7 +30,7 @@ endef define Package/quagga-unstable $(call Package/quagga-unstable/Default) - DEPENDS:= + DEPENDS:= +librt MENU:=1 endef 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 1213b040f3..e3d4655c82 100644 --- a/net/quagga-unstable/patches/100-quagga_multipath_caching_policy.patch +++ b/net/quagga-unstable/patches/100-quagga_multipath_caching_policy.patch @@ -1,16 +1,15 @@ -diff -urN quagga-0.99.11/configure.ac quagga-0.99.11.new/configure.ac ---- quagga-0.99.11/configure.ac 2008-10-02 10:31:09.000000000 +0200 -+++ quagga-0.99.11.new/configure.ac 2008-11-22 20:58:12.000000000 +0100 -@@ -385,7 +385,7 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -394,7 +394,7 @@ dnl ------------------------- AC_CHECK_HEADERS([stropts.h sys/ksym.h sys/times.h sys/select.h \ sys/types.h linux/version.h netdb.h asm/types.h \ sys/param.h limits.h signal.h libutil.h \ -- sys/socket.h netinet/in.h]) -+ sys/socket.h netinet/in.h linux/ip_mp_alg.h]) +- sys/socket.h netinet/in.h time.h sys/time.h]) ++ sys/socket.h netinet/in.h time.h sys/time.h linux/ip_mp_alg.h]) dnl Utility macro to avoid retyping includes all the time m4_define([QUAGGA_INCLUDES], -@@ -755,6 +755,17 @@ +@@ -774,6 +774,17 @@ AC_SUBST(RT_METHOD) AC_SUBST(KERNEL_METHOD) AC_SUBST(OTHER_METHOD) @@ -28,10 +27,9 @@ diff -urN quagga-0.99.11/configure.ac quagga-0.99.11.new/configure.ac dnl -------------------------- dnl Determine IS-IS I/O method dnl -------------------------- -diff -urN quagga-0.99.11/lib/command.h quagga-0.99.11.new/lib/command.h ---- quagga-0.99.11/lib/command.h 2008-09-09 22:18:57.000000000 +0200 -+++ quagga-0.99.11.new/lib/command.h 2008-11-22 20:48:07.000000000 +0100 -@@ -101,6 +101,7 @@ +--- a/lib/command.h ++++ b/lib/command.h +@@ -101,6 +101,7 @@ enum node_type DUMP_NODE, /* Packet dump node. */ FORWARDING_NODE, /* IP forwarding node. */ PROTOCOL_NODE, /* protocol filtering node */ @@ -39,7 +37,7 @@ diff -urN quagga-0.99.11/lib/command.h quagga-0.99.11.new/lib/command.h VTY_NODE, /* Vty node. */ }; -@@ -272,6 +273,7 @@ +@@ -272,6 +273,7 @@ struct desc /* Common descriptions. */ #define SHOW_STR "Show running system information\n" #define IP_STR "IP information\n" @@ -47,10 +45,9 @@ diff -urN quagga-0.99.11/lib/command.h quagga-0.99.11.new/lib/command.h #define IPV6_STR "IPv6 information\n" #define NO_STR "Negate a command or set its defaults\n" #define REDIST_STR "Redistribute information from another routing protocol\n" -diff -urN quagga-0.99.11/lib/zebra.h quagga-0.99.11.new/lib/zebra.h ---- quagga-0.99.11/lib/zebra.h 2008-09-24 17:22:51.000000000 +0200 -+++ quagga-0.99.11.new/lib/zebra.h 2008-11-22 20:48:44.000000000 +0100 -@@ -168,6 +168,10 @@ +--- a/lib/zebra.h ++++ b/lib/zebra.h +@@ -176,6 +176,10 @@ typedef int socklen_t; #define RT_TABLE_MAIN 0 #endif /* HAVE_NETLINK */ @@ -61,9 +58,8 @@ diff -urN quagga-0.99.11/lib/zebra.h quagga-0.99.11.new/lib/zebra.h #ifdef HAVE_NETDB_H #include #endif /* HAVE_NETDB_H */ -diff -urN quagga-0.99.11/zebra/main.c quagga-0.99.11.new/zebra/main.c ---- quagga-0.99.11/zebra/main.c 2008-09-05 16:27:26.000000000 +0200 -+++ quagga-0.99.11.new/zebra/main.c 2008-11-22 20:48:44.000000000 +0100 +--- a/zebra/main.c ++++ b/zebra/main.c @@ -44,6 +44,7 @@ struct zebra_t zebrad = { @@ -72,9 +68,8 @@ diff -urN quagga-0.99.11/zebra/main.c quagga-0.99.11.new/zebra/main.c }; /* process id. */ -diff -urN quagga-0.99.11/zebra/multipath.h quagga-0.99.11.new/zebra/multipath.h ---- quagga-0.99.11/zebra/multipath.h 1970-01-01 01:00:00.000000000 +0100 -+++ quagga-0.99.11.new/zebra/multipath.h 2008-11-22 20:48:44.000000000 +0100 +--- /dev/null ++++ b/zebra/multipath.h @@ -0,0 +1,37 @@ +/* + * multipath policy names. @@ -113,9 +108,8 @@ diff -urN quagga-0.99.11/zebra/multipath.h quagga-0.99.11.new/zebra/multipath.h +#endif +#endif + -diff -urN quagga-0.99.11/zebra/rt_netlink.c quagga-0.99.11.new/zebra/rt_netlink.c ---- quagga-0.99.11/zebra/rt_netlink.c 2008-09-05 16:27:26.000000000 +0200 -+++ quagga-0.99.11.new/zebra/rt_netlink.c 2008-11-22 20:48:44.000000000 +0100 +--- a/zebra/rt_netlink.c ++++ b/zebra/rt_netlink.c @@ -36,6 +36,7 @@ #include "thread.h" #include "privs.h" @@ -124,7 +118,7 @@ diff -urN quagga-0.99.11/zebra/rt_netlink.c quagga-0.99.11.new/zebra/rt_netlink. #include "zebra/zserv.h" #include "zebra/rt.h" #include "zebra/redistribute.h" -@@ -1694,6 +1695,16 @@ +@@ -1694,6 +1695,16 @@ netlink_route_multipath (int cmd, struct if (src) addattr_l (&req.n, sizeof req, RTA_PREFSRC, &src->ipv4, bytelen); @@ -141,9 +135,8 @@ diff -urN quagga-0.99.11/zebra/rt_netlink.c quagga-0.99.11.new/zebra/rt_netlink. if (rta->rta_len > RTA_LENGTH (0)) addattr_l (&req.n, 1024, RTA_MULTIPATH, RTA_DATA (rta), RTA_PAYLOAD (rta)); -diff -urN quagga-0.99.11/zebra/zserv.c quagga-0.99.11.new/zebra/zserv.c ---- quagga-0.99.11/zebra/zserv.c 2008-09-24 17:22:51.000000000 +0200 -+++ quagga-0.99.11.new/zebra/zserv.c 2008-11-22 20:48:44.000000000 +0100 +--- a/zebra/zserv.c ++++ b/zebra/zserv.c @@ -36,6 +36,7 @@ #include "privs.h" #include "network.h" @@ -152,7 +145,7 @@ diff -urN quagga-0.99.11/zebra/zserv.c quagga-0.99.11.new/zebra/zserv.c #include "zebra/zserv.h" #include "zebra/router-id.h" -@@ -1120,6 +1121,9 @@ +@@ -1120,6 +1121,9 @@ zebra_client_create (int sock) /* Set table number. */ client->rtm_table = zebrad.rtm_table_default; @@ -162,7 +155,7 @@ diff -urN quagga-0.99.11/zebra/zserv.c quagga-0.99.11.new/zebra/zserv.c /* Add this client to linked list. */ listnode_add (zebrad.client_list, client); -@@ -1697,6 +1701,91 @@ +@@ -1697,6 +1701,91 @@ static struct cmd_node forwarding_node = }; @@ -254,7 +247,7 @@ diff -urN quagga-0.99.11/zebra/zserv.c quagga-0.99.11.new/zebra/zserv.c /* Initialisation of zebra and installation of commands. */ void zebra_init (void) -@@ -1715,6 +1804,10 @@ +@@ -1715,6 +1804,10 @@ zebra_init (void) install_node (&table_node, config_write_table); install_node (&forwarding_node, config_write_forwarding); @@ -265,7 +258,7 @@ diff -urN quagga-0.99.11/zebra/zserv.c quagga-0.99.11.new/zebra/zserv.c install_element (VIEW_NODE, &show_ip_forwarding_cmd); install_element (ENABLE_NODE, &show_ip_forwarding_cmd); install_element (CONFIG_NODE, &ip_forwarding_cmd); -@@ -1725,6 +1818,14 @@ +@@ -1725,6 +1818,14 @@ zebra_init (void) install_element (VIEW_NODE, &show_table_cmd); install_element (ENABLE_NODE, &show_table_cmd); install_element (CONFIG_NODE, &config_table_cmd); @@ -280,10 +273,9 @@ diff -urN quagga-0.99.11/zebra/zserv.c quagga-0.99.11.new/zebra/zserv.c #endif /* HAVE_NETLINK */ #ifdef HAVE_IPV6 -diff -urN quagga-0.99.11/zebra/zserv.h quagga-0.99.11.new/zebra/zserv.h ---- quagga-0.99.11/zebra/zserv.h 2008-09-24 17:22:51.000000000 +0200 -+++ quagga-0.99.11.new/zebra/zserv.h 2008-11-22 20:48:44.000000000 +0100 -@@ -55,6 +55,9 @@ +--- a/zebra/zserv.h ++++ b/zebra/zserv.h +@@ -55,6 +55,9 @@ struct zserv /* default routing table this client munges */ int rtm_table; @@ -293,7 +285,7 @@ diff -urN quagga-0.99.11/zebra/zserv.h quagga-0.99.11.new/zebra/zserv.h /* This client's redistribute flag. */ u_char redist[ZEBRA_ROUTE_MAX]; -@@ -78,6 +81,9 @@ +@@ -78,6 +81,9 @@ struct zebra_t /* default table */ int rtm_table_default;