quagga: Bump to v1.1.0

- Fix dependencies to 'libzebra'
- Drop support for 'babeld' daemon
- Drop support for extra MANET protocols
- Refresh patches

diff --git a/quagga/Makefile b/quagga/Makefile
index 67eedd672fdd6a0ec62fa475f04325b6a7384757..f8963e01ac3a9710097ad892c11e91e35504504f 100644 (file)
--- a/quagga/Makefile
+++ b/quagga/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006-2013 OpenWrt.org
+# Copyright (C) 2006-2016 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,11 +8,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=quagga
-PKG_VERSION:=0.99.22.4
-PKG_RELEASE:=2
-PKG_MD5SUM:=03ef24a448be47beba80efa2152f8a28
+PKG_VERSION:=1.1.0
+PKG_RELEASE:=1
+PKG_MD5SUM:=daa303871e07ea5856aae6fd79e89722
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://download.savannah.gnu.org/releases/quagga/
 PKG_CONFIG_DEPENDS:= \
        CONFIG_IPV6 \
@@ -25,7 +25,6 @@ PKG_CONFIG_DEPENDS:= \
        CONFIG_PACKAGE_quagga-ospf6d \
        CONFIG_PACKAGE_quagga-ripd \
        CONFIG_PACKAGE_quagga-ripngd \
-       CONFIG_PACKAGE_quagga-babeld \
        CONFIG_PACKAGE_quagga-vtysh
 PKG_BUILD_PARALLEL:=1
 PKG_FIXUP:=autoreconf
@@ -41,7 +40,7 @@ define Package/quagga/Default
   DEPENDS:=quagga
   TITLE:=The Quagga Software Routing Suite
   URL:=http://www.quagga.net
-  MAINTAINER:=Vasilis Tsiligiannis <b_tsiligiannis@silverton.gr>
+  MAINTAINER:=Vasilis Tsiligiannis <acinonyx@openwrt.gr>
 endef
 
 define Package/quagga
@@ -77,6 +76,7 @@ endef
 
 define Package/quagga-libospf
   $(call Package/quagga/Default)
+  DEPENDS+=+quagga-libzebra
   TITLE:=OSPF library
 endef
 
@@ -94,13 +94,13 @@ endef
 
 define Package/quagga-ospfd
   $(call Package/quagga/Default)
-  DEPENDS+=+quagga-libospf +quagga-libzebra
+  DEPENDS+=+quagga-libospf
   TITLE:=OSPFv2 routing engine
 endef
 
 define Package/quagga-ospf6d
   $(call Package/quagga/Default)
-  DEPENDS+=+quagga-libospf +quagga-libzebra @IPV6
+  DEPENDS+=+quagga-libospf @IPV6
   TITLE:=OSPFv3 routing engine
 endef
 
@@ -116,12 +116,6 @@ define Package/quagga-ripngd
   TITLE:=RIPNG routing engine
 endef
 
-define Package/quagga-babeld
-  $(call Package/quagga/Default)
-  DEPENDS+=+quagga-libzebra @IPV6
-  TITLE:=Babel routing engine
-endef
-
 define Package/quagga-vtysh
   $(call Package/quagga/Default)
   DEPENDS+=+quagga-libzebra +libreadline +libncurses
@@ -156,10 +150,6 @@ define Package/quagga-ripngd/conffiles
 /etc/quagga/ripngd.conf
 endef
 
-define Package/quagga-babeld/conffiles
-/etc/quagga/babeld.conf
-endef
-
 ifneq ($(SDK),)
 CONFIG_PACKAGE_quagga-libzebra:=m
 CONFIG_PACKAGE_quagga-libospf:=m
@@ -170,7 +160,6 @@ CONFIG_PACKAGE_quagga-isisd:=m
 CONFIG_PACKAGE_quagga-ospf6d:=m
 CONFIG_PACKAGE_quagga-ripd:=m
 CONFIG_PACKAGE_quagga-ripngd:=m
-CONFIG_PACKAGE_quagga-babeld:=m
 CONFIG_PACKAGE_quagga-vtysh:=m
 endif
 
@@ -181,7 +170,6 @@ CONFIGURE_ARGS+= \
        --disable-static \
        --enable-user=network \
        --enable-group=network \
-       --enable-pie=no \
        --enable-multipath=8 \
        --disable-ospfclient \
        --disable-capabilities \
@@ -193,7 +181,6 @@ CONFIGURE_ARGS+= \
        $(call autoconf_bool,CONFIG_PACKAGE_quagga-ospf6d,ospf6d) \
        $(call autoconf_bool,CONFIG_PACKAGE_quagga-ripd,ripd) \
        $(call autoconf_bool,CONFIG_PACKAGE_quagga-ripngd,ripngd) \
-       $(call autoconf_bool,CONFIG_PACKAGE_quagga-babeld,babeld) \
        $(call autoconf_bool,CONFIG_PACKAGE_quagga-vtysh,vtysh) \
 
 MAKE_FLAGS += \
@@ -267,14 +254,6 @@ define Package/quagga-ripngd/install
        $(INSTALL_CONF) ./files/quagga.conf $(1)/etc/quagga/ripngd.conf
 endef
 
-define Package/quagga-babeld/install
-       $(INSTALL_DIR) $(1)/usr/sbin
-       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/babeld $(1)/usr/sbin/
-       $(INSTALL_DIR) $(1)/etc/quagga
-       chmod 0750 $(1)/etc/quagga
-       $(INSTALL_CONF) ./files/quagga.conf $(1)/etc/quagga/babeld.conf
-endef
-
 define Package/quagga-vtysh/install
        $(INSTALL_DIR) $(1)/usr/bin
        $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/vtysh $(1)/usr/bin/
@@ -301,5 +280,4 @@ $(eval $(call BuildPackage,quagga-ospfd))
 $(eval $(call BuildPackage,quagga-ospf6d))
 $(eval $(call BuildPackage,quagga-ripd))
 $(eval $(call BuildPackage,quagga-ripngd))
-$(eval $(call BuildPackage,quagga-babeld))
 $(eval $(call BuildPackage,quagga-vtysh))

diff --git a/quagga/patches/110-vtysh-fix-build-against-readline-6.3.patch b/quagga/patches/110-vtysh-fix-build-against-readline-6.3.patch
deleted file mode 100644 (file)
index e8c499e..0000000
--- a/quagga/patches/110-vtysh-fix-build-against-readline-6.3.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/vtysh/vtysh.c
-+++ b/vtysh/vtysh.c
-@@ -2211,9 +2211,9 @@
- vtysh_readline_init (void)
- {
-   /* readline related settings. */
--  rl_bind_key ('?', (Function *) vtysh_rl_describe);
-+  rl_bind_key ('?', (rl_command_func_t *) vtysh_rl_describe);
-   rl_completion_entry_function = vtysh_completion_entry_function;
--  rl_attempted_completion_function = (CPPFunction *)new_completion;
-+  rl_attempted_completion_function = (rl_completion_func_t *) new_completion;
-   /* do not append space after completion. It will be appended
-    * in new_completion() function explicitly. */
-   rl_completion_append_character = '\0';
-

diff --git a/quagga/patches/120-quagga_manet.patch b/quagga/patches/120-quagga_manet.patch
deleted file mode 100644 (file)
index 2411bd0..0000000
--- a/quagga/patches/120-quagga_manet.patch
+++ /dev/null
@@ -1,243 +0,0 @@
---- a/lib/log.c
-+++ b/lib/log.c
-@@ -925,13 +925,19 @@ proto_redistnum(int afi, const char *s)
-       return ZEBRA_ROUTE_STATIC;
-       else if (strncmp (s, "r", 1) == 0)
-       return ZEBRA_ROUTE_RIP;
--      else if (strncmp (s, "o", 1) == 0)
-+      else if (strncmp (s, "os", 2) == 0)
-       return ZEBRA_ROUTE_OSPF;
-       else if (strncmp (s, "i", 1) == 0)
-       return ZEBRA_ROUTE_ISIS;
-       else if (strncmp (s, "bg", 2) == 0)
-       return ZEBRA_ROUTE_BGP;
--      else if (strncmp (s, "ba", 2) == 0)
-+      else if (strncmp (s, "h", 1) == 0)
-+      return ZEBRA_ROUTE_HSLS;
-+      else if (strncmp (s, "ol", 2) == 0)
-+      return ZEBRA_ROUTE_OLSR;
-+      else if (strncmp (s, "bat", 3) == 0)
-+      return ZEBRA_ROUTE_BATMAN;
-+      else if (strncmp (s, "bab", 3) == 0)
-       return ZEBRA_ROUTE_BABEL;
-     }
-   if (afi == AFI_IP6)
-@@ -944,13 +950,19 @@ proto_redistnum(int afi, const char *s)
-       return ZEBRA_ROUTE_STATIC;
-       else if (strncmp (s, "r", 1) == 0)
-       return ZEBRA_ROUTE_RIPNG;
--      else if (strncmp (s, "o", 1) == 0)
-+      else if (strncmp (s, "os", 2) == 0)
-       return ZEBRA_ROUTE_OSPF6;
-       else if (strncmp (s, "i", 1) == 0)
-       return ZEBRA_ROUTE_ISIS;
-       else if (strncmp (s, "bg", 2) == 0)
-       return ZEBRA_ROUTE_BGP;
--      else if (strncmp (s, "ba", 2) == 0)
-+      else if (strncmp (s, "h", 1) == 0)
-+      return ZEBRA_ROUTE_HSLS;
-+      else if (strncmp (s, "ol", 2) == 0)
-+      return ZEBRA_ROUTE_OLSR;
-+      else if (strncmp (s, "bat", 3) == 0)
-+      return ZEBRA_ROUTE_BATMAN;
-+      else if (strncmp (s, "bab", 3) == 0)
-       return ZEBRA_ROUTE_BABEL;
-     }
-   return -1;
---- a/lib/route_types.txt
-+++ b/lib/route_types.txt
-@@ -51,13 +51,9 @@ ZEBRA_ROUTE_OSPF,       ospf,      ospfd
- ZEBRA_ROUTE_OSPF6,      ospf6,     ospf6d, 'O', 0, 1, "OSPFv6"
- ZEBRA_ROUTE_ISIS,       isis,      isisd,  'I', 1, 1, "IS-IS"
- ZEBRA_ROUTE_BGP,        bgp,       bgpd,   'B', 1, 1, "BGP"
--# HSLS and OLSR both are AFI independent (so: 1, 1), however
--# we want to disable for them for general Quagga distribution.
--# This at least makes it trivial for users of these protocols
--# to 'switch on' redist support (direct numeric entry remaining
--# possible).
--ZEBRA_ROUTE_HSLS,       hsls,      hslsd,  'H', 0, 0, "HSLS"
--ZEBRA_ROUTE_OLSR,       olsr,      olsrd,  'o', 0, 0, "OLSR"
-+ZEBRA_ROUTE_HSLS,       hsls,      hslsd,  'H', 1, 1, "HSLS"
-+ZEBRA_ROUTE_OLSR,       olsr,      olsrd,  'o', 1, 1, "OLSR"
-+ZEBRA_ROUTE_BATMAN,     batman,    batmand,'b', 1, 1, "BATMAN"
- ZEBRA_ROUTE_BABEL,      babel,     babeld, 'A', 1, 1, "Babel"
- 
- ## help strings
-@@ -72,5 +68,6 @@ 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)"
--ZEBRA_ROUTE_OLSR,   "Optimised Link State Routing (OLSR)"
-+ZEBRA_ROUTE_OLSR,   "Optimized Link State Routing (OLSR)"
-+ZEBRA_ROUTE_BATMAN, "Better Approach to Mobile Ad-Hoc Networking (BATMAN)"
- ZEBRA_ROUTE_BABEL,  "Babel routing protocol (Babel)"
---- a/ripd/rip_zebra.c
-+++ b/ripd/rip_zebra.c
-@@ -206,9 +206,12 @@ static struct {
-   {ZEBRA_ROUTE_KERNEL,  1, "kernel"},
-   {ZEBRA_ROUTE_CONNECT, 1, "connected"},
-   {ZEBRA_ROUTE_STATIC,  1, "static"},
--  {ZEBRA_ROUTE_OSPF,    1, "ospf"},
-+  {ZEBRA_ROUTE_OSPF,    2, "ospf"},
-   {ZEBRA_ROUTE_BGP,     2, "bgp"},
--  {ZEBRA_ROUTE_BABEL,   2, "babel"},
-+  {ZEBRA_ROUTE_HSLS,    1, "hsls"},
-+  {ZEBRA_ROUTE_OLSR,    2, "olsr"},
-+  {ZEBRA_ROUTE_BATMAN,  3, "batman"},
-+  {ZEBRA_ROUTE_BABEL,   3, "babel"},
-   {0, 0, NULL}
- };
- 
---- a/ripngd/ripng_zebra.c
-+++ b/ripngd/ripng_zebra.c
-@@ -216,9 +216,12 @@ static struct {
-   {ZEBRA_ROUTE_KERNEL,  1, "kernel"},
-   {ZEBRA_ROUTE_CONNECT, 1, "connected"},
-   {ZEBRA_ROUTE_STATIC,  1, "static"},
--  {ZEBRA_ROUTE_OSPF6,   1, "ospf6"},
-+  {ZEBRA_ROUTE_OSPF6,   2, "ospf6"},
-   {ZEBRA_ROUTE_BGP,     2, "bgp"},
--  {ZEBRA_ROUTE_BABEL,   2, "babel"},
-+  {ZEBRA_ROUTE_HSLS,    1, "hsls"},
-+  {ZEBRA_ROUTE_OLSR,    2, "olsr"},
-+  {ZEBRA_ROUTE_BATMAN,  3, "batman"},
-+  {ZEBRA_ROUTE_BABEL,   3, "babel"},
-   {0, 0, NULL}
- };
- 
---- a/zebra/rt_netlink.c
-+++ b/zebra/rt_netlink.c
-@@ -1609,6 +1609,9 @@ netlink_route_multipath (int cmd, struct
-                         addattr_l (&req.n, sizeof req, RTA_PREFSRC,
-                                &nexthop->src.ipv4, bytelen);
- 
-+                    if (rib->type == ZEBRA_ROUTE_OLSR)
-+                      req.r.rtm_scope = RT_SCOPE_LINK;
-+
-                     if (IS_ZEBRA_DEBUG_KERNEL)
-                       zlog_debug("netlink_route_multipath() (single hop): "
-                                  "nexthop via if %u", nexthop->ifindex);
---- a/zebra/zebra_rib.c
-+++ b/zebra/zebra_rib.c
-@@ -68,6 +68,9 @@ static const struct
-   [ZEBRA_ROUTE_OSPF6]   = {ZEBRA_ROUTE_OSPF6,   110},
-   [ZEBRA_ROUTE_ISIS]    = {ZEBRA_ROUTE_ISIS,    115},
-   [ZEBRA_ROUTE_BGP]     = {ZEBRA_ROUTE_BGP,      20  /* IBGP is 200. */},
-+  [ZEBRA_ROUTE_HSLS]    = {ZEBRA_ROUTE_HSLS,      0},
-+  [ZEBRA_ROUTE_OLSR]    = {ZEBRA_ROUTE_OLSR,      0},
-+  [ZEBRA_ROUTE_BATMAN]  = {ZEBRA_ROUTE_BATMAN,    0},
-   [ZEBRA_ROUTE_BABEL]   = {ZEBRA_ROUTE_BABEL,    95},
-   /* no entry/default: 150 */
- };
-@@ -456,6 +459,18 @@ nexthop_active_ipv4 (struct rib *rib, st
-                 }
-             return 0;
-           }
-+        else if (match->type == ZEBRA_ROUTE_OLSR)
-+          {
-+            for (newhop = match->nexthop; newhop; newhop = newhop->next)
-+              if (CHECK_FLAG (newhop->flags, NEXTHOP_FLAG_FIB)
-+                  && newhop->type == NEXTHOP_TYPE_IFINDEX)
-+                {
-+                  if (nexthop->type == NEXTHOP_TYPE_IPV4)
-+                    nexthop->ifindex = newhop->ifindex;
-+                  return 1;
-+                }
-+            return 0;
-+          }
-         else
-           {
-             return 0;
-@@ -560,6 +575,18 @@ nexthop_active_ipv6 (struct rib *rib, st
-                 }
-             return 0;
-           }
-+        else if (match->type == ZEBRA_ROUTE_OLSR)
-+          {
-+            for (newhop = match->nexthop; newhop; newhop = newhop->next)
-+              if (CHECK_FLAG (newhop->flags, NEXTHOP_FLAG_FIB)
-+                  && newhop->type == NEXTHOP_TYPE_IFINDEX)
-+                {
-+                  if (nexthop->type == NEXTHOP_TYPE_IPV6)
-+                    nexthop->ifindex = newhop->ifindex;
-+                  return 1;
-+                }
-+            return 0;
-+          }
-         else
-           {
-             return 0;
-@@ -1376,6 +1403,8 @@ static const u_char meta_queue_map[ZEBRA
-   [ZEBRA_ROUTE_ISIS]    = 2,
-   [ZEBRA_ROUTE_BGP]     = 3,
-   [ZEBRA_ROUTE_HSLS]    = 4,
-+  [ZEBRA_ROUTE_OLSR]    = 4,
-+  [ZEBRA_ROUTE_BATMAN]  = 4,
-   [ZEBRA_ROUTE_BABEL]   = 2,
- };
- 
---- a/zebra/zebra_snmp.c
-+++ b/zebra/zebra_snmp.c
-@@ -245,6 +245,12 @@ proto_trans(int type)
-       return 1; /* shouldn't happen */
-     case ZEBRA_ROUTE_BGP:
-       return 14; /* bgp */
-+    case ZEBRA_ROUTE_HSLS:
-+      return 1; /* other */
-+    case ZEBRA_ROUTE_OLSR:
-+      return 1; /* other */
-+    case ZEBRA_ROUTE_BATMAN:
-+      return 1; /* other */
-     default:
-       return 1; /* other */
-     }
---- a/zebra/zebra_vty.c
-+++ b/zebra/zebra_vty.c
-@@ -558,7 +558,10 @@ vty_show_ip_route_detail (struct vty *vt
-         || rib->type == ZEBRA_ROUTE_OSPF
-         || rib->type == ZEBRA_ROUTE_BABEL
-         || rib->type == ZEBRA_ROUTE_ISIS
--        || rib->type == ZEBRA_ROUTE_BGP)
-+        || rib->type == ZEBRA_ROUTE_BGP
-+        || rib->type == ZEBRA_ROUTE_HSLS
-+        || rib->type == ZEBRA_ROUTE_OLSR
-+        || rib->type == ZEBRA_ROUTE_BATMAN)
-       {
-         time_t uptime;
-         struct tm *tm;
-@@ -784,7 +787,10 @@ vty_show_ip_route (struct vty *vty, stru
-         || rib->type == ZEBRA_ROUTE_OSPF
-         || rib->type == ZEBRA_ROUTE_BABEL
-         || rib->type == ZEBRA_ROUTE_ISIS
--        || rib->type == ZEBRA_ROUTE_BGP)
-+        || rib->type == ZEBRA_ROUTE_BGP
-+        || rib->type == ZEBRA_ROUTE_HSLS
-+        || rib->type == ZEBRA_ROUTE_OLSR
-+        || rib->type == ZEBRA_ROUTE_BATMAN)
-       {
-         time_t uptime;
-         struct tm *tm;
-@@ -1577,7 +1583,10 @@ vty_show_ipv6_route_detail (struct vty *
-         || rib->type == ZEBRA_ROUTE_OSPF6
-         || rib->type == ZEBRA_ROUTE_BABEL
-         || rib->type == ZEBRA_ROUTE_ISIS
--        || rib->type == ZEBRA_ROUTE_BGP)
-+        || rib->type == ZEBRA_ROUTE_BGP
-+        || rib->type == ZEBRA_ROUTE_HSLS
-+        || rib->type == ZEBRA_ROUTE_OLSR
-+        || rib->type == ZEBRA_ROUTE_BATMAN)
-       {
-         time_t uptime;
-         struct tm *tm;
-@@ -1757,7 +1766,10 @@ vty_show_ipv6_route (struct vty *vty, st
-         || rib->type == ZEBRA_ROUTE_OSPF6
-         || rib->type == ZEBRA_ROUTE_BABEL
-         || rib->type == ZEBRA_ROUTE_ISIS
--        || rib->type == ZEBRA_ROUTE_BGP)
-+        || rib->type == ZEBRA_ROUTE_BGP
-+        || rib->type == ZEBRA_ROUTE_HSLS
-+        || rib->type == ZEBRA_ROUTE_OLSR
-+        || rib->type == ZEBRA_ROUTE_BATMAN)
-       {
-         time_t uptime;
-         struct tm *tm;

diff --git a/quagga/patches/140-holdtimer-set.patch b/quagga/patches/140-holdtimer-set.patch
index b699775273d88934f9180b8a8d6adb9ce59d3b2f..6d1c1ea95b239b960e96adac7cad86ad1cc08c3f 100644 (file)
--- a/quagga/patches/140-holdtimer-set.patch
+++ b/quagga/patches/140-holdtimer-set.patch
@@ -1,6 +1,6 @@
 --- a/bgpd/bgp_network.c
 +++ b/bgpd/bgp_network.c
-@@ -193,8 +193,7 @@ bgp_accept (struct thread *thread)
+@@ -257,8 +257,7 @@ bgp_accept (struct thread *thread)
      peer->fd = bgp_sock;
      peer->status = Active;
      peer->local_id = peer1->local_id;
@@ -12,11 +12,11 @@
      sockunion2str (&su, buf, SU_ADDRSTRLEN);
 --- a/bgpd/bgpd.h
 +++ b/bgpd/bgpd.h
-@@ -732,6 +732,7 @@ struct bgp_nlri
+@@ -752,6 +752,7 @@ struct bgp_nlri
+ 
  /* BGP timers default value.  */
- #define BGP_INIT_START_TIMER                     5
- #define BGP_ERROR_START_TIMER                   30
+ #define BGP_INIT_START_TIMER                     1
 +#define BGP_LARGE_HOLDTIME                     240
  #define BGP_DEFAULT_HOLDTIME                   180
  #define BGP_DEFAULT_KEEPALIVE                   60 
- #define BGP_DEFAULT_ASORIGINATE                 15
+ #define BGP_DEFAULT_EBGP_ROUTEADV               30

diff --git a/quagga/patches/150-no-cross-fs-link.patch b/quagga/patches/150-no-cross-fs-link.patch
index 32c120832a008a04966c7bbdd8fae2771db4d496..84451033f937ca7e4876c4e508bc6c5ac1b881ff 100644 (file)
--- a/quagga/patches/150-no-cross-fs-link.patch
+++ b/quagga/patches/150-no-cross-fs-link.patch
@@ -1,6 +1,6 @@
 --- a/lib/command.c
 +++ b/lib/command.c
-@@ -2527,6 +2527,13 @@ DEFUN (config_write_file,
+@@ -3198,6 +3198,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,
-@@ -2540,7 +2547,23 @@ DEFUN (config_write_file,
+@@ -3211,7 +3218,23 @@ DEFUN (config_write_file,
                VTY_NEWLINE);
        goto finished;
      }

diff --git a/quagga/patches/170-use-supported-pagers.patch b/quagga/patches/170-use-supported-pagers.patch
index 15595a7363a14d5441a4aab783a0a8e18abb6b25..ad4c4dbc35fa1d188702bcdef108799c37a66759 100644 (file)
--- a/quagga/patches/170-use-supported-pagers.patch
+++ b/quagga/patches/170-use-supported-pagers.patch
@@ -1,6 +1,6 @@
 --- a/vtysh/vtysh.c
 +++ b/vtysh/vtysh.c
-@@ -268,7 +268,7 @@ vtysh_pager_init (void)
+@@ -251,7 +251,7 @@ vtysh_pager_init (void)
    if (pager_defined)
      vtysh_pager_name = strdup (pager_defined);
    else
@@ -9,7 +9,7 @@
  }
  
  /* Command execution over the vty interface. */
-@@ -1884,7 +1884,7 @@ DEFUN (vtysh_terminal_length,
+@@ -2047,7 +2047,7 @@ DEFUN (vtysh_terminal_length,
  {
    int lines;
    char *endptr = NULL;
@@ -18,7 +18,7 @@
  
    lines = strtol (argv[0], &endptr, 10);
    if (lines < 0 || lines > 512 || *endptr != '\0')
-@@ -1901,7 +1901,7 @@ DEFUN (vtysh_terminal_length,
+@@ -2064,7 +2064,7 @@ DEFUN (vtysh_terminal_length,
  
    if (lines != 0)
      {