[wireshark/f15] upgrade to 1.4.8 Resolves: 719782 CVE-2011-2597
Jan Šafránek
jsafrane at fedoraproject.org
Thu Jul 21 10:36:40 UTC 2011
commit 4ab583eb591d2f9ae5af01af424cd4f9391e9858
Author: Jan Safranek <jsafrane at redhat.com>
Date: Thu Jul 21 12:36:17 2011 +0200
upgrade to 1.4.8
Resolves: 719782 CVE-2011-2597
.gitignore | 1 +
sources | 2 +-
...up-msg.patch => wireshark-1.4.8-group-msg.patch | 34 ++++++++-----------
wireshark.spec | 10 ++++--
4 files changed, 23 insertions(+), 24 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 814667f..09ad243 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ wireshark-1.2.10.tar.bz2
/wireshark-1.4.5.tar.bz2
/wireshark-1.4.6.tar.bz2
/wireshark-1.4.7.tar.bz2
+/wireshark-1.4.8.tar.bz2
diff --git a/sources b/sources
index 9e21712..43e2136 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b5065426d5524ddc1667314f8256c2b1 wireshark-1.4.7.tar.bz2
+d0cf6c24b00071efb356328c8d9c03a7 wireshark-1.4.8.tar.bz2
diff --git a/wireshark-1.4.2-group-msg.patch b/wireshark-1.4.8-group-msg.patch
similarity index 61%
rename from wireshark-1.4.2-group-msg.patch
rename to wireshark-1.4.8-group-msg.patch
index a599322..6173ee1 100644
--- a/wireshark-1.4.2-group-msg.patch
+++ b/wireshark-1.4.8-group-msg.patch
@@ -6,17 +6,11 @@ Add Fedora-specific message to error output when dumpcap cannot be started
because of permissions.
Signed-off-by: Jan Safranek <jsafrane at redhat.com>
----
- capture_sync.c | 14 ++++++++++----
- 1 files changed, 10 insertions(+), 4 deletions(-)
-
-
-diff --git a/capture_sync.c b/capture_sync.c
-index 68b79f7..71de366 100644
---- a/capture_sync.c
-+++ b/capture_sync.c
-@@ -351,6 +351,7 @@ sync_pipe_start(capture_options *capture_opts) {
+diff -up wireshark-1.4.8/capture_sync.c.group-msg wireshark-1.4.8/capture_sync.c
+--- wireshark-1.4.8/capture_sync.c.group-msg 2011-07-18 21:13:42.000000000 +0200
++++ wireshark-1.4.8/capture_sync.c 2011-07-21 12:33:14.212640543 +0200
+@@ -351,6 +351,7 @@ sync_pipe_start(capture_options *capture
gchar *signal_pipe_name;
#else
char errmsg[1024+1];
@@ -24,20 +18,20 @@ index 68b79f7..71de366 100644
int sync_pipe[2]; /* pipe used to send messages from child to parent */
enum PIPES { PIPE_READ, PIPE_WRITE }; /* Constants 0 and 1 for PIPE_READ and PIPE_WRITE */
#endif
-@@ -596,8 +597,10 @@ sync_pipe_start(capture_options *capture_opts) {
+@@ -596,8 +597,10 @@ sync_pipe_start(capture_options *capture
dup2(sync_pipe[PIPE_WRITE], 2);
ws_close(sync_pipe[PIPE_READ]);
execv(argv[0], (gpointer)argv);
- g_snprintf(errmsg, sizeof errmsg, "Couldn't run %s in child process: %s",
-- argv[0], strerror(errno));
+- argv[0], g_strerror(errno));
+ if (errno == EPERM || errno == EACCES)
-+ securitymsg = "\nAre you memeber of 'wireshark' group? Try running\n'usermod -a -G wireshark _your_username_' as root.";
++ securitymsg = "\nAre you memeber of 'wireshark' group? Try running\n'usermod -a -G wireshark _your_username_' as root.";
+ g_snprintf(errmsg, sizeof errmsg, "Couldn't run %s in child process: %s%s",
-+ argv[0], strerror(errno), securitymsg);
++ argv[0], g_strerror(errno), securitymsg);
sync_pipe_errmsg_to_parent(2, errmsg, "");
/* Exit with "_exit()", so that we don't close the connection
-@@ -687,6 +690,7 @@ sync_pipe_open_command(const char** argv, int *data_read_fd,
+@@ -687,6 +690,7 @@ sync_pipe_open_command(const char** argv
int i;
#else
char errmsg[1024+1];
@@ -45,16 +39,16 @@ index 68b79f7..71de366 100644
int sync_pipe[2]; /* pipe used to send messages from child to parent */
int data_pipe[2]; /* pipe used to send data from child to parent */
#endif
-@@ -811,8 +815,10 @@ sync_pipe_open_command(const char** argv, int *data_read_fd,
+@@ -811,8 +815,10 @@ sync_pipe_open_command(const char** argv
ws_close(sync_pipe[PIPE_READ]);
ws_close(sync_pipe[PIPE_WRITE]);
execv(argv[0], (gpointer)argv);
- g_snprintf(errmsg, sizeof errmsg, "Couldn't run %s in child process: %s",
-- argv[0], strerror(errno));
-+ if (errno == EPERM || errno == EACCES)
-+ securitymsg = "\nAre you memeber of 'wireshark' group? Try running\n'usermod -a -G wireshark _your_username_' as root.";
+- argv[0], g_strerror(errno));
++ if (errno == EPERM || errno == EACCES)
++ securitymsg = "\nAre you memeber of 'wireshark' group? Try running\n'usermod -a -G wireshark _your_username_' as root.";
+ g_snprintf(errmsg, sizeof errmsg, "Couldn't run %s in child process: %s%s",
-+ argv[0], strerror(errno), securitymsg);
++ argv[0], g_strerror(errno), securitymsg);
sync_pipe_errmsg_to_parent(2, errmsg, "");
/* Exit with "_exit()", so that we don't close the connection
diff --git a/wireshark.spec b/wireshark.spec
index 4a8b211..af3ea91 100644
--- a/wireshark.spec
+++ b/wireshark.spec
@@ -10,8 +10,8 @@
Summary: Network traffic analyzer
Name: wireshark
-Version: 1.4.7
-Release: 2%{?dist}
+Version: 1.4.8
+Release: 1%{?dist}
License: GPL+
Group: Applications/Internet
Source0: http://wireshark.org/download/src/%{name}-%{version}.tar.bz2
@@ -29,7 +29,7 @@ Patch1: wireshark-nfsv41-cleanup.patch
Patch2: wireshark-1.2.4-enable_lua.patch
Patch3: wireshark-libtool-pie.patch
Patch4: wireshark-1.4.0-doc-path.patch
-Patch5: wireshark-1.4.2-group-msg.patch
+Patch5: wireshark-1.4.8-group-msg.patch
Url: http://www.wireshark.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -322,6 +322,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_sbindir}/idl2wrs
%changelog
+* Thu Jul 21 2011 Jan Safranek <jsafrane at redhat.com> - 1.4.8.1
+- upgrade to 1.4.8
+- see http://www.wireshark.org/docs/relnotes/wireshark-1.4.8.html
+
* Thu Jun 16 2011 Jan Safranek <jsafrane at redhat.com> - 1.4.7-2
- fixed Fedora-specific message when user is not part of 'wireshark' group
- now it does not contain '<' and '>' characters (#713545)
More information about the scm-commits
mailing list