- up to 4.13.0

[packages/iproute2.git] / iproute2-build.patch

diff --git a/iproute2-build.patch b/iproute2-build.patch
index b1a46d5c6359ef21575858c119229458bba53a5b..36452cf29555510d4aa922d7d91e1d79c5d102bb 100644 (file)
--- a/iproute2-build.patch
+++ b/iproute2-build.patch
@@ -1,63 +1,11 @@
-diff -urN iproute2-2.6.7.org/include/rt_names.h iproute2-2.6.7/include/rt_names.h
---- iproute2-2.6.7.org/include/rt_names.h      2004-06-16 21:07:09.457517808 +0200
-+++ iproute2-2.6.7/include/rt_names.h  2004-06-16 21:12:26.790275896 +0200
-@@ -1,6 +1,8 @@
- #ifndef RT_NAMES_H_
- #define RT_NAMES_H_ 1
- 
-+#include <asm/byteorder.h>
-+
- const char* rtnl_rtprot_n2a(int id, char *buf, int len);
- const char* rtnl_rtscope_n2a(int id, char *buf, int len);
- const char* rtnl_rttable_n2a(int id, char *buf, int len);
-diff -urN iproute2-2.6.7.org/lib/rt_names.c iproute2-2.6.7/lib/rt_names.c
---- iproute2-2.6.7.org/lib/rt_names.c  2004-06-16 21:07:09.400526472 +0200
-+++ iproute2-2.6.7/lib/rt_names.c      2004-06-16 21:10:48.897157912 +0200
-@@ -16,6 +16,7 @@
- #include <fcntl.h>
- #include <string.h>
- #include <sys/time.h>
-+#include <asm/byteorder.h>
- 
- static void rtnl_tab_initialize(char *file, char **tab, int size)
- {
-diff -urN iproute2-2.6.7.org/Makefile iproute2-2.6.7/Makefile
---- iproute2-2.6.7.org/Makefile        2004-06-16 21:07:09.445519632 +0200
-+++ iproute2-2.6.7/Makefile    2004-06-16 21:10:12.256728104 +0200
-@@ -4,13 +4,10 @@
- CONFDIR=/etc/iproute2
- DOCDIR=/usr/doc/iproute2
- 
--KERNEL_INCLUDE=/usr/include
--LIBC_INCLUDE=/usr/include
--
- DEFINES= -DRESOLVE_HOSTNAMES
- 
- #options if you have a bind>=4.9.4 libresolv (or, maybe, glibc)
--LDLIBS=-lresolv
-+LDLIBS=
- ADDLIB=
- 
- #options if you compile with libc5, and without a bind>=4.9.4 libresolv
-@@ -23,19 +20,9 @@
- #options for ipx
- ADDLIB+=ipx_ntop.o ipx_pton.o
- 
--ifeq ($(LIBC_INCLUDE)/socketbits.h,$(wildcard $(LIBC_INCLUDE)/socketbits.h))
--  ifeq ($(LIBC_INCLUDE)/net/if_packet.h,$(wildcard $(LIBC_INCLUDE)/net/if_packet.h))
--    GLIBCFIX=-I../include-glibc -include ../include-glibc/glibc-bugs.h
--  endif
--endif
--ifeq ($(LIBC_INCLUDE)/bits/socket.h,$(wildcard $(LIBC_INCLUDE)/bits/socket.h))
--  GLIBCFIX=-I../include-glibc -I/usr/include/db3 -include ../include-glibc/glibc-bugs.h
--endif
--
--
- CC = gcc
--CCOPTS = -D_GNU_SOURCE -O2 -Wstrict-prototypes -Wall -g
--CFLAGS = $(CCOPTS) $(GLIBCFIX) -I$(KERNEL_INCLUDE) -I../include $(DEFINES)
-+CCOPTS = -D_GNU_SOURCE $(OPT) -Wstrict-prototypes -Wall -g
-+CFLAGS = $(CCOPTS) -I../include $(DEFINES)
- 
- LDLIBS += -L../lib -lnetlink -lutil
- 
+--- iproute2-3.8.0/ip/iplink_can.c~    2013-02-21 17:41:20.000000000 +0100
++++ iproute2-3.8.0/ip/iplink_can.c     2013-03-05 22:03:13.578484638 +0100
+@@ -107,7 +107,7 @@
+                       if (get_u32(&bt.bitrate, *argv, 0))
+                               invarg("invalid \"bitrate\" value\n", *argv);
+               } else if (matches(*argv, "sample-point") == 0) {
+-                      float sp;
++                      float sp = 0;
+ 
+                       NEXT_ARG();
+                       if (get_float(&sp, *argv))