From c3f8397720b1ae490b509442632956653a0abd32 Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Fri, 9 Mar 2007 00:06:40 +0000 Subject: [PATCH] iptables: Apply patch to use cross ar instead of host ar. (by Cyril Romain) --- packages/iptables/files/.mtn2git_empty | 0 packages/iptables/files/compile.patch | 17 +++++++++++++++++ packages/iptables/iptables_1.2.9.bb | 5 +++-- packages/iptables/iptables_1.3.3.bb | 5 +++-- 4 files changed, 23 insertions(+), 4 deletions(-) create mode 100644 packages/iptables/files/.mtn2git_empty create mode 100644 packages/iptables/files/compile.patch diff --git a/packages/iptables/files/.mtn2git_empty b/packages/iptables/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/iptables/files/compile.patch b/packages/iptables/files/compile.patch new file mode 100644 index 0000000000..76662d9748 --- /dev/null +++ b/packages/iptables/files/compile.patch @@ -0,0 +1,17 @@ +Index: iptables-1.3.3/extensions/Makefile +=================================================================== +--- iptables-1.3.3.orig/extensions/Makefile ++++ iptables-1.3.3/extensions/Makefile +@@ -67,10 +67,10 @@ endif + + ifdef NO_SHARED_LIBS + extensions/libext.a: $(EXT_OBJS) +- rm -f $@; ar crv $@ $(EXT_OBJS) ++ rm -f $@; $(AR) crv $@ $(EXT_OBJS) + + extensions/libext6.a: $(EXT6_OBJS) +- rm -f $@; ar crv $@ $(EXT6_OBJS) ++ rm -f $@; $(AR) crv $@ $(EXT6_OBJS) + + extensions/initext.o: extensions/initext.c + extensions/initext6.o: extensions/initext6.c diff --git a/packages/iptables/iptables_1.2.9.bb b/packages/iptables/iptables_1.2.9.bb index fe43ff488e..213802d17f 100644 --- a/packages/iptables/iptables_1.2.9.bb +++ b/packages/iptables/iptables_1.2.9.bb @@ -1,9 +1,10 @@ SECTION = "console/network" DESCRIPTION = "iptables network filtering tools" LICENSE = "GPL" -PR = "r1" +PR = "r2" -SRC_URI = "http://www.netfilter.org/files/iptables-${PV}.tar.bz2" +SRC_URI = "http://www.netfilter.org/files/iptables-${PV}.tar.bz2 \ + file://compile.patch;patch=1" S = "${WORKDIR}/iptables-${PV}" diff --git a/packages/iptables/iptables_1.3.3.bb b/packages/iptables/iptables_1.3.3.bb index 4c500ad5b1..5f19d45317 100644 --- a/packages/iptables/iptables_1.3.3.bb +++ b/packages/iptables/iptables_1.3.3.bb @@ -3,14 +3,15 @@ HOMEPAGE = "http://www.netfilter.org/" SECTION = "console/utils" LICENSE = "GPL" RRECOMMENDS = "kernel-module-ip-tables kernel-module-iptable-filter" -PR = "r3" +PR = "r4" PACKAGES =+ "${PN}-utils" FILES_${PN}-utils = "${sbindir}/iptables-save ${sbindir}/iptables-restore" -SRC_URI = "http://www.netfilter.org/files/iptables-${PV}.tar.bz2" +SRC_URI = "http://www.netfilter.org/files/iptables-${PV}.tar.bz2 \ + file://compile.patch;patch=1" S = "${WORKDIR}/iptables-${PV}" -- 2.39.5