another round of updates and musl fixes

8 files changed, 46 insertions, 52 deletions

diff --git a/package/quagga/Makefile b/package/quagga/Makefile
index 99de25ba4..59135aeb0 100644
--- a/package/quagga/Makefile
+++ b/package/quagga/Makefile
@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		quagga
-PKG_VERSION:=		0.99.17
+PKG_VERSION:=		0.99.22.4
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		37b9022adca04b03863d2d79787e643f
+PKG_MD5SUM:=		27ef98abb1820bae19eb71f631a10853
 PKG_DESCR:=		A routing software package
 PKG_SECTION:=		route
 PKG_BUILDDEP:=		readline ncurses
diff --git a/package/quagga/patches/patch-configure b/package/quagga/patches/patch-configure
deleted file mode 100644
index 3780d661a..000000000
--- a/package/quagga/patches/patch-configure
+++ /dev/null
@@ -1,20 +0,0 @@
---- quagga-0.99.17.orig/configure	2010-08-19 11:43:02.000000000 +0200
-+++ quagga-0.99.17/configure	2011-02-16 22:51:51.000000000 +0100
-@@ -14188,7 +14188,7 @@ if test "${ac_cv_func_malloc_0_nonnull+s
-   $as_echo_n "(cached) " >&6
- else
-   if test "$cross_compiling" = yes; then :
--  ac_cv_func_malloc_0_nonnull=no
-+  ac_cv_func_malloc_0_nonnull=yes
- else
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
-@@ -14640,7 +14640,7 @@ if test "${ac_cv_func_realloc_0_nonnull+
-   $as_echo_n "(cached) " >&6
- else
-   if test "$cross_compiling" = yes; then :
--  ac_cv_func_realloc_0_nonnull=no
-+  ac_cv_func_realloc_0_nonnull=yes
- else
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
diff --git a/package/quagga/patches/patch-lib_queue_h b/package/quagga/patches/patch-lib_queue_h
new file mode 100644
index 000000000..2a2ce12ac
--- /dev/null
+++ b/package/quagga/patches/patch-lib_queue_h
@@ -0,0 +1,11 @@
+--- quagga-0.99.22.4.orig/lib/queue.h	2013-08-04 15:01:38.000000000 +0200
++++ quagga-0.99.22.4/lib/queue.h	2013-12-30 19:57:25.000000000 +0100
+@@ -33,8 +33,6 @@
+ #ifndef _SYS_QUEUE_H_
+ #define	_SYS_QUEUE_H_
+ 
+-#include <sys/cdefs.h>
+-
+ /*
+  * This file defines four types of data structures: singly-linked lists,
+  * singly-linked tail queues, lists and tail queues.
diff --git a/package/quagga/patches/patch-lib_sockopt_c b/package/quagga/patches/patch-lib_sockopt_c
new file mode 100644
index 000000000..c33333766
--- /dev/null
+++ b/package/quagga/patches/patch-lib_sockopt_c
@@ -0,0 +1,23 @@
+--- quagga-0.99.22.4.orig/lib/sockopt.c	2013-04-14 14:46:07.000000000 +0200
++++ quagga-0.99.22.4/lib/sockopt.c	2013-12-30 19:56:54.000000000 +0100
+@@ -24,6 +24,20 @@
+ #include "sockopt.h"
+ #include "sockunion.h"
+ 
++#if !defined(__GLIBC__)
++/* For TCP_MD5SIG socket option.  */
++#define TCP_MD5SIG_MAXKEYLEN    80
++
++struct tcp_md5sig
++{
++  struct sockaddr_storage tcpm_addr;            /* Address associated.  */
++  u_int16_t     __tcpm_pad1;                    /* Zero.  */
++  u_int16_t     tcpm_keylen;                    /* Key length.  */
++  u_int32_t     __tcpm_pad2;                    /* Zero.  */
++  u_int8_t      tcpm_key[TCP_MD5SIG_MAXKEYLEN]; /* Key (binary).  */
++};
++#endif
++
+ int
+ setsockopt_so_recvbuf (int sock, int size)
+ {
diff --git a/package/quagga/patches/patch-lib_zebra_h b/package/quagga/patches/patch-lib_zebra_h
new file mode 100644
index 000000000..160b4cc20
--- /dev/null
+++ b/package/quagga/patches/patch-lib_zebra_h
@@ -0,0 +1,10 @@
+--- quagga-0.99.22.4.orig/lib/zebra.h	2013-09-02 14:53:04.000000000 +0200
++++ quagga-0.99.22.4/lib/zebra.h	2013-12-30 19:58:14.000000000 +0100
+@@ -51,7 +51,6 @@ typedef int socklen_t;
+ #ifdef HAVE_STROPTS_H
+ #include <stropts.h>
+ #endif /* HAVE_STROPTS_H */
+-#include <sys/fcntl.h>
+ #ifdef HAVE_SYS_SELECT_H
+ #include <sys/select.h>
+ #endif /* HAVE_SYS_SELECT_H */
diff --git a/package/quagga/patches/patch-ltmain_sh b/package/quagga/patches/patch-ltmain_sh
deleted file mode 100644
index c6711472d..000000000
--- a/package/quagga/patches/patch-ltmain_sh
+++ /dev/null
@@ -1,11 +0,0 @@
---- quagga-0.99.17.orig/ltmain.sh	2010-08-19 11:43:02.000000000 +0200
-+++ quagga-0.99.17/ltmain.sh	2011-01-16 22:05:52.000000000 +0100
-@@ -4765,7 +4765,7 @@ func_mode_link ()
-       # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
-       # @file GCC response files
-       -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
--      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
-+      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-fstack-protector*|-flto)
-         func_quote_for_eval "$arg"
- 	arg="$func_quote_for_eval_result"
-         func_append compile_command " $arg"
diff --git a/package/quagga/patches/patch-redhat_quagga_spec b/package/quagga/patches/patch-redhat_quagga_spec
deleted file mode 100644
index bf00ca130..000000000
--- a/package/quagga/patches/patch-redhat_quagga_spec
+++ /dev/null
@@ -1,11 +0,0 @@
---- quagga-0.99.17.orig/redhat/quagga.spec	2010-08-19 11:44:45.000000000 +0200
-+++ quagga-0.99.17/redhat/quagga.spec	2011-01-16 22:05:02.000000000 +0100
-@@ -90,7 +90,7 @@
- Summary: Routing daemon
- Name:		quagga
- Version:	0.99.17
--Release:	20100819%{release_rev}
-+Release:	20110116%{release_rev}
- License:	GPL
- Group: System Environment/Daemons
- Source0:	http://www.quagga.net/snapshots/cvs/%{name}-%{version}.tar.gz
diff --git a/package/quagga/patches/patch-vtysh_extract_pl b/package/quagga/patches/patch-vtysh_extract_pl
deleted file mode 100644
index dc3229fd2..000000000
--- a/package/quagga/patches/patch-vtysh_extract_pl
+++ /dev/null
@@ -1,8 +0,0 @@
---- quagga-0.99.17.orig/vtysh/extract.pl	2010-08-19 11:44:45.000000000 +0200
-+++ quagga-0.99.17/vtysh/extract.pl	2011-01-16 22:05:03.000000000 +0100
-@@ -1,4 +1,4 @@
--#! 
-+#! /opt/local/bin/perl
- ##
- ## vtysh/extract.pl.  Generated from extract.pl.in by configure.
- ##