[wireshark/f12/master] upgrade to 1.2.10 Resolves: #625940 CVE-2010-2287 CVE-2010-2286 CVE-2010-2284 CVE-2010-2283

Tue Aug 24 14:16:19 UTC 2010

commit 2a0c7a5d869c8f8c6a6f8a2024acd67376ede3cb
Author: Jan Safranek <jsafrane at redhat.com>
Date:   Tue Aug 24 16:16:13 2010 +0200

    upgrade to 1.2.10
    Resolves: #625940 CVE-2010-2287 CVE-2010-2286 CVE-2010-2284 CVE-2010-2283

 .gitignore                        |    3 +-
 sources                           |    2 +-
 wireshark-1.2.4-filter_null.patch |   14 -----------
 wireshark.spec                    |   44 +++++++++++++++++++++----------------
 4 files changed, 28 insertions(+), 35 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index 7ada2e2..5538e50 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
-wireshark-1.2.6.tar.bz2
+wireshark-1.2.9.tar.bz2
+wireshark-1.2.10.tar.bz2
diff --git a/sources b/sources
index 3a804a9..2ae035a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f3e0917ed393366bbf96c53b58cb0931  wireshark-1.2.6.tar.bz2
+f8bc926956c13fcddb4df0601011ceef  wireshark-1.2.10.tar.bz2
diff --git a/wireshark.spec b/wireshark.spec
index 1d73be9..bc4440f 100644
--- a/wireshark.spec
+++ b/wireshark.spec
@@ -1,4 +1,5 @@
-%define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")
+%define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")
+
 #define to 0 for final version
 %define svn_version 0
 %define with_adns 0
@@ -11,11 +12,11 @@
 
 Summary: 	Network traffic analyzer
 Name: 		wireshark
-Version:	1.2.6
+Version:	1.2.10
 %if %{svn_version}
 Release: 	0.%{svn_version}%{?dist}
 %else
-Release: 	2%{?dist}
+Release: 	1%{?dist}
 %endif
 License: 	GPL+
 Group: 		Applications/Internet
@@ -29,15 +30,14 @@ Source1:	wireshark.pam
 Source2:	wireshark.console
 Source3:	wireshark.desktop
 Source4:	wireshark-autoconf.m4
-Patch1:		wireshark-1.0.2-pie.patch
 Patch2:		wireshark-nfsv4-opts.patch
 Patch3:		wireshark-0.99.7-path.patch
 Patch4:		wireshark-1.1.2-nfs41-backchnl-decode.patch
-Patch5:		wireshark-1.2.4-filter_null.patch
 Patch6:		wireshark-1.2.4-enable_lua.patch
-Patch7:		wireshark-1.2.4-disable_warning_dialog.patch
+Patch7:		wireshark-1.2.8-disable_warning_dialog.patch
 Patch8:		wireshark-1.2.6-nfs40-backchnl-decode.patch
 Patch9:		wireshark-1.2.6-smb-find-full-dir-info.patch
+Patch10:	wireshark-libtool-pie.patch
 
 Url: 		http://www.wireshark.org/
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -52,6 +52,7 @@ BuildRequires:  gnutls-devel
 BuildRequires:  desktop-file-utils, automake, libtool
 BuildRequires:	xdg-utils
 BuildRequires: 	flex, bison, python
+BuildRequires:	GeoIP-devel
 %if %{with_adns}
 BuildRequires:	adns-devel
 %endif
@@ -73,6 +74,7 @@ Requires:	usermode >= 1.37
 Requires:	wireshark = %{version}-%{release}
 Requires:	libsmi
 Requires:	xdg-utils, usermode-gtk
+Requires:	GeoIP
 %if %{with_adns}
 Requires:	adns
 %endif
@@ -111,11 +113,9 @@ and plugins.
 %else
 %setup -q -n %{name}-%{version}
 %endif
-#%patch1 -p1 -b .pie
 %patch2 -p1 
 %patch3 -p1
 %patch4 -p1
-%patch5 -p1
 
 %if %{with_lua}
 %patch6 -p1 -b .enable_lua
@@ -124,6 +124,7 @@ and plugins.
 %patch7 -p1 -b .dialog
 %patch8 -p1
 %patch9 -p1
+%patch10 -p1
 
 %build
 %ifarch s390 s390x sparcv9 sparc64
@@ -133,9 +134,9 @@ export PIECFLAGS="-fpie"
 %endif
 # FC5+ automatic -fstack-protector-all switch
 export RPM_OPT_FLAGS=${RPM_OPT_FLAGS//-fstack-protector/-fstack-protector-all}
-export CFLAGS="$RPM_OPT_FLAGS $CPPFLAGS"
-export CXXFLAGS="$RPM_OPT_FLAGS $CPPFLAGS"
-export LDFLAGS="$LDFLAGS -lm -lcrypto"
+export CFLAGS="$RPM_OPT_FLAGS $CPPFLAGS $PIECFLAGS"
+export CXXFLAGS="$RPM_OPT_FLAGS $CPPFLAGS $PIECFLAGS"
+export LDFLAGS="$LDFLAGS -pie"
 %if %{svn_version}
 ./autogen.sh
 %endif
@@ -187,8 +188,8 @@ mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man1
 install -m 644 *.1 $RPM_BUILD_ROOT/%{_mandir}/man1
 
 # Install python stuff.
-mkdir -p $RPM_BUILD_ROOT%{python_sitelib}
-install -m 644 tools/wireshark_be.py tools/wireshark_gen.py  $RPM_BUILD_ROOT%{python_sitelib}
+mkdir -p $RPM_BUILD_ROOT%{python_sitearch}
+install -m 644 tools/wireshark_be.py tools/wireshark_gen.py  $RPM_BUILD_ROOT%{python_sitearch}
 
 desktop-file-install --vendor fedora                            \
         --dir ${RPM_BUILD_ROOT}%{_datadir}/applications         \
@@ -236,6 +237,7 @@ install -m 644 epan/dfilter/dfilter.h	"${IDIR}/epan/dfilter/"
 install -m 644 epan/dfilter/drange.h	"${IDIR}/epan/dfilter/"
 install -m 644 wiretap/wtap.h		"${IDIR}/wiretap/"
 
+
 #	Create pkg-config control file.
 mkdir -p "${RPM_BUILD_ROOT}%{_libdir}/pkgconfig"
 cat > "${RPM_BUILD_ROOT}%{_libdir}/pkgconfig/wireshark.pc" <<- "EOF"
@@ -283,7 +285,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_sbindir}/dumpcap
 %{_sbindir}/tethereal
 %{_sbindir}/rawshark
-%{python_sitelib}/*
+%{python_sitearch}/*.py*
 %{_libdir}/lib*.so.*
 %{_libdir}/wireshark/plugins
 %{_mandir}/man1/editcap.*
@@ -294,10 +296,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/dumpcap.*
 %{_mandir}/man4/wireshark-filter.*
 %{_mandir}/man1/rawshark.*
-#%{_libdir}/wireshark
 %config(noreplace) %{_sysconfdir}/pam.d/wireshark
 %config(noreplace) %{_sysconfdir}/security/console.apps/wireshark
 %{_datadir}/wireshark
+%if %{with_lua}
+%exclude %{_datadir}/wireshark/init.lua
+%endif
+
 
 %files gnome
 %defattr(-,root,root)
@@ -317,12 +322,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/aclocal/*
 %{_mandir}/man1/idl2wrs.*
 %{_sbindir}/idl2wrs
-%if %{with_lua}
-%exclude %{_datadir}/wireshark/init.lua
-%endif
-
 
 %changelog
+* Tue Aug 24 2010 Jan Safranek <jsafrane at redhat.com> - 1.2.10-1
+- upgrade to 1.2.10
+- see http://www.wireshark.org/docs/relnotes/wireshark-1.2.10.html
+- Resolves: #625940 CVE-2010-2287 CVE-2010-2286 CVE-2010-2284 CVE-2010-2283
+
 * Tue Mar 16 2010 Jeff Layton <jlayton at redhat.com> - 1.2.6-2
 - add patch to allow decode of NFSv4.0 callback channel
 - add patch to allow decode of more SMB FIND_FILE infolevels
