Merge branch 'master' of git://github.com/infrastation/ceropackages-3.3

Conflicts:
	net/quagga/Makefile

Denis contributed some fixes to the default babeld.conf file

net/quagga/Makefile

@@ -23,8 +23,8 @@ PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 
 #PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 #PKG_SOURCE_URL:=http://www.quagga.net/download/ \
-                http://www.de.quagga.net/download/ \
-                http://www.uk.quagga.net/download/
+#                http://www.de.quagga.net/download/ \
+#                http://www.uk.quagga.net/download/
 
 PKG_CONFIG_DEPENDS:= \
 	CONFIG_IPV6 \
@@ -50,7 +50,7 @@ define Package/quagga/Default
   SUBMENU:=Routing and Redirection
   TITLE:=The Quagga Software Routing Suite (RE version)
   URL:=http://www.quagga.net
-  DEPENDS:= +libcap +libgcrypt +libgpg-error +librt +quagga-libzebra
+  DEPENDS:= +libcap +librt +quagga-libzebra
   MAINTAINER:=Vasilis Tsiligiannis <b_tsiligiannis@silverton.gr>
 endef
 
@@ -62,12 +62,12 @@ endef
 define Package/quagga/description
   A routing software package that provides TCP/IP based routing services
   with routing protocols support such as RIPv1, RIPv2, RIPng, OSPFv2,
-  OSPFv3, BGP-4, and BGP-4+
+  OSPFv3, BGP-4, BGP-4+ and Babel.
 endef
 
 define Package/quagga-libzebra
   $(call Package/quagga/Default)
-  DEPENDS+=+libgcrypt
+  DEPENDS+=+libgcrypt +libgpg-error
   TITLE:=zebra library
 endef
 
@@ -78,48 +78,48 @@ endef
 
 define Package/quagga-bgpd
   $(call Package/quagga/Default)
-  DEPENDS+=+quagga-libzebra
   TITLE:=BGPv4, BGPv4+, BGPv4- routing engine
 endef
 
 define Package/quagga-isisd
   $(call Package/quagga/Default)
+  DEPENDS+=+quagga
   TITLE:=IS-IS routing engine
 endef
 
 define Package/quagga-ospfd
   $(call Package/quagga/Default)
-  DEPENDS+=+quagga-libospf +quagga-libzebra
+  DEPENDS+=+quagga-libospf +quagga
   TITLE:=OSPFv2 routing engine
 endef
 
 define Package/quagga-ospf6d
   $(call Package/quagga/Default)
-  DEPENDS+=+quagga-libospf +quagga-libzebra +libgcrypt @IPV6
+  DEPENDS+=+quagga-libospf +quagga @IPV6
   TITLE:=OSPFv3 routing engine
 endef
 
 define Package/quagga-ripd
   $(call Package/quagga/Default)
-  DEPENDS+=+quagga-libzebra
+  DEPENDS+=+quagga
   TITLE:=RIP routing engine
 endef
 
 define Package/quagga-ripngd
   $(call Package/quagga/Default)
-  DEPENDS+=+quagga-libzebra @IPV6
+  DEPENDS+=+quagga @IPV6
   TITLE:=RIPNG routing engine
 endef
 
 define Package/quagga-babeld
   $(call Package/quagga/Default)
-  DEPENDS+=+quagga-libzebra +libgcrypt @IPV6
+  DEPENDS+=+quagga @IPV6
   TITLE:=Babeld routing engine
 endef
 
 define Package/quagga-vtysh
   $(call Package/quagga/Default)
-  DEPENDS+=quagga-libzebra +libreadline +libncurses
+  DEPENDS+=+libreadline +libncurses
   TITLE:=integrated shell for Quagga routing software
 endef
 

net/quagga/files/babeld.conf

@@ -5,34 +5,16 @@ access-list vty deny any
 !
 line vty
 	access-class vty
- 
+!
 router babel
-
-network se00
-	redistribute kernel
-	no redistribute static
-network ge00
-	redistribute kernel
-	no redistribute static
-network sw00
-	redistribute kernel
-	no redistribute static
-network sw10
-	redistribute kernel
-	no redistribute static
-network gw00
-	redistribute kernel
-	no redistribute static
-network gw10
-	redistribute kernel
-	no redistribute static
-network gw01
-	redistribute kernel
-	no redistribute static
-network gw11
-	redistribute kernel
-	no redistribute static
-
+	network se00
+	network sw00
+	network sw10
+	network gw10
+	network gw01
+	network gw11
+	redistribute connected
+!
 interface ge00
 	babel wired
 interface se00