From 60a93cc58d6e4a299292372074a29a5029c87278 Mon Sep 17 00:00:00 2001
From: =?utf8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= <noltari@gmail.com>
Date: Fri, 23 Jan 2015 14:19:48 +0100
Subject: [PATCH] bird: add lightweight client support
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Based on pull request https://github.com/openwrt-routing/packages/pull/42 by MartinStrbacka.
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
---
 bird/Makefile | 54 ++++++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 51 insertions(+), 3 deletions(-)

diff --git a/bird/Makefile b/bird/Makefile
index 920ae81..5f8200c 100644
--- a/bird/Makefile
+++ b/bird/Makefile
@@ -1,5 +1,5 @@
 # 
-# Copyright (C) 2009-2014 OpenWrt.org
+# Copyright (C) 2009-2015 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=bird
 PKG_VERSION:=1.4.5
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=bird-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=ftp://bird.network.cz/pub/bird
@@ -30,6 +30,11 @@ define Package/birdc/Default
   DEPENDS:= +libreadline +libncurses
 endef
 
+define Package/birdcl/Default
+  TITLE:=The BIRD lightweight command-line client
+  URL:=http://bird.network.cz/
+endef
+
 define Package/bird/Default/description1
 BIRD is an internet routing daemon which manages TCP/IP routing tables
 with support of modern routing protocols, easy to use configuration
@@ -58,6 +63,14 @@ should install BIRD command-line client together with BIRD.
 
 endef
 
+define Package/bird/Default/description4
+This is a BIRD lightweight command-line client. It is used to send commands to BIRD,
+commands can perform simple actions such as enabling/disabling of
+protocols, telling BIRD to show various information, telling it to show
+a routing table filtered by a filter, or asking BIRD to reconfigure.
+
+endef
+
 define Package/bird4
 $(call Package/bird/Default)
   SECTION:=net
@@ -75,6 +88,15 @@ $(call Package/birdc/Default)
   DEPENDS+= +bird4
 endef
 
+define Package/birdcl4
+$(call Package/birdcl/Default)
+  SECTION:=net
+  CATEGORY:=Network
+  SUBMENU:=Routing and Redirection
+  TITLE+= (IPv4)
+  DEPENDS+= +bird4
+endef
+
 define Package/bird6
 $(call Package/bird/Default)
   SECTION:=net
@@ -92,6 +114,15 @@ $(call Package/birdc/Default)
   DEPENDS+= +bird6
 endef
 
+define Package/birdcl6
+$(call Package/birdcl/Default)
+  SECTION:=net
+  CATEGORY:=Network
+  SUBMENU:=Routing and Redirection
+  TITLE+= (IPv6)
+  DEPENDS+= +bird6
+endef
+
 define Package/bird4/description
 $(call Package/bird/Default/description1)
 This is IPv4 version of BIRD, it supports OSPFv2, RIPv2 and BGP
@@ -105,6 +136,11 @@ $(call Package/bird/Default/description1)
 $(call Package/bird/Default/description3)
 endef
 
+define Package/birdcl4/description
+$(call Package/bird/Default/description1)
+$(call Package/bird/Default/description4)
+endef
+
 define Package/bird6/description
 $(call Package/bird/Default/description1)
 This is IPv6 version of BIRD, it supports OSPFv3, RIPng and BGP
@@ -118,6 +154,11 @@ $(call Package/bird/Default/description1)
 $(call Package/bird/Default/description3)
 endef
 
+define Package/birdcl6/description
+$(call Package/bird/Default/description1)
+$(call Package/bird/Default/description4)
+endef
+
 CONFIGURE_ARGS += --with-linux-headers="$(LINUX_DIR)"
 
 define Build/Template
@@ -125,7 +166,7 @@ define Build/Template
 $(STAMP_BUILT)-$(2): $(STAMP_PREPARED)
 	$(call Build/Configure/Default,$(3))
 	$(call Build/Compile/Default,)
-	( cd $(PKG_BUILD_DIR); mv -f bird bird$(2); mv -f birdc birdc$(2) )
+	( cd $(PKG_BUILD_DIR); mv -f bird bird$(2); mv -f birdc birdc$(2); mv -f birdcl birdcl$(2) )
 	-$(MAKE) -C $(PKG_BUILD_DIR) clean
 	touch $$@
 
@@ -150,6 +191,11 @@ define Package/birdc$(2)/install
 	$(INSTALL_BIN) $$(PKG_BUILD_DIR)/birdc$(2) $$(1)/usr/sbin/
 endef
 
+define Package/birdcl$(2)/install
+	$(INSTALL_DIR) $$(1)/usr/sbin
+	$(INSTALL_BIN) $$(PKG_BUILD_DIR)/birdcl$(2) $$(1)/usr/sbin/
+endef
+
 endef
 
 
@@ -158,5 +204,7 @@ $(eval $(call Build/Template,bird6,6, --enable-ipv6))
 
 $(eval $(call BuildPackage,bird4))
 $(eval $(call BuildPackage,birdc4))
+$(eval $(call BuildPackage,birdcl4))
 $(eval $(call BuildPackage,bird6))
 $(eval $(call BuildPackage,birdc6))
+$(eval $(call BuildPackage,birdcl6))
-- 
2.30.2