Hello community,

here is the log from the commit of package wireshark for openSUSE:Leap:15.2 
checked in at 2020-03-17 04:15:26
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Leap:15.2/wireshark (Old)
 and      /work/SRC/openSUSE:Leap:15.2/.wireshark.new.3160 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "wireshark"

Tue Mar 17 04:15:26 2020 rev:38 rq:785024 version:3.2.2

Changes:
--------
--- /work/SRC/openSUSE:Leap:15.2/wireshark/wireshark.changes    2020-01-15 
16:29:21.800785217 +0100
+++ /work/SRC/openSUSE:Leap:15.2/.wireshark.new.3160/wireshark.changes  
2020-03-17 04:15:54.632985944 +0100
@@ -2 +2 @@
-Tue Apr  9 15:42:34 UTC 2019 - Robert Frohl <rfr...@suse.com>
+Fri Mar  6 10:01:51 UTC 2020 - Robert Frohl <rfr...@suse.com>
@@ -4 +4,120 @@
-- Wireshark 2.4.14 (bsc#1131945): 
+- Remove dependency on brotli, only the library is needed.
+
+-------------------------------------------------------------------
+Thu Feb 27 07:51:33 UTC 2020 - Robert Frohl <rfr...@suse.com>
+
+- wireshark 3.2.2 (boo#1165241)
+  * CVE-2020-9431: LTE RRC dissector memory leak.
+  * CVE-2020-9430: WiMax DLMAP dissector crash.
+  * CVE-2020-9428: EAP dissector crash.
+  * CVE-2020-9429: WireGuard dissector crash.
+- Further features, bug fixes and updated protocol support as listed in:
+  https://www.wireshark.org/docs/relnotes/wireshark-3.2.2.html
+
+-------------------------------------------------------------------
+Thu Jan 23 13:34:13 UTC 2020 - Robert Frohl <rfr...@suse.com>
+
+- Fixed build against SLE flavors
+
+-------------------------------------------------------------------
+Thu Jan 16 08:39:33 UTC 2020 - Robert Frohl <rfr...@suse.com>
+
+- wireshark 3.2.1
+  * CVE-2020-7044: WASSP dissector crash (boo#1161052)
+- Further features, bug fixes and updated protocol support as listed in:
+  https://www.wireshark.org/docs/relnotes/wireshark-3.2.1.html
+
+-------------------------------------------------------------------
+Thu Dec 19 08:54:00 UTC 2019 - Robert Frohl <rfr...@suse.com>
+
+- wireshark 3.2.0 
+  * Brotli decompression support in HTTP/HTTP2 (requires the brotli library).
+  * You can now follow HTTP/2 and QUIC streams.
+  * HTTP2 support streaming mode reassembly. To use this feature, 
subdissectors can register itself to "streaming_content_type" dissector table 
and return pinfo→desegment_len and pinfo→desegment_offset to tell HTTP2 when to 
start and how many additional bytes requires when next called.
+  * IOGraph automatically adds a graph for the selected display filter if no 
previous graph exists
+  * WireGuard decryption can now be enabled through keys embedded in a pcapng 
in addition to the existing key log preference (Bug 15571).
+- Further features, bug fixes and updated protocol support as listed in:
+  https://www.wireshark.org/docs/relnotes/wireshark-3.2.0.html
+
+-------------------------------------------------------------------
+Thu Dec 05 04:10:01 UTC 2019 - sean...@opensuse.org
+
+- wireshark 3.0.7:
+  * CVE-2019-19553: CMS dissector crash (boo#1158505).
+  * ws_pipe_wait_for_pipe() can wait on closed handles
+  * suport for 11ax in PEEKREMOTE
+  * reassembling of the two TLS records not working correctly
+- Further features, bug fixes and updated protocol support as listed in:
+  https://www.wireshark.org/docs/relnotes/wireshark-3.0.7.html
+
+-------------------------------------------------------------------
+Tue Dec  3 14:22:57 UTC 2019 - Marcus Rueckert <mrueck...@suse.de>
+
+- since we only have one gui package now move the gui related files
+  to that package, which in turn reduces the requires in the main
+  package for headless installations.
+
+-------------------------------------------------------------------
+Thu Oct 24 07:52:01 UTC 2019 - Robert Frohl <rfr...@suse.com>
+
+- wireshark 3.0.6:
+  * extcap: Several issues when capturing from multiple extcap interfaces.
+  * Expert Infos Incorrectly Displays Info Column instead of comment.
+  * Wireshark does not support USB packets with size greater than 256 KiB.
+  * IS-IS: add support for decoding TE TLV Type 138 as per RFC 5307.
+- Further features, bug fixes and updated protocol support as listed in:
+  https://www.wireshark.org/docs/relnotes/wireshark-3.0.6.html
+
+-------------------------------------------------------------------
+Sat Sep 21 17:42:03 UTC 2019 - Andreas Stieger <andreas.stie...@gmx.de>
+
+- wireshark 3.0.5:
+  * Fix Qt interface crashes on a profile with packet list only
+  * NET-SNMP EngineID Length handling Warning
+  * fix Crash SIGSEGV when decrypting IEEE 802.11 EAP re-authentications
+ 
+-------------------------------------------------------------------
+Mon Sep 16 08:52:40 UTC 2019 - Robert Frohl <rfr...@suse.com>
+
+- wireshark 3.0.4
+  * CVE-2019-16319: Fixed an infinite loop in the Gryphon dissector 
(boo#1150690).
+- Further features, bug fixes and updated protocol support as listed in:
+  https://www.wireshark.org/docs/relnotes/wireshark-3.0.4.html
+
+-------------------------------------------------------------------
+Tue Jul 23 08:52:31 UTC 2019 - Johannes Segitz <jseg...@suse.de>
+
+- Added BuildRequires for spandsp-devel to enable decoding of various
+  VoIP codecs
+
+-------------------------------------------------------------------
+Thu Jul 18 07:58:22 UTC 2019 - Robert Frohl <rfr...@suse.com>
+
+- wireshark 3.0.3
+  * CVE-2019-13619: ASN.1 BER and related dissectors crash. (bsc#1141980)
+- Further features, bug fixes and updated protocol support as listed in:
+  https://www.wireshark.org/docs/relnotes/wireshark-3.0.3.html
+
+-------------------------------------------------------------------
+Wed Jun 12 14:33:19 UTC 2019 - Dominique Leuenberger <dims...@opensuse.org>
+
+- BuildRequire pkgconfig(systemd) instead of systemd: allow OBS to
+  shortcut the build queues by allowing usage of systemd-mini
+
+-------------------------------------------------------------------
+Thu May 23 07:34:38 UTC 2019 - Robert Frohl <rfr...@suse.com>
+
+- Wireshark 3.0.2 (bsc#1136021)
+  * Wireshark dissection engine crash.
+- Further features, bug fixes and updated protocol support as listed in:
+  https://www.wireshark.org/docs/relnotes/wireshark-3.0.2.html
+
+-------------------------------------------------------------------
+Wed Apr 17 15:47:01 UTC 2019 - Robert Frohl <rfr...@suse.com>
+
+- Added config.h again, which got lost during the wireshark 3 update.
+
+-------------------------------------------------------------------
+Tue Apr  9 07:38:06 UTC 2019 - Robert Frohl <rfr...@suse.com>
+
+- Wireshark 3.0.1 (bsc#1131941)
@@ -6,0 +126,3 @@
+  * CVE-2019-10897: IEEE 802.11 dissector infinite loop.
+  * CVE-2019-10898: GSUP dissector infinite loop.
+  * CVE-2019-10900: Rbm dissector infinite loop.
@@ -8,0 +131 @@
+  * CVE-2019-10902: TSDNS dissector crash.
@@ -11,2 +134,2 @@
-- Further bug fixes and updated protocol support as listed in:
-  https://www.wireshark.org/docs/relnotes/wireshark-2.4.14.html
+- Further features, bug fixes and updated protocol support as listed in:
+  https://www.wireshark.org/docs/relnotes/wireshark-3.0.1.html
@@ -15 +138 @@
-Thu Mar  7 08:45:46 UTC 2019 - Robert Frohl <rfr...@suse.com>
+Thu Mar 21 14:09:53 UTC 2019 - Robert Frohl <rfr...@suse.com>
@@ -17,4 +140,30 @@
-- Wireshark 2.4.13:
-  * CVE-2019-9214: RPCAP dissector could crash (bsc#1127367)
-  * CVE-2019-9209: ASN.1 BER and related dissectors could crash (bsc#1127369)
-  * CVE-2019-9208: TCAP dissector could crash (bsc#1127370)
+- Wireshark 3.0.0 
+  * The IP map feature (the "Map" button in the "Endpoints" dialog) has been
+    added back in a modernized form.
+  * Initial support for using PKCS #11 tokens for RSA decryption in TLS. This
+    can be configured at Preferences, RSA Keys.
+  * Conversation timestamps are supported for UDP/UDP-Lite protocols.
+  * TShark now supports the -G elastic-mapping option which generates an
+    ElasticSearch mapping file.
+  * The Ethernet and IEEE 802.11 dissectors no longer validate the frame check
+    sequence (checksum) by default.
+  * The TCP dissector gained a new "Reassemble out-of-order segments"
+    preference to fix dissection and decryption issues in case TCP segments are
+    received out-of-order.
+  * Decryption support for the new WireGuard dissector.
+  * The BOOTP dissector has been renamed to DHCP. With the exception of
+    "bootp.dhcp", the old "bootp.*" display filter fields are still supported
+    but may be removed in a future release.
+  * The SSL dissector has been renamed to TLS. As with BOOTP the old "ssl.*"
+    display filter fields are supported but may be removed in a future release.
+- Further features, bug fixes and updated protocol support as listed in:
+  https://www.wireshark.org/docs/relnotes/wireshark-3.0.0.html
+- removed wireshark-1.10.0-enable_lua.patch, because LUA is enabled by default.
+
+-------------------------------------------------------------------
+Thu Feb 28 13:21:47 UTC 2019 - Robert Frohl <rfr...@suse.com>
+
+- Wireshark 2.6.7
+  * CVE-2019-9214: RPCAP dissector could crash (bnc#1127367)
+  * CVE-2019-9209: ASN.1 BER and related dissectors could crash (bnc#1127369)
+  * CVE-2019-9208: TCAP dissector could crash (bnc#1127370)
@@ -22 +171 @@
-  https://www.wireshark.org/docs/relnotes/wireshark-2.4.13.html
+  https://www.wireshark.org/docs/relnotes/wireshark-2.6.7.html
@@ -25 +174 @@
-Fri Jan 11 14:29:57 UTC 2019 - Robert Frohl <rfr...@suse.com>
+Wed Jan  9 15:04:35 UTC 2019 - Robert Frohl <rfr...@suse.com>
@@ -27 +176,2 @@
-- Wireshark 2.4.12:
+- Wireshark 2.6.6
+  * CVE-2019-5716: The 6LoWPAN dissector could crash (bsc#1121231)
@@ -31 +180,0 @@
-  * CVE-2019-5721: The ENIP dissector could crash (bsc#1121235)
@@ -33 +182 @@
-  https://www.wireshark.org/docs/relnotes/wireshark-2.4.12.html
+  https://www.wireshark.org/docs/relnotes/wireshark-2.6.6.html
@@ -38 +187 @@
-- Wireshark 2.4.11 (bsc#1117740):
+- Wireshark 2.6.5 (bsc#1117740):
@@ -44,0 +194 @@
+  * CVE-2018-19628: The ZigBee ZCL dissector could crash (wnpa-sec-2018-57)
@@ -46 +196 @@
-  https://www.wireshark.org/docs/relnotes/wireshark-2.4.11.html
+  https://www.wireshark.org/docs/relnotes/wireshark-2.6.5.html
@@ -51 +201 @@
++++ 190 more lines (skipped)
++++ between /work/SRC/openSUSE:Leap:15.2/wireshark/wireshark.changes
++++ and /work/SRC/openSUSE:Leap:15.2/.wireshark.new.3160/wireshark.changes

Old:
----
  SIGNATURES-2.4.14.txt
  wireshark-1.10.0-enable_lua.patch
  wireshark-1.2.0-disable-warning-dialog.patch
  wireshark-1.2.0-geoip.patch
  wireshark-2.4.14.tar.xz

New:
----
  SIGNATURES-3.2.2.txt
  wireshark-3.2.2.tar.xz

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

Other differences:
------------------
++++++ wireshark.spec ++++++
--- /var/tmp/diff_new_pack.Ko67lN/_old  2020-03-17 04:15:56.300986912 +0100
+++ /var/tmp/diff_new_pack.Ko67lN/_new  2020-03-17 04:15:56.320986923 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package wireshark
 #
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -12,31 +12,22 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
 # define libraries
-%define libutil libwsutil8
-%define libwire libwireshark9
-%define libtap libwiretap7
-%define libcodecs libwscodecs1
-# disable caps
-%define use_caps 0
-# Enable new Qt gui on new releases and build old GTK2 gui on old releases
-%if 0%{?suse_version} > 1140
-%bcond_without gnutls
-%bcond_without qt
-%bcond_with gtk
-%bcond_without geoip
+%define libutil libwsutil11
+%define libwire libwireshark13
+%define libtap libwiretap10
+%define libcodecs libwscodecs2
+%if 0%{?suse_version} >= 1500
+%bcond_without lz4
 %else
-%bcond_with gnutls
-%bcond_with qt
-%bcond_without gtk
-%bcond_with geoip
+%bcond_with lz4
 %endif
 Name:           wireshark
-Version:        2.4.14
+Version:        3.2.2
 Release:        0
 Summary:        A Network Traffic Analyser
 License:        GPL-2.0-or-later AND GPL-3.0-or-later
@@ -45,19 +36,17 @@
 Source:         
https://www.wireshark.org/download/src/%{name}-%{version}.tar.xz
 Source2:        https://www.wireshark.org/download/SIGNATURES-%{version}.txt
 Source3:        
https://www.wireshark.org/download/gerald_at_wireshark_dot_org.gpg#/wireshark.keyring
-
-# PATCH-FIX-OPENSUSE wireshark-1.6.3-disable-warning-dialog.patch bnc#349782 
prus...@suse.cz -- don't show warning when running as root
-Patch1:         wireshark-1.2.0-disable-warning-dialog.patch
-# PATCH-FEATURE-OPENSUSE wireshark-1.2.0-geoip.patch prus...@suse.cz -- search 
in /var/lib/GeoIP if user hasn't set any GeoIP folders
-Patch2:         wireshark-1.2.0-geoip.patch
-Patch4:         wireshark-1.10.0-enable_lua.patch
 BuildRequires:  bison
 BuildRequires:  flex
-BuildRequires:  glib2-devel
+BuildRequires:  glib2-devel >= 2.32
 BuildRequires:  hicolor-icon-theme
 BuildRequires:  krb5-devel
+BuildRequires:  libbrotli-devel
+# keep until libbrotli-devel bug is fixed
+BuildRequires:  libbrotlidec1
+BuildRequires:  libcap-devel
 BuildRequires:  libcares-devel
-BuildRequires:  libgcrypt-devel >= 1.4.2
+BuildRequires:  libgcrypt-devel >= 1.8.0
 BuildRequires:  libpcap-devel
 BuildRequires:  libsmi-devel
 BuildRequires:  libtool
@@ -66,50 +55,46 @@
 BuildRequires:  pcre-devel
 BuildRequires:  pkgconfig
 BuildRequires:  portaudio-devel
+BuildRequires:  snappy-devel
+BuildRequires:  spandsp-devel
 BuildRequires:  tcpd-devel
 BuildRequires:  update-desktop-files
 BuildRequires:  zlib-devel
-Requires:       hicolor-icon-theme
+BuildRequires:  pkgconfig(libmaxminddb)
+BuildRequires:  pkgconfig(libnghttp2)
+BuildRequires:  pkgconfig(libssh) >= 0.6.0
+BuildRequires:  pkgconfig(libsystemd)
+BuildRequires:  pkgconfig(libxml-2.0)
+Requires(pre):  permissions
 Requires(pre):  shadow
+# keep until libbrotli-devel bug is fixed
+Requires:       libbrotlidec1
 Recommends:     wireshark-ui = %{version}
 Provides:       ethereal = %{version}
+Obsoletes:      %{libcodecs} < %{version}
 Obsoletes:      ethereal < %{version}
-%if %{with gnutls}
-BuildRequires:  libgnutls-devel >= 2.12.0
-%endif
-%if !0%{use_caps}
-Requires:       xdg-utils
-%else
-BuildRequires:  libcap-devel
-Requires(pre):  permissions
-%endif
-%if %{with geoip}
-BuildRequires:  GeoIP-devel
-Recommends:     GeoIP
+Provides:       group(wireshark)
+%if %{with lz4}
+BuildRequires:  pkgconfig(liblz4)
+# in openSUSE Leap 42.3, lz4 was incorrectly packaged
+BuildConflicts: pkgconfig(liblz4) = 124
 %endif
+BuildRequires:  libgnutls-devel >= 3.2
 %if 0%{?suse_version} > 1310
 BuildRequires:  pkgconfig(libnl-3.0)
 %endif
-%if %{with gtk}
-BuildRequires:  cairo-devel
-BuildRequires:  gtk2-devel >= 2.12.0
-%endif
-%if %{with qt}
-BuildRequires:  libqt5-linguist
-BuildRequires:  pkgconfig(Qt5Core) >= 5.0.0
+BuildRequires:  libqt5-linguist-devel
+BuildRequires:  pkgconfig(Qt5Core) >= 5.2.0
 BuildRequires:  pkgconfig(Qt5Gui)
 BuildRequires:  pkgconfig(Qt5Multimedia)
 BuildRequires:  pkgconfig(Qt5PrintSupport)
+BuildRequires:  pkgconfig(Qt5Svg)
 BuildRequires:  pkgconfig(Qt5Widgets)
-%endif
 %if 0%{?suse_version} > 1320
 BuildRequires:  lua51-devel
 %else
 BuildRequires:  lua-devel
 %endif
-%if 0%{?suse_version} <= 1110
-BuildRequires:  xz
-%endif
 
 %description
 Wireshark is a network protocol analyzer. It allows examining data
@@ -142,17 +127,9 @@
 Wiretap, part of the Wireshark project, is a library that allows one to read
 and write several packet capture file formats.
 
-%package -n %{libcodecs}
-Summary:        Network packet dissection codecs library
-Group:          System/Libraries
-
-%description -n %{libcodecs}
-The libwscodecs library provides codec functions for libwireshark.
-
 %package devel
 Summary:        A Network Traffic Analyser
 Group:          Development/Libraries/C and C++
-Requires:       %{libcodecs} = %{version}
 Requires:       %{libtap} = %{version}
 Requires:       %{libutil} = %{version}
 Requires:       %{libwire} = %{version}
@@ -166,29 +143,18 @@
 Wireshark is a network protocol analyzer. It allows examining data
 from a live network or from a capture file on disk.
 
-%if %{with gtk}
-%package ui-gtk
-Summary:        A Network Traffic Analyser - GTK+ UI
-Group:          Productivity/Networking/Diagnostic
-Requires:       %{name} = %{version}
-Provides:       %{name}-ui = %{version}
-
-%description ui-gtk
-This package contains the GTK+ UI of Wireshark.
-%endif
-
-%if %{with qt}
 %package ui-qt
 Summary:        A Network Traffic Analyser - Qt UI
 Group:          Productivity/Networking/Diagnostic
 Requires:       %{name} = %{version}
+Requires:       hicolor-icon-theme
 Provides:       %{name}-ui = %{version}
 # gtk is the deprecated ui so ensure its uninstall
-Obsoletes:      %{name}-ui-gtk
+Provides:       %{name}-ui-gtk = %{version}
+Obsoletes:      %{name}-ui-gtk < %{version}
 
 %description ui-qt
 This package contains the Qt based UI for Wireshark.
-%endif
 
 %prep
 # The publisher doesn't sign the source tarball, but a signatures file 
containing multiple hashes.
@@ -197,77 +163,39 @@
 echo "`grep %{name}-%{version}.tar.xz %{SOURCE2} | grep SHA256 | head -n1 | 
cut -d= -f2`  %{SOURCE0}" | sha256sum -c
 
 %setup -q
-%patch2 -p1
-%patch4 -p1
-
-%if ! %{use_caps}
-%patch1 -p1
-# open capture files without root privileges bsc#1025714
-for X in wireshark{,-gtk}.desktop; do
-       cp -pv $X ${X/wireshark/wireshark-file}
-       echo "NoDisplay=true" >> ${X/wireshark/wireshark-file}
-done
-sed -i '/^MimeType.*/d' wireshark{,-gtk}.desktop
-# run as root if not using caps
-sed -i 's!^Exec=wireshark!Exec=%{_bindir}/xdg-su -c %{_bindir}/wireshark!' 
wireshark{,-gtk}.desktop
-%endif
 sed -i 's/^Icon=wireshark.png$/Icon=wireshark/' wireshark*.desktop
 
 %build
-export CFLAGS="%{optflags} -fPIC"
-export CXXFLAGS="%{optflags} -fPIC"
-export LDFLAGS="-pie"
-
-%if %{with qt}
-#XXX: buggy autoconf checks..
-export PATH="%{_libdir}/qt5/bin:$PATH"
-%endif
-
-%configure \
-%if %{with gtk}
-    --with-gtk=2 \
-%endif
-%if %{with qt}
-    --with-qt=yes \
-%else
-    --with-qt=no \
-%endif
-    --with-ssl \
-%if %{with gnutls}
-    --with-gnutls=yes \
+%cmake -DCMAKE_INSTALL_LIBDIR='%{_lib}/'
+%if 0%{?is_opensuse}
+%cmake_build
 %else
-    --with-gnutls=no \
+# if the cmake_build makro does not exit we build it by hand...
+/usr/bin/make \
+    %if "/usr/bin/make" == "/usr/bin/make" 
+        -O VERBOSE=1 \
+    %else 
+        -v \
+    %endif 
+    -j8
 %endif
-    --with-plugins=%{_libdir}/%{name}/plugins/%{version} \
-    --with-pic=yes
-
-make %{?_smp_mflags} V=1
 
 %install
-%make_install
+%cmake_install
 find %{buildroot} -type f -name "*.la" -delete -print
 
 # Ethereal support (remove when SLE-11 is out of scope
-%if %{with gtk}
-ln -fs wireshark-gtk %{buildroot}%{_bindir}/ethereal
-%endif
-%if %{with qt}
 ln -fs wireshark %{buildroot}%{_bindir}/ethereal
-%endif
 ln -fs tshark %{buildroot}%{_bindir}/tethereal
 
 install -d -m 0755 %{buildroot}%{_sysconfdir}
 install -d -m 0755 %{buildroot}%{_mandir}/man1/
 # install separate appdata files corresponding to .desktop files for AppStore 
integration
-%if %{with qt}
 install -d -m0755 %{buildroot}%{_datadir}/appdata
 install -m644 wireshark.appdata.xml 
%{buildroot}%{_datadir}/appdata/%{name}.appdata.xml
 sed -i -e "/<description>/i \ \ \ \ <name>Wireshark (QT) Network 
Analyzer<\/name>" \
        -e "/<description>/i \ \ \ \ <summary>QT interface for wireshark 
network traffic analyzer<\/summary>" \
     %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml
-%else
-rm -f %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml
-%endif
 
 # -devel
 install -d -m 0755  %{buildroot}%{_includedir}/wireshark
@@ -281,6 +209,7 @@
 mkdir -p "${IDIR}/wiretap"
 mkdir -p "${IDIR}/wsutil"
 install -m 644 *.h                              "${IDIR}/"
+install -m 644 build/config.h                   "${IDIR}/"
 install -m 644 epan/*.h                                "${IDIR}/epan/"
 install -m 644 epan/crypt/*.h                  "${IDIR}/epan/crypt"
 install -m 644 epan/ftypes/*.h                 "${IDIR}/epan/ftypes"
@@ -290,47 +219,20 @@
 install -m 644 wiretap/*.h                     "${IDIR}/wiretap"
 install -m 644 wsutil/*.h                      "${IDIR}/wsutil"
 
-%if %{with gtk}
-install -D -m 0644 image/wsicon48.png 
%{buildroot}%{_datadir}/pixmaps/wireshark-gtk.png
-install -D -m 0644 wireshark-gtk.desktop 
%{buildroot}%{_datadir}/applications/wireshark-gtk.desktop
-%suse_update_desktop_file -n %{name}-gtk
-%if ! %{use_caps}
-install -D -m 0644 wireshark-file-gtk.desktop 
%{buildroot}%{_datadir}/applications/wireshark-file-gtk.desktop
-%suse_update_desktop_file -n %{name}-file-gtk
-%endif
-%else
-# sometimes the gtk.desktop gets autoinstalled by make_install
-rm -f %{buildroot}%{_datadir}/applications/wireshark-gtk.desktop
-%endif
-
-%if %{with qt}
 install -D -m 0644 image/wsicon48.png 
%{buildroot}%{_datadir}/pixmaps/wireshark.png
 install -D -m 0644 wireshark.desktop 
%{buildroot}%{_datadir}/applications/wireshark.desktop
 %suse_update_desktop_file %{name}
-%if ! %{use_caps}
-install -D -m 0644 wireshark-file.desktop 
%{buildroot}%{_datadir}/applications/wireshark-file.desktop
-%suse_update_desktop_file %{name}-file
-%endif
-%else
-rm -f %{buildroot}%{_datadir}/applications/wireshark.desktop
-%endif
 
-%if %{use_caps}
+rm -f %{buildroot}%{_datadir}/doc/wireshark/*.html
+
 %pre
 getent group wireshark >/dev/null || groupadd -r wireshark
 
 %verifyscript
-%{verify_permissions -e %{_bindir}/dumpcap}
-%endif
+%verify_permissions -e %{_bindir}/dumpcap
 
 %post
-%if %{use_caps}
-%if 0%{?set_permissions:1} > 0
 %set_permissions %{_bindir}/dumpcap
-%else
-%run_permissions
-%endif
-%endif # use_caps
 exit 0
 
 %post -n %{libutil} -p /sbin/ldconfig
@@ -339,38 +241,28 @@
 %postun -n %{libwire} -p /sbin/ldconfig
 %post -n %{libtap} -p /sbin/ldconfig
 %postun -n %{libtap} -p /sbin/ldconfig
-%post -n %{libcodecs} -p /sbin/ldconfig
-%postun -n %{libcodecs} -p /sbin/ldconfig
 
 %files
-%doc AUTHORS NEWS README README.linux README.vmware
 %license COPYING
+%doc AUTHORS NEWS README.md README.linux
 %{_mandir}/man1/[^i]*
 %{_mandir}/man4/*
 %{_bindir}/capinfos
 %{_bindir}/captype
-%{_bindir}/dftest
 %{_bindir}/editcap
 %{_bindir}/idl2wrs
 %{_bindir}/mergecap
+%{_bindir}/mmdbresolve
 %{_bindir}/randpkt
 %{_bindir}/rawshark
 %{_bindir}/reordercap
+%{_bindir}/sharkd
 %{_bindir}/tethereal
 %{_bindir}/text2pcap
 %{_bindir}/tshark
-%{_bindir}/sharkd
-%if %{use_caps}
-%verify(not mode caps) %attr(0750,root,wireshark) 
%caps(cap_net_raw,cap_net_admin=eip) %{_bindir}/dumpcap
-%else
-%{_bindir}/dumpcap
-%endif
+%verify(not mode caps) %attr(0750,root,wireshark) 
%caps(cap_net_raw,cap_net_admin=ep) %{_bindir}/dumpcap
 %{_libdir}/wireshark/
 %{_datadir}/wireshark/
-%{_datadir}/icons/hicolor/*/apps/wireshark.png
-%{_datadir}/icons/hicolor/*/mimetypes/application-wireshark-doc.png
-%{_datadir}/icons/hicolor/scalable/apps/wireshark.svg
-%{_datadir}/mime/packages/wireshark.xml
 
 %files -n %{libutil}
 %{_libdir}/libwsutil*.so.*
@@ -381,49 +273,23 @@
 %files -n %{libtap}
 %{_libdir}/libwiretap.so.*
 
-%files -n %{libcodecs}
-%{_libdir}/libwscodecs.so.*
-
 %files devel
-%doc doc/README.*
 %{_includedir}/wireshark
+%{_includedir}/wireshark/config.h
 %{_libdir}/lib*.so
 %{_libdir}/pkgconfig/wireshark.pc
 
-%if %{with gtk}
-%files ui-gtk
-%{_bindir}/wireshark-gtk
-%{_bindir}/ethereal
-%{_datadir}/applications/wireshark-gtk.desktop
-%if ! %{use_caps}
-%{_datadir}/applications/wireshark-file-gtk.desktop
-%endif
-%{_datadir}/pixmaps/wireshark-gtk.png
-
-%post ui-gtk
-test -f %{_bindir}/update-mime-database && %{_bindir}/update-mime-database 
%{_datadir}/mime > /dev/null || :
-test -f %{_bindir}/update-desktop-database && 
%{_bindir}/update-desktop-database > /dev/null || :
-test -f /sbin/conf.d/SuSEconfig.gtk2 && SuSEconfig --module gtk2 > /dev/null 
|| :
-test -f /sbin/conf.d/SuSEconfig.glib2 && SuSEconfig --module glib2 > /dev/null 
|| :
-
-%postun ui-gtk
-test -f %{_bindir}/update-mime-database && %{_bindir}/update-mime-database 
%{_datadir}/mime > /dev/null || :
-test -f %{_bindir}/update-desktop-database && 
%{_bindir}/update-desktop-database > /dev/null || :
-test -f /sbin/conf.d/SuSEconfig.gtk2 && SuSEconfig --module gtk2 > /dev/null 
|| :
-test -f /sbin/conf.d/SuSEconfig.glib2 && SuSEconfig --module glib2 > /dev/null 
|| :
-%endif
-
-%if %{with qt}
 %files ui-qt
 %{_bindir}/wireshark
 %{_bindir}/ethereal
 %dir %{_datadir}/appdata
 %{_datadir}/appdata/wireshark.appdata.xml
 %{_datadir}/applications/wireshark.desktop
-%if ! %{use_caps}
-%{_datadir}/applications/wireshark-file.desktop
-%endif
 %{_datadir}/pixmaps/wireshark.png
+%{_datadir}/icons/hicolor/*/apps/wireshark.png
+%{_datadir}/icons/hicolor/*/mimetypes/application-wireshark-doc.png
+%{_datadir}/icons/hicolor/scalable/apps/wireshark.svg
+%{_datadir}/mime/packages/wireshark.xml
 
 %post ui-qt
 %desktop_database_post
@@ -432,6 +298,5 @@
 %postun ui-qt
 %desktop_database_postun
 %icon_theme_cache_postun
-%endif
 
 %changelog

++++++ SIGNATURES-2.4.14.txt -> SIGNATURES-3.2.2.txt ++++++
--- /work/SRC/openSUSE:Leap:15.2/wireshark/SIGNATURES-2.4.14.txt        
2020-01-15 16:29:21.052784795 +0100
+++ /work/SRC/openSUSE:Leap:15.2/.wireshark.new.3160/SIGNATURES-3.2.2.txt       
2020-03-17 04:15:54.060985612 +0100
@@ -1,40 +1,40 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-wireshark-2.4.14.tar.xz: 29167308 bytes
-SHA256(wireshark-2.4.14.tar.xz)=0e616f5d75888995e608878e1bb8b753c80608385336c0d492a776c2af11b09b
-RIPEMD160(wireshark-2.4.14.tar.xz)=062fc0b2f65f9f65826485b493dcd9297f59c72b
-SHA1(wireshark-2.4.14.tar.xz)=c454fb7db5cf6f8b631be83f2e7eb5b0a8580fe1
-
-Wireshark-win64-2.4.14.exe: 58015560 bytes
-SHA256(Wireshark-win64-2.4.14.exe)=90ba990e0bdae13785b5dc2ca6ac5e2825381cc3f464da82d946a4c4886939cd
-RIPEMD160(Wireshark-win64-2.4.14.exe)=310f76b59b211f446d74ed192deccf747d4d5982
-SHA1(Wireshark-win64-2.4.14.exe)=e73038cd92e6e48930d6d780537db7a227b97ce0
-
-Wireshark-win32-2.4.14.exe: 52819416 bytes
-SHA256(Wireshark-win32-2.4.14.exe)=245d8845ca6928bee4173253dc2ccddde5f61c306692881a502259122175d97b
-RIPEMD160(Wireshark-win32-2.4.14.exe)=687dd384a1ae5216737e5d1a5ed5f0eeb8354c52
-SHA1(Wireshark-win32-2.4.14.exe)=7f9558d90b65402a06e769632d8d1c31b6d50286
-
-Wireshark-win64-2.4.14.msi: 47124480 bytes
-SHA256(Wireshark-win64-2.4.14.msi)=644e9310cd0c457a9390a949401bf77e2902de80763c8f4a2ed5afb30725be18
-RIPEMD160(Wireshark-win64-2.4.14.msi)=e5e52f7b1b2ef6837a0d8c720a2311ee2cef43b9
-SHA1(Wireshark-win64-2.4.14.msi)=8da44af9ca8414d58efc0a653b51e16e7be2f6fa
-
-Wireshark-win32-2.4.14.msi: 42070016 bytes
-SHA256(Wireshark-win32-2.4.14.msi)=ad886fbc311a0d011bda823f085528f298423c7f6c5b935a4e8d4f76142986ea
-RIPEMD160(Wireshark-win32-2.4.14.msi)=b6b8534692c97c767abb99c7626e73dd47f064dc
-SHA1(Wireshark-win32-2.4.14.msi)=365ba1356beb095d58e46a5e6f9b663d9840b4b0
-
-WiresharkPortable_2.4.14.paf.exe: 45471320 bytes
-SHA256(WiresharkPortable_2.4.14.paf.exe)=efe6eba8c69c93347d50debfe9f2c64239e31cbad296d2f0aa6fc97835a10898
-RIPEMD160(WiresharkPortable_2.4.14.paf.exe)=d6fc496d2c161189d127c5932eb6b6caf1a56c63
-SHA1(WiresharkPortable_2.4.14.paf.exe)=406674d371028e07e117b013315b0abf367cbdef
-
-Wireshark 2.4.14 Intel 64.dmg: 42593636 bytes
-SHA256(Wireshark 2.4.14 Intel 
64.dmg)=f2df1d1ea1a88f83a9d300ad546df98b5e3dcd608cc06a0ffd101e9e81259db4
-RIPEMD160(Wireshark 2.4.14 Intel 
64.dmg)=c32fa021be43c15987e300766c53e37f0ec8246d
-SHA1(Wireshark 2.4.14 Intel 64.dmg)=3f867e407d18f724f0105bcf4fd4de9c140e724d
+wireshark-3.2.2.tar.xz: 31548392 bytes
+SHA256(wireshark-3.2.2.tar.xz)=5f5923ef4c3fee370ed0ca1bb324f37c246015eba4a7e74ab95d9208feeded79
+RIPEMD160(wireshark-3.2.2.tar.xz)=886e731f8055c32f82d29931981b13a07bb0584c
+SHA1(wireshark-3.2.2.tar.xz)=9cc54a56e9c2ed77e1bc436d9ae2f7bba68d26f8
+
+Wireshark-win64-3.2.2.exe: 60064040 bytes
+SHA256(Wireshark-win64-3.2.2.exe)=cc9b49c696219cc093debaae11febeb546b2a508f41150b983ae0af6954c0512
+RIPEMD160(Wireshark-win64-3.2.2.exe)=2b292f3882e1eb27a01707fc98aa460501cbb296
+SHA1(Wireshark-win64-3.2.2.exe)=865313414ccd9a1f9792f0a94e5de01b59716274
+
+Wireshark-win32-3.2.2.exe: 54766256 bytes
+SHA256(Wireshark-win32-3.2.2.exe)=73af61a1edae2af371e432a09bbda8af48a8ada0ea789592ff24499d80070ae6
+RIPEMD160(Wireshark-win32-3.2.2.exe)=849d9cbb6c807369148a7e80826b62892ae6d9e6
+SHA1(Wireshark-win32-3.2.2.exe)=32cfdad68a57619fad98a36b184fcba9aecd7f40
+
+Wireshark-win64-3.2.2.msi: 48234496 bytes
+SHA256(Wireshark-win64-3.2.2.msi)=2be8c75267a4a5670facc7246e3afa145a9f0b04fe9cc6a03876a2100cf54d51
+RIPEMD160(Wireshark-win64-3.2.2.msi)=34ce997ebc0f70a5f58ec8c9ad469743ebc7b7a8
+SHA1(Wireshark-win64-3.2.2.msi)=c03c345347ff1b2e143bea23521a3e3051dce4ec
+
+Wireshark-win32-3.2.2.msi: 42946560 bytes
+SHA256(Wireshark-win32-3.2.2.msi)=9806b8985b5e697b273dd16d5039877b7f7d2bed3c48581f540556cf5b60ee57
+RIPEMD160(Wireshark-win32-3.2.2.msi)=9136a45df0d15d526b308697560a3cd3fb8328e4
+SHA1(Wireshark-win32-3.2.2.msi)=4730be9ec289cc33b290216de2f42027980de9e9
+
+WiresharkPortable_3.2.2.paf.exe: 36532592 bytes
+SHA256(WiresharkPortable_3.2.2.paf.exe)=bcae2ceaf37afb2ab1f6bb1b9f1054c68a537e22b98219407561007ba3217647
+RIPEMD160(WiresharkPortable_3.2.2.paf.exe)=d66557ea96adadff42db9b484ab1030da9a92855
+SHA1(WiresharkPortable_3.2.2.paf.exe)=1235aaa1a73b33065ebab1e21bdcb2c10a9bbf55
+
+Wireshark 3.2.2 Intel 64.dmg: 97487826 bytes
+SHA256(Wireshark 3.2.2 Intel 
64.dmg)=c6bda7aba34c441dc8b3998ffbe938ea37a98cf9e4cbf0136a8b65229ce0887f
+RIPEMD160(Wireshark 3.2.2 Intel 
64.dmg)=db7aaf2ff01d14653c5dbca355cf042cdc472192
+SHA1(Wireshark 3.2.2 Intel 64.dmg)=1a37a7cd62ab258431ad166d62cfbc42f0a7287a
 
 You can validate these hashes using the following commands (among others):
 
@@ -44,17 +44,17 @@
     Other: openssl sha256 wireshark-x.y.z.tar.xz
 -----BEGIN PGP SIGNATURE-----
 
-iQIzBAEBCgAdFiEEWlrbp9vqbD+HIk8ZgiRKeOb+ruoFAlyrqAEACgkQgiRKeOb+
-rurxQw/8DXnfTj6ynopEDObB/YcXIs71BB7Akf17SoAVdFt3gKiNW24F9FPy4Gew
-3d21oa/8egSD2pJMOE5wJmFfGWSGSGhnL0QRYbyvsFDfiYlvPueFPG+bpTgoSTO1
-O0qILCJrSfBhjT97OIAlsW4MNvmWBOvNVYlrhuyTSn7RPVXcBYS/ErhoNtv+2HAB
-qiWrNgyhSih5MOBYw8fNsNKpUWLicbh0KQ/dTMwDP5rtak6laAXvdZ1AtFMsDIsG
-+HVSQcaygI3KElZy+t1zW2ZdBSrak66P+Q2tKku0VZDySoQdEOHLuxEr5MesvLge
-i7E8ABVg30wHEepRdnFPAuB7SBxsio8KpMeVCxv4/Hr5f7JcEIu9e0CSSBCGVyTc
-2MUKgvY26t8Trco7Tmj3AuZSVWTioNb6uUg4DVecHfdCEqXoDq2OcBiDk8gN9F3Y
-tORmQ7yEJFDI+A5PRkqGuVOoml6qblquK0dYCkzBlsWv1g91k3DHA+yw7fQDCZSM
-jr/L5uhlNCTyCotj1vhd7Ck1kCZZcXH6/YCSif1yUBrq3srs1v86vAMlnYjnM8FF
-TMyCDIQhdzYyPtApBOdSitle4AXSvK3Ta0eB0o0bKOTvCSddD7/KIvCGxZvGziOs
-aYakYGegtPslSIgsXSRV6SuI+Y7gduUDwSOK7IdoqnCpaCJ23Kk=
-=FSRR
+iQIzBAEBCgAdFiEEWlrbp9vqbD+HIk8ZgiRKeOb+ruoFAl5W4l4ACgkQgiRKeOb+
+ruqVJA//ctBHfeFtMvuIhDyDLzgGxFSOB448Aa2BxBSWd/WQ9gqwmbHK7LZKx5UA
+27BWikL+ZJFEe1hzh4cwgcpq7wmutWabDZSRIzg1zmEsvqrNrwiCGEeaAnEr8dgQ
+cj+YapEBXauMG3Be5OWDzzXZYP5H96KOoFmubCrFSEgq2jY+tg4Ukyks28mWB+vN
+Ys8XsSIYEfXGIynW5aZCRcXrqMUTgIfDUXjYjRui/ZPuRaXFd1fryNV4jYM3/JO9
+tIbEf4Cluy7vKpiWMlY4DB66vZU7m9iGaR1JR4SPACa0oPTZCeWxx/elcI6y29oo
+LXEBGnsas3HSdDGEc7uZ18mV1jFbp0VBgS1pNPOoiZFa2vJ4htOji1ZeK4BLwNg6
+qBIVpyPeRqnDCcYq53xCc3aKQe4VN42OdCwuD3sSUK0b8PbPeAlDzxntJRoAUAQG
+FwbQumODbJHqJlb5E4UmCjSrrmoyI1w48s1DDgESeBjQYmSqm1tp2P7P3E2gyYQQ
+L2mIdeHjzOVSzsc4X8MTvEUlG8IxbnwmQsy+YwFl54ijIHddthHX2MqDZLp/8zO7
+l5uX2p9yRBj8xCOjfkp8KOzzab4htYtpAmfER9gWL56IDbK/BqjjNoCxxcbxZ47a
+y5yvP3IZsbdzchr5ktF6ZJbN1OzjPIr+VmUd5R8a92LgWjve9pI=
+=PJXP
 -----END PGP SIGNATURE-----

++++++ wireshark-2.4.14.tar.xz -> wireshark-3.2.2.tar.xz ++++++
/work/SRC/openSUSE:Leap:15.2/wireshark/wireshark-2.4.14.tar.xz 
/work/SRC/openSUSE:Leap:15.2/.wireshark.new.3160/wireshark-3.2.2.tar.xz differ: 
char 13, line 1



Reply via email to