From 5b8c082c3c19daf03f3ce3c43a44565826ea870cadaa8add3997f1f3713f1a52 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Mon, 10 Oct 2022 16:44:26 +0000 Subject: [PATCH] Updating link to change in openSUSE:Factory/wireshark revision 194.0 OBS-URL: https://build.opensuse.org/package/show/network:utilities/wireshark?expand=0&rev=bf1b0418b15bdfc35b4d002fecb17e02 --- wireshark-0010-dumpcap-permission-denied.patch | 14 +++++++------- wireshark.changes | 11 ----------- wireshark.spec | 9 +-------- 3 files changed, 8 insertions(+), 26 deletions(-) diff --git a/wireshark-0010-dumpcap-permission-denied.patch b/wireshark-0010-dumpcap-permission-denied.patch index d292b9f..0359ac1 100644 --- a/wireshark-0010-dumpcap-permission-denied.patch +++ b/wireshark-0010-dumpcap-permission-denied.patch @@ -4,10 +4,10 @@ Date: Wed Jan 13 14:18:36 2021 +0100 Warn if user can't access dumpcap. -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 +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 @@ -24,6 +24,10 @@ #include #include @@ -19,7 +19,7 @@ Index: wireshark-4.0.0/capture/capture_sync.c #ifdef _WIN32 #include #include -@@ -738,11 +742,22 @@ sync_pipe_start(capture_options *capture +@@ -592,11 +596,22 @@ sync_pipe_start(capture_options *capture_opts, capture_session *cap_session, inf * Child process - run dumpcap with the right arguments to make * it just capture with the specified capture parameters */ @@ -44,7 +44,7 @@ Index: wireshark-4.0.0/capture/capture_sync.c sync_pipe_errmsg_to_parent(2, errmsg, ""); /* Exit with "_exit()", so that we don't close the connection -@@ -987,6 +1002,7 @@ sync_pipe_open_command(char* const argv[ +@@ -827,6 +842,7 @@ sync_pipe_open_command(char* const argv[], int *data_read_fd, * Child process - run dumpcap with the right arguments to make * it just capture with the specified capture parameters */ @@ -52,7 +52,7 @@ Index: wireshark-4.0.0/capture/capture_sync.c dup2(data_pipe[PIPE_WRITE], 1); ws_close(data_pipe[PIPE_READ]); ws_close(data_pipe[PIPE_WRITE]); -@@ -994,8 +1010,18 @@ sync_pipe_open_command(char* const argv[ +@@ -834,8 +850,18 @@ sync_pipe_open_command(char* const argv[], int *data_read_fd, ws_close(sync_pipe[PIPE_READ]); ws_close(sync_pipe[PIPE_WRITE]); execv(argv[0], argv); diff --git a/wireshark.changes b/wireshark.changes index f70fbdc..5670cbf 100644 --- a/wireshark.changes +++ b/wireshark.changes @@ -1,14 +1,3 @@ -------------------------------------------------------------------- -Fri Oct 7 06:15:13 UTC 2022 - ecsos - -- Added an additional desktopfile to start wireshark which asks for - the super user password. - -------------------------------------------------------------------- -Thu Oct 6 15:48:15 UTC 2022 - ecsos - -- Fix build error for Leap. - ------------------------------------------------------------------- Wed Oct 5 15:01:15 UTC 2022 - Robert Frohl diff --git a/wireshark.spec b/wireshark.spec index eb9f098..8bdcd88 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -61,7 +61,7 @@ BuildRequires: libtool BuildRequires: lua51-devel BuildRequires: net-snmp-devel BuildRequires: openssl-devel -BuildRequires: pcre2-devel +BuildRequires: pcre-devel BuildRequires: pkgconfig BuildRequires: portaudio-devel BuildRequires: snappy-devel @@ -88,7 +88,6 @@ 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} @@ -220,12 +219,7 @@ 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 @@ -287,7 +281,6 @@ 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