[wireshark/f13/master] upgrade to 1.2.14 Resolves: CVE-2011-0445 CVE-2011-0444

[Jan Šafránek]

commit c8c5ae508895f388f80d4aae97e4e19c662a8374
Author: Jan Safranek <jsafrane at redhat.com>
Date:   Mon Jan 17 10:23:37 2011 +0100

    upgrade to 1.2.14
    Resolves: CVE-2011-0445 CVE-2011-0444

 .gitignore                            |    1 +
 sources                               |    2 +-
 wireshark-1.4.2-enttec-overflow.patch |   53 ---------------------------------
 wireshark.spec                        |   10 ++++--
 4 files changed, 8 insertions(+), 58 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6586751..32a8fbf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ wireshark-1.2.9.tar.bz2
 wireshark-1.2.10.tar.bz2
 wireshark-1.2.11.tar.bz2
 /wireshark-1.2.13.tar.bz2
+/wireshark-1.2.14.tar.bz2
diff --git a/sources b/sources
index 17f663d..0b331a3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-bd8ca6bd7e818dcc46a7137f9c3dfdce  wireshark-1.2.13.tar.bz2
+eb5130582d1db4fbb400138ba36e7d42  wireshark-1.2.14.tar.bz2
diff --git a/wireshark.spec b/wireshark.spec
index 0eda2fb..4f85b2c 100644
--- a/wireshark.spec
+++ b/wireshark.spec
@@ -12,11 +12,11 @@
 
 Summary: 	Network traffic analyzer
 Name: 		wireshark
-Version:	1.2.13
+Version:	1.2.14
 %if %{svn_version}
 Release: 	0.%{svn_version}%{?dist}
 %else
-Release: 	2%{?dist}
+Release: 	1%{?dist}
 %endif
 License: 	GPL+
 Group: 		Applications/Internet
@@ -38,7 +38,6 @@ 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
-Patch11:	wireshark-1.4.2-enttec-overflow.patch
 
 Url: 		http://www.wireshark.org/
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -126,7 +125,6 @@ and plugins.
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
-%patch11 -p1 -b .enttec-overflow
 
 %build
 %ifarch s390 s390x sparcv9 sparc64
@@ -326,6 +324,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_sbindir}/idl2wrs
 
 %changelog
+* Mon Jan 17 2011 Jan Safranek <jsafrane at redhat.com> - 1.2.14-1
+- upgrade to 1.2.14
+- see http://www.wireshark.org/docs/relnotes/wireshark-1.2.14.html
+
 * Wed Jan  5 2011 Jan Safranek <jsafrane at redhat.com> - 1.2.13-2
 - fixed buffer overflow in ENTTEC dissector (#666897)