From 968316d01beba463dc7c6f370a64bb13adc835a0 Mon Sep 17 00:00:00 2001 From: Christian Wiese Date: Tue, 7 Dec 2010 11:48:59 +0100 Subject: [PATCH] ebtables: Updated (2.0.6 -> 2.0.9-2) --- .../ebtables/ebtables-makefile-prefix.patch | 33 +++++ security/ebtables/ebtables.conf | 9 +- security/ebtables/ebtables.desc | 5 +- security/ebtables/gcc4.patch | 116 ------------------ security/ebtables/iets.patch | 26 ---- 5 files changed, 38 insertions(+), 151 deletions(-) create mode 100644 security/ebtables/ebtables-makefile-prefix.patch delete mode 100644 security/ebtables/gcc4.patch delete mode 100644 security/ebtables/iets.patch diff --git a/security/ebtables/ebtables-makefile-prefix.patch b/security/ebtables/ebtables-makefile-prefix.patch new file mode 100644 index 000000000..e82856ad0 --- /dev/null +++ b/security/ebtables/ebtables-makefile-prefix.patch @@ -0,0 +1,33 @@ +# --- SDE-COPYRIGHT-NOTE-BEGIN --- +# This copyright note is auto-generated by ./scripts/Create-CopyPatch. +# +# Filename: package/.../ebtables/ebtables-makefile-prefix.patch +# Copyright (C) 2010 The OpenSDE Project +# +# More information can be found in the files COPYING and README. +# +# This patch file is dual-licensed. It is available under the license the +# patched project is licensed under, as long as it is an OpenSource license +# as defined at http://www.opensource.org/ (e.g. BSD, X11) or 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. +# --- SDE-COPYRIGHT-NOTE-END --- + +diff -ruN ebtables-v2.0.9-2-orig/Makefile ebtables-v2.0.9-2/Makefile +--- ebtables-v2.0.9-2-orig/Makefile 2010-02-03 22:17:45.000000000 +0100 ++++ ebtables-v2.0.9-2/Makefile 2010-12-07 11:34:28.650696422 +0100 +@@ -7,9 +7,10 @@ + PROGDATE:=June\ 2009 + + # default paths +-LIBDIR:=/usr/lib +-MANDIR:=/usr/local/man +-BINDIR:=/usr/local/sbin ++PREFIX:=/usr/local ++LIBDIR:=$(PREFIX)/lib ++MANDIR:=$(PREFIX)/man ++BINDIR:=$(PREFIX)/sbin + ETCDIR:=/etc + INITDIR:=/etc/rc.d/init.d + SYSCONFIGDIR:=/etc/sysconfig diff --git a/security/ebtables/ebtables.conf b/security/ebtables/ebtables.conf index 460652f7d..782892c82 100644 --- a/security/ebtables/ebtables.conf +++ b/security/ebtables/ebtables.conf @@ -2,7 +2,7 @@ # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # # Filename: package/.../ebtables/ebtables.conf -# Copyright (C) 2006 The OpenSDE Project +# Copyright (C) 2006 - 2010 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project # # More information can be found in the files COPYING and README. @@ -13,9 +13,4 @@ # GNU General Public License can be found in the file COPYING. # --- SDE-COPYRIGHT-NOTE-END --- -var_append makeinstopt ' ' "MANDIR=$root/$mandir" -var_append makeinstopt ' ' "BINPATH=$root/$sbindir/" -var_append makeinstopt ' ' "ETHERTYPESPATH=$root/$sysconfdir" - -# use the real headers -hook_add prepatch 5 'rm -rvf include/linux' +var_append makeinstopt ' ' "PREFIX=$root/$prefix" diff --git a/security/ebtables/ebtables.desc b/security/ebtables/ebtables.desc index 64e6a930f..05cfd9f90 100644 --- a/security/ebtables/ebtables.desc +++ b/security/ebtables/ebtables.desc @@ -2,6 +2,7 @@ [COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch. [COPY] [COPY] Filename: package/.../ebtables/ebtables.desc +[COPY] Copyright (C) 2010 The OpenSDE Project [COPY] Copyright (C) 2004 - 2006 The T2 SDE Project [COPY] [COPY] More information can be found in the files COPYING and README. @@ -33,7 +34,7 @@ [L] OpenSource [S] Stable -[V] 2.0.6 +[V] 2.0.9-2 [P] X -----5---9 200.000 -[D] 775772331 ebtables-v2.0.6.tar.gz http://dl.sourceforge.net/ebtables/ +[D] 1302877171 ebtables-v2.0.9-2.tar.gz http://dl.sourceforge.net/ebtables/ diff --git a/security/ebtables/gcc4.patch b/security/ebtables/gcc4.patch deleted file mode 100644 index a87298322..000000000 --- a/security/ebtables/gcc4.patch +++ /dev/null @@ -1,116 +0,0 @@ -# --- SDE-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# Filename: package/.../ebtables/gcc4.patch -# Copyright (C) 2004 - 2006 The T2 SDE Project -# -# More information can be found in the files COPYING and README. -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or 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. -# --- SDE-COPYRIGHT-NOTE-END --- -diff -Nur ebtables-v2.0.6.orig/extensions/ebt_ip.c ebtables-v2.0.6/extensions/ebt_ip.c ---- ebtables-v2.0.6.orig/extensions/ebt_ip.c 2003-11-02 20:22:56.000000000 +0200 -+++ ebtables-v2.0.6/extensions/ebt_ip.c 2005-11-01 18:48:56.000000000 +0200 -@@ -244,6 +244,7 @@ - struct ebt_ip_info *ipinfo = (struct ebt_ip_info *)(*match)->data; - char *end; - long int i; -+ unsigned char j; - - switch (c) { - case IP_SOURCE: -@@ -313,7 +314,7 @@ - ipinfo->invflags |= EBT_IP_PROTO; - if (optind > argc) - print_error("Missing IP protocol argument"); -- (unsigned char) i = strtoul(argv[optind - 1], &end, 10); -+ j = strtoul(argv[optind - 1], &end, 10); - if (*end != '\0') { - struct protoent *pe; - -@@ -324,7 +325,7 @@ - argv[optind - 1]); - ipinfo->protocol = pe->p_proto; - } else { -- ipinfo->protocol = (unsigned char) i; -+ ipinfo->protocol = j; - } - ipinfo->bitmask |= EBT_IP_PROTO; - break; -diff -Nur ebtables-v2.0.6.orig/extensions/ebt_limit.c ebtables-v2.0.6/extensions/ebt_limit.c ---- ebtables-v2.0.6.orig/extensions/ebt_limit.c 2003-11-02 20:22:56.000000000 +0200 -+++ ebtables-v2.0.6/extensions/ebt_limit.c 2005-11-01 18:48:56.000000000 +0200 -@@ -203,15 +203,15 @@ - - static struct ebt_u_match limit_match = - { -- .name EBT_LIMIT_MATCH, -- .size sizeof(struct ebt_limit_info), -- .help print_help, -- .init init, -- .parse parse, -- .final_check final_check, -- .print print, -- .compare compare, -- .extra_ops opts, -+ .name = EBT_LIMIT_MATCH, -+ .size = sizeof(struct ebt_limit_info), -+ .help = print_help, -+ .init = init, -+ .parse = parse, -+ .final_check = final_check, -+ .print = print, -+ .compare = compare, -+ .extra_ops = opts, - }; - - static void _init(void) __attribute((constructor)); -diff -Nur ebtables-v2.0.6.orig/extensions/ebt_vlan.c ebtables-v2.0.6/extensions/ebt_vlan.c ---- ebtables-v2.0.6.orig/extensions/ebt_vlan.c 2003-11-02 20:22:56.000000000 +0200 -+++ ebtables-v2.0.6/extensions/ebt_vlan.c 2005-11-01 18:48:56.000000000 +0200 -@@ -135,14 +135,16 @@ - (struct ebt_vlan_info *) (*match)->data; - char *end; - struct ebt_vlan_info local; -+ unsigned short id, encap; -+ unsigned char prio; - - switch (c) { - case VLAN_ID: - check_option(flags, OPT_VLAN_ID); - CHECK_INV_FLAG(EBT_VLAN_ID); - CHECK_IF_MISSING_VALUE; -- (unsigned short) local.id = -- strtoul(argv[optind - 1], &end, 10); -+ id = strtoul(argv[optind - 1], &end, 10); -+ local.id = (uint16_t) id; - CHECK_RANGE(local.id > 4094 || *end != '\0'); - vlaninfo->id = local.id; - SET_BITMASK(EBT_VLAN_ID); -@@ -152,8 +154,8 @@ - check_option(flags, OPT_VLAN_PRIO); - CHECK_INV_FLAG(EBT_VLAN_PRIO); - CHECK_IF_MISSING_VALUE; -- (unsigned char) local.prio = -- strtoul(argv[optind - 1], &end, 10); -+ prio = strtoul(argv[optind - 1], &end, 10); -+ local.prio = (uint8_t) prio; - CHECK_RANGE(local.prio >= 8 || *end != '\0'); - vlaninfo->prio = local.prio; - SET_BITMASK(EBT_VLAN_PRIO); -@@ -163,8 +165,8 @@ - check_option(flags, OPT_VLAN_ENCAP); - CHECK_INV_FLAG(EBT_VLAN_ENCAP); - CHECK_IF_MISSING_VALUE; -- (unsigned short) local.encap = -- strtoul(argv[optind - 1], &end, 16); -+ encap = strtoul(argv[optind - 1], &end, 16); -+ local.encap = (uint16_t) encap; - if (*end != '\0') { - ethent = getethertypebyname(argv[optind - 1]); - if (ethent == NULL) diff --git a/security/ebtables/iets.patch b/security/ebtables/iets.patch deleted file mode 100644 index 5b2984203..000000000 --- a/security/ebtables/iets.patch +++ /dev/null @@ -1,26 +0,0 @@ -# --- SDE-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# Filename: package/.../ebtables/iets.patch -# Copyright (C) 2004 - 2006 The T2 SDE Project -# -# More information can be found in the files COPYING and README. -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or 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. -# --- SDE-COPYRIGHT-NOTE-END --- ---- ebtables-v2.0.6/ebtables.c.old Thu Sep 9 22:39:49 2004 -+++ ebtables-v2.0.6/ebtables.c Thu Sep 9 22:40:18 2004 -@@ -1170,7 +1170,7 @@ static int check_rule_exists(int rule_nr - if (!t->compare(t->t, u_e->t)) - continue; - return i; --letscontinue: -+letscontinue:; - } - return -1; - }