rpm/wireshark
SHA256
1
0
Fork 0
forked from pool/wireshark
Code Pull Requests Activity

Accepting request 1008752 from home:ecsos

Browse Source 
- Added an additional desktopfile to start wireshark which asks for
  the super user password.
- Fix build error for Leap.

OBS-URL: https://build.opensuse.org/request/show/1008752
OBS-URL: https://build.opensuse.org/package/show/network:utilities/wireshark?expand=0&rev=378
This commit is contained in:
Robert Frohl 2022-10-07 17:27:25 +00:00 committed by Git OBS Bridge
parent ded8393c8f
commit bf14c8eaf6
3 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
wireshark-0010-dumpcap-permission-denied.patch
View File

@ -4,10 +4,10 @@ Date: Wed Jan 13 14:18:36 2021 +0100
Warn if user can't access dumpcap.
diff --git a/capchild/capture_sync.c b/capchild/capture_sync.c
index f31914886a..d3baab6c50 100644
--- a/capture/capture_sync.c
+++ b/capture/capture_sync.c
Index: wireshark-4.0.0/capture/capture_sync.c
===================================================================
--- wireshark-4.0.0.orig/capture/capture_sync.c
+++ wireshark-4.0.0/capture/capture_sync.c
@@ -24,6 +24,10 @@
#include <wsutil/wslog.h>
#include <wsutil/ws_assert.h>
@ -19,7 +19,7 @@ index f31914886a..d3baab6c50 100644
#ifdef _WIN32
#include <wsutil/unicode-utils.h>
#include <wsutil/win32-utils.h>
@@ -592,11 +596,22 @@ sync_pipe_start(capture_options *capture_opts, capture_session *cap_session, inf
@@ -738,11 +742,22 @@ sync_pipe_start(capture_options *capture
* Child process - run dumpcap with the right arguments to make
* it just capture with the specified capture parameters
*/
@ -44,7 +44,7 @@ index f31914886a..d3baab6c50 100644
sync_pipe_errmsg_to_parent(2, errmsg, "");
/* Exit with "_exit()", so that we don't close the connection
@@ -827,6 +842,7 @@ sync_pipe_open_command(char* const argv[], int *data_read_fd,
@@ -987,6 +1002,7 @@ sync_pipe_open_command(char* const argv[
* Child process - run dumpcap with the right arguments to make
* it just capture with the specified capture parameters
*/
@ -52,7 +52,7 @@ index f31914886a..d3baab6c50 100644
dup2(data_pipe[PIPE_WRITE], 1);
ws_close(data_pipe[PIPE_READ]);
ws_close(data_pipe[PIPE_WRITE]);
@@ -834,8 +850,18 @@ sync_pipe_open_command(char* const argv[], int *data_read_fd,
@@ -994,8 +1010,18 @@ sync_pipe_open_command(char* const argv[
ws_close(sync_pipe[PIPE_READ]);
ws_close(sync_pipe[PIPE_WRITE]);
execv(argv[0], argv);

11
wireshark.changes
View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Fri Oct 7 06:15:13 UTC 2022 - ecsos <ecsos@opensuse.org>
- Added an additional desktopfile to start wireshark which asks for
the super user password.
-------------------------------------------------------------------
Thu Oct 6 15:48:15 UTC 2022 - ecsos <ecsos@opensuse.org>
- Fix build error for Leap.
-------------------------------------------------------------------
Wed Oct 5 15:01:15 UTC 2022 - Robert Frohl <rfrohl@suse.com>

9
wireshark.spec
View File

@ -61,7 +61,7 @@ BuildRequires: libtool
BuildRequires: lua51-devel
BuildRequires: net-snmp-devel
BuildRequires: openssl-devel
BuildRequires: pcre-devel
BuildRequires: pcre2-devel
BuildRequires: pkgconfig
BuildRequires: portaudio-devel
BuildRequires: snappy-devel
@ -88,6 +88,7 @@ BuildRequires: pkgconfig(sbc)
BuildRequires: pkgconfig(speexdsp)
# keep until libbrotli-devel bug is fixed
Requires: libbrotlidec1
Requires: xdg-utils
Requires(pre): permissions
Requires(pre): shadow
Recommends: wireshark-ui = %{version}
@ -219,7 +220,12 @@ install -m 644 epan/dissectors/*.h "${IDIR}/epan/dissectors"
install -m 644 wiretap/*.h "${IDIR}/wiretap"
install -m 644 wsutil/*.h "${IDIR}/wsutil"
# desktop file
cp resources/freedesktop/%{org_name}.desktop %{buildroot}%{_datadir}/applications/%{org_name}-su.desktop
sed -i -e 's|Name=Wireshark|Name=Wireshark - Super User Mode|g' %{buildroot}%{_datadir}/applications/%{org_name}-su.desktop
sed -i -e 's|Exec=wireshark %f|Exec=xdg-su -c wireshark %f|g' %{buildroot}%{_datadir}/applications/%{org_name}-su.desktop
%suse_update_desktop_file %{org_name}
%suse_update_desktop_file %{org_name}-su
rm -f %{buildroot}%{_datadir}/doc/wireshark/*.html
@ -281,6 +287,7 @@ exit 0
%{_bindir}/wireshark
%{_bindir}/ethereal
%{_datadir}/applications/%{org_name}.desktop
%{_datadir}/applications/%{org_name}-su.desktop
%{_datadir}/icons/hicolor/*/apps/%{org_name}.png
%{_datadir}/icons/hicolor/*/mimetypes/%{org_name}-mimetype.png
%{_datadir}/icons/hicolor/scalable/apps/%{org_name}.svg