diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2010-11-21 21:46:24 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2010-11-21 21:46:24 +0000 |
| commit | 9d1efe19f8182ca968545119e52418f6fd651f40 (patch) | |
| tree | d8cd8a06b53c0b7b1724ef96191b48721ee352cc /sys-apps/iproute2/files | |
| parent | convert IUSE appending to the += operator, and pull out IUSE=vanilla for all ... (diff) | |
| download | gentoo-2-9d1efe19f8182ca968545119e52418f6fd651f40.tar.gz gentoo-2-9d1efe19f8182ca968545119e52418f6fd651f40.tar.bz2 gentoo-2-9d1efe19f8182ca968545119e52418f6fd651f40.zip | |
Add USE=iptables to control support for it, and fix up iptables handling in the process to use the newer x_xt module. Pull in pkg-config when necessary #346137 by Mike Gilbert.
(Portage version: 2.2.0_alpha4/cvs/Linux x86_64)
Diffstat (limited to 'sys-apps/iproute2/files')
| -rw-r--r-- | sys-apps/iproute2/files/iproute2-2.6.35-no-iptables.patch | 15 | ||||
| -rw-r--r-- | sys-apps/iproute2/files/iproute2-2.6.35-xtables.patch | 30 |
2 files changed, 45 insertions, 0 deletions
diff --git a/sys-apps/iproute2/files/iproute2-2.6.35-no-iptables.patch b/sys-apps/iproute2/files/iproute2-2.6.35-no-iptables.patch new file mode 100644 index 000000000000..a51cf78ac8df --- /dev/null +++ b/sys-apps/iproute2/files/iproute2-2.6.35-no-iptables.patch @@ -0,0 +1,15 @@ +diff --git a/tc/Makefile b/tc/Makefile +index 3aa9f26..0a827da 100644 +--- a/tc/Makefile ++++ b/tc/Makefile +@@ -58,7 +58,9 @@ else + CFLAGS += -DTC_CONFIG_XT_H + TCSO += m_xt_old.so + else +- TCMODULES += m_ipt.o ++ ifneq ($(TC_CONFIG_XT),n) ++ TCMODULES += m_ipt.o ++ endif + endif + endif + endif diff --git a/sys-apps/iproute2/files/iproute2-2.6.35-xtables.patch b/sys-apps/iproute2/files/iproute2-2.6.35-xtables.patch new file mode 100644 index 000000000000..748c77bde828 --- /dev/null +++ b/sys-apps/iproute2/files/iproute2-2.6.35-xtables.patch @@ -0,0 +1,30 @@ +From 035ea3a8a1c9f67721fa0b53540620c7c49bc8ab Mon Sep 17 00:00:00 2001 +From: Mike Frysinger <vapier@gentoo.org> +Date: Sun, 21 Nov 2010 16:07:26 -0500 +Subject: [PATCH] m_xt: stop using xtables_set_revision() + +iptables dropped the xtables_set_revision() function around version 1.4.9, +so set the rev directly ourselves. This should be compatible back to the +original version m_xt itself is designed for. + +Signed-off-by: Mike Frysinger <vapier@gentoo.org> +--- + tc/m_xt.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/tc/m_xt.c b/tc/m_xt.c +index bfc4937..ede9913 100644 +--- a/tc/m_xt.c ++++ b/tc/m_xt.c +@@ -88,7 +88,7 @@ build_st(struct xtables_target *target, struct xt_entry_target *t) + target->t = xtables_calloc(1, size); + target->t->u.target_size = size; + strcpy(target->t->u.user.name, target->name); +- xtables_set_revision(target->t->u.user.name, target->revision); ++ target->t->u.user.revision = target->revision; + + if (target->init != NULL) + target->init(target->t); +-- +1.7.3.1 + |