From 367f4cd34605b4b99868f5d4a47fe6df7a120917 Mon Sep 17 00:00:00 2001
From: Jo-Philipp Wich <jow@openwrt.org>
Date: Tue, 26 Jul 2011 21:48:20 +0000
Subject: [PATCH] merge r27790

SVN-Revision: 27791
---
 net/quagga/Makefile                           |  4 +--
 .../170-use-supported-pagers.patch            | 29 +++++++++++++++++++
 .../patches/170-use-supported-pagers.patch    | 29 +++++++++++++++++++
 3 files changed, 60 insertions(+), 2 deletions(-)
 create mode 100644 net/quagga/patches-old/170-use-supported-pagers.patch
 create mode 100644 net/quagga/patches/170-use-supported-pagers.patch

diff --git a/net/quagga/Makefile b/net/quagga/Makefile
index 68e36a52c..1baf6b02a 100644
--- a/net/quagga/Makefile
+++ b/net/quagga/Makefile
@@ -10,12 +10,12 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=quagga
 ifneq ($(CONFIG_QUAGGA_OLD),)
   PKG_VERSION:=0.98.6
-  PKG_RELEASE:=9
+  PKG_RELEASE:=10
   PKG_MD5SUM:=b0d4132039953a0214256873b7d23d68
   PATCH_DIR:=./patches-old
 else
   PKG_VERSION:=0.99.18
-  PKG_RELEASE:=1
+  PKG_RELEASE:=2
   PKG_MD5SUM:=59e306e93a4a1ce16760f20e9075d473
 endif
 
diff --git a/net/quagga/patches-old/170-use-supported-pagers.patch b/net/quagga/patches-old/170-use-supported-pagers.patch
new file mode 100644
index 000000000..fca7fc40e
--- /dev/null
+++ b/net/quagga/patches-old/170-use-supported-pagers.patch
@@ -0,0 +1,29 @@
+--- a/vtysh/vtysh.c
++++ b/vtysh/vtysh.c
+@@ -243,7 +243,7 @@ vtysh_pager_init ()
+   if (pager_defined)
+     vtysh_pager_name = strdup (pager_defined);
+   else
+-    vtysh_pager_name = strdup ("more");
++    vtysh_pager_name = strdup ("cat");
+ }
+ 
+ /* Command execution over the vty interface. */
+@@ -1745,7 +1745,7 @@ DEFUN (vtysh_terminal_length,
+ {
+   int lines;
+   char *endptr = NULL;
+-  char default_pager[10];
++  char default_pager[12];
+ 
+   lines = strtol (argv[0], &endptr, 10);
+   if (lines < 0 || lines > 512 || *endptr != '\0')
+@@ -1762,7 +1762,7 @@ DEFUN (vtysh_terminal_length,
+ 
+   if (lines != 0)
+     {
+-      snprintf(default_pager, 10, "more -%i", lines);
++      snprintf(default_pager, 12, "head -n %i", lines);
+       vtysh_pager_name = strdup (default_pager);
+     }
+ 
diff --git a/net/quagga/patches/170-use-supported-pagers.patch b/net/quagga/patches/170-use-supported-pagers.patch
new file mode 100644
index 000000000..fe1a4d9b9
--- /dev/null
+++ b/net/quagga/patches/170-use-supported-pagers.patch
@@ -0,0 +1,29 @@
+--- a/vtysh/vtysh.c
++++ b/vtysh/vtysh.c
+@@ -268,7 +268,7 @@ vtysh_pager_init (void)
+   if (pager_defined)
+     vtysh_pager_name = strdup (pager_defined);
+   else
+-    vtysh_pager_name = strdup ("more");
++    vtysh_pager_name = strdup ("cat");
+ }
+ 
+ /* Command execution over the vty interface. */
+@@ -1866,7 +1866,7 @@ DEFUN (vtysh_terminal_length,
+ {
+   int lines;
+   char *endptr = NULL;
+-  char default_pager[10];
++  char default_pager[12];
+ 
+   lines = strtol (argv[0], &endptr, 10);
+   if (lines < 0 || lines > 512 || *endptr != '\0')
+@@ -1883,7 +1883,7 @@ DEFUN (vtysh_terminal_length,
+ 
+   if (lines != 0)
+     {
+-      snprintf(default_pager, 10, "more -%i", lines);
++      snprintf(default_pager, 12, "head -n %i", lines);
+       vtysh_pager_name = strdup (default_pager);
+     }
+ 
-- 
2.30.2