From 38f2ed94663fbd3556c5163cb663c898849ffdef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Toke=20H=C3=B8iland-J=C3=B8rgensen?= Date: Mon, 19 Aug 2019 12:34:05 +0200 Subject: [PATCH 1/4] bird2: Bump to v2.0.5 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Toke Høiland-Jørgensen --- bird2/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bird2/Makefile b/bird2/Makefile index f14b77c..045213d 100644 --- a/bird2/Makefile +++ b/bird2/Makefile @@ -7,12 +7,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=bird2 -PKG_VERSION:=2.0.4 +PKG_VERSION:=2.0.5 PKG_RELEASE:=1 PKG_SOURCE:=bird-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=ftp://bird.network.cz/pub/bird -PKG_HASH:=676010b7517d4159b9af37401c26185f561ffcffeba73690a2ef2fad984714de +PKG_HASH:=4e4b736fd26579823a728be6a7746b3f525206e3c9a4a21fccb302cffd3029d3 PKG_BUILD_DEPENDS:=ncurses readline PKG_MAINTAINER:=Toke Høiland-Jørgensen PKG_BUILD_DIR:=$(BUILD_DIR)/bird-$(PKG_VERSION) From 3a800853d629beb95c2c0ab6eb1729028f41cb8a Mon Sep 17 00:00:00 2001 From: Josef Schlehofer Date: Sun, 29 Sep 2019 20:35:35 +0200 Subject: [PATCH 2/4] bird2: Update to version 2.0.6 Signed-off-by: Josef Schlehofer --- bird2/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bird2/Makefile b/bird2/Makefile index 045213d..a01025a 100644 --- a/bird2/Makefile +++ b/bird2/Makefile @@ -7,12 +7,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=bird2 -PKG_VERSION:=2.0.5 +PKG_VERSION:=2.0.6 PKG_RELEASE:=1 PKG_SOURCE:=bird-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=ftp://bird.network.cz/pub/bird -PKG_HASH:=4e4b736fd26579823a728be6a7746b3f525206e3c9a4a21fccb302cffd3029d3 +PKG_HASH:=90934cce6ae90039ab1e58ade223935f9221a7e5eac05df6fb53045b77bfd3aa PKG_BUILD_DEPENDS:=ncurses readline PKG_MAINTAINER:=Toke Høiland-Jørgensen PKG_BUILD_DIR:=$(BUILD_DIR)/bird-$(PKG_VERSION) From 6e51cca4ea4e585ab87acb817513a078d214f9ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Toke=20H=C3=B8iland-J=C3=B8rgensen?= Date: Sat, 21 Dec 2019 23:18:36 +0100 Subject: [PATCH 3/4] bird2: Update to v2.0.7 (#516) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bump release to upstream v2.0.7 Signed-off-by: Toke Høiland-Jørgensen --- bird2/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bird2/Makefile b/bird2/Makefile index a01025a..cad2ddd 100644 --- a/bird2/Makefile +++ b/bird2/Makefile @@ -7,12 +7,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=bird2 -PKG_VERSION:=2.0.6 +PKG_VERSION:=2.0.7 PKG_RELEASE:=1 PKG_SOURCE:=bird-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=ftp://bird.network.cz/pub/bird -PKG_HASH:=90934cce6ae90039ab1e58ade223935f9221a7e5eac05df6fb53045b77bfd3aa +PKG_HASH:=631d2b58aebdbd651aaa3c68c3756c02ebfe5b1e60d307771ea909eeaa5b1066 PKG_BUILD_DEPENDS:=ncurses readline PKG_MAINTAINER:=Toke Høiland-Jørgensen PKG_BUILD_DIR:=$(BUILD_DIR)/bird-$(PKG_VERSION) From dc81e506ca5499f13ce3d3f31a6d32866f235e56 Mon Sep 17 00:00:00 2001 From: Yuxiang Zhu Date: Sun, 9 Feb 2020 05:47:13 +0800 Subject: [PATCH 4/4] bird2: fix service restart and reload (#546) `/etc/init.d/bird restart` or `/etc/init.d/bird reload` has no effects. This PR fixes this issue by: - running the service in the foreground to meet the requirements of procd - sending SIGHUP signal to reload the service --- bird2/Makefile | 2 +- bird2/files/bird.init | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/bird2/Makefile b/bird2/Makefile index cad2ddd..fc3d1c2 100644 --- a/bird2/Makefile +++ b/bird2/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=bird2 PKG_VERSION:=2.0.7 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=bird-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=ftp://bird.network.cz/pub/bird diff --git a/bird2/files/bird.init b/bird2/files/bird.init index 18db4af..5f7a442 100644 --- a/bird2/files/bird.init +++ b/bird2/files/bird.init @@ -11,10 +11,14 @@ BIRD_PID_FILE="/var/run/bird.pid" start_service() { mkdir -p /var/run procd_open_instance - procd_set_param command $BIRD_BIN -c $BIRD_CONF -P $BIRD_PID_FILE + procd_set_param command $BIRD_BIN -f -c $BIRD_CONF -P $BIRD_PID_FILE procd_set_param file "$BIRD_CONF" procd_set_param stdout 1 procd_set_param stderr 1 procd_set_param respawn procd_close_instance } + +reload_service() { + procd_send_signal bird +}