diff --git a/SIGNATURES-2.4.6.txt b/SIGNATURES-2.4.6.txt deleted file mode 100644 index af190e6..0000000 --- a/SIGNATURES-2.4.6.txt +++ /dev/null @@ -1,60 +0,0 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA512 - -wireshark-2.4.6.tar.xz: 28851192 bytes -SHA256(wireshark-2.4.6.tar.xz)=8e965fd282bc0c09e7c4eba5f08a555d0ccf40a7d1544b939e01b90bc893d5fe -RIPEMD160(wireshark-2.4.6.tar.xz)=4d58798dfbb5a6567a731e0d6308e1dca3c859ee -SHA1(wireshark-2.4.6.tar.xz)=25ba24628acfc12d7541298255f50e8034e694b7 - -Wireshark-win64-2.4.6.exe: 57924080 bytes -SHA256(Wireshark-win64-2.4.6.exe)=025c68ae6ac5a4ae146ba8318f596089859c9d5d890b688ed8c1498745779412 -RIPEMD160(Wireshark-win64-2.4.6.exe)=d861ae68de77ede9c07ce5ca8126ccadb2ccbe94 -SHA1(Wireshark-win64-2.4.6.exe)=5f57fe6ff476b619eb83ff4e8d18b6ffca6f0afb - -Wireshark-win32-2.4.6.exe: 52729424 bytes -SHA256(Wireshark-win32-2.4.6.exe)=6395ca0265207dcdcb1080073591968dec2711cbea27708efb83bbd6c3a32235 -RIPEMD160(Wireshark-win32-2.4.6.exe)=6bc69510b01a9cc1199d2f813d996a692d2f1cb2 -SHA1(Wireshark-win32-2.4.6.exe)=a4e3855757d7a92e29b7e2217cf297b589f9e5e9 - -Wireshark-win32-2.4.6.msi: 41992192 bytes -SHA256(Wireshark-win32-2.4.6.msi)=6efc9545528c76166e00942a2e7ef334c06ff7de15c450d9d685c9a0ffe8936d -RIPEMD160(Wireshark-win32-2.4.6.msi)=afc7b83b434df048b2b645b68ba6b28fc2ef2ff4 -SHA1(Wireshark-win32-2.4.6.msi)=667c7f3bc788cdff4b3875c7e709d199b63da2ce - -Wireshark-win64-2.4.6.msi: 47026176 bytes -SHA256(Wireshark-win64-2.4.6.msi)=c4b6cac3c8a8814fc9bb6e19a28a467b26067bc0a661150e7018f8923e43d535 -RIPEMD160(Wireshark-win64-2.4.6.msi)=76b331d59b0ee1b7b29ccac0c9865094e7f1622f -SHA1(Wireshark-win64-2.4.6.msi)=2a67f3d3ba177686794cf1ff3e64cfd56541c217 - -WiresharkPortable_2.4.6.paf.exe: 45406800 bytes -SHA256(WiresharkPortable_2.4.6.paf.exe)=bcf10c20f0bfc0ebace4bbfd4022cdc69e642bbe27128a01a3b5bb3f6e532fc3 -RIPEMD160(WiresharkPortable_2.4.6.paf.exe)=cd01b4e5aa81f7c3543b6c78224900c1890f0909 -SHA1(WiresharkPortable_2.4.6.paf.exe)=7425c8a3f5eb8efa0304b7ac10acc598e3b6eb54 - -Wireshark 2.4.6 Intel 64.dmg: 42490725 bytes -SHA256(Wireshark 2.4.6 Intel 64.dmg)=0e51f0c7892422df8a755044344cb9f01d4b2bbc9f90bcc63fb4a791000106f8 -RIPEMD160(Wireshark 2.4.6 Intel 64.dmg)=7ca143bacb1ee969709c8933fd1d29127be687e1 -SHA1(Wireshark 2.4.6 Intel 64.dmg)=5845d6ebe392ec1094c4e4297dd79807a3bab114 - -You can validate these hashes using the following commands (among others): - - Windows: certutil -hashfile Wireshark-win64-x.y.z.exe SHA256 - Linux (GNU Coreutils): sha256sum wireshark-x.y.z.tar.xz - macOS: shasum -a 256 "Wireshark x.y.z Intel 64.dmg" - Other: openssl sha256 wireshark-x.y.z.tar.xz ------BEGIN PGP SIGNATURE----- - -iQIzBAEBCgAdFiEEWlrbp9vqbD+HIk8ZgiRKeOb+ruoFAlrD8F4ACgkQgiRKeOb+ -ruoZYxAApq3NGF5OsDWdM1lo4JeMNR6fp8vDx91hYYV3mbarauLljp4yM6Wmp9qt -iSJ4SmjjuBAOWU0CvZJP9g2t7Yy4BMpCddVdeGwOr3tEcnbcoftPEd4auoLd1Hnb -Ue5WZYB58nzzQpz78chbZX+H4o8r7K8Z98eQdtoC69mTszr6qrGkEKTuf5zzFQIh -MmrfrhTjzHCdW5GsjxcWtkI7jsFUx3Gx0ziyCg6sm1H/8ZDL+/OhO5bVyXNAsF8B -62qXJNx2LDh+KDKVxJy3LVBTgWDUfelTnO/vIXeX8pevSqX1TaiDT65NaOFmw8Ix -K2V44bBIhbi5XfKv922ENCmX2fJzMii7N9cgXWOPOs0bx2t+DG2Lsc9Invo5kiHn -uqDhe4/1FG1dqlmEByaDiCJ8EjDiZot1iQUHPybEILBaWRbrI+9IX4bQ3DFLATL5 -jeWPotJNZVsFc2sGGJocGIBUI0S8eT1MZqsQjvRxh5GT/E++gXqtXAGjBINv/Rx7 -9DTkoSSWJ5d0AOQb3/oP9csUEyHymx8R+LQZ1LukPTfw0/VKp0d0HBlDtpezbUpp -kFc/FRhss1b3jWlxC/dfqHtrkLIWJQkR5vBFqrS1OC2UgKZsUw0iAMyCnhEx86x4 -K0D1f0sGynuHJ8NIN0nm0f2qP28NaF5wU8+7ZX5H71gsRiY+76s= -=kjTJ ------END PGP SIGNATURE----- diff --git a/SIGNATURES-2.6.0.txt b/SIGNATURES-2.6.0.txt new file mode 100644 index 0000000..9eee70d --- /dev/null +++ b/SIGNATURES-2.6.0.txt @@ -0,0 +1,60 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA512 + +wireshark-2.6.0.tar.xz: 28314868 bytes +SHA256(wireshark-2.6.0.tar.xz)=711c7f01d27a8817d58277a5487cef3e3c7bab1c8caaf8f4c92aa21015b9117f +RIPEMD160(wireshark-2.6.0.tar.xz)=4eb1a446dabff8f452737ea22bfc341a3be89a3f +SHA1(wireshark-2.6.0.tar.xz)=d1f53751c5b24d6b1695117fb396a6b202e88451 + +Wireshark-win64-2.6.0.exe: 59943760 bytes +SHA256(Wireshark-win64-2.6.0.exe)=a5c276cd3b2b3023b597debdf292cccb7f7f64400cd40d2ef5dd139d18424936 +RIPEMD160(Wireshark-win64-2.6.0.exe)=0b5bd8f1ccd332cce5fe84da4a738015a223d597 +SHA1(Wireshark-win64-2.6.0.exe)=c40d1d86fe64a5a25d80b60d51bdb3bcc8bda0e5 + +Wireshark-win32-2.6.0.exe: 54218808 bytes +SHA256(Wireshark-win32-2.6.0.exe)=d96e76ab9d5d94cb70cd7686ff0302d482a5be79ae8fc95934902de79b9be94b +RIPEMD160(Wireshark-win32-2.6.0.exe)=c8c84d84afa90199f1a54374e31c53a860182c76 +SHA1(Wireshark-win32-2.6.0.exe)=3f9444afff971703f0a8c1913ce688cf6a28f205 + +Wireshark-win64-2.6.0.msi: 49328128 bytes +SHA256(Wireshark-win64-2.6.0.msi)=aa8765c8b398f177ef960e2a936bdb20f21f0df7327fec65098c80f975a601ec +RIPEMD160(Wireshark-win64-2.6.0.msi)=6fde01e3ad151fbdc0c5cbb42e4fc2a4b71a0798 +SHA1(Wireshark-win64-2.6.0.msi)=7f1c374bcb54888deaee420335413bea0e0e8f92 + +Wireshark-win32-2.6.0.msi: 43687936 bytes +SHA256(Wireshark-win32-2.6.0.msi)=e44de9f328657bc68fba991fb1edae905cad579e6d153acc032597acd081c523 +RIPEMD160(Wireshark-win32-2.6.0.msi)=51de3c000f9b28907f9ecfb01d6f5fb98be76ab8 +SHA1(Wireshark-win32-2.6.0.msi)=4b1ee29fec281170975c05388e1eb2d4ecae0cf9 + +WiresharkPortable_2.6.0.paf.exe: 37448928 bytes +SHA256(WiresharkPortable_2.6.0.paf.exe)=59a0e2708988222032a5b0dfd30a5e64b11d2c947f70b0d77fd0a1f4890a3c53 +RIPEMD160(WiresharkPortable_2.6.0.paf.exe)=e9f627ae37b861f09a80fe4bf88762a118824698 +SHA1(WiresharkPortable_2.6.0.paf.exe)=c88b195266620a1a6dee64e11ec4dc9501d5fcba + +Wireshark 2.6.0 Intel 64.dmg: 168876995 bytes +SHA256(Wireshark 2.6.0 Intel 64.dmg)=0d20a6075a7c92ed37cefa19ba9ae128d53ed06038c633043b43dd3f0091cd83 +RIPEMD160(Wireshark 2.6.0 Intel 64.dmg)=1faa9631276f34de78b3b690751165d5b408faee +SHA1(Wireshark 2.6.0 Intel 64.dmg)=fefc72db0abab71fedd5f1efda3f0e4f11a0a4b1 + +You can validate these hashes using the following commands (among others): + + Windows: certutil -hashfile Wireshark-win64-x.y.z.exe SHA256 + Linux (GNU Coreutils): sha256sum wireshark-x.y.z.tar.xz + macOS: shasum -a 256 "Wireshark x.y.z Intel 64.dmg" + Other: openssl sha256 wireshark-x.y.z.tar.xz +-----BEGIN PGP SIGNATURE----- + +iQIzBAEBCgAdFiEEWlrbp9vqbD+HIk8ZgiRKeOb+ruoFAlrfd7YACgkQgiRKeOb+ +ruqTLA//b47ghEriokmSRL8IfLgRuloDuOkEvb87vqUhzI5RzPUyqkqrnElI9Uj4 +CbwMwpTUAbzoGreNGlRntQonLlw3p/hPl9/9CdRnkhw1l1SLA9d1ya02luRHmWkN ++gHOq12V0CGYx5W7mh49BjDHHSCEfDxTakHdYU7rSdoC39I4iSaDctVDc6+GgLC6 +iWNvIk2LtQ7BWbB8YXR+AlYgUBR2KNE3vC3qwM8J1pBVCyiihvjdoV4BkxQGZ6OC +sxAZ0tFLSZ3mQVocYxUyVm2rMlXYIJTjSLVkvgJs3y/jwROHsV8jkSm/CK+eXgdw +XwaJeRbJP4ItpmwP2HsTYvnjdTe+oJ2E73DJ0NtpYjSlA1+gvbVznGLXiXlIDwWm +/ZtrKcmi25fsPKjmwJjaUrhGtiu0SARvoWF0J4SIqopPAPtUXTyYcjp3GFkMIBmj +lwiYPAm8+FXtPE0Tj/Ko0dfL10wjZfliZuz5/AaazeTnrZ7V8hX+foBHaa+mH9sR +J3BZDhXArPKuWyORrHnFsc+qGNvRPl9UUfYVuZ59TZca0zzir4j5SFaWI9lqh0pT +jxIWoZ6UIZT8Zk2dwC+YLH7JEuolcwHi0JyRvWnymqoQXtGvjZzy69WbIwd7Lny5 +ljSbUI5zbsRPTzRKYzIopUjx9qrR0EYMDpGPvfUJ3tu1Z1VoenQ= +=AIK8 +-----END PGP SIGNATURE----- diff --git a/wireshark-1.2.0-disable-warning-dialog.patch b/wireshark-1.2.0-disable-warning-dialog.patch deleted file mode 100644 index f50dd11..0000000 --- a/wireshark-1.2.0-disable-warning-dialog.patch +++ /dev/null @@ -1,42 +0,0 @@ ---- - ui/gtk/main.c | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -Index: wireshark-1.12.0/ui/gtk/main.c -=================================================================== ---- wireshark-1.12.0.orig/ui/gtk/main.c 2014-08-04 23:46:11.000000000 +0100 -+++ wireshark-1.12.0/ui/gtk/main.c 2014-08-04 23:51:21.000000000 +0100 -@@ -1378,11 +1378,13 @@ main_colorize_changed(gboolean packet_li - - static GtkWidget *close_dlg = NULL; - -+/* - static void - priv_warning_dialog_cb(gpointer dialog, gint btn _U_, gpointer data _U_) - { - recent.privs_warn_if_elevated = !simple_dialog_check_get(dialog); - } -+*/ - - #ifdef _WIN32 - static void -@@ -2074,9 +2076,10 @@ check_and_warn_user_startup(gchar *cf_na - #endif - { - gchar *cur_user, *cur_group; -- gpointer priv_warning_dialog; -+// gpointer priv_warning_dialog; - - /* Tell the user not to run as root. */ -+/* - if (running_with_special_privs() && recent.privs_warn_if_elevated) { - cur_user = get_cur_username(); - cur_group = get_cur_groupname(); -@@ -2091,6 +2094,7 @@ check_and_warn_user_startup(gchar *cf_na - simple_dialog_check_set(priv_warning_dialog, "Don't show this message again."); - simple_dialog_set_cb(priv_warning_dialog, priv_warning_dialog_cb, NULL); - } -+*/ - - #ifdef _WIN32 - /* Warn the user if npf.sys isn't loaded. */ diff --git a/wireshark-1.2.0-geoip.patch b/wireshark-1.2.0-geoip.patch deleted file mode 100644 index 2a976cf..0000000 --- a/wireshark-1.2.0-geoip.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- - epan/geoip_db.c | 3 +++ - 1 file changed, 3 insertions(+) - -Index: wireshark-1.12.0/epan/geoip_db.c -=================================================================== ---- wireshark-1.12.0.orig/epan/geoip_db.c 2014-07-31 20:22:47.000000000 +0100 -+++ wireshark-1.12.0/epan/geoip_db.c 2014-08-04 23:44:43.000000000 +0100 -@@ -175,6 +175,9 @@ static void geoip_db_post_update_cb(void - geoip_dat_scan_dir(geoip_db_paths[i].path); - } - } -+ if (num_geoip_db_paths < 1) { -+ geoip_dat_scan_dir("/var/lib/GeoIP"); -+ } - - /* add fake databases for latitude and longitude - * (using "City" in reality) */ diff --git a/wireshark-2.4.6.tar.xz b/wireshark-2.4.6.tar.xz deleted file mode 100644 index ea154c7..0000000 --- a/wireshark-2.4.6.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8e965fd282bc0c09e7c4eba5f08a555d0ccf40a7d1544b939e01b90bc893d5fe -size 28851192 diff --git a/wireshark-2.6.0.tar.xz b/wireshark-2.6.0.tar.xz new file mode 100644 index 0000000..3d41ac2 --- /dev/null +++ b/wireshark-2.6.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:711c7f01d27a8817d58277a5487cef3e3c7bab1c8caaf8f4c92aa21015b9117f +size 28314868 diff --git a/wireshark.changes b/wireshark.changes index abadc54..078a2eb 100644 --- a/wireshark.changes +++ b/wireshark.changes @@ -1,3 +1,100 @@ +------------------------------------------------------------------- +Mon May 7 20:43:35 UTC 2018 - astieger@suse.com + +- Turn on ssh, maxminddb, c-ares, snappy, lz4, HTTP2 support +- Use capabilities to be able to run capture as a non-root user. + In easy system permissions mode all users can capture traffic. + In secure system permissions mode, must be added to the wireshark + group to capture. bsc#957624 + Drop wireshark-1.2.0-disable-warning-dialog.patch + +------------------------------------------------------------------- +Tue May 1 17:19:49 UTC 2018 - ecsos@opensuse.org + +- update to 2.6.0 + * Bug Fixes + - The following bugs have been fixed: + - Dumpcap might not quit if Wireshark or TShark crashes. + (Bug 1419) + * New and Updated Features + The following features are new (or have been significantly + updated) since version 2.5.0: + - HTTP Request sequences are now supported. + - Wireshark now supports MaxMind DB files. Support for GeoIP + and GeoLite Legacy databases has been removed. + - The Windows packages are now built using Microsoft Visual + Studio 2017. + - The IP map feature (the “Map” button in the “Endpoints” + dialog) has been removed. + The following features are new (or have been + significantly updated) since version 2.4.0: + - Display filter buttons can now be edited, disabled, and + removed via a context menu directly from the toolbar + - Drag & Drop filter fields to the display filter toolbar or + edit to create a button on the fly or apply the filter as + a display filter. + - Application startup time has been reduced. + - Some keyboard shortcut mix-ups have been resolved by + assigning new shortcuts to Edit → Copy methods. + - TShark now supports color using the --color option. + - The "matches" display filter operator is now case-insensitive. + - Display expression (button) preferences have been converted + to a UAT. This puts the display expressions in their own file. + Wireshark still supports preference files that contain the + old preferences, but new preference files will be written + without the old fields. + - SMI private enterprise numbers are now read from the + “enterprises.tsv” configuration file. + - The QUIC dissector has been renamed to Google QUIC + (quic → gquic). + - The selected packet number can now be shown in the Status Bar + by enabling Preferences → Appearance → Layout → Show selected + packet number. + - File load time in the Status Bar is now disabled by default + and can be enabled in + Preferences → Appearance → Layout → Show file load time. + - Support for the G.729A codec in the RTP Player is now added + via the bcg729 library. + - Support for hardware-timestamping of packets has been added. + - Improved NetMon .cap support with comments, event tracing, + network filter, network info types and some Message Analyzer + exported types. + - The personal plugins folder on Linux/Unix is now + ~/.local/lib/wireshark/plugins. + - TShark can print flow graphs using -z flow… + - Capinfos now prints SHA256 hashes in addition to RIPEMD160 + and SHA1. MD5 output has been removed. + - The packet editor has been removed. (This was a GTK+ only + experimental feature.) + - Support BBC micro:bit Bluetooth profile + - The Linux and UNIX installation step for Wireshark will now + install headers required to build plugins. A pkg-config file + is provided to help with this (see “doc/plugins.example” for + details). Note you must still rebuild all plugins between + minor releases (X.Y). + - The Windows installers and packages now ship with Qt 5.9.4. + - The generic data dissector can now uncompress zlib compressed + data. + - DNS Stats now supports service level statistics. + - DNS filters for retransmissions and unsolicited responses + have been added. + - The “tcptrace” TCP Stream graph now shows duplicate ACKS and + zero window advertisements. + - The membership operator now supports ranges, allowing display + filters such as tcp.port in {4430..4434} to be expressed. + See the User’s Guide, chapter Building display filter + expressions for details. + * New Protocol Support + * Updated Protocol Support + - Too many protocols have been updated to list here. + * New and Updated Capture File Support + - Microsoft Network Monitor + * New and Updated Capture Interfaces support + - LoRaTap + +- drop patch wireshark-1.2.0-geoip.patch, because file to patch + no more exists + ------------------------------------------------------------------- Wed Apr 4 20:20:16 UTC 2018 - astieger@suse.com diff --git a/wireshark.spec b/wireshark.spec index a1888de..74a190d 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -17,45 +17,42 @@ # define libraries -%define libutil libwsutil8 -%define libwire libwireshark9 -%define libtap libwiretap7 -%define libcodecs libwscodecs1 -# disable caps -%define use_caps 0 +%define libutil libwsutil9 +%define libwire libwireshark11 +%define libtap libwiretap8 +%define libcodecs libwscodecs0 # 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 %else %bcond_with gnutls %bcond_with qt %bcond_without gtk -%bcond_with geoip +%endif +%if 0%{?suse_version} >= 1500 +%bcond_without lz4 +%else +%bcond_with lz4 %endif Name: wireshark -Version: 2.4.6 +Version: 2.6.0 Release: 0 Summary: A Network Traffic Analyser -License: GPL-2.0+ AND GPL-3.0+ +License: GPL-2.0-or-later AND GPL-3.0-or-later Group: Productivity/Networking/Diagnostic Url: https://www.wireshark.org/ 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 prusnak@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 prusnak@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 -# for patch7 wireshark-1.12.6-fix-QT-PIC-PIE.patch BuildRequires: bison BuildRequires: flex BuildRequires: glib2-devel BuildRequires: hicolor-icon-theme BuildRequires: krb5-devel +BuildRequires: libcap-devel BuildRequires: libcares-devel BuildRequires: libgcrypt-devel >= 1.4.2 BuildRequires: libpcap-devel @@ -66,27 +63,29 @@ BuildRequires: openssl-devel BuildRequires: pcre-devel BuildRequires: pkgconfig BuildRequires: portaudio-devel +BuildRequires: snappy-devel BuildRequires: tcpd-devel BuildRequires: update-desktop-files BuildRequires: zlib-devel +BuildRequires: pkgconfig(libmaxminddb) +BuildRequires: pkgconfig(libnghttp2) +BuildRequires: pkgconfig(libssh) >= 0.6.0 +BuildRequires: pkgconfig(libxml-2.0) Requires: hicolor-icon-theme +Requires(pre): permissions Requires(pre): shadow Recommends: wireshark-ui = %{version} Provides: ethereal = %{version} Obsoletes: ethereal < %{version} +Provides: group(wireshark) +%if %{with lz4} +BuildRequires: pkgconfig(liblz4) +# in openSUSE Leap 42.3, lz4 was incorrectly packaged +BuildConflicts: pkgconfig(liblz4) = 124 +%endif %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 -%endif %if 0%{?suse_version} > 1310 BuildRequires: pkgconfig(libnl-3.0) %endif @@ -107,9 +106,6 @@ 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 @@ -197,20 +193,7 @@ echo "`grep %{name}-%{version}.tar.xz %{SOURCE2} | grep SHA1 | head -n1 | cut -d 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 @@ -232,13 +215,21 @@ export PATH="%{_libdir}/qt5/bin:$PATH" %else --with-qt=no \ %endif - --with-ssl \ %if %{with gnutls} --with-gnutls=yes \ %else --with-gnutls=no \ %endif - --with-plugins=%{_libdir}/%{name}/plugins/%{version} \ + --with-libssh=yes \ + --with-maxminddb=yes \ + --with-krb5=yes \ + --with-c-ares=yes \ + --with-snappy=yes \ +%if %{with lz4} + --with-lz4=yes \ +%endif + --with-zlib=yes \ + --with-nghttp2=yes \ --with-pic=yes make %{?_smp_mflags} V=1 @@ -294,10 +285,6 @@ install -m 644 wsutil/*.h "${IDIR}/wsutil" 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 @@ -307,30 +294,18 @@ rm -f %{buildroot}%{_datadir}/applications/wireshark-gtk.desktop 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} %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 @@ -343,27 +318,24 @@ exit 0 %postun -n %{libcodecs} -p /sbin/ldconfig %files -%doc AUTHORS COPYING 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 @@ -384,7 +356,6 @@ exit 0 %{_libdir}/libwscodecs.so.* %files devel -%doc doc/README.* %{_includedir}/wireshark %{_libdir}/lib*.so %{_libdir}/pkgconfig/wireshark.pc @@ -394,9 +365,6 @@ exit 0 %{_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 @@ -419,9 +387,6 @@ test -f /sbin/conf.d/SuSEconfig.glib2 && SuSEconfig --module glib2 > /dev/null | %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 %post ui-qt