diff options
Diffstat (limited to 'net-firewall')
26 files changed, 939 insertions, 503 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 Binary files differdeleted 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 Binary files differdeleted 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 Binary files differdeleted 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 Binary files differdeleted 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 Binary files differdeleted 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 @@ diff --git a/net-firewall/iptables/files/1.3.1-files/grsecurity-1.2.8-iptables.patch-1.3.1 b/net-firewall/iptables/files/1.3.1-files/grsecurity-1.2.8-iptables.patch-1.3.1 new file mode 100644 index 000000000000..61b3d0934730 --- /dev/null +++ b/net-firewall/iptables/files/1.3.1-files/grsecurity-1.2.8-iptables.patch-1.3.1 @@ -0,0 +1,67 @@ +--- /dev/null ++++ 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 = { ++ .next = NULL, ++ .name = "stealth", ++ .version = IPTABLES_VERSION, ++ .size = IPT_ALIGN(0), ++ .userspacesize = IPT_ALIGN(0), ++ .help = &help, ++ .init = &init, ++ .parse = &parse, ++ .final_check = &final_check, ++ .print = NULL, ++ .save = NULL, ++ .extra_opts = opts ++}; ++ ++void _init(void) ++{ ++ register_match(&stealth); ++} diff --git a/net-firewall/iptables/files/1.3.1-files/grsecurity-1.2.8-iptables.patch-1.3.1.bz2 b/net-firewall/iptables/files/1.3.1-files/grsecurity-1.2.8-iptables.patch-1.3.1.bz2 Binary files differdeleted file mode 100644 index 106545d31948..000000000000 --- a/net-firewall/iptables/files/1.3.1-files/grsecurity-1.2.8-iptables.patch-1.3.1.bz2 +++ /dev/null diff --git a/net-firewall/iptables/files/1.3.1-files/install_all_dev_files.patch-1.3.1 b/net-firewall/iptables/files/1.3.1-files/install_all_dev_files.patch-1.3.1 new file mode 100644 index 000000000000..d60b45385b87 --- /dev/null +++ b/net-firewall/iptables/files/1.3.1-files/install_all_dev_files.patch-1.3.1 @@ -0,0 +1,80 @@ +--- iptables-1.3.1/Makefile ++++ iptables-1.3.1/Makefile +@@ -38,8 +38,10 @@ + 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. + ifneq ($(DO_MULTI), 1) +@@ -48,10 +50,12 @@ + 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 +@@ -113,6 +117,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 $@ $< + +@@ -154,6 +160,8 @@ + cp $< $@ + endif + ++libip6tables.a: libip6tables.a(ip6tables.o) ++ + ip6tables.o: ip6tables.c + $(CC) $(CFLAGS) -DIP6T_LIB_DIR=\"$(IPT_LIBDIR)\" -c -o $@ $< + +@@ -202,7 +210,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) +--- iptables-1.3.1/libipq/Makefile ++++ iptables-1.3.1/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: +--- iptables-1.3.1/libiptc/Makefile ++++ iptables-1.3.1/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.3.1-files/install_all_dev_files.patch-1.3.1.bz2 b/net-firewall/iptables/files/1.3.1-files/install_all_dev_files.patch-1.3.1.bz2 Binary files differdeleted file mode 100644 index 39b97a195734..000000000000 --- a/net-firewall/iptables/files/1.3.1-files/install_all_dev_files.patch-1.3.1.bz2 +++ /dev/null diff --git a/net-firewall/iptables/files/1.3.1-files/install_ipv6_apps.patch b/net-firewall/iptables/files/1.3.1-files/install_ipv6_apps.patch new file mode 100644 index 000000000000..ac5357283575 --- /dev/null +++ b/net-firewall/iptables/files/1.3.1-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.3.1-files/install_ipv6_apps.patch.bz2 b/net-firewall/iptables/files/1.3.1-files/install_ipv6_apps.patch.bz2 Binary files differdeleted file mode 100644 index d6a865a6eb28..000000000000 --- a/net-firewall/iptables/files/1.3.1-files/install_ipv6_apps.patch.bz2 +++ /dev/null diff --git a/net-firewall/iptables/files/1.3.1-files/iptables-1.3.1-compilefix.patch b/net-firewall/iptables/files/1.3.1-files/iptables-1.3.1-compilefix.patch index e9ccb754e7b1..e21c36cceb2c 100644 --- a/net-firewall/iptables/files/1.3.1-files/iptables-1.3.1-compilefix.patch +++ b/net-firewall/iptables/files/1.3.1-files/iptables-1.3.1-compilefix.patch @@ -1,6 +1,5 @@ -diff -Nuar iptables-1.3.1.old/extensions/libipt_conntrack.c iptables-1.3.1/extensions/libipt_conntrack.c ---- iptables-1.3.1.old/extensions/libipt_conntrack.c 2005-02-19 11:19:17.000000000 -0800 -+++ iptables-1.3.1/extensions/libipt_conntrack.c 2005-03-08 23:22:10.342926831 -0800 +--- iptables-1.3.1/extensions/libipt_conntrack.c ++++ iptables-1.3.1/extensions/libipt_conntrack.c @@ -9,6 +9,7 @@ #include <getopt.h> #include <ctype.h> diff --git a/net-firewall/iptables/files/digest-iptables-1.3.2 b/net-firewall/iptables/files/digest-iptables-1.3.2 deleted file mode 100644 index 3dde90ceb0a7..000000000000 --- a/net-firewall/iptables/files/digest-iptables-1.3.2 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 9a951971de3f6c7f60dece4023a48687 iptables-1.3.2.tar.bz2 186255 -MD5 9adae8be9562775a176fc1b275b3cb29 iptables-1.3.0-imq1.diff 5369 -MD5 7ce3a8ca7635ffbd231cc061fad3c228 netfilter-layer7-v1.4.tar.gz 72293 diff --git a/net-firewall/iptables/files/digest-iptables-1.3.3-r1 b/net-firewall/iptables/files/digest-iptables-1.3.3-r1 deleted file mode 100644 index ac69b3102f57..000000000000 --- a/net-firewall/iptables/files/digest-iptables-1.3.3-r1 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 86d88455520cfdc56fd7ae27897a80a4 iptables-1.3.3.tar.bz2 173558 -MD5 9adae8be9562775a176fc1b275b3cb29 iptables-1.3.0-imq1.diff 5369 -MD5 73d57c4b63c18c6593bcb346821fe0d6 netfilter-layer7-v1.5.tar.gz 88140 diff --git a/net-firewall/iptables/files/digest-iptables-1.3.3-r2 b/net-firewall/iptables/files/digest-iptables-1.3.3-r2 deleted file mode 100644 index 7bcc747bcaa2..000000000000 --- a/net-firewall/iptables/files/digest-iptables-1.3.3-r2 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 86d88455520cfdc56fd7ae27897a80a4 iptables-1.3.3.tar.bz2 173558 -MD5 9adae8be9562775a176fc1b275b3cb29 iptables-1.3.0-imq1.diff 5369 -MD5 c760af92bc31c0fbd86faa3155e3f551 netfilter-layer7-v2.0-beta.tar.gz 88369 diff --git a/net-firewall/iptables/iptables-1.2.11-r3.ebuild b/net-firewall/iptables/iptables-1.2.11-r3.ebuild index f8254d61dd6b..06b9dcd3cae1 100644 --- a/net-firewall/iptables/iptables-1.2.11-r3.ebuild +++ b/net-firewall/iptables/iptables-1.2.11-r3.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2005 Gentoo Foundation +# Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.2.11-r3.ebuild,v 1.15 2005/08/25 04:35:11 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.2.11-r3.ebuild,v 1.16 2006/02/02 01:40:48 vapier Exp $ inherit eutils flag-o-matic toolchain-funcs @@ -35,16 +35,16 @@ pkg_setup() { src_unpack() { unpack ${A} ; cd ${S} - epatch ${FILESDIR}/${PV}-files/grsecurity-1.2.8-iptables.patch.bz2 - epatch ${FILESDIR}/${PV}-files/install_ipv6_apps.patch.bz2 - epatch ${FILESDIR}/${PV}-files/install_all_dev_files.patch.bz2 + epatch ${FILESDIR}/${PV}-files/grsecurity-1.2.8-iptables.patch + epatch ${FILESDIR}/${PV}-files/install_ipv6_apps.patch + epatch ${FILESDIR}/${PV}-files/install_all_dev_files.patch epatch ${FILESDIR}/${PV}-files/round-robin.patch epatch ${FILESDIR}/${PV}-files/CAN-2004-0986.patch ; # security bug 70240 sed -i "s/PF_EXT_SLIB:=/PF_EXT_SLIB:=stealth /g" extensions/Makefile if use extensions; then - epatch ${FILESDIR}/${PV}-files/iptables-1.2.9-imq1.diff.bz2 - epatch ${FILESDIR}/${PV}-files/iptables-layer7-0.9.0.patch.bz2 + epatch ${FILESDIR}/${PV}-files/iptables-1.2.9-imq1.diff + epatch ${FILESDIR}/${PV}-files/iptables-layer7-0.9.0.patch chmod +x extensions/.IMQ-test* chmod +x extensions/.childlevel-test* diff --git a/net-firewall/iptables/iptables-1.3.2.ebuild b/net-firewall/iptables/iptables-1.3.2.ebuild deleted file mode 100644 index 87cbb65b41e7..000000000000 --- a/net-firewall/iptables/iptables-1.3.2.ebuild +++ /dev/null @@ -1,159 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.3.2.ebuild,v 1.11 2005/09/15 23:01:28 agriffis Exp $ - -inherit eutils flag-o-matic toolchain-funcs linux-info - -L7_PV="1.4" -L7_P="netfilter-layer7-v${L7_PV}" -L7_PATCH="iptables-layer7-${L7_PV}.patch" -IMQ_PATCH="iptables-1.3.0-imq1.diff" - -DESCRIPTION="Linux kernel (2.4+) firewall, NAT and packet mangling tools" -HOMEPAGE="http://www.iptables.org/" -SRC_URI="http://www.iptables.org/files/${P}.tar.bz2 - extensions? ( - http://www.linuximq.net/patchs/${IMQ_PATCH} - mirror://sourceforge/l7-filter/${L7_P}.tar.gz - )" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86" -IUSE="ipv6 static extensions" - -DEPEND="virtual/os-headers - extensions? ( virtual/linux-sources )" -RDEPEND="" - -pkg_setup() { - if use extensions ; then - ewarn "WARNING: 3rd party extensions has been enabled." - ewarn "This means that iptables will use your currently installed" - ewarn "kernel in ${KERNEL_DIR} as headers for iptables." - ewarn - ewarn "You may have to patch your kernel to allow iptables to build." - ewarn "Please check http://ftp.netfilter.org/pub/patch-o-matic-ng/snapshot/ for patches" - ewarn "for your kernel." - ewarn - ewarn "For layer 7 support emerge net-misc/l7-filter-${L7_PV} before this" - linux-info_pkg_setup - fi -} - -src_unpack() { - unpack ${P}.tar.bz2 - use extensions && unpack ${L7_P}.tar.gz - cd "${S}" - - EPATCH_OPTS="-p0" \ - epatch "${FILESDIR}"/1.3.1-files/install_ipv6_apps.patch.bz2 - EPATCH_OPTS="-p1" \ - epatch "${FILESDIR}"/1.3.1-files/install_all_dev_files.patch-1.3.1.bz2 - - # this provide's grsec's stealth match - EPATCH_OPTS="-p0" \ - epatch "${FILESDIR}"/1.3.1-files/grsecurity-1.2.8-iptables.patch-1.3.1.bz2 - sed -i \ - -e "s/PF_EXT_SLIB:=/PF_EXT_SLIB:=stealth /g" \ - extensions/Makefile || die "failed to enable stealth extension" - - EPATCH_OPTS="-p1" \ - epatch "${FILESDIR}"/1.3.1-files/${PN}-1.3.1-compilefix.patch - - if use extensions ; then - EPATCH_OPTS="-p1" epatch "${DISTDIR}"/${IMQ_PATCH} - EPATCH_OPTS="-p1" epatch "${WORKDIR}"/${L7_P}/${L7_PATCH} - chmod +x extensions/{.IMQ-test*,.childlevel-test*,.layer7-test*} - fi -} - - -src_defs() { - # these are used in both of src_compile and src_install - myconf="${myconf} PREFIX=" - myconf="${myconf} LIBDIR=/$(get_libdir)" - myconf="${myconf} BINDIR=/sbin" - myconf="${myconf} MANDIR=/usr/share/man" - myconf="${myconf} INCDIR=/usr/include" - # iptables and libraries are now installed to /sbin and /lib, so that - # systems with remote network-mounted /usr filesystems can get their - # network interfaces up and running correctly without /usr. - use ipv6 || myconf="${myconf} DO_IPV6=0" - use static && myconf="${myconf} NO_SHARED_LIBS=0" - export myconf - if ! use extensions ; then - export KERNEL_DIR="/usr" - diemsg="" - else - diemsg="Please check http://cvs.iptables.org/patch-o-matic-ng/updates/ if your kernel needs to be patched for iptables" - fi - export diemsg -} - - -src_compile() { - src_defs - - # iptables will NOT work correctly unless -O[123] are present! - replace-flags -O0 -O2 - get-flag -O || append-flags -O2 - - # prevent it from causing ICMP errors. - # http://bugs.gentoo.org/show_bug.cgi?id=23645 - filter-flags -fstack-protector - - emake -j1 \ - COPT_FLAGS="${CFLAGS}" ${myconf} \ - KERNEL_DIR="${KERNEL_DIR}" \ - CC="$(tc-getCC)" \ - || die "${diemsg}" -} - -src_install() { - src_defs - make ${myconf} \ - DESTDIR="${D}" \ - KERNEL_DIR="${KERNEL_DIR}" \ - install install-devel || die "${diemsg}" - - dodir /usr/$(get_libdir) - mv -f "${D}"/$(get_libdir)/*.a "${D}"/usr/$(get_libdir) - - keepdir /var/lib/iptables - newinitd "${FILESDIR}"/${PN}-1.3.2.init iptables - newconfd "${FILESDIR}"/${PN}-1.3.2.confd iptables - - if use ipv6 ; then - keepdir /var/lib/ip6tables - newinitd "${FILESDIR}"/iptables-1.3.2.init ip6tables - newconfd "${FILESDIR}"/ip6tables-1.3.2.confd ip6tables - fi -} - -pkg_postinst() { - einfo "This package now includes an initscript which loads and saves" - einfo "rules stored in /var/lib/iptables/rules-save" - use ipv6 && einfo "and /var/lib/ip6tables/rules-save" - einfo "This location can be changed in /etc/conf.d/iptables" - einfo - einfo "If you are using the iptables initsscript you should save your" - einfo "rules using the new iptables version before rebooting." - einfo - einfo "If you are upgrading to a >=2.4.21 kernel you may need to rebuild" - einfo "iptables." - einfo - ewarn "!!! ipforwarding is now not a part of the iptables initscripts." - einfo - einfo "To enable ipforwarding at bootup:" - einfo "/etc/sysctl.conf and set net.ipv4.ip_forward = 1" - if use ipv6 ; then - einfo "and/or" - einfo " net.ipv6.ip_forward = 1" - einfo "for ipv6." - fi - echo - ewarn "When upgrading from iptables-1.2.x, you may be unable to remove" - ewarn "rules added with iptables-1.2.x. This is a known issue, please see:" - ewarn "http://bugs.gentoo.org/show_bug.cgi?id=92535" -} diff --git a/net-firewall/iptables/iptables-1.3.3-r1.ebuild b/net-firewall/iptables/iptables-1.3.3-r1.ebuild deleted file mode 100644 index a7bf2564c3f5..000000000000 --- a/net-firewall/iptables/iptables-1.3.3-r1.ebuild +++ /dev/null @@ -1,159 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.3.3-r1.ebuild,v 1.1 2005/09/17 09:15:46 dragonheart Exp $ - -inherit eutils flag-o-matic toolchain-funcs linux-info - -L7_PV="1.5" -L7_P="netfilter-layer7-v${L7_PV}" -L7_PATCH="iptables-layer7-${L7_PV}.patch" -IMQ_PATCH="iptables-1.3.0-imq1.diff" - -DESCRIPTION="Linux kernel (2.4+) firewall, NAT and packet mangling tools" -HOMEPAGE="http://www.iptables.org/ http://www.linuximq.net/ http://l7-filter.sf.net/" -SRC_URI="http://www.iptables.org/files/${P}.tar.bz2 - extensions? ( - http://www.linuximq.net/patchs/${IMQ_PATCH} - mirror://sourceforge/l7-filter/${L7_P}.tar.gz - )" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -IUSE="ipv6 static extensions" - -DEPEND="virtual/os-headers - extensions? ( virtual/linux-sources )" -RDEPEND="" - -pkg_setup() { - if use extensions ; then - ewarn "WARNING: 3rd party extensions has been enabled." - ewarn "This means that iptables will use your currently installed" - ewarn "kernel in ${KERNEL_DIR} as headers for iptables." - ewarn - ewarn "You may have to patch your kernel to allow iptables to build." - ewarn "Please check http://ftp.netfilter.org/pub/patch-o-matic-ng/snapshot/ for patches" - ewarn "for your kernel." - ewarn - ewarn "For layer 7 support emerge net-misc/l7-filter-${L7_PV} before this" - linux-info_pkg_setup - fi -} - -src_unpack() { - unpack ${P}.tar.bz2 - use extensions && unpack ${L7_P}.tar.gz - cd "${S}" - - EPATCH_OPTS="-p0" \ - epatch "${FILESDIR}"/1.3.1-files/install_ipv6_apps.patch.bz2 - EPATCH_OPTS="-p1" \ - epatch "${FILESDIR}"/1.3.1-files/install_all_dev_files.patch-1.3.1.bz2 - - # this provide's grsec's stealth match - EPATCH_OPTS="-p0" \ - epatch "${FILESDIR}"/1.3.1-files/grsecurity-1.2.8-iptables.patch-1.3.1.bz2 - sed -i \ - -e "s/PF_EXT_SLIB:=/PF_EXT_SLIB:=stealth /g" \ - extensions/Makefile || die "failed to enable stealth extension" - - EPATCH_OPTS="-p1" \ - epatch "${FILESDIR}"/1.3.1-files/${PN}-1.3.1-compilefix.patch - - if use extensions ; then - EPATCH_OPTS="-p1" epatch "${DISTDIR}"/${IMQ_PATCH} - EPATCH_OPTS="-p1" epatch "${WORKDIR}"/${L7_P}/${L7_PATCH} - chmod +x extensions/{.IMQ-test*,.childlevel-test*,.layer7-test*} - fi -} - - -src_defs() { - # these are used in both of src_compile and src_install - myconf="${myconf} PREFIX=" - myconf="${myconf} LIBDIR=/$(get_libdir)" - myconf="${myconf} BINDIR=/sbin" - myconf="${myconf} MANDIR=/usr/share/man" - myconf="${myconf} INCDIR=/usr/include" - # iptables and libraries are now installed to /sbin and /lib, so that - # systems with remote network-mounted /usr filesystems can get their - # network interfaces up and running correctly without /usr. - use ipv6 || myconf="${myconf} DO_IPV6=0" - use static && myconf="${myconf} NO_SHARED_LIBS=0" - export myconf - if ! use extensions ; then - export KERNEL_DIR="/usr" - diemsg="" - else - diemsg="Please check http://cvs.iptables.org/patch-o-matic-ng/updates/ if your kernel needs to be patched for iptables" - fi - export diemsg -} - - -src_compile() { - src_defs - - # iptables will NOT work correctly unless -O[123] are present! - replace-flags -O0 -O2 - get-flag -O || append-flags -O2 - - # prevent it from causing ICMP errors. - # http://bugs.gentoo.org/show_bug.cgi?id=23645 - filter-flags -fstack-protector - - emake -j1 \ - COPT_FLAGS="${CFLAGS}" ${myconf} \ - KERNEL_DIR="${KERNEL_DIR}" \ - CC="$(tc-getCC)" \ - || die "${diemsg}" -} - -src_install() { - src_defs - make ${myconf} \ - DESTDIR="${D}" \ - KERNEL_DIR="${KERNEL_DIR}" \ - install install-devel || die "${diemsg}" - - dodir /usr/$(get_libdir) - mv -f "${D}"/$(get_libdir)/*.a "${D}"/usr/$(get_libdir) - - keepdir /var/lib/iptables - newinitd "${FILESDIR}"/${PN}-1.3.2.init iptables - newconfd "${FILESDIR}"/${PN}-1.3.2.confd iptables - - if use ipv6 ; then - keepdir /var/lib/ip6tables - newinitd "${FILESDIR}"/iptables-1.3.2.init ip6tables - newconfd "${FILESDIR}"/ip6tables-1.3.2.confd ip6tables - fi -} - -pkg_postinst() { - einfo "This package now includes an initscript which loads and saves" - einfo "rules stored in /var/lib/iptables/rules-save" - use ipv6 && einfo "and /var/lib/ip6tables/rules-save" - einfo "This location can be changed in /etc/conf.d/iptables" - einfo - einfo "If you are using the iptables initsscript you should save your" - einfo "rules using the new iptables version before rebooting." - einfo - einfo "If you are upgrading to a >=2.4.21 kernel you may need to rebuild" - einfo "iptables." - einfo - ewarn "!!! ipforwarding is now not a part of the iptables initscripts." - einfo - einfo "To enable ipforwarding at bootup:" - einfo "/etc/sysctl.conf and set net.ipv4.ip_forward = 1" - if use ipv6 ; then - einfo "and/or" - einfo " net.ipv6.ip_forward = 1" - einfo "for ipv6." - fi - echo - ewarn "When upgrading from iptables-1.2.x, you may be unable to remove" - ewarn "rules added with iptables-1.2.x. This is a known issue, please see:" - ewarn "http://bugs.gentoo.org/show_bug.cgi?id=92535" -} diff --git a/net-firewall/iptables/iptables-1.3.3-r2.ebuild b/net-firewall/iptables/iptables-1.3.3-r2.ebuild deleted file mode 100644 index 6f2d46511399..000000000000 --- a/net-firewall/iptables/iptables-1.3.3-r2.ebuild +++ /dev/null @@ -1,159 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.3.3-r2.ebuild,v 1.1 2005/09/24 23:24:54 dragonheart Exp $ - -inherit eutils flag-o-matic toolchain-funcs linux-info - -L7_PV="2.0-beta" -L7_P="netfilter-layer7-v${L7_PV}" -L7_PATCH="iptables-layer7-2.0.patch" -IMQ_PATCH="iptables-1.3.0-imq1.diff" - -DESCRIPTION="Linux kernel (2.4+) firewall, NAT and packet mangling tools" -HOMEPAGE="http://www.iptables.org/ http://www.linuximq.net/ http://l7-filter.sf.net/" -SRC_URI="http://www.iptables.org/files/${P}.tar.bz2 - extensions? ( - http://www.linuximq.net/patchs/${IMQ_PATCH} - mirror://sourceforge/l7-filter/${L7_P}.tar.gz - )" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -IUSE="ipv6 static extensions" - -DEPEND="virtual/os-headers - extensions? ( virtual/linux-sources )" -RDEPEND="" - -pkg_setup() { - if use extensions ; then - ewarn "WARNING: 3rd party extensions has been enabled." - ewarn "This means that iptables will use your currently installed" - ewarn "kernel in ${KERNEL_DIR} as headers for iptables." - ewarn - ewarn "You may have to patch your kernel to allow iptables to build." - ewarn "Please check http://ftp.netfilter.org/pub/patch-o-matic-ng/snapshot/ for patches" - ewarn "for your kernel." - ewarn - ewarn "For layer 7 support emerge net-misc/l7-filter-${L7_PV} before this" - linux-info_pkg_setup - fi -} - -src_unpack() { - unpack ${P}.tar.bz2 - use extensions && unpack ${L7_P}.tar.gz - cd "${S}" - - EPATCH_OPTS="-p0" \ - epatch "${FILESDIR}"/1.3.1-files/install_ipv6_apps.patch.bz2 - EPATCH_OPTS="-p1" \ - epatch "${FILESDIR}"/1.3.1-files/install_all_dev_files.patch-1.3.1.bz2 - - # this provide's grsec's stealth match - EPATCH_OPTS="-p0" \ - epatch "${FILESDIR}"/1.3.1-files/grsecurity-1.2.8-iptables.patch-1.3.1.bz2 - sed -i \ - -e "s/PF_EXT_SLIB:=/PF_EXT_SLIB:=stealth /g" \ - extensions/Makefile || die "failed to enable stealth extension" - - EPATCH_OPTS="-p1" \ - epatch "${FILESDIR}"/1.3.1-files/${PN}-1.3.1-compilefix.patch - - if use extensions ; then - EPATCH_OPTS="-p1" epatch "${DISTDIR}"/${IMQ_PATCH} - EPATCH_OPTS="-p1" epatch "${WORKDIR}"/${L7_P}/${L7_PATCH} - chmod +x extensions/{.IMQ-test*,.childlevel-test*,.layer7-test*} - fi -} - - -src_defs() { - # these are used in both of src_compile and src_install - myconf="${myconf} PREFIX=" - myconf="${myconf} LIBDIR=/$(get_libdir)" - myconf="${myconf} BINDIR=/sbin" - myconf="${myconf} MANDIR=/usr/share/man" - myconf="${myconf} INCDIR=/usr/include" - # iptables and libraries are now installed to /sbin and /lib, so that - # systems with remote network-mounted /usr filesystems can get their - # network interfaces up and running correctly without /usr. - use ipv6 || myconf="${myconf} DO_IPV6=0" - use static && myconf="${myconf} NO_SHARED_LIBS=0" - export myconf - if ! use extensions ; then - export KERNEL_DIR="/usr" - diemsg="" - else - diemsg="Please check http://cvs.iptables.org/patch-o-matic-ng/updates/ if your kernel needs to be patched for iptables" - fi - export diemsg -} - - -src_compile() { - src_defs - - # iptables will NOT work correctly unless -O[123] are present! - replace-flags -O0 -O2 - get-flag -O || append-flags -O2 - - # prevent it from causing ICMP errors. - # http://bugs.gentoo.org/show_bug.cgi?id=23645 - filter-flags -fstack-protector - - emake -j1 \ - COPT_FLAGS="${CFLAGS}" ${myconf} \ - KERNEL_DIR="${KERNEL_DIR}" \ - CC="$(tc-getCC)" \ - || die "${diemsg}" -} - -src_install() { - src_defs - make ${myconf} \ - DESTDIR="${D}" \ - KERNEL_DIR="${KERNEL_DIR}" \ - install install-devel || die "${diemsg}" - - dodir /usr/$(get_libdir) - mv -f "${D}"/$(get_libdir)/*.a "${D}"/usr/$(get_libdir) - - keepdir /var/lib/iptables - newinitd "${FILESDIR}"/${PN}-1.3.2.init iptables - newconfd "${FILESDIR}"/${PN}-1.3.2.confd iptables - - if use ipv6 ; then - keepdir /var/lib/ip6tables - newinitd "${FILESDIR}"/iptables-1.3.2.init ip6tables - newconfd "${FILESDIR}"/ip6tables-1.3.2.confd ip6tables - fi -} - -pkg_postinst() { - einfo "This package now includes an initscript which loads and saves" - einfo "rules stored in /var/lib/iptables/rules-save" - use ipv6 && einfo "and /var/lib/ip6tables/rules-save" - einfo "This location can be changed in /etc/conf.d/iptables" - einfo - einfo "If you are using the iptables initsscript you should save your" - einfo "rules using the new iptables version before rebooting." - einfo - einfo "If you are upgrading to a >=2.4.21 kernel you may need to rebuild" - einfo "iptables." - einfo - ewarn "!!! ipforwarding is now not a part of the iptables initscripts." - einfo - einfo "To enable ipforwarding at bootup:" - einfo "/etc/sysctl.conf and set net.ipv4.ip_forward = 1" - if use ipv6 ; then - einfo "and/or" - einfo " net.ipv6.ip_forward = 1" - einfo "for ipv6." - fi - echo - ewarn "When upgrading from iptables-1.2.x, you may be unable to remove" - ewarn "rules added with iptables-1.2.x. This is a known issue, please see:" - ewarn "http://bugs.gentoo.org/show_bug.cgi?id=92535" -} diff --git a/net-firewall/iptables/iptables-1.3.4.ebuild b/net-firewall/iptables/iptables-1.3.4.ebuild index f4a47ab75d4a..862431889972 100644 --- a/net-firewall/iptables/iptables-1.3.4.ebuild +++ b/net-firewall/iptables/iptables-1.3.4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.3.4.ebuild,v 1.9 2006/01/06 10:52:41 dragonheart Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.3.4.ebuild,v 1.10 2006/02/02 01:40:48 vapier Exp $ inherit eutils flag-o-matic toolchain-funcs linux-info @@ -19,7 +19,7 @@ SRC_URI="http://iptables.org/projects/iptables/files/${P}.tar.bz2 LICENSE="GPL-2" SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86" +KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86" IUSE="ipv6 static extensions" DEPEND="virtual/os-headers @@ -47,13 +47,13 @@ src_unpack() { cd "${S}" EPATCH_OPTS="-p0" \ - epatch "${FILESDIR}"/1.3.1-files/install_ipv6_apps.patch.bz2 + epatch "${FILESDIR}"/1.3.1-files/install_ipv6_apps.patch EPATCH_OPTS="-p1" \ - epatch "${FILESDIR}"/1.3.1-files/install_all_dev_files.patch-1.3.1.bz2 + epatch "${FILESDIR}"/1.3.1-files/install_all_dev_files.patch-1.3.1 # this provide's grsec's stealth match EPATCH_OPTS="-p0" \ - epatch "${FILESDIR}"/1.3.1-files/grsecurity-1.2.8-iptables.patch-1.3.1.bz2 + epatch "${FILESDIR}"/1.3.1-files/grsecurity-1.2.8-iptables.patch-1.3.1 sed -i \ -e "s/PF_EXT_SLIB:=/PF_EXT_SLIB:=stealth /g" \ extensions/Makefile || die "failed to enable stealth extension" |