From 844b610048692e35da684c25c2813dc4d05a96f3 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Wed, 11 Sep 2013 15:08:10 +0400 Subject: [PATCH] Ver. 1.10.2 Signed-off-by: Peter Lemenkov --- .gitignore | 1 + sources | 2 +- wireshark-0001-enable-Lua-support.patch | 4 +-- ...02-Customize-permission-denied-error.patch | 6 ++--- ...correct-shared-object-name-in-python.patch | 4 +-- ...k-0004-fix-documentation-build-error.patch | 4 +-- ...x-string-overrun-in-plugins-profinet.patch | 4 +-- ...kov-via-https-bugs.wireshark.org-bug.patch | 19 ++++++------- ....pod-unterminated-list-s-at-head-in-.patch | 27 ------------------- wireshark.console | 4 --- wireshark.spec | 10 +++---- 11 files changed, 26 insertions(+), 59 deletions(-) delete mode 100644 wireshark-0007-Fix-.-reordercap.pod-unterminated-list-s-at-head-in-.patch delete mode 100644 wireshark.console diff --git a/.gitignore b/.gitignore index 3dbde9e..1592d25 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,4 @@ wireshark-1.2.10.tar.bz2 /wireshark-1.8.6.tar.bz2 /wireshark-1.10.0.tar.bz2 /wireshark-1.10.1.tar.bz2 +/wireshark-1.10.2.tar.bz2 diff --git a/sources b/sources index 62ecfc9..6b22136 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d8915cf7555e2bbb699020a8736631e7 wireshark-1.10.1.tar.bz2 +cd7fedd0a67df5ad4905fd356efdc1e8 wireshark-1.10.2.tar.bz2 diff --git a/wireshark-0001-enable-Lua-support.patch b/wireshark-0001-enable-Lua-support.patch index 0795263..7e414f0 100644 --- a/wireshark-0001-enable-Lua-support.patch +++ b/wireshark-0001-enable-Lua-support.patch @@ -1,7 +1,7 @@ -From 31e5f281628f586e7f08b4792c391cf7eb387078 Mon Sep 17 00:00:00 2001 +From e8be5a7c24830ce686cec89dac060b3c0495b70e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Radek=20Vok=C3=A1l?= Date: Tue, 15 Dec 2009 08:36:27 +0000 -Subject: [PATCH 1/7] enable Lua support +Subject: [PATCH 1/6] enable Lua support --- epan/wslua/template-init.lua | 2 +- diff --git a/wireshark-0002-Customize-permission-denied-error.patch b/wireshark-0002-Customize-permission-denied-error.patch index 93d6104..c091b0d 100644 --- a/wireshark-0002-Customize-permission-denied-error.patch +++ b/wireshark-0002-Customize-permission-denied-error.patch @@ -1,7 +1,7 @@ -From 0a4f4f8cb1b4706b33ab1c0fddbd37ffa21d51f1 Mon Sep 17 00:00:00 2001 +From a6168e1f1bdb639c0ffd15a5f4eed864814e0bce Mon Sep 17 00:00:00 2001 From: Jan Safranek Date: Fri, 26 Nov 2010 14:30:45 +0300 -Subject: [PATCH 2/7] Customize 'permission denied' error. +Subject: [PATCH 2/6] Customize 'permission denied' error. Add Fedora-specific message to error output when dumpcap cannot be started because of permissions. @@ -12,7 +12,7 @@ Signed-off-by: Jan Safranek 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/capture_sync.c b/capture_sync.c -index 5914977..11d5316 100644 +index 391aa6a..6dfe1de 100644 --- a/capture_sync.c +++ b/capture_sync.c @@ -368,6 +368,7 @@ sync_pipe_start(capture_options *capture_opts, capture_session *cap_session) diff --git a/wireshark-0003-Load-correct-shared-object-name-in-python.patch b/wireshark-0003-Load-correct-shared-object-name-in-python.patch index b1dd6fd..8f19f41 100644 --- a/wireshark-0003-Load-correct-shared-object-name-in-python.patch +++ b/wireshark-0003-Load-correct-shared-object-name-in-python.patch @@ -1,7 +1,7 @@ -From cd1f3ac8810a9abda87e71f6d5a3a8e46fcbdde9 Mon Sep 17 00:00:00 2001 +From ec02325332d4e198b1ccd6955ed6a489a5a7c826 Mon Sep 17 00:00:00 2001 From: Jan Safranek Date: Thu, 9 Jun 2011 14:56:59 +0200 -Subject: [PATCH 3/7] Load correct shared object name in python. +Subject: [PATCH 3/6] Load correct shared object name in python. This fixes following error message shown by wireshark/tshark when wireshark-devel was not installed: diff --git a/wireshark-0004-fix-documentation-build-error.patch b/wireshark-0004-fix-documentation-build-error.patch index 72cc673..f4d8f4a 100644 --- a/wireshark-0004-fix-documentation-build-error.patch +++ b/wireshark-0004-fix-documentation-build-error.patch @@ -1,7 +1,7 @@ -From 245cae76f4501ed44d1c9261a502e6ed35f48f2f Mon Sep 17 00:00:00 2001 +From 5dab288d99b6847ca5ecd98ae5bdb95402fa5cd0 Mon Sep 17 00:00:00 2001 From: Peter Hatina Date: Mon, 8 Apr 2013 13:03:24 +0200 -Subject: [PATCH 4/7] fix documentation build error +Subject: [PATCH 4/6] fix documentation build error --- doc/asn2deb.pod | 1 + diff --git a/wireshark-0005-fix-string-overrun-in-plugins-profinet.patch b/wireshark-0005-fix-string-overrun-in-plugins-profinet.patch index fa41b40..30527b6 100644 --- a/wireshark-0005-fix-string-overrun-in-plugins-profinet.patch +++ b/wireshark-0005-fix-string-overrun-in-plugins-profinet.patch @@ -1,7 +1,7 @@ -From df227f91183e56ef1fe66da5b891a150da8ebe3d Mon Sep 17 00:00:00 2001 +From 396979b80d273319cd69084e262567aae0024b25 Mon Sep 17 00:00:00 2001 From: Peter Hatina Date: Wed, 4 Sep 2013 10:03:57 +0200 -Subject: [PATCH 5/7] fix string overrun in plugins/profinet +Subject: [PATCH 5/6] fix string overrun in plugins/profinet --- plugins/profinet/packet-dcom-cba.c | 2 +- diff --git a/wireshark-0006-From-Peter-Lemenkov-via-https-bugs.wireshark.org-bug.patch b/wireshark-0006-From-Peter-Lemenkov-via-https-bugs.wireshark.org-bug.patch index 14a7cce..2de5779 100644 --- a/wireshark-0006-From-Peter-Lemenkov-via-https-bugs.wireshark.org-bug.patch +++ b/wireshark-0006-From-Peter-Lemenkov-via-https-bugs.wireshark.org-bug.patch @@ -1,7 +1,7 @@ -From 24b762c8073ef2b823dfe74292f5201582fe5656 Mon Sep 17 00:00:00 2001 +From 3c9d2b8cefb0204bf2b83ac925e80e775945e57f Mon Sep 17 00:00:00 2001 From: Evan Huus Date: Sun, 18 Aug 2013 19:49:08 +0000 -Subject: [PATCH 6/7] From Peter Lemenkov via +Subject: [PATCH 6/6] From Peter Lemenkov via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8326 Dissector for the Sippy RTPproxy controlling protocol. RTPproxy is a well-known @@ -11,9 +11,6 @@ implements it (sometimes slightly extending). svn path=/trunk/; revision=51417 -Conflicts: - AUTHORS - Add a cast to try and fix packet-rtpproxy.c:226: warning: implicit conversion shortens 64-bit value into a 32-bit value @@ -45,19 +42,19 @@ svn path=/trunk/; revision=51430 create mode 100644 epan/dissectors/packet-rtpproxy.c diff --git a/AUTHORS b/AUTHORS -index 820ba7e..fdb3b9a 100644 +index aa446db..ac40c25 100644 --- a/AUTHORS +++ b/AUTHORS -@@ -3731,6 +3731,7 @@ Alexander Chemeris - Ivan Klyuchnikov - Max Baker +@@ -3733,6 +3733,7 @@ Max Baker Mike Garratt + Bart Van Assche + Karl Beldan +Peter Lemenkov - Dan Lasley gave permission for his + dumpit() hex-dump routine to be used. diff --git a/epan/CMakeLists.txt b/epan/CMakeLists.txt -index 9b8d4d9..3dfa974 100644 +index 69eb75f..610cea7 100644 --- a/epan/CMakeLists.txt +++ b/epan/CMakeLists.txt @@ -1083,6 +1083,7 @@ set(DISSECTOR_SRC diff --git a/wireshark-0007-Fix-.-reordercap.pod-unterminated-list-s-at-head-in-.patch b/wireshark-0007-Fix-.-reordercap.pod-unterminated-list-s-at-head-in-.patch deleted file mode 100644 index 9369911..0000000 --- a/wireshark-0007-Fix-.-reordercap.pod-unterminated-list-s-at-head-in-.patch +++ /dev/null @@ -1,27 +0,0 @@ -From efa46e067df903458fa299a95a86adc83a065940 Mon Sep 17 00:00:00 2001 -From: Evan Huus -Date: Mon, 20 May 2013 14:56:18 +0000 -Subject: [PATCH 7/7] Fix "./reordercap.pod: unterminated list(s) at =head in - paragraph 14. ignoring." - -svn path=/trunk/; revision=49436 ---- - doc/reordercap.pod | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/doc/reordercap.pod b/doc/reordercap.pod -index 08a1c9a..3278a5b 100644 ---- a/doc/reordercap.pod -+++ b/doc/reordercap.pod -@@ -40,6 +40,8 @@ the same way B handles this. - When the B<-n> option is used, B will not write out the output - file if it finds that the input file is already in order. - -+=back -+ - =head1 SEE ALSO - - pcap(3), wireshark(1), tshark(1), dumpcap(1), editcap(1), mergecap(1), --- -1.8.3.1 - diff --git a/wireshark.console b/wireshark.console deleted file mode 100644 index 2a976f5..0000000 --- a/wireshark.console +++ /dev/null @@ -1,4 +0,0 @@ -USER=root -PROGRAM=/usr/sbin/wireshark -SESSION=true -FALLBACK=true diff --git a/wireshark.spec b/wireshark.spec index f0b0f52..ca42043 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -20,12 +20,11 @@ Summary: Network traffic analyzer Name: wireshark -Version: 1.10.1 +Version: 1.10.2 Release: 1%{?dist} License: GPL+ Group: Applications/Internet Source0: http://wireshark.org/download/src/%{name}-%{version}.tar.bz2 -Source2: wireshark.console Source3: wireshark.desktop Source4: wireshark-autoconf.m4 Source5: wireshark-mime-package.xml @@ -44,8 +43,6 @@ Patch4: wireshark-0004-fix-documentation-build-error.patch Patch5: wireshark-0005-fix-string-overrun-in-plugins-profinet.patch # backported from upstream. See https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8326 Patch6: wireshark-0006-From-Peter-Lemenkov-via-https-bugs.wireshark.org-bug.patch -# backported from upstream commit, svn path=/trunk/; revision=49436 -Patch7: wireshark-0007-Fix-.-reordercap.pod-unterminated-list-s-at-head-in-.patch Url: http://www.wireshark.org/ BuildRequires: libpcap-devel >= 0.9 @@ -144,7 +141,6 @@ and plugins. %patch4 -p1 -b .pod2man %patch5 -p1 -b .profinet_crash %patch6 -p1 -b .rtpproxy -%patch7 -p1 -b .add_end %build %ifarch s390 s390x sparcv9 sparc64 @@ -371,6 +367,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_datadir}/aclocal/* %changelog +* Wed Sep 11 2013 Peter Lemenkov - 1.10-2-1 +- Ver. 1.10.2 +- Actually remove the console helper + * Mon Sep 09 2013 Peter Lemenkov - 1.10.1-1 - Ver. 1.10.1 - Backported rtpproxy dissector module