From 0c1529eee2680484c9521e095466afed7519baca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= <noltari@gmail.com>
Date: Fri, 17 Jan 2014 19:54:43 +0100
Subject: [PATCH 1/4] [bird] Cleanup unneeded files.

---
 bird/Makefile         |  3 +--
 bird/files/bird4.init |  4 +---
 bird/files/bird4loop  | 24 ------------------------
 bird/files/bird6.init |  4 +---
 bird/files/bird6loop  | 24 ------------------------
 5 files changed, 3 insertions(+), 56 deletions(-)
 delete mode 100644 bird/files/bird4loop
 delete mode 100644 bird/files/bird6loop

diff --git a/bird/Makefile b/bird/Makefile
index cea4690..cb4b2a1 100644
--- a/bird/Makefile
+++ b/bird/Makefile
@@ -1,5 +1,5 @@
 # 
-# Copyright (C) 2009-2012 OpenWrt.org
+# Copyright (C) 2009-2014 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -133,7 +133,6 @@ $(STAMP_BUILT): $(STAMP_BUILT)-$(2)
 define Package/bird$(2)/install
 	$(INSTALL_DIR)  $$(1)/usr/sbin
 	$(INSTALL_BIN)  $$(PKG_BUILD_DIR)/bird$(2) $$(1)/usr/sbin/
-	$(INSTALL_BIN)  ./files/bird$(2)loop $$(1)/usr/sbin/
 	$(INSTALL_DIR)  $$(1)/etc
 	$(INSTALL_DATA) ./files/bird$(2).conf $$(1)/etc/
 	$(INSTALL_DIR)  $$(1)/etc/init.d
diff --git a/bird/files/bird4.init b/bird/files/bird4.init
index 18243bb..4fbd302 100644
--- a/bird/files/bird4.init
+++ b/bird/files/bird4.init
@@ -1,5 +1,5 @@
 #!/bin/sh /etc/rc.common
-# Copyright (C) 2010-2011 OpenWrt.org
+# Copyright (C) 2010-2014 OpenWrt.org
 
 START=99
 STOP=10
@@ -11,11 +11,9 @@ BIRD="/usr/sbin/bird4 -c /etc/bird4.conf"
 
 start() {
 	service_start $BIRD -d
-#	( SERVICE_MATCH_NAME=1 service_start /usr/sbin/bird4loop )
 }
 
 stop() {
-#	( SERVICE_MATCH_NAME=1 service_stop /usr/sbin/bird4loop )
 	service_stop $BIRD
 }
 
diff --git a/bird/files/bird4loop b/bird/files/bird4loop
deleted file mode 100644
index 8154902..0000000
--- a/bird/files/bird4loop
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh
-
-BIRD="/usr/sbin/bird4 -c /etc/bird4.conf"
-
-$BIRD -p || return 1
-
-. /lib/functions.sh
-. /lib/functions/service.sh
-
-SERVICE_DAEMONIZE=1
-SERVICE_WRITE_PID=1
-
-sig_handler() {
-	running=0
-	service_stop $BIRD
-}
-
-running=1
-trap sig_handler INT
-trap sig_handler TERM
-while [ $running -gt 0 ]; do
-	service_check $BIRD || service_start $BIRD -d "$@"
-	sleep 3
-done
diff --git a/bird/files/bird6.init b/bird/files/bird6.init
index 67b32f1..9089e00 100644
--- a/bird/files/bird6.init
+++ b/bird/files/bird6.init
@@ -1,5 +1,5 @@
 #!/bin/sh /etc/rc.common
-# Copyright (C) 2010-2011 OpenWrt.org
+# Copyright (C) 2010-2014 OpenWrt.org
 
 START=99
 STOP=10
@@ -11,11 +11,9 @@ BIRD="/usr/sbin/bird6 -c /etc/bird6.conf"
 
 start() {
 	service_start $BIRD -d
-#	( SERVICE_MATCH_NAME=1 service_start /usr/sbin/bird6loop )
 }
 
 stop() {
-#	( SERVICE_MATCH_NAME=1 service_stop /usr/sbin/bird6loop )
 	service_stop $BIRD
 }
 
diff --git a/bird/files/bird6loop b/bird/files/bird6loop
deleted file mode 100644
index 510add4..0000000
--- a/bird/files/bird6loop
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh
-
-BIRD="/usr/sbin/bird6 -c /etc/bird6.conf"
-
-$BIRD -p || return 1
-
-. /lib/functions.sh
-. /lib/functions/service.sh
-
-SERVICE_DAEMONIZE=1
-SERVICE_WRITE_PID=1
-
-sig_handler() {
-	running=0
-	service_stop $BIRD
-}
-
-running=1
-trap sig_handler INT
-trap sig_handler TERM
-while [ $running -gt 0 ]; do
-	service_check $BIRD || service_start $BIRD -d "$@"
-	sleep 3
-done

From 8731e0647a475105acc254bc44aab50e4a828003 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= <noltari@gmail.com>
Date: Fri, 17 Jan 2014 20:24:45 +0100
Subject: [PATCH 2/4] [bird] Improve init files.

---
 bird/files/bird4.init | 11 +++++++----
 bird/files/bird6.init | 11 +++++++----
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/bird/files/bird4.init b/bird/files/bird4.init
index 4fbd302..80bc516 100644
--- a/bird/files/bird4.init
+++ b/bird/files/bird4.init
@@ -1,22 +1,25 @@
 #!/bin/sh /etc/rc.common
 # Copyright (C) 2010-2014 OpenWrt.org
 
+BIRD="bird4"
+
 START=99
 STOP=10
 
 SERVICE_DAEMONIZE=1
 SERVICE_WRITE_PID=1
 
-BIRD="/usr/sbin/bird4 -c /etc/bird4.conf"
+BIRD_BIN="/usr/sbin/$BIRD"
+BIRD_CONF="/etc/$BIRD.conf"
 
 start() {
-	service_start $BIRD -d
+	service_start $BIRD_BIN -d -c $BIRD_CONF
 }
 
 stop() {
-	service_stop $BIRD
+	service_stop $BIRD_BIN
 }
 
 reload() {
-	service_reload $BIRD
+	service_reload $BIRD_BIN
 }
diff --git a/bird/files/bird6.init b/bird/files/bird6.init
index 9089e00..2b39e3f 100644
--- a/bird/files/bird6.init
+++ b/bird/files/bird6.init
@@ -1,22 +1,25 @@
 #!/bin/sh /etc/rc.common
 # Copyright (C) 2010-2014 OpenWrt.org
 
+BIRD="bird6"
+
 START=99
 STOP=10
 
 SERVICE_DAEMONIZE=1
 SERVICE_WRITE_PID=1
 
-BIRD="/usr/sbin/bird6 -c /etc/bird6.conf"
+BIRD_BIN="/usr/sbin/$BIRD"
+BIRD_CONF="/etc/$BIRD.conf"
 
 start() {
-	service_start $BIRD -d
+	service_start $BIRD_BIN -d -c $BIRD_CONF
 }
 
 stop() {
-	service_stop $BIRD
+	service_stop $BIRD_BIN
 }
 
 reload() {
-	service_reload $BIRD
+	service_reload $BIRD_BIN
 }

From eb975ff19709f6495550a2a904698802581bbb1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= <noltari@gmail.com>
Date: Fri, 17 Jan 2014 20:29:15 +0100
Subject: [PATCH 3/4] [bird] Use pid file support introduced in v1.3.12.

---
 bird/files/bird4.init | 5 +++--
 bird/files/bird6.init | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/bird/files/bird4.init b/bird/files/bird4.init
index 80bc516..a1a1be2 100644
--- a/bird/files/bird4.init
+++ b/bird/files/bird4.init
@@ -7,13 +7,14 @@ START=99
 STOP=10
 
 SERVICE_DAEMONIZE=1
-SERVICE_WRITE_PID=1
+SERVICE_USE_PID=1
+SERVICE_PID_FILE="/var/run/$BIRD.pid"
 
 BIRD_BIN="/usr/sbin/$BIRD"
 BIRD_CONF="/etc/$BIRD.conf"
 
 start() {
-	service_start $BIRD_BIN -d -c $BIRD_CONF
+	service_start $BIRD_BIN -d -c $BIRD_CONF -P $SERVICE_PID_FILE
 }
 
 stop() {
diff --git a/bird/files/bird6.init b/bird/files/bird6.init
index 2b39e3f..6156fb2 100644
--- a/bird/files/bird6.init
+++ b/bird/files/bird6.init
@@ -7,13 +7,14 @@ START=99
 STOP=10
 
 SERVICE_DAEMONIZE=1
-SERVICE_WRITE_PID=1
+SERVICE_USE_PID=1
+SERVICE_PID_FILE="/var/run/$BIRD.pid"
 
 BIRD_BIN="/usr/sbin/$BIRD"
 BIRD_CONF="/etc/$BIRD.conf"
 
 start() {
-	service_start $BIRD_BIN -d -c $BIRD_CONF
+	service_start $BIRD_BIN -d -c $BIRD_CONF -P $SERVICE_PID_FILE
 }
 
 stop() {

From 347dd3a6425a7ec04fb883cbe98bb68487887966 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= <noltari@gmail.com>
Date: Fri, 17 Jan 2014 20:30:01 +0100
Subject: [PATCH 4/4] [bird] Bump package release.

---
 bird/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bird/Makefile b/bird/Makefile
index cb4b2a1..c3f1c11 100644
--- a/bird/Makefile
+++ b/bird/Makefile
@@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=bird
 PKG_VERSION:=1.4.0
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=bird-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=ftp://bird.network.cz/pub/bird