[wireshark/f15] fixed Fedora-specific message when user is not part of 'wireshark' group
Jan Šafránek
jsafrane at fedoraproject.org
Thu Jun 16 08:19:57 UTC 2011
commit 1122193b626c3a517693e84351c99732568b8a14
Author: Jan Safranek <jsafrane at redhat.com>
Date: Thu Jun 16 09:30:51 2011 +0200
fixed Fedora-specific message when user is not part of 'wireshark' group
wireshark-1.4.2-group-msg.patch | 4 ++--
wireshark.spec | 6 +++++-
2 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/wireshark-1.4.2-group-msg.patch b/wireshark-1.4.2-group-msg.patch
index 8ad42df..a599322 100644
--- a/wireshark-1.4.2-group-msg.patch
+++ b/wireshark-1.4.2-group-msg.patch
@@ -31,7 +31,7 @@ index 68b79f7..71de366 100644
- 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 'usermod -a -G wireshark <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);
sync_pipe_errmsg_to_parent(2, errmsg, "");
@@ -52,7 +52,7 @@ index 68b79f7..71de366 100644
- 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 'usermod -a -G wireshark <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);
sync_pipe_errmsg_to_parent(2, errmsg, "");
diff --git a/wireshark.spec b/wireshark.spec
index c991091..4a8b211 100644
--- a/wireshark.spec
+++ b/wireshark.spec
@@ -11,7 +11,7 @@
Summary: Network traffic analyzer
Name: wireshark
Version: 1.4.7
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPL+
Group: Applications/Internet
Source0: http://wireshark.org/download/src/%{name}-%{version}.tar.bz2
@@ -322,6 +322,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_sbindir}/idl2wrs
%changelog
+* 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)
+
* Thu Jun 2 2011 Jan Safranek <jsafrane at redhat.com> - 1.4.7-1
- upgrade to 1.4.7
- see http://www.wireshark.org/docs/relnotes/wireshark-1.4.7.html
More information about the scm-commits
mailing list