Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package wireshark for openSUSE:Factory 
checked in at 2022-10-10 18:44:26
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/wireshark (Old)
 and      /work/SRC/openSUSE:Factory/.wireshark.new.2275 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "wireshark"

Mon Oct 10 18:44:26 2022 rev:194 rq:1008364 version:4.0.0

Changes:
--------
--- /work/SRC/openSUSE:Factory/wireshark/wireshark.changes      2022-10-10 
18:43:45.594765000 +0200
+++ /work/SRC/openSUSE:Factory/.wireshark.new.2275/wireshark.changes    
2022-10-10 18:45:06.462939060 +0200
@@ -2,11 +1,0 @@
-Fri Oct  7 06:15:13 UTC 2022 - ecsos <ec...@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 <ec...@opensuse.org>
-
-- Fix build error for Leap.
-
--------------------------------------------------------------------

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ wireshark.spec ++++++
--- /var/tmp/diff_new_pack.3XIFhR/_old  2022-10-10 18:45:07.106940446 +0200
+++ /var/tmp/diff_new_pack.3XIFhR/_new  2022-10-10 18:45:07.110940455 +0200
@@ -61,7 +61,7 @@
 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(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 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 @@
 %{_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

++++++ wireshark-0010-dumpcap-permission-denied.patch ++++++
--- /var/tmp/diff_new_pack.3XIFhR/_old  2022-10-10 18:45:07.146940533 +0200
+++ /var/tmp/diff_new_pack.3XIFhR/_new  2022-10-10 18:45:07.150940541 +0200
@@ -4,10 +4,10 @@
 
     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 <wsutil/wslog.h>
  #include <wsutil/ws_assert.h>
@@ -19,7 +19,7 @@
  #ifdef _WIN32
  #include <wsutil/unicode-utils.h>
  #include <wsutil/win32-utils.h>
-@@ -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 @@
          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 @@
          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);

Reply via email to