11 files changed, 765 insertions, 2 deletions
diff --git a/net-firewall/iptables/files/1.2.11-files/grsecurity-1.2.8-iptables.patch b/net-firewall/iptables/files/1.2.11-files/grsecurity-1.2.8-iptables.patch
new file mode 100644
index 000000000000..929d77438c45
--- /dev/null
+++ b/net-firewall/iptables/files/1.2.11-files/grsecurity-1.2.8-iptables.patch
@@ -0,0 +1,67 @@
+--- extensions/libipt_stealth.c
++++ extensions/libipt_stealth.c
+@@ -0,0 +1,64 @@
++/* Shared library add-on to iptables to add stealth support.
++ * Copyright (C) 2002 Brad Spengler  <spender@grsecurity.net>
++ * This netfilter module is licensed under the GNU GPL.
++ */
++
++#include <stdio.h>
++#include <netdb.h>
++#include <stdlib.h>
++#include <getopt.h>
++#include <iptables.h>
++
++/* Function which prints out usage message. */
++static void
++help(void)
++{
++	printf("stealth v%s takes no options\n\n", IPTABLES_VERSION);
++}
++
++static struct option opts[] = {
++	{0}
++};
++
++/* Initialize the match. */
++static void
++init(struct ipt_entry_match *m, unsigned int *nfcache)
++{
++	*nfcache |= NFC_UNKNOWN;
++}
++
++static int
++parse(int c, char **argv, int invert, unsigned int *flags,
++	const struct ipt_entry *entry,
++	unsigned int *nfcache,
++	struct ipt_entry_match **match)
++{
++	return 0;
++}
++
++static void
++final_check(unsigned int flags)
++{
++	return;
++}
++
++static
++struct iptables_match stealth = {
++	NULL,
++	"stealth",
++	IPTABLES_VERSION,
++	IPT_ALIGN(0),
++	IPT_ALIGN(0),
++	&help,
++	&init, 
++	&parse,
++	&final_check,
++	NULL,
++	NULL,
++	opts  
++};
++
++void _init(void)
++{
++	register_match(&stealth);
++}
diff --git a/net-firewall/iptables/files/1.2.11-files/grsecurity-1.2.8-iptables.patch.bz2 b/net-firewall/iptables/files/1.2.11-files/grsecurity-1.2.8-iptables.patch.bz2
deleted file mode 100644
index 2d23cde70c29..000000000000
--- a/net-firewall/iptables/files/1.2.11-files/grsecurity-1.2.8-iptables.patch.bz2
+++ /dev/null
diff --git a/net-firewall/iptables/files/1.2.11-files/install_all_dev_files.patch b/net-firewall/iptables/files/1.2.11-files/install_all_dev_files.patch
new file mode 100644
index 000000000000..410f15023845
--- /dev/null
+++ b/net-firewall/iptables/files/1.2.11-files/install_all_dev_files.patch
@@ -0,0 +1,79 @@
+--- Makefile
++++ Makefile
+@@ -38,18 +38,22 @@
+ CFLAGS += -DNO_SHARED_LIBS=1
+ endif
+ 
+-EXTRAS+=iptables iptables.o iptables.8
++EXTRAS+=iptables iptables.o iptables.8 libiptables.a
+ EXTRA_INSTALLS+=$(DESTDIR)$(BINDIR)/iptables $(DESTDIR)$(MANDIR)/man8/iptables.8
++DEVEL_HEADERS+=include/iptables.h include/iptables_common.h
++DEVEL_LIBS+=libiptables.a
+ 
+ # No longer experimental.
+ EXTRAS+=iptables-save iptables-restore
+ EXTRA_INSTALLS+=$(DESTDIR)$(BINDIR)/iptables-save $(DESTDIR)$(BINDIR)/iptables-restore $(DESTDIR)$(MANDIR)/man8/iptables-restore.8 $(DESTDIR)$(MANDIR)/man8/iptables-save.8
+ 
+ ifeq ($(DO_IPV6), 1)
+-EXTRAS+=ip6tables ip6tables.o ip6tables.8
++EXTRAS+=ip6tables ip6tables.o ip6tables.8 libip6tables.a
+ EXTRA_INSTALLS+=$(DESTDIR)$(BINDIR)/ip6tables $(DESTDIR)$(MANDIR)/man8/ip6tables.8
+ EXTRAS+=ip6tables-save ip6tables-restore
+ EXTRA_INSTALLS+=$(DESTDIR)$(BINDIR)/ip6tables-save $(DESTDIR)$(BINDIR)/ip6tables-restore # $(DESTDIR)$(MANDIR)/man8/iptables-restore.8 $(DESTDIR)$(MANDIR)/man8/iptables-save.8 $(DESTDIR)$(MANDIR)/man8/ip6tables-save.8 $(DESTDIR)$(MANDIR)/man8/ip6tables-restore.8
++DEVEL_HEADERS+=include/ip6tables.h
++DEVEL_LIBS+=libip6tables.a
+ endif
+ 
+ # Sparc64 hack
+@@ -111,6 +115,8 @@
+ print-extensions:
+ 	@[ -n "$(OPTIONALS)" ] && echo Extensions found: $(OPTIONALS)
+ 
++libiptables.a: libiptables.a(iptables.o)
++
+ iptables.o: iptables.c
+ 	$(CC) $(CFLAGS) -DIPT_LIB_DIR=\"$(IPT_LIBDIR)\" -c -o $@ $<
+ 
+@@ -135,6 +141,8 @@
+ 	@[ -d $(DESTDIR)$(BINDIR) ] || mkdir -p $(DESTDIR)$(BINDIR)
+ 	cp $< $@
+ 
++libip6tables.a: libip6tables.a(ip6tables.o)
++
+ ip6tables.o: ip6tables.c
+ 	$(CC) $(CFLAGS) -DIP6T_LIB_DIR=\"$(IPT_LIBDIR)\" -c -o $@ $<
+ 
+@@ -183,7 +191,7 @@
+ .PHONY: install-devel-headers
+ install-devel-headers: $(DEVEL_HEADERS)
+ 	@[ -d $(DESTDIR)$(INCDIR) ] || mkdir -p $(DESTDIR)$(INCDIR)
+-	@cp -v $(DEVEL_HEADERS) $(DESTDIR)$(INCDIR)
++	@cp -v --parents $(DEVEL_HEADERS) `echo $(DESTDIR)$(INCDIR) | sed  -e "s:/include/\?::"`
+ 
+ .PHONY: install-devel-libs
+ install-devel-libs: $(DEVEL_LIBS)
+--- libipq/Makefile
++++ libipq/Makefile
+@@ -17,7 +17,7 @@
+ 
+ DEVEL_LIBS+=libipq/libipq.a
+ 
+-DEVEL_HEADERS+=include/libipq/libipq.h
++DEVEL_HEADERS+=include/libipq/libipq.h include/libipq/ip_queue_64.h
+ 
+ ifndef TOPLEVEL_INCLUDED
+ local:
+--- libiptc/Makefile
++++ libiptc/Makefile
+@@ -16,8 +16,11 @@
+ ifeq ($(DO_IPV6), 1)
+ EXTRA_DEPENDS+= libiptc/libip6tc.d
+ libiptc/libiptc.a: libiptc/libiptc.a(libiptc/libip6tc.o)
++DEVEL_HEADERS+=include/libiptc/libip6tc.h
+ endif
+ 
++DEVEL_HEADERS+=include/libiptc/libiptc.h include/libiptc/ipt_kernel_headers.h
++
+ libiptc/libip4tc.d libiptc/libip6tc.d: %.d: %.c
+ 	@-$(CC) -M -MG $(CFLAGS) $< | sed -e 's@^.*\.o:@$*.d libiptc/libiptc.a($*.o):@' > $@
+ endif
diff --git a/net-firewall/iptables/files/1.2.11-files/install_all_dev_files.patch.bz2 b/net-firewall/iptables/files/1.2.11-files/install_all_dev_files.patch.bz2
deleted file mode 100644
index 9cae5c993354..000000000000
--- a/net-firewall/iptables/files/1.2.11-files/install_all_dev_files.patch.bz2
+++ /dev/null
diff --git a/net-firewall/iptables/files/1.2.11-files/install_ipv6_apps.patch b/net-firewall/iptables/files/1.2.11-files/install_ipv6_apps.patch
new file mode 100644
index 000000000000..ac5357283575
--- /dev/null
+++ b/net-firewall/iptables/files/1.2.11-files/install_ipv6_apps.patch
@@ -0,0 +1,13 @@
+--- Makefile
++++ Makefile
+@@ -63,8 +63,8 @@
+ ifeq ($(DO_IPV6), 1)
+ EXTRAS+=ip6tables ip6tables.o
+ EXTRA_INSTALLS+=$(DESTDIR)$(BINDIR)/ip6tables $(DESTDIR)$(MANDIR)/man8/ip6tables.8
+-EXTRAS_EXP+=ip6tables-save ip6tables-restore
+-EXTRA_INSTALLS_EXP+=$(DESTDIR)$(BINDIR)/ip6tables-save $(DESTDIR)$(BINDIR)/ip6tables-restore # $(DESTDIR)$(MANDIR)/man8/iptables-restore.8 $(DESTDIR)$(MANDIR)/man8/iptables-save.8 $(DESTDIR)$(MANDIR)/man8/ip6tables-save.8 $(DESTDIR)$(MANDIR)/man8/ip6tables-restore.8
++EXTRAS+=ip6tables-save ip6tables-restore
++EXTRA_INSTALLS+=$(DESTDIR)$(BINDIR)/ip6tables-save $(DESTDIR)$(BINDIR)/ip6tables-restore # $(DESTDIR)$(MANDIR)/man8/iptables-restore.8 $(DESTDIR)$(MANDIR)/man8/iptables-save.8 $(DESTDIR)$(MANDIR)/man8/ip6tables-save.8 $(DESTDIR)$(MANDIR)/man8/ip6tables-restore.8
+ endif
+ 
+ # Sparc64 hack
diff --git a/net-firewall/iptables/files/1.2.11-files/install_ipv6_apps.patch.bz2 b/net-firewall/iptables/files/1.2.11-files/install_ipv6_apps.patch.bz2
deleted file mode 100644
index d6a865a6eb28..000000000000
--- a/net-firewall/iptables/files/1.2.11-files/install_ipv6_apps.patch.bz2
+++ /dev/null
diff --git a/net-firewall/iptables/files/1.2.11-files/iptables-1.2.9-imq1.diff b/net-firewall/iptables/files/1.2.11-files/iptables-1.2.9-imq1.diff
new file mode 100644
index 000000000000..903e38f16498
--- /dev/null
+++ b/net-firewall/iptables/files/1.2.11-files/iptables-1.2.9-imq1.diff
@@ -0,0 +1,222 @@
+--- extensions.orig/.IMQ-test6	Thu Jan  1 01:00:00 1970
++++ extensions/.IMQ-test6	Mon Jun 16 10:12:47 2003
+@@ -0,0 +1,3 @@
++#!/bin/sh
++# True if IMQ target patch is applied.
++[ -f $KERNEL_DIR/net/ipv6/netfilter/ip6t_IMQ.c ] && echo IMQ
+--- extensions.orig/libip6t_IMQ.c	Thu Jan  1 01:00:00 1970
++++ extensions/libip6t_IMQ.c	Mon Jun 16 10:12:47 2003
+@@ -0,0 +1,102 @@
++/* Shared library add-on to iptables to add IMQ target support. */
++#include <stdio.h>
++#include <string.h>
++#include <stdlib.h>
++#include <getopt.h>
++
++#include <ip6tables.h>
++#include <linux/netfilter_ipv6/ip6_tables.h>
++#include <linux/netfilter_ipv6/ip6t_IMQ.h>
++
++/* Function which prints out usage message. */
++static void
++help(void)
++{
++	printf(
++"IMQ target v%s options:\n"
++"  --todev <N>		enqueue to imq<N>, defaults to 0\n", 
++IPTABLES_VERSION);
++}
++
++static struct option opts[] = {
++	{ "todev", 1, 0, '1' },
++	{ 0 }
++};
++
++/* Initialize the target. */
++static void
++init(struct ip6t_entry_target *t, unsigned int *nfcache)
++{
++	struct ip6t_imq_info *mr = (struct ip6t_imq_info*)t->data;
++
++	mr->todev = 0;
++	*nfcache |= NFC_UNKNOWN;
++}
++
++/* Function which parses command options; returns true if it
++   ate an option */
++static int
++parse(int c, char **argv, int invert, unsigned int *flags,
++      const struct ip6t_entry *entry,
++      struct ip6t_entry_target **target)
++{
++	struct ip6t_imq_info *mr = (struct ip6t_imq_info*)(*target)->data;
++	
++	switch(c) {
++	case '1':
++		if (check_inverse(optarg, &invert, NULL, 0))
++			exit_error(PARAMETER_PROBLEM,
++				   "Unexpected `!' after --todev");
++		mr->todev=atoi(optarg);
++		break;
++	default:
++		return 0;
++	}
++	return 1;
++}
++
++static void
++final_check(unsigned int flags)
++{
++}
++
++/* Prints out the targinfo. */
++static void
++print(const struct ip6t_ip6 *ip,
++      const struct ip6t_entry_target *target,
++      int numeric)
++{
++	struct ip6t_imq_info *mr = (struct ip6t_imq_info*)target->data;
++
++	printf("IMQ: todev %u ", mr->todev);
++}
++
++/* Saves the union ipt_targinfo in parsable form to stdout. */
++static void
++save(const struct ip6t_ip6 *ip, const struct ip6t_entry_target *target)
++{
++	struct ip6t_imq_info *mr = (struct ip6t_imq_info*)target->data;
++
++	printf("--todev %u", mr->todev);
++}
++
++static
++struct ip6tables_target imq
++= { NULL,
++    "IMQ",
++    IPTABLES_VERSION,
++    IP6T_ALIGN(sizeof(struct ip6t_imq_info)),
++    IP6T_ALIGN(sizeof(struct ip6t_imq_info)),
++    &help,
++    &init,
++    &parse,
++    &final_check,
++    &print,
++    &save,
++    opts
++};
++
++void _init(void)
++{
++	register_target6(&imq);
++}
+--- extensions.orig/.IMQ-test	Thu Jan  1 01:00:00 1970
++++ extensions/.IMQ-test	Mon Jun 16 10:12:47 2003
+@@ -0,0 +1,3 @@
++#!/bin/sh
++# True if IMQ target patch is applied.
++[ -f $KERNEL_DIR/net/ipv4/netfilter/ipt_IMQ.c ] && echo IMQ
+--- extensions.orig/libipt_IMQ.c	Thu Jan  1 01:00:00 1970
++++ extensions/libipt_IMQ.c	Mon Jun 16 10:12:47 2003
+@@ -0,0 +1,102 @@
++/* Shared library add-on to iptables to add IMQ target support. */
++#include <stdio.h>
++#include <string.h>
++#include <stdlib.h>
++#include <getopt.h>
++
++#include <iptables.h>
++#include <linux/netfilter_ipv4/ip_tables.h>
++#include <linux/netfilter_ipv4/ipt_IMQ.h>
++
++/* Function which prints out usage message. */
++static void
++help(void)
++{
++	printf(
++"IMQ target v%s options:\n"
++"  --todev <N>		enqueue to imq<N>, defaults to 0\n", 
++IPTABLES_VERSION);
++}
++
++static struct option opts[] = {
++	{ "todev", 1, 0, '1' },
++	{ 0 }
++};
++
++/* Initialize the target. */
++static void
++init(struct ipt_entry_target *t, unsigned int *nfcache)
++{
++	struct ipt_imq_info *mr = (struct ipt_imq_info*)t->data;
++
++	mr->todev = 0;
++	*nfcache |= NFC_UNKNOWN;
++}
++
++/* Function which parses command options; returns true if it
++   ate an option */
++static int
++parse(int c, char **argv, int invert, unsigned int *flags,
++      const struct ipt_entry *entry,
++      struct ipt_entry_target **target)
++{
++	struct ipt_imq_info *mr = (struct ipt_imq_info*)(*target)->data;
++	
++	switch(c) {
++	case '1':
++		if (check_inverse(optarg, &invert, NULL, 0))
++			exit_error(PARAMETER_PROBLEM,
++				   "Unexpected `!' after --todev");
++		mr->todev=atoi(optarg);
++		break;
++	default:
++		return 0;
++	}
++	return 1;
++}
++
++static void
++final_check(unsigned int flags)
++{
++}
++
++/* Prints out the targinfo. */
++static void
++print(const struct ipt_ip *ip,
++      const struct ipt_entry_target *target,
++      int numeric)
++{
++	struct ipt_imq_info *mr = (struct ipt_imq_info*)target->data;
++
++	printf("IMQ: todev %u ", mr->todev);
++}
++
++/* Saves the union ipt_targinfo in parsable form to stdout. */
++static void
++save(const struct ipt_ip *ip, const struct ipt_entry_target *target)
++{
++	struct ipt_imq_info *mr = (struct ipt_imq_info*)target->data;
++
++	printf("--todev %u", mr->todev);
++}
++
++static
++struct iptables_target imq
++= { NULL,
++    "IMQ",
++    IPTABLES_VERSION,
++    IPT_ALIGN(sizeof(struct ipt_imq_info)),
++    IPT_ALIGN(sizeof(struct ipt_imq_info)),
++    &help,
++    &init,
++    &parse,
++    &final_check,
++    &print,
++    &save,
++    opts
++};
++
++void _init(void)
++{
++	register_target(&imq);
++}
diff --git a/net-firewall/iptables/files/1.2.11-files/iptables-1.2.9-imq1.diff.bz2 b/net-firewall/iptables/files/1.2.11-files/iptables-1.2.9-imq1.diff.bz2
deleted file mode 100644
index efdba3e37808..000000000000
--- a/net-firewall/iptables/files/1.2.11-files/iptables-1.2.9-imq1.diff.bz2
+++ /dev/null
diff --git a/net-firewall/iptables/files/1.2.11-files/iptables-layer7-0.9.0.patch b/net-firewall/iptables/files/1.2.11-files/iptables-layer7-0.9.0.patch
new file mode 100644
index 000000000000..1fee2e03c448
--- /dev/null
+++ b/net-firewall/iptables/files/1.2.11-files/iptables-layer7-0.9.0.patch
@@ -0,0 +1,384 @@
+--- extensions/.layer7-test
++++ extensions/.layer7-test
+@@ -0,0 +1,2 @@
++#! /bin/sh
++[ -f $KERNEL_DIR/include/linux/netfilter_ipv4/ipt_layer7.h ] && echo layer7
+--- extensions/libipt_layer7.c
++++ extensions/libipt_layer7.c
+@@ -0,0 +1,360 @@
++/* 
++   Shared library add-on to iptables to add layer 7 matching support. 
++  
++   By Matthew Strait <quadong@users.sf.net>, Oct 2003.
++
++   http://l7-filter.sf.net 
++
++   This program is free software; you can redistribute it and/or
++   modify it under the terms of the GNU General Public License
++   as published by the Free Software Foundation; either version
++   2 of the License, or (at your option) any later version.
++   http://www.gnu.org/licenses/gpl.txt
++
++   Based on libipt_string.c (C) 2000 Emmanuel Roger <winfield@freegates.be>
++*/
++
++#define _GNU_SOURCE
++#include <stdio.h>
++#include <netdb.h>
++#include <string.h>
++#include <stdlib.h>
++#include <getopt.h>
++#include <ctype.h>
++#include <dirent.h>
++
++#include <iptables.h>
++#include <linux/netfilter_ipv4/ipt_layer7.h>
++
++#define MAX_FN_LEN 256
++
++static char l7dir[MAX_FN_LEN] = "\0";
++
++/* Function which prints out usage message. */
++static void help(void)
++{
++	printf(
++	"LAYER7 match v%s options:\n"
++	"--l7dir <directory>  : Look for patterns here instead of /etc/l7-protocols/\n"
++	"                       (--l7dir must be specified before --l7proto if used!)\n"
++	"--l7proto [!] <name> : Match the protocol defined in /etc/l7-protocols/name.pat\n",
++	IPTABLES_VERSION);
++	fputc('\n', stdout);
++}
++
++static struct option opts[] = {
++	{ .name = "l7proto", .has_arg = 1, .flag = 0, .val = '1' },
++	{ .name = "l7dir",   .has_arg = 1, .flag = 0, .val = '2' },
++	{ .name = 0 }
++};
++
++/* Initialize the match. */
++static void init(struct ipt_entry_match *m, unsigned int *nfcache)
++{
++	*nfcache |= NFC_UNKNOWN;
++}
++
++/* reads filename, puts protocol info into layer7_protocol_info, number of protocols to numprotos */
++int parse_protocol_file(char * filename, const unsigned char * protoname, struct ipt_layer7_info *info)
++{
++	FILE * f;
++	char * line = NULL;
++	int len = 0;
++
++	enum { protocol, pattern, done } datatype = protocol;
++
++	f = fopen(filename, "r");
++
++	if(!f)
++	{
++		//fprintf(stderr, "Can't open %s\n", filename);
++		return 0;
++	}
++
++	while(getline(&line, &len, f) != -1)
++	{
++		if(strlen(line) < 2 || line[0] == '#')
++			continue;
++
++		/* strip the pesky newline... */
++		if(line[strlen(line) - 1] == '\n')
++			line[strlen(line) - 1] = '\0';
++
++		if(datatype == protocol)
++		{
++			if(strcmp(line, protoname))
++				exit_error(OTHER_PROBLEM, 
++					"Protocol name (%s) doesn't match file name (%s).  Bailing out\n",
++					protoname, filename);
++
++			if(strlen(line) >= MAX_PROTOCOL_LEN)
++				 exit_error(PARAMETER_PROBLEM, 
++					"Protocol name in %s too long!", filename);
++			strncpy(info->protocol, line, MAX_PROTOCOL_LEN);
++
++			datatype = pattern; 
++		}
++		else if(datatype == pattern)
++		{
++			if(strlen(line) >= MAX_PATTERN_LEN)
++				 exit_error(PARAMETER_PROBLEM, "Pattern in %s too long!", filename);
++			strncpy(info->pattern, line, MAX_PATTERN_LEN);
++			
++			datatype = done;			
++			break;
++		}
++		else
++			exit_error(OTHER_PROBLEM, "Internal error");
++	}
++
++	if(datatype != done)
++		exit_error(OTHER_PROBLEM, "Failed to get all needed data from %s", filename);
++
++	if(line) free(line);
++	fclose(f);
++
++	return 1;
++
++/*
++	fprintf(stderr, "protocol: %s\npattern: %s\n\n", 
++			info->protocol,
++			info->pattern);
++*/
++}
++
++static int hex2dec(char c)
++{
++        switch (c)
++        {
++                case '0' ... '9':
++                        return c - '0';
++                case 'a' ... 'f':
++                        return c - 'a' + 10;
++                case 'A' ... 'F':
++                        return c - 'A' + 10;
++                default:
++                        exit_error(OTHER_PROBLEM, "hex2dec: bad value!\n");
++                        return 0;
++        }
++}
++
++/* takes a string with \xHH escapes and returns one with the characters 
++they stand for */
++static char * pre_process(char * s)
++{
++	char * result = malloc(strlen(s) + 1);
++	int sindex = 0, rindex = 0;
++        while( sindex < strlen(s) )
++        {
++            if( sindex + 3 < strlen(s) &&
++                s[sindex] == '\\' && s[sindex+1] == 'x' && 
++                isxdigit(s[sindex + 2]) && isxdigit(s[sindex + 3]) ) 
++                {
++                        /* carefully remember to call tolower here... */
++                        result[rindex] = tolower( hex2dec(s[sindex + 2])*16 +
++                                                  hex2dec(s[sindex + 3] ) );
++                        sindex += 3; /* 4 total */
++                }
++                else
++                        result[rindex] = tolower(s[sindex]);
++
++		sindex++; 
++		rindex++;
++        }
++	result[rindex] = '\0';
++
++	return result;
++}
++
++#define MAX_SUBDIRS 128
++char ** readl7dir(char * dirname)
++{
++        DIR             * scratchdir;
++        struct dirent   ** namelist;
++	char ** subdirs = malloc(MAX_SUBDIRS * sizeof(char *));
++
++        int n, d = 1;
++	subdirs[0] = "";
++
++        n = scandir(dirname, &namelist, 0, alphasort);
++
++	if (n < 0)
++	{
++            perror("scandir");
++	    exit_error(OTHER_PROBLEM, "Couldn't open %s\n", dirname);
++	}
++        else 
++	{
++            	while(n--) 
++		{
++			char fulldirname[MAX_FN_LEN];
++
++			snprintf(fulldirname, MAX_FN_LEN, "%s/%s", dirname, namelist[n]->d_name);
++
++                	if((scratchdir = opendir(fulldirname)) != NULL)
++			{
++				closedir(scratchdir);
++
++				if(!strcmp(namelist[n]->d_name, ".") || 
++				   !strcmp(namelist[n]->d_name, ".."))
++					/* do nothing */ ;
++				else
++				{
++					subdirs[d] = malloc(strlen(namelist[n]->d_name) + 1);
++					strcpy(subdirs[d], namelist[n]->d_name);
++					d++;
++					if(d >= MAX_SUBDIRS - 1)
++					{
++						fprintf(stderr, 
++						  "Too many subdirectories, skipping the rest!\n");
++						break;
++					}
++				}
++			}
++                	free(namelist[n]);
++            	}
++            	free(namelist);
++        }
++	
++	subdirs[d] = NULL;
++
++	return subdirs;
++}
++
++static void
++parse_layer7_protocol(const unsigned char *s, struct ipt_layer7_info *info)
++{
++	char filename[MAX_FN_LEN];
++	char * dir = NULL;
++	char ** subdirs;
++	int n = 0, done = 0;
++
++	if(strlen(l7dir) > 0)
++		dir = l7dir;
++	else
++		dir = "/etc/l7-protocols";
++
++	subdirs = readl7dir(dir);
++
++	while(subdirs[n] != NULL)
++	{
++		int c = snprintf(filename, MAX_FN_LEN, "%s/%s/%s.pat", dir, subdirs[n], s);
++
++		//fprintf(stderr, "Trying to find pattern in %s ... ", filename);
++
++		if(c > MAX_FN_LEN)
++		{
++			exit_error(OTHER_PROBLEM, 
++				"Filename beginning with %s is too long!\n", filename);
++		}
++
++		/* read in the pattern from the file */
++		if(parse_protocol_file(filename, s, info))
++		{
++			//fprintf(stderr, "found\n");
++			done = 1;
++			break;
++		}
++		
++		//fprintf(stderr, "not found\n");
++
++		n++;
++	}
++
++	if(!done)
++		exit_error(OTHER_PROBLEM, 
++			"Couldn't find a pattern definition file for %s.\n", s);
++
++	/* process \xHH escapes and tolower everything. (our regex lib has no
++	case insensitivity option.) */
++	strncpy(info->pattern, pre_process(info->pattern), MAX_PATTERN_LEN);
++}
++
++/* Function which parses command options; returns true if it ate an option */
++static int parse(int c, char **argv, int invert, unsigned int *flags,
++      const struct ipt_entry *entry, unsigned int *nfcache,
++      struct ipt_entry_match **match)
++{
++	struct ipt_layer7_info *layer7info = 
++		(struct ipt_layer7_info *)(*match)->data;
++
++	switch (c) {
++	case '1':
++		check_inverse(optarg, &invert, &optind, 0);
++		parse_layer7_protocol(argv[optind-1], layer7info);
++		if (invert)
++			layer7info->invert = 1;
++		*flags = 1;
++		break;
++
++	case '2':
++		/* not going to use this, but maybe we need to strip a ! anyway (?) */
++		check_inverse(optarg, &invert, &optind, 0);
++
++		if(strlen(argv[optind-1]) >= MAX_FN_LEN)
++			exit_error(PARAMETER_PROBLEM, "directory name too long\n");
++
++		strncpy(l7dir, argv[optind-1], MAX_FN_LEN);
++
++		*flags = 1;
++		break;
++
++	default:
++		return 0;
++	}
++
++	return 1;
++}
++
++/* Final check; must have specified --pattern. */
++static void final_check(unsigned int flags)
++{
++	if (!flags)
++		exit_error(PARAMETER_PROBLEM,
++			   "LAYER7 match: You must specify `--pattern'");
++}
++
++static void print_protocol(char s[], int invert, int numeric)
++{
++	fputs("l7proto ", stdout);
++	if (invert) fputc('!', stdout);
++	printf("%s ", s);
++}
++
++/* Prints out the matchinfo. */
++static void print(const struct ipt_ip *ip,
++      const struct ipt_entry_match *match,
++      int numeric)
++{
++	printf("LAYER7 ");
++
++	print_protocol(((struct ipt_layer7_info *)match->data)->protocol,
++		  ((struct ipt_layer7_info *)match->data)->invert, numeric);
++}
++/* Saves the union ipt_matchinfo in parsable form to stdout. */
++static void save(const struct ipt_ip *ip, const struct ipt_entry_match *match)
++{
++        const struct ipt_layer7_info *info =
++            (const struct ipt_layer7_info*) match->data;
++
++        printf("--l7proto %s%s ", (info->invert)   ? "! ": "", info->protocol);
++}
++
++static struct iptables_match layer7 = { 
++    .name          = "layer7",
++    .version       = IPTABLES_VERSION,
++    .size          = IPT_ALIGN(sizeof(struct ipt_layer7_info)),
++    .userspacesize = IPT_ALIGN(sizeof(struct ipt_layer7_info)),
++    .help          = &help,
++    .init          = &init,
++    .parse         = &parse,
++    .final_check   = &final_check,
++    .print         = &print,
++    .save          = &save,
++    .extra_opts    = opts
++};
++
++void _init(void)
++{
++	register_match(&layer7);
++}
+--- extensions/libipt_layer7.man
++++ extensions/libipt_layer7.man
+@@ -0,0 +1,13 @@
++This module matches packets based on the application layer data of 
++their connections.  It uses regular expression matching to compare 
++the application layer data to regular expressions found it the layer7 
++configuration files.  This is an experimental module which can be found at 
++http://l7-filter.sf.net.  It takes two options.
++.TP
++.BI "--l7proto " "\fIprotocol\fP"
++Match the specified protocol.  The protocol name must match a file 
++name in /etc/l7-protocols/
++.TP
++.BI "--l7dir " "\fIdirectory\fP"
++Use \fIdirectory\fP instead of /etc/l7-protocols/
++
diff --git a/net-firewall/iptables/files/1.2.11-files/iptables-layer7-0.9.0.patch.bz2 b/net-firewall/iptables/files/1.2.11-files/iptables-layer7-0.9.0.patch.bz2
deleted file mode 100644
index d01057502c59..000000000000
--- a/net-firewall/iptables/files/1.2.11-files/iptables-layer7-0.9.0.patch.bz2
+++ /dev/null
diff --git a/net-firewall/iptables/files/1.2.11-files/round-robin.patch b/net-firewall/iptables/files/1.2.11-files/round-robin.patch
index ed9c90481c21..fcc339965425 100644
--- a/net-firewall/iptables/files/1.2.11-files/round-robin.patch
+++ b/net-firewall/iptables/files/1.2.11-files/round-robin.patch
@@ -1,8 +1,6 @@
-===================================================================
 RCS file: /data/cvspublic/iptables/iptables.c,v
 retrieving revision 1.68
 retrieving revision 1.70
-diff -u -r1.68 -r1.70
 --- iptables/iptables.c	2004/05/26 16:04:48	1.68
 +++ iptables/iptables.c	2004/08/03 22:38:39	1.70
 @@ -551,7 +551,7 @@