Changeset 14738


Ignorieren:
Zeitstempel:
20.06.2018 15:35:47 (vor 3 Monaten)
Autor:
er13
Nachricht:

bird: bump version to 1.6.4 [1]

  • compile-tested only
  • refs #2962

[1] http://bird.network.cz/?o_news

Ort:
trunk
Dateien:
8 bearbeitet

Legende:

Unverändert
Hinzugefügt
Entfernt
  • trunk/CHANGELOG

    r14734 r14738  
    9393    * bind 9.11.3 
    9494    * bip 0.8.9 
    95     * bird 1.4.0 
     95    * bird 1.6.4 
    9696    * CCID 1.4.18 
    9797    * cifs-utils 6.6 
  • trunk/make/bird/Config.in

    r11519 r14738  
    11config FREETZ_PACKAGE_BIRD 
    2     bool "Bird 1.4.0" 
     2    bool "Bird 1.6.4" 
    33    default n 
    44    help 
  • trunk/make/bird/bird.mk

    r12668 r14738  
    1 $(call PKG_INIT_BIN, 1.4.0) 
     1$(call PKG_INIT_BIN, 1.6.4) 
    22$(PKG)_SOURCE:=$(pkg)-$($(PKG)_VERSION).tar.gz 
    3 $(PKG)_SOURCE_MD5:=4e5a47308335b1b0bf4691cac6c4174f 
     3$(PKG)_SOURCE_MD5:=d62ec2547338e8d3dfb934b4c7b2faa4 
    44$(PKG)_SITE:=ftp://bird.network.cz/pub/bird 
    55$(PKG)_STARTLEVEL=82 
  • trunk/make/bird/patches/002-missing_includes.patch

    r11519 r14738  
    1 --- client/client.c 
    2 +++ client/client.c 
    3 @@ -28,6 +28,7 @@ 
    4  #include <sys/socket.h> 
    5  #include <sys/un.h> 
    6  #include <sys/types.h> 
    7 +#include <sys/select.h> 
    8   
    9  #include "nest/bird.h" 
    10  #include "lib/resource.h" 
    11  #include "lib/resource.h" 
    121--- filter/tree.c 
    132+++ filter/tree.c 
    14 @@ -6,8 +6,9 @@ 
     3@@ -6,6 +6,8 @@ 
    154  * Can be freely distributed and used under the terms of the GNU GPL. 
    165  */ 
    176  
    18 -#include "lib/alloca.h" 
    19 +#include <stdlib.h> /* malloc, free */ 
     7+#include <stdlib.h> /* qsort */ 
     8+ 
     9 #include "lib/alloca.h" 
    2010 #include "nest/bird.h" 
    21 +#include "lib/alloca.h" /* alloca - requires HAVE_ALLOCA_H defined in one of the headers included from nest/bird.h */ 
    2211 #include "conf/conf.h" 
    23  #include "filter/filter.h" 
     12--- lib/alloca.h 
     13+++ lib/alloca.h 
     14@@ -9,6 +9,8 @@ 
     15 #ifndef _BIRD_ALLOCA_H_ 
     16 #define _BIRD_ALLOCA_H_ 
    2417  
    25 --- lib/string.h 
    26 +++ lib/string.h 
    27 @@ -11,6 +11,7 @@ 
    28   
    29  #include <stdarg.h> 
    30  #include <string.h> 
    31 +#include <strings.h> /* bzero */ 
    32   
    33  int bsprintf(char *str, const char *fmt, ...); 
    34  int bvsprintf(char *str, const char *fmt, va_list args); 
     18+#include "nest/bird.h" /* HAVE_ALLOCA_H is defined in one of the headers included from nest/bird.h */ 
     19+ 
     20 #ifdef HAVE_ALLOCA_H 
     21 #include <alloca.h> 
     22 #else 
     23--- lib/resource.h 
     24+++ lib/resource.h 
     25@@ -93,6 +93,7 @@ 
     26 #define xrealloc(size) _xrealloc_leap(__FILE__, __LINE__, size) 
     27 #define xfree(ptr) _xfree_leap(__FILE__, __LINE__, ptr) 
     28 #else 
     29+#include <stdlib.h> /* free */ 
     30 /* 
     31  * Unfortunately, several libraries we might want to link to define 
     32  * their own xmalloc and we don't want to interfere with them, hence 
  • trunk/make/bird/patches/003-birdc_fix_buffer_overflow.patch

    r11519 r14738  
    11--- client/client.c 
    22+++ client/client.c 
    3 @@ -250,7 +250,7 @@ 
     3@@ -256,7 +256,7 @@ 
    44  
    55   bzero(&sa, sizeof(sa)); 
     
    88+  strncpy(sa.sun_path, server_path, sizeof(sa.sun_path)); 
    99   if (connect(server_fd, (struct sockaddr *) &sa, SUN_LEN(&sa)) < 0) 
    10      die("Unable to connect to server control socket (%s): %m", server_path); 
     10     DIE("Unable to connect to server control socket (%s)", server_path); 
    1111   if (fcntl(server_fd, F_SETFL, O_NONBLOCK) < 0) 
    1212--- sysdep/unix/io.c 
    1313+++ sysdep/unix/io.c 
    14 @@ -1274,7 +1274,7 @@ 
     14@@ -1515,7 +1515,7 @@ 
    1515  
    1616   /* Path length checked in test_old_bird() */ 
     
    1818-  strcpy(sa.sun_path, name); 
    1919+  strncpy(sa.sun_path, name, sizeof(sa.sun_path)); 
     20  
    2021   if (bind(fd, (struct sockaddr *) &sa, SUN_LEN(&sa)) < 0) 
    21      ERR("bind"); 
    22    if (listen(fd, 8)) 
     22     return -1; 
  • trunk/make/bird/patches/100-fix_debugging_paths.patch

    r11519 r14738  
    11--- configure 
    22+++ configure 
    3 @@ -2375,13 +2375,8 @@ 
     3@@ -2210,13 +2210,8 @@ 
    44 fi 
    55  
    66  
    77-if test "$enable_debug" = yes ; then 
    8 -   CONFIG_FILE="bird$SUFFIX.conf" 
    9 -   CONTROL_SOCKET="bird$SUFFIX.ctl" 
     8-  CONFIG_FILE="bird$SUFFIX.conf" 
     9-  CONTROL_SOCKET="bird$SUFFIX.ctl" 
    1010-else 
    11     CONFIG_FILE="\$(sysconfdir)/bird$SUFFIX.conf" 
    12     CONTROL_SOCKET="$runtimedir/bird$SUFFIX.ctl" 
     11   CONFIG_FILE="\$(sysconfdir)/bird$SUFFIX.conf" 
     12   CONTROL_SOCKET="$runtimedir/bird$SUFFIX.ctl" 
    1313-fi 
    1414  
  • trunk/make/bird/patches/101-disable_default_debug.patch

    r11519 r14738  
    11--- sysdep/unix/main.c 
    22+++ sysdep/unix/main.c 
    3 @@ -41,11 +41,7 @@ 
     3@@ -43,11 +43,7 @@ 
    44  * Debugging 
    55  */ 
  • trunk/make/bird/patches/102-CPPFLAGS.patch

    r11519 r14738  
    66  
    77-CPPFLAGS=-I$(root-rel) -I$(srcdir) @CPPFLAGS@ 
    8 +CPPFLAGS=-I$(root-rel) -I$(srcdir) @CPPFLAGS@ -D_XOPEN_SOURCE=600 
     8+CPPFLAGS=-I$(root-rel) -I$(srcdir) @CPPFLAGS@ -D_GNU_SOURCE 
    99 CFLAGS=$(CPPFLAGS) @CFLAGS@ 
    1010 LDFLAGS=@LDFLAGS@ 
    1111 LIBS=@LIBS@ 
    12 @@ -68,7 +68,7 @@ 
    13  all.o: $(objs) 
     12@@ -69,7 +69,7 @@ 
    1413 #       $(LD) -r -o $@ $^ 
    1514 #  Changed to $(CC) because $(LD) has problems with crosscompiling 
    16 -   $(CC) -nostdlib -r -o $@ $^ 
    17 +   $(CC) $(CFLAGS) -nostdlib -r -o $@ $^ 
     15    @echo LD -r -o $@ $^ 
     16-   @$(CC) -nostdlib -r -o $@ $^ 
     17+   @$(CC) $(CFLAGS) -nostdlib -r -o $@ $^ 
    1818  
    1919 endif 
Hinweis: Hilfe zur Verwendung der Changeset-Ansicht finden Sie unter TracChangeset.