summaryrefslogtreecommitdiff
path: root/packages/iptables
diff options
context:
space:
mode:
authorDenys Dmytriyenko <denis@denix.org>2009-03-17 14:32:59 -0400
committerDenys Dmytriyenko <denis@denix.org>2009-03-17 14:32:59 -0400
commit709c4d66e0b107ca606941b988bad717c0b45d9b (patch)
tree37ee08b1eb308f3b2b6426d5793545c38396b838 /packages/iptables
parentfa6cd5a3b993f16c27de4ff82b42684516d433ba (diff)
rename packages/ to recipes/ per earlier agreement
See links below for more details: http://thread.gmane.org/gmane.comp.handhelds.openembedded/21326 http://thread.gmane.org/gmane.comp.handhelds.openembedded/21816 Signed-off-by: Denys Dmytriyenko <denis@denix.org> Acked-by: Mike Westerhof <mwester@dls.net> Acked-by: Philip Balister <philip@balister.org> Acked-by: Khem Raj <raj.khem@gmail.com> Acked-by: Marcin Juszkiewicz <hrw@openembedded.org> Acked-by: Koen Kooi <koen@openembedded.org> Acked-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
Diffstat (limited to 'packages/iptables')
-rw-r--r--packages/iptables/files/compile.patch17
-rw-r--r--packages/iptables/files/getsockopt-failed.patch28
-rw-r--r--packages/iptables/files/iptables-use-s6_addr32.patch32
-rw-r--r--packages/iptables/iptables.inc33
-rw-r--r--packages/iptables/iptables_1.3.8.bb8
5 files changed, 0 insertions, 118 deletions
diff --git a/packages/iptables/files/compile.patch b/packages/iptables/files/compile.patch
deleted file mode 100644
index 76662d9748..0000000000
--- a/packages/iptables/files/compile.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-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/files/getsockopt-failed.patch b/packages/iptables/files/getsockopt-failed.patch
deleted file mode 100644
index bba9bdaafb..0000000000
--- a/packages/iptables/files/getsockopt-failed.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-This patch fixes an issue where iptables throws the following error:
-"getsockopt failed strangely". This patch is taken from the netfilter
-svn (and it's included in iptable 1.4.0rc1):
-
-http://svn.netfilter.org/cgi-bin/viewcvs.cgi?rev=6890&view=rev
-
---- iptables/iptables.c 2007/04/30 00:01:39 6815
-+++ iptables/iptables.c 2007/06/26 15:29:45 6890
-@@ -1158,7 +1158,7 @@
- max_rev = getsockopt(sockfd, IPPROTO_IP, opt, &rev, &s);
- if (max_rev < 0) {
- /* Definitely don't support this? */
-- if (errno == EPROTONOSUPPORT) {
-+ if (errno == ENOENT || errno == EPROTONOSUPPORT) {
- close(sockfd);
- return 0;
- } else if (errno == ENOPROTOOPT) {
---- iptables/ip6tables.c 2007/06/25 14:55:18 6889
-+++ iptables/ip6tables.c 2007/06/26 15:29:45 6890
-@@ -1130,7 +1130,7 @@
- max_rev = getsockopt(sockfd, IPPROTO_IPV6, opt, &rev, &s);
- if (max_rev < 0) {
- /* Definitely don't support this? */
-- if (errno == EPROTONOSUPPORT) {
-+ if (errno == ENOENT || errno == EPROTONOSUPPORT) {
- close(sockfd);
- return 0;
- } else if (errno == ENOPROTOOPT) {
diff --git a/packages/iptables/files/iptables-use-s6_addr32.patch b/packages/iptables/files/iptables-use-s6_addr32.patch
deleted file mode 100644
index d3d215ba58..0000000000
--- a/packages/iptables/files/iptables-use-s6_addr32.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-This patch fixes a compile error which is demonstrated with glibc/eglibc cvs
-the union ip6_u has been renamed inside glibc header in.h here
-http://sourceware.org/cgi-bin/cvsweb.cgi/libc/inet/netinet/in.h.diff?r1=1.55&r2=1.56&cvsroot=glibc
-We should be really using
-the defines that are provided in inet/netinet/in.h to access the members instead.
-
-Index: iptables-1.3.8/ip6tables.c
-===================================================================
---- iptables-1.3.8.orig/ip6tables.c
-+++ iptables-1.3.8/ip6tables.c
-@@ -730,7 +730,7 @@ parse_hostnetworkmask(const char *name,
- for (i = 0, j = 0; i < n; i++) {
- int k;
- for (k = 0; k < 4; k++)
-- addrp[j].in6_u.u6_addr32[k] &= maskp->in6_u.u6_addr32[k];
-+ addrp[j].s6_addr32[k] &= maskp->s6_addr32[k];
- j++;
- for (k = 0; k < j - 1; k++) {
- if (IN6_ARE_ADDR_EQUAL(&addrp[k], &addrp[j - 1])) {
-Index: iptables-1.3.8/libiptc/libip6tc.c
-===================================================================
---- iptables-1.3.8.orig/libiptc/libip6tc.c
-+++ iptables-1.3.8/libiptc/libip6tc.c
-@@ -113,7 +113,7 @@ typedef unsigned int socklen_t;
- #include "libiptc.c"
-
- #define BIT6(a, l) \
-- ((ntohl(a->in6_u.u6_addr32[(l) / 32]) >> (31 - ((l) & 31))) & 1)
-+ ((ntohl(a->s6_addr32[(l) / 32]) >> (31 - ((l) & 31))) & 1)
-
- int
- ipv6_prefix_length(const struct in6_addr *a)
diff --git a/packages/iptables/iptables.inc b/packages/iptables/iptables.inc
deleted file mode 100644
index 4868abb8ee..0000000000
--- a/packages/iptables/iptables.inc
+++ /dev/null
@@ -1,33 +0,0 @@
-DESCRIPTION = "iptables network filtering tools"
-HOMEPAGE = "http://www.netfilter.org/"
-SECTION = "console/utils"
-LICENSE = "GPL"
-
-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}"
-
-RRECOMMENDS = "\
- kernel-module-ip-tables \
- kernel-module-iptable-nat \
- kernel-module-iptable-filter \
- kernel-module-ipt-masquerade \
-"
diff --git a/packages/iptables/iptables_1.3.8.bb b/packages/iptables/iptables_1.3.8.bb
deleted file mode 100644
index 040be0643f..0000000000
--- a/packages/iptables/iptables_1.3.8.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require iptables.inc
-PR = "r4"
-
-SRC_URI += "\
- file://getsockopt-failed.patch;patch=1 \
- file://iptables-use-s6_addr32.patch;patch=1 \
-"
-