From 003f9041bd4497113c0fd1d41082078034b2217c Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Thu, 14 Sep 2006 19:01:04 +0000 Subject: [PATCH] Fix bz 206257 --- ebtables-v2.0.8-rc2-segfaultfix.patch | 11 +++++++++++ ebtables.spec | 7 ++++++- 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 ebtables-v2.0.8-rc2-segfaultfix.patch diff --git a/ebtables-v2.0.8-rc2-segfaultfix.patch b/ebtables-v2.0.8-rc2-segfaultfix.patch new file mode 100644 index 0000000..a04205e --- /dev/null +++ b/ebtables-v2.0.8-rc2-segfaultfix.patch @@ -0,0 +1,11 @@ +--- ebtables-v2.0.8-rc2/libebtc.c.BAD 2006-09-14 13:53:38.000000000 -0500 ++++ ebtables-v2.0.8-rc2/libebtc.c 2006-09-14 13:53:54.000000000 -0500 +@@ -1033,7 +1033,7 @@ + stack[sp].e = e; + sp++; + j = -1; +- e = entries2->entries; ++ e = entries2->entries->next; + chain_nr = verdict + NF_BR_NUMHOOKS; + entries = entries2; + continue; diff --git a/ebtables.spec b/ebtables.spec index 5f0f2b6..d77ce52 100644 --- a/ebtables.spec +++ b/ebtables.spec @@ -2,7 +2,7 @@ Name: ebtables Version: 2.0.8 -Release: 0.2.%{prever}%{?dist} +Release: 0.3.%{prever}%{?dist} Summary: Ethernet Bridge frame table administration tool License: GPL Group: System Environment/Base @@ -10,6 +10,7 @@ URL: http://ebtables.sourceforge.net/ Source0: http://dl.sf.net/ebtables/ebtables-v%{version}-%{prever}.tar.gz Source1: ebtables.sysv Patch0: ebtables-2.0.8-noconfigh.patch +Patch1: ebtables-v2.0.8-rc2-segfaultfix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) PreReq: /sbin/chkconfig PreReq: /sbin/service @@ -28,6 +29,7 @@ like iptables. There are no known incompatibility issues. %prep %setup -q -n ebtables-v%{version}-%{prever} %patch0 -p1 +%patch1 -p1 %build MY_CFLAGS=`echo $RPM_OPT_FLAGS -fPIC | sed -e 's/-fstack-protector//g'` @@ -78,6 +80,9 @@ fi %ghost %{_sysconfdir}/ebtables.broute %changelog +* Thu Sep 14 2006 Tom "spot" Callaway 2.0.8-0.3.rc2 +- fix bugzilla 206257 + * Tue Sep 12 2006 Tom "spot" Callaway 2.0.8-0.2.rc2 - fix for FC-6