From 94bf738a5a241aa9232f9efc82eed6be2ab9833d85e720f3ee0777c80e59b15d Mon Sep 17 00:00:00 2001
From: OBS User unknown <null@suse.de>
Date: Sat, 3 Mar 2007 13:37:07 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/openSUSE:Factory/tcpdump?expand=0&rev=2

---
 tcpdump-3.9.5-802_11-overflow.diff | 20 ++++++++++++++++++++
 tcpdump.changes                    |  5 +++++
 tcpdump.spec                       | 17 ++++++++++-------
 3 files changed, 35 insertions(+), 7 deletions(-)
 create mode 100644 tcpdump-3.9.5-802_11-overflow.diff

diff --git a/tcpdump-3.9.5-802_11-overflow.diff b/tcpdump-3.9.5-802_11-overflow.diff
new file mode 100644
index 0000000..e243ff4
--- /dev/null
+++ b/tcpdump-3.9.5-802_11-overflow.diff
@@ -0,0 +1,20 @@
+--- print-802_11.c
++++ print-802_11.c
+@@ -22,7 +22,7 @@
+ 
+ #ifndef lint
+ static const char rcsid[] _U_ =
+-    "@(#) $Header: /tcpdump/master/tcpdump/print-802_11.c,v 1.31.2.11 2006/06/13 22:25:43 guy Exp $ (LBL)";
++    "@(#) $Header: /tcpdump/master/tcpdump/print-802_11.c,v 1.43 2007/02/01 02:18:18 guy Exp $ (LBL)";
+ #endif
+ 
+ #ifdef HAVE_CONFIG_H
+@@ -264,7 +264,7 @@
+ 
+ 			if (pbody->tim.length <= 3)
+ 				break;
+-			if (pbody->rates.length > sizeof pbody->tim.bitmap)
++			if (pbody->tim.length - 3 > sizeof pbody->tim.bitmap)
+ 				return;
+ 			if (!TTEST2(*(p + offset), pbody->tim.length - 3))
+ 				return;
diff --git a/tcpdump.changes b/tcpdump.changes
index aaf9e95..fe091ce 100644
--- a/tcpdump.changes
+++ b/tcpdump.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Mar  2 11:44:35 CET 2007 - prusnak@suse.cz
+
+- fixed one byte overflow (802_11-overflow.diff) [#250163]
+
 -------------------------------------------------------------------
 Wed Jan  3 15:43:19 CET 2007 - prusnak@suse.cz
 
diff --git a/tcpdump.spec b/tcpdump.spec
index 3406d3f..e474072 100644
--- a/tcpdump.spec
+++ b/tcpdump.spec
@@ -13,7 +13,7 @@
 Name:           tcpdump
 BuildRequires:  libpcap libsmi openssl-devel
 Version:        3.9.5
-Release:        1
+Release:        7
 Autoreqprov:    on
 License:        BSD License and BSD-like
 Group:          Productivity/Networking/Diagnostic
@@ -26,6 +26,7 @@ Patch1:         %{name}-%{version}-autoconf.diff
 Patch2:         %{name}-%{version}-aliasing.diff
 Patch3:         %{name}-%{version}-uninitialized.diff
 Patch4:         %{name}-%{version}-juniper.diff
+Patch5:         %{name}-%{version}-802_11-overflow.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -36,11 +37,13 @@ ethernet. It can be used to debug specific network problems.
 
 %prep
 %setup -q
+rm -rf win32
 %patch0
 %patch1
 %patch2
 %patch3
 %patch4
+%patch5
 
 %build
 %{suse_update_config -f}
@@ -49,11 +52,9 @@ aclocal --force
 libtoolize --force --copy
 autoconf --force
 autoheader --force
-CFLAGS="$RPM_OPT_FLAGS -Wall -DGUESS_TSO -fstack-protector" \
-	./configure \
-	--prefix=%{_prefix} \
-	--mandir=%{_mandir} \
-	--enable-ipv6
+export CFLAGS="$RPM_OPT_FLAGS -Wall -DGUESS_TSO -fstack-protector"
+%configure \
+    --enable-ipv6
 make
 
 %install
@@ -71,7 +72,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_mandir}/man?/*
 %{_sbindir}/*
 
-%changelog -n tcpdump
+%changelog
+* Fri Mar 02 2007 - prusnak@suse.cz
+- fixed one byte overflow (802_11-overflow.diff) [#250163]
 * Wed Jan 03 2007 - prusnak@suse.cz
 - update to 3.9.5
   * Fixes for 64bit compiling