Hello,
this is bird version bump to 1.3.9 while getting rid
of the previous path patch and just correcting init files.

Signed-off-by: Daniel Petre <d...@ip6.ro>

Index: feeds/packages/net/bird/Makefile
===================================================================
--- feeds/packages/net/bird/Makefile    (revision 36194)
+++ feeds/packages/net/bird/Makefile    (working copy)
@@ -7,12 +7,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=bird
-PKG_VERSION:=1.3.7
+PKG_VERSION:=1.3.9
 PKG_RELEASE:=1
 
 PKG_SOURCE:=bird-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=ftp://bird.network.cz/pub/bird
-PKG_MD5SUM:=c400b008ef834d9e7288dcdbe41b7c15
+PKG_MD5SUM:=86042560b5053dd008ba0b5ecbdde136
 PKG_BUILD_DEPENDS:=libncurses libreadline
 
 include $(INCLUDE_DIR)/package.mk
Index: feeds/packages/net/bird/files/bird4.init
===================================================================
--- feeds/packages/net/bird/files/bird4.init    (revision 36194)
+++ feeds/packages/net/bird/files/bird4.init    (working copy)
@@ -7,7 +7,7 @@
 SERVICE_WRITE_PID=1
 
 start() {
-       service_start /usr/sbin/bird4 -d
+       service_start /usr/sbin/bird4 -d -c /etc/bird4.conf
 #      ( SERVICE_MATCH_NAME=1 service_start /usr/sbin/bird4loop )
 }
 
Index: feeds/packages/net/bird/files/bird4.conf
===================================================================
--- feeds/packages/net/bird/files/bird4.conf    (revision 36194)
+++ feeds/packages/net/bird/files/bird4.conf    (working copy)
@@ -8,7 +8,7 @@
 log syslog all;
 
 # Override router ID
-#router id 192.168.0.1;
+router id 192.168.1.1;
 
 # Turn on global debugging of all protocols
 #debug protocols all;
Index: feeds/packages/net/bird/files/bird6.init
===================================================================
--- feeds/packages/net/bird/files/bird6.init    (revision 36194)
+++ feeds/packages/net/bird/files/bird6.init    (working copy)
@@ -7,7 +7,7 @@
 SERVICE_WRITE_PID=1
 
 start() {
-       service_start /usr/sbin/bird6 -d
+       service_start /usr/sbin/bird6 -d -c /etc/bird6.conf
 #      ( SERVICE_MATCH_NAME=1 service_start /usr/sbin/bird6loop )
 }
 
Index: feeds/packages/net/bird/files/bird6.conf
===================================================================
--- feeds/packages/net/bird/files/bird6.conf    (revision 36194)
+++ feeds/packages/net/bird/files/bird6.conf    (working copy)
@@ -8,7 +8,7 @@
 log syslog all;
 
 # Override router ID
-#router id 192.168.0.1;
+router id 1.1.168.192;
 
 # Turn on global debugging of all protocols
 #debug protocols all;
Index: feeds/packages/net/bird/patches/0001-change_config_name.patch
===================================================================
--- feeds/packages/net/bird/patches/0001-change_config_name.patch       
(revision 36194)
+++ feeds/packages/net/bird/patches/0001-change_config_name.patch       
(working copy)
@@ -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
- 

_______________________________________________
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

Reply via email to