diff options
| author | Marcin Juszkiewicz <hrw@openembedded.org> | 2007-08-09 08:41:19 +0000 |
|---|---|---|
| committer | Marcin Juszkiewicz <hrw@openembedded.org> | 2007-08-09 08:41:19 +0000 |
| commit | 9d829ed05c295df608b4fc108eb1c628fd06fd39 (patch) | |
| tree | c1b27cfe4498f8abef1a61325922906f3e6a32ff /packages/iptables | |
| parent | 1434b204e16e87b7f59f074f3036d5dcbcf0116f (diff) | |
| parent | 6ccac10beeaaa02a86081bd6179fd57c208ad6b1 (diff) | |
merge of '76e1e69496801009ea0aa69c84f76e858978ab99'
and 'db976a98427dd6a195e2cf167e225de2d0206aea'
Diffstat (limited to 'packages/iptables')
| -rw-r--r-- | packages/iptables/files/.mtn2git_empty | 0 | ||||
| -rw-r--r-- | packages/iptables/files/compile.patch | 17 | ||||
| -rw-r--r-- | packages/iptables/iptables_1.2.9.bb | 5 | ||||
| -rw-r--r-- | packages/iptables/iptables_1.3.3.bb | 5 | ||||
| -rw-r--r-- | packages/iptables/iptables_1.3.8.bb | 30 |
5 files changed, 53 insertions, 4 deletions
diff --git a/packages/iptables/files/.mtn2git_empty b/packages/iptables/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/iptables/files/.mtn2git_empty 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}" diff --git a/packages/iptables/iptables_1.3.8.bb b/packages/iptables/iptables_1.3.8.bb new file mode 100644 index 0000000000..eccc1c077a --- /dev/null +++ b/packages/iptables/iptables_1.3.8.bb @@ -0,0 +1,30 @@ +DESCRIPTION = "iptables network filtering tools" +HOMEPAGE = "http://www.netfilter.org/" +SECTION = "console/utils" +LICENSE = "GPL" +RRECOMMENDS = "kernel-module-ip-tables kernel-module-iptable-filter" +PR = "r0" +SRC_URI = "http://netfilter.org/projects/iptables/files/iptables-${PV}.tar.bz2 \ + " + +S = "${WORKDIR}/iptables-${PV}" + +PARALLEL_MAKE="" + +export COPT_FLAGS = "${CFLAGS}" +export KERNEL_DIR = "${STAGING_INCDIR}" + +do_compile () { + unset CFLAGS + oe_runmake BINDIR=${D}${sbindir} LIBDIR=${D}${libdir} MANDIR=${D}${mandir} NO_SHARED_LIBS=1 +} + +do_install () { + unset CFLAGS + oe_runmake BINDIR=${D}${sbindir} LIBDIR=${D}${libdir} MANDIR=${D}${mandir} install NO_SHARED_LIBS=1 +} + +PACKAGES =+ "${PN}-utils" +FILES_${PN}-utils = "${sbindir}/iptables-save ${sbindir}/iptables-restore" +FILES_${PN}-doc += "${mandir}" + |