Ver. 1.10.3
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
This commit is contained in:
Peter Lemenkov
parent
b6d90cd46a
commit
c06811f865
1
.gitignore
vendored
1
.gitignore
vendored
@ -27,3 +27,4 @@ wireshark-1.2.10.tar.bz2
|
||||
/wireshark-1.10.0.tar.bz2
|
||||
/wireshark-1.10.1.tar.bz2
|
||||
/wireshark-1.10.2.tar.bz2
|
||||
/wireshark-1.10.3.tar.bz2
|
||||
|
||||
2
sources
2
sources
@ -1 +1 @@
|
||||
cd7fedd0a67df5ad4905fd356efdc1e8 wireshark-1.10.2.tar.bz2
|
||||
ceb4b2bac5607d948e00bd950461be1c wireshark-1.10.3.tar.bz2
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From e8be5a7c24830ce686cec89dac060b3c0495b70e Mon Sep 17 00:00:00 2001
|
||||
From 9d38601b45c6bce770946ac3c36a675a2f1a4359 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Radek=20Vok=C3=A1l?= <rvokal@fedoraproject.org>
|
||||
Date: Tue, 15 Dec 2009 08:36:27 +0000
|
||||
Subject: [PATCH 01/14] enable Lua support
|
||||
Subject: [PATCH 01/13] enable Lua support
|
||||
|
||||
---
|
||||
epan/wslua/template-init.lua | 2 +-
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From a6168e1f1bdb639c0ffd15a5f4eed864814e0bce Mon Sep 17 00:00:00 2001
|
||||
From d7b9380cb2b827fb627f82a1c3b73496b089b8dd Mon Sep 17 00:00:00 2001
|
||||
From: Jan Safranek <jsafrane@redhat.com>
|
||||
Date: Fri, 26 Nov 2010 14:30:45 +0300
|
||||
Subject: [PATCH 02/14] Customize 'permission denied' error.
|
||||
Subject: [PATCH 02/13] Customize 'permission denied' error.
|
||||
|
||||
Add Fedora-specific message to error output when dumpcap cannot be started
|
||||
because of permissions.
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From ec02325332d4e198b1ccd6955ed6a489a5a7c826 Mon Sep 17 00:00:00 2001
|
||||
From 0d0f937fcbb73fb36a44bd7061817ff1cdac0032 Mon Sep 17 00:00:00 2001
|
||||
From: Jan Safranek <jsafrane@redhat.com>
|
||||
Date: Thu, 9 Jun 2011 14:56:59 +0200
|
||||
Subject: [PATCH 03/14] Load correct shared object name in python.
|
||||
Subject: [PATCH 03/13] Load correct shared object name in python.
|
||||
|
||||
This fixes following error message shown by wireshark/tshark when wireshark-devel
|
||||
was not installed:
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From 5dab288d99b6847ca5ecd98ae5bdb95402fa5cd0 Mon Sep 17 00:00:00 2001
|
||||
From 8e34a9a261f26ceabc39ea373d9025a24805b832 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Hatina <phatina@redhat.com>
|
||||
Date: Mon, 8 Apr 2013 13:03:24 +0200
|
||||
Subject: [PATCH 04/14] fix documentation build error
|
||||
Subject: [PATCH 04/13] fix documentation build error
|
||||
|
||||
---
|
||||
doc/asn2deb.pod | 1 +
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From 396979b80d273319cd69084e262567aae0024b25 Mon Sep 17 00:00:00 2001
|
||||
From dfd843cda67cfd9b785b44f5096a185c04c08be8 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Hatina <phatina@redhat.com>
|
||||
Date: Wed, 4 Sep 2013 10:03:57 +0200
|
||||
Subject: [PATCH 05/14] fix string overrun in plugins/profinet
|
||||
Subject: [PATCH 05/13] fix string overrun in plugins/profinet
|
||||
|
||||
---
|
||||
plugins/profinet/packet-dcom-cba.c | 2 +-
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From 3c9d2b8cefb0204bf2b83ac925e80e775945e57f Mon Sep 17 00:00:00 2001
|
||||
From b516cc6516b505b264bd75ef5e574490f22912e5 Mon Sep 17 00:00:00 2001
|
||||
From: Evan Huus <eapache@gmail.com>
|
||||
Date: Sun, 18 Aug 2013 19:49:08 +0000
|
||||
Subject: [PATCH 06/14] From Peter Lemenkov via
|
||||
Subject: [PATCH 06/13] 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
|
||||
@ -34,25 +34,28 @@ Fix Coverity CID 1063335: Unused pointer value.
|
||||
|
||||
svn path=/trunk/; revision=51430
|
||||
---
|
||||
AUTHORS | 1 +
|
||||
AUTHORS | 2 +-
|
||||
epan/CMakeLists.txt | 1 +
|
||||
epan/dissectors/Makefile.common | 1 +
|
||||
epan/dissectors/packet-rtpproxy.c | 808 ++++++++++++++++++++++++++++++++++++++
|
||||
4 files changed, 811 insertions(+)
|
||||
4 files changed, 811 insertions(+), 1 deletion(-)
|
||||
create mode 100644 epan/dissectors/packet-rtpproxy.c
|
||||
|
||||
diff --git a/AUTHORS b/AUTHORS
|
||||
index aa446db..ac40c25 100644
|
||||
index 10782b0..4c77f60 100644
|
||||
--- a/AUTHORS
|
||||
+++ b/AUTHORS
|
||||
@@ -3733,6 +3733,7 @@ Max Baker <max[AT]warped.org>
|
||||
@@ -3733,9 +3733,9 @@ Max Baker <max[AT]warped.org>
|
||||
Mike Garratt <mg.wireshark[AT]evn.co.nz>
|
||||
Bart Van Assche <bvanassche[AT]acm.org>
|
||||
Karl Beldan <karl.beldan[AT]gmail.com>
|
||||
+Peter Lemenkov <lemenkov[AT]gmail.com>
|
||||
Masayuki Takemura <masayuki.takemura[AT]gmail.com>
|
||||
|
||||
-
|
||||
Dan Lasley <dlasley[AT]promus.com> gave permission for his
|
||||
dumpit() hex-dump routine to be used.
|
||||
|
||||
diff --git a/epan/CMakeLists.txt b/epan/CMakeLists.txt
|
||||
index 69eb75f..610cea7 100644
|
||||
--- a/epan/CMakeLists.txt
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From 876cb9d160cd8cd4042cdc7a01981d0ae2dbee06 Mon Sep 17 00:00:00 2001
|
||||
From 9bad0b9e84deabc2b65cee6a650b68866d7d70f3 Mon Sep 17 00:00:00 2001
|
||||
From: Anders Broman <anders.broman@ericsson.com>
|
||||
Date: Thu, 11 Jul 2013 21:13:27 +0000
|
||||
Subject: [PATCH 07/14] The beginning of an openflow dissector.
|
||||
Subject: [PATCH 07/13] The beginning of an openflow dissector.
|
||||
|
||||
svn path=/trunk/; revision=50513
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From 0422c8801690fa8dde284f4e8781f31d69b44326 Mon Sep 17 00:00:00 2001
|
||||
From b30893997caf826b0ebdc7e0cb6d5e1f89bbd08e Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Radek=20Vok=C3=A1l?= <rvokal@fedoraproject.org>
|
||||
Date: Mon, 21 Dec 2009 11:19:39 +0000
|
||||
Subject: [PATCH 08/14] adds autoconf macro file
|
||||
Subject: [PATCH 08/13] adds autoconf macro file
|
||||
|
||||
updated autoconf macros and pkgconfig file in wireshark-devel to reflect current config.h Resolves: #746655
|
||||
---
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From f49769f56e1e6a22ca235e8f2b73337309ddcfa2 Mon Sep 17 00:00:00 2001
|
||||
From 8e0c0df6291f9e8948d6653230bdc59692803890 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Lemenkov <lemenkov@gmail.com>
|
||||
Date: Fri, 13 Sep 2013 14:36:55 +0400
|
||||
Subject: [PATCH 09/14] Restore Fedora-specific groups
|
||||
Subject: [PATCH 09/13] Restore Fedora-specific groups
|
||||
|
||||
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
|
||||
---
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From 224cd146ec71d0ff7bdff3e8d7707ca603220410 Mon Sep 17 00:00:00 2001
|
||||
From a5f6e0766675cf2e6f7104a04d9d73eca2c6796d Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Radek=20Vok=C3=A1l?= <rvokal@fedoraproject.org>
|
||||
Date: Thu, 17 Dec 2009 09:17:07 +0000
|
||||
Subject: [PATCH 10/14] Add pkgconfig entry
|
||||
Subject: [PATCH 10/13] Add pkgconfig entry
|
||||
|
||||
---
|
||||
Makefile.am | 3 +++
|
||||
@ -25,7 +25,7 @@ index eb735a5..2844c90 100644
|
||||
# Wireshark configuration files are put in $(pkgdatadir).
|
||||
#
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index cfa8f05..a9f77a7 100644
|
||||
index 6c05883..5cae378 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -2543,6 +2543,7 @@ AC_CONFIG_HEADERS(config.h)
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From fa0c546efa38a9f112257b3b3a1be15ba4cb3d4b Mon Sep 17 00:00:00 2001
|
||||
From 44ac61f5942aa0a58f6a85781666b178244e89cd Mon Sep 17 00:00:00 2001
|
||||
From: Peter Lemenkov <lemenkov@gmail.com>
|
||||
Date: Fri, 13 Sep 2013 15:25:12 +0400
|
||||
Subject: [PATCH 11/14] Install autoconf-related file
|
||||
Subject: [PATCH 11/13] Install autoconf-related file
|
||||
|
||||
---
|
||||
Makefile.am | 3 ++
|
||||
|
||||
@ -1,5 +1,21 @@
|
||||
From aaf8ad314b952c61c9b569ac22c2765f5e6653d7 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Hatina <phatina@redhat.com>
|
||||
Date: Tue, 24 Sep 2013 10:55:09 +0200
|
||||
Subject: [PATCH 12/13] move default temporary directory to /var/tmp
|
||||
|
||||
---
|
||||
epan/filesystem.c | 4 ++-
|
||||
tempfile.c | 7 ++---
|
||||
ui/gtk/proto_help.c | 4 ++-
|
||||
wsutil/Makefile.common | 6 +++--
|
||||
wsutil/wstmpdir.c | 70 ++++++++++++++++++++++++++++++++++++++++++++++++++
|
||||
wsutil/wstmpdir.h | 39 ++++++++++++++++++++++++++++
|
||||
6 files changed, 123 insertions(+), 7 deletions(-)
|
||||
create mode 100644 wsutil/wstmpdir.c
|
||||
create mode 100644 wsutil/wstmpdir.h
|
||||
|
||||
diff --git a/epan/filesystem.c b/epan/filesystem.c
|
||||
index 89edb8a..00acdd9 100644
|
||||
index 053711d..adf3b91 100644
|
||||
--- a/epan/filesystem.c
|
||||
+++ b/epan/filesystem.c
|
||||
@@ -74,6 +74,8 @@
|
||||
@ -21,7 +37,7 @@ index 89edb8a..00acdd9 100644
|
||||
|
||||
/*
|
||||
diff --git a/tempfile.c b/tempfile.c
|
||||
index 9a236df..ab6d1dc 100644
|
||||
index 2fab0df..10ab3e6 100644
|
||||
--- a/tempfile.c
|
||||
+++ b/tempfile.c
|
||||
@@ -50,6 +50,7 @@
|
||||
@ -60,7 +76,7 @@ index 9a236df..ab6d1dc 100644
|
||||
while (g_snprintf(td_path[idx], td_path_len[idx], "%s%c%s" TMP_FILE_SUFFIX, tmp_dir, G_DIR_SEPARATOR, pfx) > td_path_len[idx]) {
|
||||
td_path_len[idx] *= 2;
|
||||
diff --git a/ui/gtk/proto_help.c b/ui/gtk/proto_help.c
|
||||
index 16dc24e..fe12c81 100644
|
||||
index bbf5fe0..9998a22 100644
|
||||
--- a/ui/gtk/proto_help.c
|
||||
+++ b/ui/gtk/proto_help.c
|
||||
@@ -44,6 +44,8 @@
|
||||
@ -82,7 +98,7 @@ index 16dc24e..fe12c81 100644
|
||||
|
||||
for (i = 0; i < PH_CONF_DIRS; i++) {
|
||||
diff --git a/wsutil/Makefile.common b/wsutil/Makefile.common
|
||||
index 93efa0f..ab8ce7d 100644
|
||||
index 570dbe6..7a33f5b 100644
|
||||
--- a/wsutil/Makefile.common
|
||||
+++ b/wsutil/Makefile.common
|
||||
@@ -43,7 +43,8 @@ LIBWSUTIL_SRC = \
|
||||
@ -223,3 +239,6 @@ index 0000000..021b615
|
||||
+#endif // __cplusplus
|
||||
+
|
||||
+#endif // __WS_TMP_DIR_H__
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From af2f5b8cf5af44ab721ff55b3fd826d3067fe3b4 Mon Sep 17 00:00:00 2001
|
||||
From ce5c6e5de39f4af8b76dad77d2c237064e0930eb Mon Sep 17 00:00:00 2001
|
||||
From: Peter Lemenkov <lemenkov@gmail.com>
|
||||
Date: Tue, 1 Oct 2013 13:35:57 +0400
|
||||
Subject: [PATCH 14/14] Added basic conversation support
|
||||
Subject: [PATCH 13/13] Added basic conversation support
|
||||
|
||||
Loosely based on a work done by Pascal Quantin <pascal.quantin@gmail.com> (see
|
||||
svn rev. 52306).
|
||||
@ -1,73 +0,0 @@
|
||||
From fc0f3e37918f727956df096fc301a0e62926c1c0 Mon Sep 17 00:00:00 2001
|
||||
From: Evan Huus <eapache@gmail.com>
|
||||
Date: Sun, 22 Sep 2013 16:42:21 +0000
|
||||
Subject: [PATCH 13/14] Manual backport of r52142 and r52144 to fix collision
|
||||
between gluster defines and system header dirent.h
|
||||
|
||||
svn path=/trunk-1.10/; revision=52173
|
||||
---
|
||||
epan/dissectors/packet-gluster.h | 18 +++++++++---------
|
||||
epan/dissectors/packet-glusterfs.c | 18 +++++++++---------
|
||||
2 files changed, 18 insertions(+), 18 deletions(-)
|
||||
|
||||
diff --git a/epan/dissectors/packet-gluster.h b/epan/dissectors/packet-gluster.h
|
||||
index e3c43d1..fc69e6c 100644
|
||||
--- a/epan/dissectors/packet-gluster.h
|
||||
+++ b/epan/dissectors/packet-gluster.h
|
||||
@@ -356,15 +356,15 @@ enum gf_fop_procnum {
|
||||
|
||||
/* dir-entry types from libglusterfs/src/compat.h */
|
||||
enum gluster_entry_types {
|
||||
- DT_UNKNOWN = 0,
|
||||
- DT_FIFO = 1,
|
||||
- DT_CHR = 2,
|
||||
- DT_DIR = 4,
|
||||
- DT_BLK = 6,
|
||||
- DT_REG = 8,
|
||||
- DT_LNK = 10,
|
||||
- DT_SOCK = 12,
|
||||
- DT_WHT = 14
|
||||
+ GLUSTER_DT_UNKNOWN = 0,
|
||||
+ GLUSTER_DT_FIFO = 1,
|
||||
+ GLUSTER_DT_CHR = 2,
|
||||
+ GLUSTER_DT_DIR = 4,
|
||||
+ GLUSTER_DT_BLK = 6,
|
||||
+ GLUSTER_DT_REG = 8,
|
||||
+ GLUSTER_DT_LNK = 10,
|
||||
+ GLUSTER_DT_SOCK = 12,
|
||||
+ GLUSTER_DT_WHT = 14
|
||||
};
|
||||
|
||||
|
||||
diff --git a/epan/dissectors/packet-glusterfs.c b/epan/dissectors/packet-glusterfs.c
|
||||
index 56f9093..29ff0dc 100644
|
||||
--- a/epan/dissectors/packet-glusterfs.c
|
||||
+++ b/epan/dissectors/packet-glusterfs.c
|
||||
@@ -2002,15 +2002,15 @@ static value_string_ext glusterfs3_1_fop_proc_vals_ext = VALUE_STRING_EXT_INIT(g
|
||||
|
||||
/* dir-entry types */
|
||||
static const value_string glusterfs_entry_type_names[] = {
|
||||
- { DT_UNKNOWN, "DT_UNKNOWN" },
|
||||
- { DT_FIFO, "DT_FIFO" },
|
||||
- { DT_CHR, "DT_CHR" },
|
||||
- { DT_DIR, "DT_DIR" },
|
||||
- { DT_BLK, "DT_BLK" },
|
||||
- { DT_REG, "DT_REG" },
|
||||
- { DT_LNK, "DT_LNK" },
|
||||
- { DT_SOCK, "DT_SOCK" },
|
||||
- { DT_WHT, "DT_WHT" },
|
||||
+ { GLUSTER_DT_UNKNOWN, "DT_UNKNOWN" },
|
||||
+ { GLUSTER_DT_FIFO, "DT_FIFO" },
|
||||
+ { GLUSTER_DT_CHR, "DT_CHR" },
|
||||
+ { GLUSTER_DT_DIR, "DT_DIR" },
|
||||
+ { GLUSTER_DT_BLK, "DT_BLK" },
|
||||
+ { GLUSTER_DT_REG, "DT_REG" },
|
||||
+ { GLUSTER_DT_LNK, "DT_LNK" },
|
||||
+ { GLUSTER_DT_SOCK, "DT_SOCK" },
|
||||
+ { GLUSTER_DT_WHT, "DT_WHT" },
|
||||
{ 0, NULL }
|
||||
};
|
||||
static value_string_ext glusterfs_entry_type_names_ext = VALUE_STRING_EXT_INIT(glusterfs_entry_type_names);
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
@ -20,8 +20,8 @@
|
||||
|
||||
Summary: Network traffic analyzer
|
||||
Name: wireshark
|
||||
Version: 1.10.2
|
||||
Release: 8%{?dist}
|
||||
Version: 1.10.3
|
||||
Release: 1%{?dist}
|
||||
License: GPL+
|
||||
Group: Applications/Internet
|
||||
Source0: http://wireshark.org/download/src/%{name}-%{version}.tar.bz2
|
||||
@ -46,12 +46,10 @@ Patch10: wireshark-0010-Add-pkgconfig-entry.patch
|
||||
# Will be proposed upstream
|
||||
Patch11: wireshark-0011-Install-autoconf-related-file.patch
|
||||
# Fedora-specific
|
||||
Patch12: wireshark-0012-tmp-dir.patch
|
||||
# Backported from upstream. See also https://bugzilla.redhat.com/1007139
|
||||
Patch13: wireshark-0013-Manual-backport-of-r52142-and-r52144-to-fix-collisio.patch
|
||||
# Backported to 1.10.0 from the patch from this ticket:
|
||||
Patch12: wireshark-0012-move-default-temporary-directory-to-var-tmp.patch
|
||||
# Backported to 1.10.x from the patch from this ticket:
|
||||
# https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9211
|
||||
Patch14: wireshark-0014-Added-basic-conversation-support.patch
|
||||
Patch13: wireshark-0013-Added-basic-conversation-support.patch
|
||||
|
||||
Url: http://www.wireshark.org/
|
||||
BuildRequires: libpcap-devel >= 0.9
|
||||
@ -158,8 +156,7 @@ and plugins.
|
||||
%patch10 -p1 -b .add_pkgconfig
|
||||
%patch11 -p1 -b .install_autoconf
|
||||
%patch12 -p1 -b .tmp_dir
|
||||
%patch13 -p1 -b .dirent_clash
|
||||
%patch14 -p1 -b .rtpproxy_conversations
|
||||
%patch13 -p1 -b .rtpproxy_conversations
|
||||
|
||||
%build
|
||||
%ifarch s390 s390x sparcv9 sparc64
|
||||
@ -354,7 +351,11 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
|
||||
%{_datadir}/aclocal/*
|
||||
|
||||
%changelog
|
||||
* Tue Oct 01 2013 Peter Lemenkov <lemenkov@gmail.com> - 1.10.0-8
|
||||
* Sat Nov 02 2013 Peter Lemenkov <lemenkov@gmail.com> - 1.10.3-1
|
||||
- Ver. 1.10.3
|
||||
- Dropped upsteamed patch no. 13
|
||||
|
||||
* Tue Oct 01 2013 Peter Lemenkov <lemenkov@gmail.com> - 1.10.2-8
|
||||
- Added support for rtpproxy conversations (req/resp matching)
|
||||
|
||||
* Tue Sep 24 2013 Peter Hatina <phatina@redhat.com> - 1.10.2-7
|
||||
|
||||
Loading…
Reference in New Issue
Block a user