From: florian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Thu, 11 Jan 2007 17:28:45 +0000 (+0000)
Subject: Rename patches to match conventions, second round; *ouch*
X-Git-Url: http://git.openwrt.org/?p=feed%2Frouting.git;a=commitdiff_plain;h=3ce9e21bda2527fe833d88f277f4e178500eee13

Rename patches to match conventions, second round; *ouch*


git-svn-id: https://svn.openwrt.org/openwrt@6081 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/Makefile b/Makefile
index c23f59c..21cb357 100644
--- a/Makefile
+++ b/Makefile
@@ -101,6 +101,7 @@ endef
 
 define Build/Configure
 	$(call Build/Configure/Default, \
+		--localstatedir=/var/run/quagga \
 		--sysconfdir=/etc/quagga/ \
 		--enable-shared \
 		--disable-static \
diff --git a/patches/01-quagga_cross.patch b/patches/01-quagga_cross.patch
new file mode 100644
index 0000000..5b8276b
--- /dev/null
+++ b/patches/01-quagga_cross.patch
@@ -0,0 +1,84 @@
+--- quagga-0.98.4/configure.orig	Mon Jun 27 19:05:31 2005
++++ quagga-0.98.4/configure	Mon Jul 11 20:32:07 2005
+@@ -12623,69 +12623,6 @@
+ 
+ 
+ 
+-echo "$as_me:$LINENO: checking for broken CMSG_FIRSTHDR" >&5
+-echo $ECHO_N "checking for broken CMSG_FIRSTHDR... $ECHO_C" >&6
+-if test "$cross_compiling" = yes; then
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-
+-#ifdef SUNOS_5
+-#define _XPG4_2
+-#define __EXTENSIONS__
+-#endif
+-#include <stdlib.h>
+-#include <sys/types.h>
+-#include <sys/socket.h>
+-
+-main()
+-{
+-  struct msghdr msg;
+-  char buf[4];
+-
+-  msg.msg_control = buf;
+-  msg.msg_controllen = 0;
+-
+-  if (CMSG_FIRSTHDR(&msg) != NULL)
+-    exit(0);
+-  exit (1);
+-}
+-_ACEOF
+-rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  echo "$as_me:$LINENO: result: yes - using workaround" >&5
+-echo "${ECHO_T}yes - using workaround" >&6
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_BROKEN_CMSG_FIRSTHDR
+-_ACEOF
+-
+-else
+-  echo "$as_me: program exited with status $ac_status" >&5
+-echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-( exit $ac_status )
+-echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
+-fi
+-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+-fi
+-
+ echo "$as_me:$LINENO: checking route read method check" >&5
+ echo $ECHO_N "checking route read method check... $ECHO_C" >&6
+ if test "${zebra_rtread+set}" = set; then
+@@ -12783,10 +12720,7 @@
+ if test "${zebra_ipforward_path+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  for zebra_ipforward_path in /proc/net/snmp /dev/ip /dev/null;
+-do
+-  test x`ls $zebra_ipforward_path 2>/dev/null` = x"$zebra_ipforward_path" && break
+-done
++  zebra_ipforward_path="/proc/net/snmp"
+ case $zebra_ipforward_path in
+   "/proc/net/snmp")  IPFORWARD=ipforward_proc.o
+                      zebra_ipforward_path="proc";;
diff --git a/patches/01-quagga_readline.patch b/patches/01-quagga_readline.patch
new file mode 100644
index 0000000..8e3b805
--- /dev/null
+++ b/patches/01-quagga_readline.patch
@@ -0,0 +1,58 @@
+--- quagga-0.98.4/configure.orig	Mon Jun 27 19:05:31 2005
++++ quagga-0.98.4/configure	Thu Jul 28 07:02:12 2005
+@@ -10937,7 +10937,7 @@
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lcurses  $LIBS"
++#LIBS="-lcurses  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -11071,7 +11071,8 @@
+ #define HAVE_LIBNCURSES 1
+ _ACEOF
+ 
+-  LIBS="-lncurses $LIBS"
++#  LIBS="-lncurses $LIBS"
++CURSES=-lncurses
+ 
+ fi
+ 
+@@ -11088,7 +11089,7 @@
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lreadline  $LIBS"
++LIBS="-lreadline $CURSES $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -11144,7 +11145,8 @@
+ #define HAVE_LIBREADLINE 1
+ _ACEOF
+ 
+-  LIBS="-lreadline $LIBS"
++#  LIBS="-lreadline $LIBS"
++CURSES="$CURSES -lreadline"
+ 
+ fi
+ 
+@@ -11303,7 +11305,7 @@
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lreadline  $LIBS"
++LIBS="-lreadline $CURSES $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -11365,7 +11367,7 @@
+ #define HAVE_LIBREADLINE 1
+ _ACEOF
+ 
+-  LIBS="-lreadline $LIBS"
++#  LIBS="-lreadline $LIBS"
+ 
+ fi
+ 
diff --git a/patches/quagga-cross.patch b/patches/quagga-cross.patch
deleted file mode 100644
index 5b8276b..0000000
--- a/patches/quagga-cross.patch
+++ /dev/null
@@ -1,84 +0,0 @@
---- quagga-0.98.4/configure.orig	Mon Jun 27 19:05:31 2005
-+++ quagga-0.98.4/configure	Mon Jul 11 20:32:07 2005
-@@ -12623,69 +12623,6 @@
- 
- 
- 
--echo "$as_me:$LINENO: checking for broken CMSG_FIRSTHDR" >&5
--echo $ECHO_N "checking for broken CMSG_FIRSTHDR... $ECHO_C" >&6
--if test "$cross_compiling" = yes; then
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
--else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--
--#ifdef SUNOS_5
--#define _XPG4_2
--#define __EXTENSIONS__
--#endif
--#include <stdlib.h>
--#include <sys/types.h>
--#include <sys/socket.h>
--
--main()
--{
--  struct msghdr msg;
--  char buf[4];
--
--  msg.msg_control = buf;
--  msg.msg_controllen = 0;
--
--  if (CMSG_FIRSTHDR(&msg) != NULL)
--    exit(0);
--  exit (1);
--}
--_ACEOF
--rm -f conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  echo "$as_me:$LINENO: result: yes - using workaround" >&5
--echo "${ECHO_T}yes - using workaround" >&6
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_BROKEN_CMSG_FIRSTHDR
--_ACEOF
--
--else
--  echo "$as_me: program exited with status $ac_status" >&5
--echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--( exit $ac_status )
--echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
--fi
--rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
--fi
--
- echo "$as_me:$LINENO: checking route read method check" >&5
- echo $ECHO_N "checking route read method check... $ECHO_C" >&6
- if test "${zebra_rtread+set}" = set; then
-@@ -12783,10 +12720,7 @@
- if test "${zebra_ipforward_path+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--  for zebra_ipforward_path in /proc/net/snmp /dev/ip /dev/null;
--do
--  test x`ls $zebra_ipforward_path 2>/dev/null` = x"$zebra_ipforward_path" && break
--done
-+  zebra_ipforward_path="/proc/net/snmp"
- case $zebra_ipforward_path in
-   "/proc/net/snmp")  IPFORWARD=ipforward_proc.o
-                      zebra_ipforward_path="proc";;
diff --git a/patches/quagga-readline.patch b/patches/quagga-readline.patch
deleted file mode 100644
index 8e3b805..0000000
--- a/patches/quagga-readline.patch
+++ /dev/null
@@ -1,58 +0,0 @@
---- quagga-0.98.4/configure.orig	Mon Jun 27 19:05:31 2005
-+++ quagga-0.98.4/configure	Thu Jul 28 07:02:12 2005
-@@ -10937,7 +10937,7 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lcurses  $LIBS"
-+#LIBS="-lcurses  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -11071,7 +11071,8 @@
- #define HAVE_LIBNCURSES 1
- _ACEOF
- 
--  LIBS="-lncurses $LIBS"
-+#  LIBS="-lncurses $LIBS"
-+CURSES=-lncurses
- 
- fi
- 
-@@ -11088,7 +11089,7 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lreadline  $LIBS"
-+LIBS="-lreadline $CURSES $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -11144,7 +11145,8 @@
- #define HAVE_LIBREADLINE 1
- _ACEOF
- 
--  LIBS="-lreadline $LIBS"
-+#  LIBS="-lreadline $LIBS"
-+CURSES="$CURSES -lreadline"
- 
- fi
- 
-@@ -11303,7 +11305,7 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lreadline  $LIBS"
-+LIBS="-lreadline $CURSES $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -11365,7 +11367,7 @@
- #define HAVE_LIBREADLINE 1
- _ACEOF
- 
--  LIBS="-lreadline $LIBS"
-+#  LIBS="-lreadline $LIBS"
- 
- fi
-