Freshen patches, work around non-buildy-ness. Signed-off-by: Russell Senior <[email protected]> --- package/network/utils/iproute2/Makefile | 8 +-- .../utils/iproute2/patches/110-extra-ccopts.patch | 12 +++-- .../iproute2/patches/120-libnetlink-pic.patch | 12 +++-- .../utils/iproute2/patches/200-act_connmark.patch | 25 +++------- .../210-build-unbreak-linkage-of-m_xt.so.patch | 58 ---------------------- .../network/utils/iproute2/patches/210-netns.patch | 12 +++++ .../network/utils/iproute2/patches/220-m_ipt.patch | 13 +++++ 7 files changed, 52 insertions(+), 88 deletions(-) delete mode 100644 package/network/utils/iproute2/patches/210-build-unbreak-linkage-of-m_xt.so.patch create mode 100644 package/network/utils/iproute2/patches/210-netns.patch create mode 100644 package/network/utils/iproute2/patches/220-m_ipt.patch
diff --git a/package/network/utils/iproute2/Makefile b/package/network/utils/iproute2/Makefile index 578010f..afd1776 100644 --- a/package/network/utils/iproute2/Makefile +++ b/package/network/utils/iproute2/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2006-2010 OpenWrt.org +# Copyright (C) 2006-2013 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=iproute2 -PKG_VERSION:=3.7.0 +PKG_VERSION:=3.8.0 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=http://kernel.org/pub/linux/utils/net/iproute2/ -PKG_MD5SUM:=47040899f8fa30c8721fc5aec6509b44 +PKG_MD5SUM:=3d4d106c79abef530479ec74ab5ff3c0 PKG_BUILD_PARALLEL:=1 PKG_BUILD_DIR:=$(BUILD_DIR)/iproute2-$(PKG_VERSION) @@ -23,7 +23,7 @@ include $(INCLUDE_DIR)/package.mk define Package/iproute2/Default SECTION:=net CATEGORY:=Network - URL:=http://linux-net.osdl.org/index.php/Iproute2 + URL:=http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2 endef define Package/ip diff --git a/package/network/utils/iproute2/patches/110-extra-ccopts.patch b/package/network/utils/iproute2/patches/110-extra-ccopts.patch index f4ef8d7..1ab8b92 100644 --- a/package/network/utils/iproute2/patches/110-extra-ccopts.patch +++ b/package/network/utils/iproute2/patches/110-extra-ccopts.patch @@ -1,11 +1,13 @@ ---- a/Makefile -+++ b/Makefile +Index: iproute2-3.8.0/Makefile +=================================================================== +--- iproute2-3.8.0.orig/Makefile ++++ iproute2-3.8.0/Makefile @@ -29,7 +29,7 @@ ADDLIB+=ipx_ntop.o ipx_pton.o CC = gcc HOSTCC = gcc DEFINES += -D_GNU_SOURCE -CCOPTS = -O2 +CCOPTS = -O2 $(EXTRA_CCOPTS) - WFLAGS = -Wall -Wstrict-prototypes - CFLAGS = $(WFLAGS) $(CCOPTS) -I../include $(DEFINES) - YACCFLAGS = -d -t -v + WFLAGS := -Wall -Wstrict-prototypes -Werror -Wmissing-prototypes + WFLAGS += -Wmissing-declarations -Wold-style-definition + diff --git a/package/network/utils/iproute2/patches/120-libnetlink-pic.patch b/package/network/utils/iproute2/patches/120-libnetlink-pic.patch index c7b78d0..5f95b25 100644 --- a/package/network/utils/iproute2/patches/120-libnetlink-pic.patch +++ b/package/network/utils/iproute2/patches/120-libnetlink-pic.patch @@ -1,8 +1,12 @@ ---- a/lib/Makefile -+++ b/lib/Makefile -@@ -1,4 +1,4 @@ +Index: iproute2-3.8.0/lib/Makefile +=================================================================== +--- iproute2-3.8.0.orig/lib/Makefile ++++ iproute2-3.8.0/lib/Makefile +@@ -1,6 +1,6 @@ + include ../Config + -CFLAGS += -fPIC -+CFLAGS+=$(FPIC) ++CFLAGS+= $(FPIC) UTILOBJ=utils.o rt_names.o ll_types.o ll_proto.o ll_addr.o inet_proto.o diff --git a/package/network/utils/iproute2/patches/200-act_connmark.patch b/package/network/utils/iproute2/patches/200-act_connmark.patch index 4a48ac3..ef8624f 100644 --- a/package/network/utils/iproute2/patches/200-act_connmark.patch +++ b/package/network/utils/iproute2/patches/200-act_connmark.patch @@ -1,5 +1,7 @@ ---- a/tc/Makefile -+++ b/tc/Makefile +Index: iproute2-3.8.0/tc/Makefile +=================================================================== +--- iproute2-3.8.0.orig/tc/Makefile ++++ iproute2-3.8.0/tc/Makefile @@ -38,6 +38,7 @@ TCMODULES += m_mirred.o TCMODULES += m_nat.o TCMODULES += m_pedit.o @@ -8,9 +10,11 @@ TCMODULES += m_csum.o TCMODULES += p_ip.o TCMODULES += p_icmp.o +Index: iproute2-3.8.0/tc/m_connmark.c +=================================================================== --- /dev/null -+++ b/tc/m_connmark.c -@@ -0,0 +1,71 @@ ++++ iproute2-3.8.0/tc/m_connmark.c +@@ -0,0 +1,58 @@ +/* + * m_connmark.c Connection tracking marking import + * @@ -37,19 +41,6 @@ +#include "utils.h" +#include "tc_util.h" + -+static void -+explain(void) -+{ -+ fprintf(stderr, "Usage: ... connmark\n"); -+} -+ -+static void -+usage(void) -+{ -+ explain(); -+ exit(-1); -+} -+ +static int +parse_connmark(struct action_util *a, int *argc_p, char ***argv_p, int tca_id, + struct nlmsghdr *n) diff --git a/package/network/utils/iproute2/patches/210-build-unbreak-linkage-of-m_xt.so.patch b/package/network/utils/iproute2/patches/210-build-unbreak-linkage-of-m_xt.so.patch deleted file mode 100644 index 7fb2c11..0000000 --- a/package/network/utils/iproute2/patches/210-build-unbreak-linkage-of-m_xt.so.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 11e8a1034656eba6571401286b99dabbd9842dac Mon Sep 17 00:00:00 2001 -From: Jan Engelhardt <[email protected]> -Date: Tue, 18 Dec 2012 09:18:45 -0800 -Subject: [PATCH] build: unbreak linakge of m_xt.so - -Commit v3.7.0~10 caused the variable new PKG_CONFIG variable never -to be present at the time of calling make, leading to tc/m_xt.so -not linked with -lxtables (result from pkg-config xtables --libs), -that in turn leading to - -tc: symbol lookup error: /usr/lib64/tc//m_xt.so: undefined symbol: -xtables_init_all - -Fixing that. - -Signed-off-by: Jan Engelhardt <[email protected]> - -Conflicts: - configure ---- - configure | 14 +++++++++++--- - 1 file changed, 11 insertions(+), 3 deletions(-) - ---- a/configure -+++ b/configure -@@ -2,14 +2,20 @@ - # This is not an autconf generated configure - # - INCLUDE=${1:-"$PWD/include"} --: ${PKG_CONFIG:=pkg-config} --: ${CC=gcc} --echo "PKG_CONFIG:=${PKG_CONFIG}" >>Config - - # Make a temp directory in build tree. - TMPDIR=$(mktemp -d config.XXXXXX) - trap 'status=$?; rm -rf $TMPDIR; exit $status' EXIT HUP INT QUIT TERM - -+check_toolchain() -+{ -+: ${PKG_CONFIG:=pkg-config} -+: ${AR=ar} -+: ${CC=gcc} -+echo "AR:=${AR}" >>Config -+echo "CC:=${CC}" >>Config -+} -+ - check_atm() - { - cat >$TMPDIR/atmtest.c <<EOF -@@ -224,6 +230,8 @@ rm -f $TMPDIR/ipsettest.c $TMPDIR/ipsett - } - - echo "# Generated config based on" $INCLUDE >Config -+echo "PKG_CONFIG:=${PKG_CONFIG}" >>Config -+check_toolchain - - echo "TC schedulers" - diff --git a/package/network/utils/iproute2/patches/210-netns.patch b/package/network/utils/iproute2/patches/210-netns.patch new file mode 100644 index 0000000..f709933 --- /dev/null +++ b/package/network/utils/iproute2/patches/210-netns.patch @@ -0,0 +1,12 @@ +Index: iproute2-3.8.0/ip/ipnetns.c +=================================================================== +--- iproute2-3.8.0.orig/ip/ipnetns.c ++++ iproute2-3.8.0/ip/ipnetns.c +@@ -4,6 +4,7 @@ + #include <sys/wait.h> + #include <sys/inotify.h> + #include <sys/mount.h> ++#include <linux/fs.h> + #include <sys/param.h> + #include <sys/syscall.h> + #include <stdio.h> diff --git a/package/network/utils/iproute2/patches/220-m_ipt.patch b/package/network/utils/iproute2/patches/220-m_ipt.patch new file mode 100644 index 0000000..1b1edca --- /dev/null +++ b/package/network/utils/iproute2/patches/220-m_ipt.patch @@ -0,0 +1,13 @@ +Index: iproute2-3.8.0/tc/m_ipt.c +=================================================================== +--- iproute2-3.8.0.orig/tc/m_ipt.c ++++ iproute2-3.8.0/tc/m_ipt.c +@@ -55,6 +55,8 @@ static struct iptables_target *t_list = + static struct option *opts = original_opts; + static unsigned int global_option_offset = 0; + #define OPTION_OFFSET 256 ++int build_st(struct iptables_target *, struct ipt_entry_target *); ++void xtables_register_target(struct iptables_target *); + + char *lib_dir; + -- 1.7.12 -- Russell Senior, President [email protected] _______________________________________________ openwrt-devel mailing list [email protected] https://lists.openwrt.org/mailman/listinfo/openwrt-devel
