Difuse/routing
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

bird: Update to 1.3.11 and fix build issues

Browse source 
Based on patch by Álvaro Fernández Rojas <noltari@gmail.com>

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
This commit is contained in:
Jo-Philipp Wich 2013-10-08 19:29:15 +00:00
parent dee0eb00c9
commit 1cccda8588
6 changed files with 18 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
bird/Makefile
View file

@ -7,12 +7,12 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=bird PKG_NAME:=bird
PKG_VERSION:=1.3.7 PKG_VERSION:=1.3.11
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_SOURCE:=bird-$(PKG_VERSION).tar.gz PKG_SOURCE:=bird-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=ftp://bird.network.cz/pub/bird PKG_SOURCE_URL:=ftp://bird.network.cz/pub/bird
PKG_MD5SUM:=c400b008ef834d9e7288dcdbe41b7c15 PKG_MD5SUM:=8ad2eb997fb8251bc5b24cf32619571b
PKG_BUILD_DEPENDS:=libncurses libreadline PKG_BUILD_DEPENDS:=libncurses libreadline
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk

11
bird/files/bird4.init
View file

@ -1,21 +1,24 @@
#!/bin/sh /etc/rc.common #!/bin/sh /etc/rc.common
# Copyright (C) 2010-2011 OpenWrt.org # Copyright (C) 2010-2011 OpenWrt.org
START=50 START=99
STOP=10
SERVICE_DAEMONIZE=1 SERVICE_DAEMONIZE=1
SERVICE_WRITE_PID=1 SERVICE_WRITE_PID=1
BIRD="/usr/sbin/bird4 -c /etc/bird4.conf"
start() { start() {
service_start /usr/sbin/bird4 -d service_start $BIRD -d
# ( SERVICE_MATCH_NAME=1 service_start /usr/sbin/bird4loop ) # ( SERVICE_MATCH_NAME=1 service_start /usr/sbin/bird4loop )
} }
stop() { stop() {
# ( SERVICE_MATCH_NAME=1 service_stop /usr/sbin/bird4loop ) # ( SERVICE_MATCH_NAME=1 service_stop /usr/sbin/bird4loop )
service_stop /usr/sbin/bird4 service_stop $BIRD
} }
reload() { reload() {
service_reload /usr/sbin/bird4 service_reload $BIRD
} }

2
bird/files/bird4loop
View file

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
BIRD=/usr/sbin/bird4 BIRD="/usr/sbin/bird4 -c /etc/bird4.conf"
$BIRD -p || return 1 $BIRD -p || return 1

11
bird/files/bird6.init
View file

@ -1,21 +1,24 @@
#!/bin/sh /etc/rc.common #!/bin/sh /etc/rc.common
# Copyright (C) 2010-2011 OpenWrt.org # Copyright (C) 2010-2011 OpenWrt.org
START=50 START=99
STOP=10
SERVICE_DAEMONIZE=1 SERVICE_DAEMONIZE=1
SERVICE_WRITE_PID=1 SERVICE_WRITE_PID=1
BIRD="/usr/sbin/bird6 -c /etc/bird6.conf"
start() { start() {
service_start /usr/sbin/bird6 -d service_start $BIRD -d
# ( SERVICE_MATCH_NAME=1 service_start /usr/sbin/bird6loop ) # ( SERVICE_MATCH_NAME=1 service_start /usr/sbin/bird6loop )
} }
stop() { stop() {
# ( SERVICE_MATCH_NAME=1 service_stop /usr/sbin/bird6loop ) # ( SERVICE_MATCH_NAME=1 service_stop /usr/sbin/bird6loop )
service_stop /usr/sbin/bird6 service_stop $BIRD
} }
reload() { reload() {
service_reload /usr/sbin/bird6 service_reload $BIRD
} }

2
bird/files/bird6loop
View file

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
BIRD=/usr/sbin/bird6 BIRD="/usr/sbin/bird6 -c /etc/bird6.conf"
$BIRD -p || return 1 $BIRD -p || return 1

20
bird/patches/0001-change_config_name.patch
View file

@ -1,20 +0,0 @@
diff --git a/sysdep/config.h b/sysdep/config.h
index 03399bd..bc5eb77 100644
--- a/sysdep/config.h
+++ b/sysdep/config.h
@@ -46,11 +46,11 @@ typedef u16 word;
# endif
#else
# ifdef DEBUGGING
-# define PATH_CONFIG "bird.conf"
-# define PATH_CONTROL_SOCKET "bird.ctl"
+# define PATH_CONFIG "bird4.conf"
+# define PATH_CONTROL_SOCKET "bird4.ctl"
# else
-# define PATH_CONFIG PATH_CONFIG_DIR "/bird.conf"
-# define PATH_CONTROL_SOCKET PATH_CONTROL_SOCKET_DIR "/bird.ctl"
+# define PATH_CONFIG PATH_CONFIG_DIR "/bird4.conf"
+# define PATH_CONTROL_SOCKET PATH_CONTROL_SOCKET_DIR "/bird4.ctl"
# endif
#endif