packages: quagga/quagga-proc.patch - updated to 0.99.13; note from Paul Jak...

[gotar]

Author: gotar                        Date: Sat Jul 11 18:06:24 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 0.99.13; note from Paul Jakma:
This breaks non-Linux. I'd accept a patch that just checked for the 
target being linux to set the required stuff, rather than checking 
for /proc/...

---- Files affected:
packages/quagga:
   quagga-proc.patch (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: packages/quagga/quagga-proc.patch
diff -u packages/quagga/quagga-proc.patch:1.2 packages/quagga/quagga-proc.patch:1.3
--- packages/quagga/quagga-proc.patch:1.2	Fri Oct 24 20:02:14 2008
+++ packages/quagga/quagga-proc.patch	Sat Jul 11 20:06:19 2009
@@ -1,49 +1,41 @@
---- quagga-0.99.11/configure.ac.orig	Sun Nov  2 05:12:19 2003
-+++ quagga-0.99.11/configure.ac	Mon Dec  1 13:33:26 2003
-@@ -933,41 +933,16 @@
+--- quagga-0.99.13/configure.ac.orig	2009-07-11 19:57:36.000000000 +0200
++++ quagga-0.99.13/configure.ac	2009-07-11 20:03:30.000000000 +0200
+@@ -951,37 +951,15 @@
  dnl -----------------------
  dnl check proc file system.
  dnl -----------------------
 -if test "$netlink" != yes; then
 -  if test -r /proc/net/dev; then
--    AC_DEFINE(HAVE_PROC_NET_DEV,,/proc/net/dev)
--    IF_PROC=if_proc.o
+     AC_DEFINE(HAVE_PROC_NET_DEV,,/proc/net/dev)
+     IF_PROC=if_proc.o
 -  fi
 -  if test -r /proc/net/if_inet6; then
--    AC_DEFINE(HAVE_PROC_NET_IF_INET6,,/proc/net/if_inet6)
+     AC_DEFINE(HAVE_PROC_NET_IF_INET6,,/proc/net/if_inet6)
 -    IF_PROC=if_proc.o
 -  fi
 -fi
-+AC_DEFINE(HAVE_PROC_NET_DEV,,/proc/net/dev)
-+IF_PROC=if_proc.o
-+AC_DEFINE(HAVE_PROC_NET_IF_INET6,,/proc/net/if_inet6)
  AC_SUBST(IF_PROC)
  
  dnl -----------------------------
  dnl check ipforward detect method
  dnl -----------------------------
--AC_CACHE_CHECK(ipforward method check, zebra_ipforward_path,
--[for zebra_ipforward_path in /proc/net/snmp /dev/ip /dev/null;
+-AC_CACHE_CHECK([ipforward method], [quagga_cv_ipforward_method],
+-[for quagga_cv_ipforward_method in /proc/net/snmp /dev/ip /dev/null;
 -do
--  test x`ls $zebra_ipforward_path 2>/dev/null` = x"$zebra_ipforward_path" && break
+-  test x`ls $quagga_cv_ipforward_method 2>/dev/null` = x"$quagga_cv_ipforward_method" && break
 -done
--case $zebra_ipforward_path in
--  "/proc/net/snmp")  IPFORWARD=ipforward_proc.o
--                     zebra_ipforward_path="proc";;
+-case $quagga_cv_ipforward_method in
+-  "/proc/net/snmp")  quagga_cv_ipforward_method="proc";;
 -  "/dev/ip")         
 -                     case "$host" in
--                       *-nec-sysv4*)  IPFORWARD=ipforward_ews.o
--                                      zebra_ipforward_path="ews";;
--                       *-freebsd*)    IPFORWARD=ipforward_sysctl.o
--                                      zebra_ipforward_path="sysctl";;
--                       *)             IPFORWARD=ipforward_solaris.o
--                                      zebra_ipforward_path="solaris";;
+-                       *-nec-sysv4*)  quagga_cv_ipforward_method="ews";;
+-                       *-freebsd*)    quagga_cv_ipforward_method="sysctl";;
+-                       *)             quagga_cv_ipforward_method="solaris";;
 -                     esac;;
--  *)                 IPFORWARD=ipforward_sysctl.o
--                     zebra_ipforward_path="sysctl";;
+-  *)                 quagga_cv_ipforward_method="sysctl";;
 -esac])
+-IPFORWARD=ipforward_${quagga_cv_ipforward_method}.o
 +IPFORWARD=ipforward_proc.o
-+zebra_ipforward_path="proc"
  AC_SUBST(IPFORWARD)
  
  AC_CHECK_FUNCS(getaddrinfo, [have_getaddrinfo=yes], [have_getaddrinfo=no])
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/quagga/quagga-proc.patch?r1=1.2&r2=1.3&f=u