New version 3.0.5

Fixes CVE-2019-13619

sources

@@ -1,2 +1,2 @@
-SHA512 (wireshark-2.6.2.tar.xz) = e39cd8dec44c8c64e5da25df0ffda529130541e5267fb0bdaa232fb4a4438c28ac5c9169ba17a37119d6cedf04a022b40da09f35f44a3739bdfb9486703f39e2
-SHA512 (SIGNATURES-2.6.2.txt) = fbce4e0fefa12f285335264e0870f3576923aeb00b0a60ed77024ea6831cd07086988bcbdeee10556437b0d63e4b285596a27c155d06d83ea18fe0534431e0d7
+SHA512 (wireshark-3.0.5.tar.xz) = 237ee66cfe0a7073f0e3623f327f7eb7204d1cd274e006dcc6890972d4135c2baa6c9d2426ea03ee64b7fc6dc45cb4cfe823e5cfc6f90e252d35b3ad7750884e
+SHA512 (SIGNATURES-3.0.5.txt) = 16032c0470d68d390bc2186f47552d5fcc865d1e5bb20d8b35f854f5d963925551ec837f707adbb891fd94b0e986cd81d4cc22fc9087bac9b6ab637235d7d3d0

wireshark-0001-enable-Lua-support.patch

@@ -1,18 +0,0 @@
-From: =?UTF-8?q?Radek=20Vok=C3=A1l?= <rvokal@fedoraproject.org>
-Date: Tue, 15 Dec 2009 08:36:27 +0000
-Subject: [PATCH] enable Lua support
-
-
-diff --git a/epan/wslua/template-init.lua b/epan/wslua/template-init.lua
-index 3fe2aca..2b48f9b 100644
---- a/epan/wslua/template-init.lua
-+++ b/epan/wslua/template-init.lua
-@@ -41,7 +41,7 @@ if running_superuser then
-     local disabled_lib = {}
-     setmetatable(disabled_lib,{ __index = function() error("this package ".. hint) end } );
- 
--    dofile = function() error("dofile " .. hint) end
-+--    dofile = function() error("dofile " .. hint) end
-     loadfile = function() error("loadfile " .. hint) end
-     loadlib = function() error("loadlib " .. hint) end
-     require = function() error("require " .. hint) end

wireshark-0002-Customize-permission-denied-error.patch

@@ -26,7 +26,7 @@ index 2f9d2cc..b18e47f 100644
 -        g_snprintf(errmsg, sizeof errmsg, "Couldn't run %s in child process: %s",
 -                   argv[0], g_strerror(errno));
 +        if (errno == EPERM || errno == EACCES)
-+ 	      securitymsg = "\nAre you a member of the 'wireshark' group? Try running\n'usermod -a -G wireshark _your_username_' as root.";
++          securitymsg = "\nAre you a member of the 'wireshark' group? Try running\n'usermod -a -G wireshark _your_username_' as root.";
 +        g_snprintf(errmsg, sizeof errmsg, "Couldn't run %s in child process: %s%s",
 +                argv[0], g_strerror(errno), securitymsg);
 +

wireshark-0006-Move-tmp-to-var-tmp.patch

@@ -6,41 +6,18 @@ Subject: [PATCH] Move /tmp to /var/tmp
 Fedora is using tmpfs which is limited by the size of RAM, thus we need
 to use different directory on different filesystem.
 ---
- ui/gtk/about_dlg.c             |  3 +-
  ui/qt/about_dialog.cpp         |  3 +-
  ui/qt/iax2_analysis_dialog.cpp |  5 +--
  ui/qt/rtp_analysis_dialog.cpp  |  5 +--
  ui/qt/rtp_audio_stream.cpp     |  3 +-
- wsutil/Makefile.am             |  6 ++--
  wsutil/tempfile.c              |  9 +++---
  wsutil/tempfile.h              |  4 +--
  wsutil/wstmpdir.c              | 70 ++++++++++++++++++++++++++++++++++++++++++
  wsutil/wstmpdir.h              | 39 +++++++++++++++++++++++
- 10 files changed, 132 insertions(+), 15 deletions(-)
+ 8 files changed, 132 insertions(+), 11 deletions(-)
  create mode 100644 wsutil/wstmpdir.c
  create mode 100644 wsutil/wstmpdir.h
 
-diff --git a/ui/gtk/about_dlg.c b/ui/gtk/about_dlg.c
-index 22ca841..6bcb527 100644
---- a/ui/gtk/about_dlg.c
-+++ b/ui/gtk/about_dlg.c
-@@ -28,6 +28,7 @@
- #include <gtk/gtk.h>
- 
- #include <wsutil/filesystem.h>
-+#include <wsutil/wstmpdir.h> /* for get_tmp_dir() */
- #include <wsutil/copyright_info.h>
- #include <version_info.h>
- #ifdef HAVE_LIBSMI
-@@ -427,7 +428,7 @@ about_folders_page_new(void)
-       "capture files");
- 
-   /* temp */
--  about_folders_row(table, "Temp", g_get_tmp_dir(),
-+  about_folders_row(table, "Temp", get_tmp_dir(),
-       "untitled capture files");
- 
-   /* pers conf */
 diff --git a/ui/qt/about_dialog.cpp b/ui/qt/about_dialog.cpp
 index 31dc581..2f74285 100644
 --- a/ui/qt/about_dialog.cpp
@@ -133,26 +110,6 @@ index fde66c8..b9531d2 100644
      tempfile_ = new QTemporaryFile(tempname, this);
      tempfile_->open();
  
-diff --git a/wsutil/Makefile.am b/wsutil/Makefile.am
-index 2af1b6c..aa149a2 100644
---- a/wsutil/Makefile.am
-+++ b/wsutil/Makefile.am
-@@ -90,6 +90,7 @@ WSUTIL_PUBLIC_INCLUDES = \
- 	ws_pipe.h		\
- 	ws_printf.h		\
- 	wsjsmn.h		\
-+	wstmpdir.h		\
- 	wsgcrypt.h		\
- 	wsgetopt.h		\
- 	wspcap.h		\
-@@ -168,6 +169,7 @@ libwsutil_la_SOURCES = \
- 	ws_pipe.c		\
- 	wsgcrypt.c		\
- 	wsjsmn.c		\
-+	wstmpdir.c		\
- 	xtea.c
- 
- if HAVE_PLUGINS
 diff --git a/wsutil/tempfile.c b/wsutil/tempfile.c
 index 8e1f8dc..dcf2f78 100644
 --- a/wsutil/tempfile.c

wireshark-0007-cmakelists.patch

@@ -1,16 +1,3 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 9e3b555..b0abd84 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -3069,7 +3069,7 @@ if(RPMBUILD_EXECUTABLE AND GIT_EXECUTABLE)
- 	endif()
- 
- 	execute_process(
--		COMMAND git describe --abbrev=8 --match v[1-9]*
-+		COMMAND git describe --always --abbrev=8 --match v[1-9]*
- 		OUTPUT_VARIABLE _git_description
- 		OUTPUT_STRIP_TRAILING_WHITESPACE
- 		WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
 diff --git a/wsutil/CMakeLists.txt b/wsutil/CMakeLists.txt
 index 0367cd1..6382a2c 100644
 --- a/wsutil/CMakeLists.txt
@@ -20,7 +7,7 @@ index 0367cd1..6382a2c 100644
  	ws_pipe.h
  	ws_printf.h
 +	wstmpdir.h
- 	wsjsmn.h
+ 	wsjson.h
  	xtea.h
  )
 @@ -118,6 +118,7 @@ set(WSUTIL_COMMON_FILES
@@ -29,5 +16,5 @@ index 0367cd1..6382a2c 100644
  	ws_pipe.c
 +	wstmpdir.c
  	wsgcrypt.c
- 	wsjsmn.c
+ 	wsjson.c
  	xtea.c

wireshark.spec

@@ -1,13 +1,12 @@
 %global with_lua 1
-%global with_portaudio 1
 %global with_maxminddb 1
-%global plugins_version 2.6
+%global plugins_version 3.0
 
 Summary:	Network traffic analyzer
 Name:		wireshark
-Version:	2.6.2
+Version:	3.0.5
 Release:	1%{?dist}
-Epoch:          1
+Epoch:		1
 License:	GPL+
 Url:		http://www.wireshark.org/
 
@@ -15,10 +14,6 @@ Source0:	https://wireshark.org/download/src/%{name}-%{version}.tar.xz
 Source1:        https://www.wireshark.org/download/src/all-versions/SIGNATURES-%{version}.txt
 Source2:	90-wireshark-usbmon.rules
 
-# Fedora-specific
-%if %{with_lua} && 0%{?fedora}
-Patch1:		wireshark-0001-enable-Lua-support.patch
-%endif
 # Fedora-specific
 Patch2:		wireshark-0002-Customize-permission-denied-error.patch
 # Will be proposed upstream
@@ -37,10 +32,6 @@ Requires:	%{name}-cli = %{epoch}:%{version}-%{release}
 Requires:	xdg-utils
 Requires:	hicolor-icon-theme
 
-%if %{with_portaudio} && 0%{?fedora}
-Requires:	portaudio
-BuildRequires:	portaudio-devel
-%endif
 %if %{with_maxminddb} && 0%{?fedora}
 Requires:	libmaxminddb
 %endif
@@ -51,7 +42,6 @@ BuildRequires:	elfutils-devel
 BuildRequires:	gcc-c++
 BuildRequires:	glib2-devel
 BuildRequires:	gnutls-devel
-BuildRequires:	gtk3-devel
 BuildRequires:	krb5-devel
 BuildRequires:	libcap-devel
 BuildRequires:	libgcrypt-devel
@@ -81,9 +71,13 @@ BuildRequires:	compat-lua-devel
 %endif
 Buildrequires: git
 %if 0%{?fedora}
-Buildrequires: python2-devel
+Buildrequires: python3-devel
 %endif
 Buildrequires: cmake
+#needed for sdjournal external capture interface
+BuildRequires: systemd-devel
+BuildRequires: libnghttp2-devel
+
 Obsoletes: wireshark-qt, wireshark-gtk
 
 %description
@@ -123,7 +117,6 @@ and plugins.
 %cmake -G "Unix Makefiles" \
   -DDISABLE_WERROR=ON \
   -DBUILD_wireshark=ON \
-  -DENABLE_QT5=ON \
 %if %{with_lua} && 0%{?fedora}
   -DENABLE_LUA=ON \
 %else
@@ -137,14 +130,11 @@ and plugins.
   -DBUILD_randpktdump=OFF \
   -DBUILD_androiddump=OFF \
   -DENABLE_SMI=ON \
-%if %{with_portaudio} && 0%{?fedora}
-  -DENABLE_PORTAUDIO=ON \
-%else
-  -DENABLE_PORTAUDIO=OFF \
-%endif
   -DENABLE_PLUGINS=ON \
   -DENABLE_NETLINK=ON \
-  -DBUILD_dcerpcidl2wrs=OFF
+  -DBUILD_dcerpcidl2wrs=OFF \
+  -DBUILD_sdjournal=ON \
+  .
 
 make %{?_smp_mflags}
 
@@ -228,7 +218,9 @@ getent group usbmon >/dev/null || groupadd -r usbmon
 %{_libdir}/wireshark/extcap/ciscodump
 %{_libdir}/wireshark/extcap/udpdump
 %{_libdir}/wireshark/extcap/sshdump
-%{_libdir}/wireshark/*.cmake
+%{_libdir}/wireshark/extcap/sdjournal
+%{_libdir}/wireshark/extcap/dpauxmon
+%{_libdir}/wireshark/cmake/*.cmake
 #the version wireshark uses to store plugins is only x.y, not .z
 %{_libdir}/wireshark/plugins/%{plugins_version}/epan/*.so
 %{_libdir}/wireshark/plugins/%{plugins_version}/wiretap/*.so
@@ -250,12 +242,15 @@ getent group usbmon >/dev/null || groupadd -r usbmon
 %{_mandir}/man1/captype.*
 %{_mandir}/man1/ciscodump.*
 %{_mandir}/man1/randpktdump.*
+%{_mandir}/man1/dpauxmon.*
+%{_mandir}/man1/sdjournal.*
 %{_mandir}/man4/extcap.*
 %if %{with_maxminddb} && 0%{?fedora}
 %{_mandir}/man1/mmdbresolve.*
 %endif
 %dir %{_datadir}/wireshark
 %{_datadir}/wireshark/*
+%{_docdir}/wireshark/*.html
 
 %files devel
 %doc doc/README.* ChangeLog
@@ -264,6 +259,35 @@ getent group usbmon >/dev/null || groupadd -r usbmon
 %{_libdir}/pkgconfig/%{name}.pc
 
 %changelog
+* Wed Oct 23 2019 Michal Ruprich <mruprich@redhat.com> - 1:3.0.5-1
+- New version 3.0.5
+
+* Tue Aug 20 2019 Michal Ruprich <mruprich@redhat.com> - 1:3.0.3-1
+- New version 3.0.3
+- Fixes CVE-2019-13619
+
+* Tue Apr 09 2019 Michal Ruprich <mruprich@redhat.com> - 1:3.0.1-1
+- New version 3.0.1
+- Fixes CVE-2019-10894, CVE-2019-10895, CVE-2019-10896, CVE-2019-10897, CVE-2019-10898, CVE-2019-10899, CVE-2019-10900, CVE-2019-10901, CVE-2019-10902, CVE-2019-10903
+
+* Mon Mar 11 2019 Michal Ruprich <mruprich@redhat.com> - 1:3.0.0-1
+- New version 3.0.0
+
+* Mon Jan 21 2019 Michal Ruprich <mruprich@redhat.com> - 1:2.6.6-1
+- New version 2.6.6 
+- Contains fixes for CVE-2019-5716, CVE-2019-5717, CVE-2019-5718, CVE-2019-5719
+
+* Thu Jan 03 2019 Michal Ruprich <mruprich@redhat.com> - 1:2.6.5-2
+- Adding libnghttp2-devel as BuildRequires - needed for HTTP2 support(rhbz#1512722)
+
+* Mon Dec 10 2018 Michal Ruprich <mruprich@redhat.com> - 1:2.6.5-1
+- New version 2.6.5
+- Contains fixes for CVE-2018-19622, CVE-2018-19623,  CVE-2018-19624, CVE-2018-19625, CVE-2018-19626, CVE-2018-19627, CVE-2018-19628
+
+* Mon Nov 12 2018 Michal Ruprich <mruprich@redhat.com> - 1:2.6.4-1
+- New version 2.6.4
+- Contains fixes for CVE-2018-16056, CVE-2018-16057, CVE-2018-16058
+
 * Mon Jul 23 2018 Michal Ruprich <mruprich@redhat.com> - 1:2.6.2-1
 - New version 2.6.2
 - Contains fixes for CVE-2018-14339, CVE-2018-14340, CVE-2018-14341, CVE-2018-14342, CVE-2018-14343, CVE-2018-14344, CVE-2018-14367, CVE-2018-14368, CVE-2018-14369, CVE-2018-14370