X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=quagga%2FMakefile;h=ae65ecea8b2b64476fc8c8ab08f144d84ae4d5aa;hb=3e6059ff4a06d53117a11e906bb1606e2c37df9b;hp=eb2e2ff2965a8a9fe2a0c58f185eaadc8062e92a;hpb=0fda0b049c88398e6b47e45be95553d638e81e54;p=feed%2Frouting.git

diff --git a/quagga/Makefile b/quagga/Makefile
index eb2e2ff..ae65ece 100644
--- 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,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=quagga
-PKG_VERSION:=0.99.22.3
+PKG_VERSION:=1.2.4
 PKG_RELEASE:=1
-PKG_MD5SUM:=1467b6828842af59b31252515729bb09
+PKG_HASH:=e364c082c3309910e1eb7b068bf39ee298e2f2f3f31a6431a5c115193bd653d3
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://download.savannah.gnu.org/releases/quagga/
+PKG_SOURCE_URL:=@SAVANNAH/quagga/
 PKG_CONFIG_DEPENDS:= \
 	CONFIG_IPV6 \
 	CONFIG_PACKAGE_quagga-watchquagga \
@@ -25,11 +25,11 @@ 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
 PKG_INSTALL:=1
+PKG_LICENSE:=GPL-2.0
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -40,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
@@ -76,6 +76,7 @@ endef
 
 define Package/quagga-libospf
   $(call Package/quagga/Default)
+  DEPENDS+=+quagga-libzebra
   TITLE:=OSPF library
 endef
 
@@ -93,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
 
@@ -115,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
@@ -155,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
@@ -169,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
 
@@ -180,11 +170,11 @@ CONFIGURE_ARGS+= \
 	--disable-static \
 	--enable-user=network \
 	--enable-group=network \
-	--enable-pie=no \
 	--enable-multipath=8 \
 	--disable-ospfclient \
 	--disable-capabilities \
 	--disable-doc \
+	--disable-nhrpd \
 	$(call autoconf_bool,CONFIG_PACKAGE_quagga-libzebra,zebra) \
 	$(call autoconf_bool,CONFIG_PACKAGE_quagga-libospf,ospfd) \
 	$(call autoconf_bool,CONFIG_PACKAGE_quagga-bgpd,bgpd) \
@@ -192,7 +182,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 += \
@@ -266,14 +255,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/
@@ -300,5 +281,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))