ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2024-12-23 15:32:33 +00:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

iproute2: refresh patches

Browse Source 
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 48613
This commit is contained in:
Felix Fietkau 2016-02-01 18:04:00 +00:00
parent 6af8f1429d
commit 29044db278
9 changed files with 28 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
package/network/utils/iproute2/patches/006-no_sctp.patch
View File

@ -1,6 +1,6 @@
--- a/ip/ipxfrm.c
+++ b/ip/ipxfrm.c
@@ -467,7 +467,6 @@ void xfrm_selector_print(struct xfrm_sel
@@ -470,7 +470,6 @@ void xfrm_selector_print(struct xfrm_sel
switch (sel->proto) {
case IPPROTO_TCP:
case IPPROTO_UDP:
@ -8,11 +8,11 @@
case IPPROTO_DCCP:
default: /* XXX */
if (sel->sport_mask)
@@ -1337,7 +1336,6 @@ static int xfrm_selector_upspec_parse(st
@@ -1341,7 +1340,6 @@ static int xfrm_selector_upspec_parse(st
switch (sel->proto) {
case IPPROTO_TCP:
case IPPROTO_UDP:
- case IPPROTO_SCTP:
case IPPROTO_DCCP:
case IPPROTO_IP: /* to allow shared SA for different protocols */
break;
default:

11
package/network/utils/iproute2/patches/007-no_arpd.patch
View File

@ -1,16 +1,15 @@
--- a/misc/Makefile
+++ b/misc/Makefile
@@ -5,9 +5,9 @@
@@ -5,9 +5,9 @@ TARGETS=ss nstat ifstat rtacct lnstat
include ../Config
-ifeq ($(HAVE_BERKELEY_DB),y)
- TARGETS += arpd
-endif
+#ifeq ($(HAVE_BERKELEY_DB),y)
+# TARGETS += arpd
+#endif
ifeq ($(HAVE_SELINUX),y)
LDLIBS += $(shell pkg-config --libs libselinux)
LDLIBS += $(shell $(PKG_CONFIG) --libs libselinux)

5
package/network/utils/iproute2/patches/008-no_netem.patch
View File

@ -3,10 +3,9 @@
@@ -41,7 +41,7 @@ WFLAGS += -Wmissing-declarations -Wold-s
CFLAGS := $(WFLAGS) $(CCOPTS) -I../include $(DEFINES) $(CFLAGS)
YACCFLAGS = -d -t -v
-SUBDIRS=lib ip tc bridge misc netem genl tipc man
+SUBDIRS=lib ip tc bridge misc genl tipc man
LIBNETLINK=../lib/libnetlink.a ../lib/libutil.a
LDLIBS += $(LIBNETLINK)

3
package/network/utils/iproute2/patches/110-extra-ccopts.patch
View File

@ -1,6 +1,6 @@
--- a/Makefile
+++ b/Makefile
@@ -34,7 +34,7 @@ ADDLIB+=ipx_ntop.o ipx_pton.o
@@ -34,7 +34,7 @@ HOSTCC = gcc
DEFINES += -D_GNU_SOURCE
# Turn on transparent support for LFS
DEFINES += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
@ -8,3 +8,4 @@
+CCOPTS = -O2 $(EXTRA_CCOPTS)
WFLAGS := -Wall -Wstrict-prototypes -Wmissing-prototypes
WFLAGS += -Wmissing-declarations -Wold-style-definition -Wformat=2

6
package/network/utils/iproute2/patches/120-libnetlink-pic.patch
View File

@ -1,11 +1,11 @@
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -4,7 +4,7 @@ ifeq ($(IP_CONFIG_SETNS),y)
CFLAGS += -DHAVE_SETNS
CFLAGS += -DHAVE_SETNS
endif
-CFLAGS += -fPIC
+CFLAGS += $(FPIC)
UTILOBJ=utils.o rt_names.o ll_types.o ll_proto.o ll_addr.o inet_proto.o namespace.o \
names.o
UTILOBJ = utils.o rt_names.o ll_types.o ll_proto.o ll_addr.o \
inet_proto.o namespace.o json_writer.o \

2
package/network/utils/iproute2/patches/130-missing_include.patch
View File

@ -5,6 +5,6 @@
#include <dirent.h>
#include <limits.h>
+#include <sys/param.h>
#include "utils.h"
#include "namespace.h"

12
package/network/utils/iproute2/patches/300-ip_tiny.patch
View File

@ -1,6 +1,6 @@
--- a/ip/Makefile
+++ b/ip/Makefile
@@ -16,6 +16,13 @@ ifeq ($(IP_CONFIG_SETNS),y)
@@ -17,6 +17,13 @@ ifeq ($(IP_CONFIG_SETNS),y)
CFLAGS += -DHAVE_SETNS
endif
@ -14,7 +14,7 @@
ALLOBJ=$(IPOBJ) $(RTMONOBJ)
SCRIPTS=ifcfg rtpr routel routef
TARGETS=ip rtmon
@@ -43,7 +50,7 @@ else
@@ -44,7 +51,7 @@ else
ip: static-syms.o
static-syms.o: static-syms.h
@ -70,7 +70,7 @@
};
--- a/lib/utils.c
+++ b/lib/utils.c
@@ -675,6 +675,7 @@ const char *rt_addr_n2a(int af, int len,
@@ -710,6 +710,7 @@ const char *rt_addr_n2a(int af, int len,
return inet_ntop(af, addr, buf, buflen);
case AF_MPLS:
return mpls_ntop(af, addr, buf, buflen);
@ -78,7 +78,7 @@
case AF_IPX:
return ipx_ntop(af, addr, buf, buflen);
case AF_DECnet:
@@ -683,6 +684,7 @@ const char *rt_addr_n2a(int af, int len,
@@ -718,6 +719,7 @@ const char *rt_addr_n2a(int af, int len,
memcpy(dna.a_addr, addr, 2);
return dnet_ntop(af, &dna, buf, buflen);
}
@ -89,7 +89,7 @@
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -4,6 +4,10 @@ ifeq ($(IP_CONFIG_SETNS),y)
CFLAGS += -DHAVE_SETNS
CFLAGS += -DHAVE_SETNS
endif
+ifeq ($(IP_CONFIG_TINY),y)
@ -98,4 +98,4 @@
+
CFLAGS += $(FPIC)
UTILOBJ=utils.o rt_names.o ll_types.o ll_proto.o ll_addr.o inet_proto.o namespace.o \
UTILOBJ = utils.o rt_names.o ll_types.o ll_proto.o ll_addr.o \

2
package/network/utils/iproute2/patches/900-drop_FAILED_POLICY.patch
View File

@ -24,7 +24,7 @@ Subject: [PATCH] add support for dropping with FAILED_POLICY
--- a/include/linux/rtnetlink.h
+++ b/include/linux/rtnetlink.h
@@ -208,6 +208,7 @@ enum {
@@ -210,6 +210,7 @@ enum {
RTN_THROW, /* Not in this table */
RTN_NAT, /* Translate this address */
RTN_XRESOLVE, /* Use external resolver */

10
package/network/utils/iproute2/patches/911-fix_in_h_include.patch
View File

@ -1,16 +1,16 @@
--- a/include/linux/in.h
+++ b/include/linux/in.h
@@ -15,6 +15,7 @@
* as published by the Free Software Foundation; either version
* 2 of the License, or (at your option) any later version.
* as published by the Free Software Foundation; either version
* 2 of the License, or (at your option) any later version.
*/
+#ifndef _NETINET_IN_H
#ifndef _LINUX_IN_H
#define _LINUX_IN_H
@@ -297,3 +298,4 @@ struct sockaddr_in {
#endif /* _LINUX_IN_H */
+#endif /* _NETINET_IN_H */
--- a/include/linux/in6.h