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

sources

@@ -1,2 +1,2 @@
-SHA512 (wireshark-2.4.0.tar.xz) = 1bac69c6582c05db05cf9fbe818baa62308e531ee3c304bcf0fe7a81aa84c41dc647ebd221f9b98d823557180097b6c239b05841ddc7ca7ede47ee2936715ab9
-SHA512 (SIGNATURES-2.4.0.txt) = db2139dad73ac8ed83fa097e5ce17bac1bd14b302c338b3c1c49dc401ba39eb17fee2d34ae350ae1bbdf7311f66a9b814028c5425e309be9b128b89995c81af8
+SHA512 (wireshark-2.6.2.tar.xz) = e39cd8dec44c8c64e5da25df0ffda529130541e5267fb0bdaa232fb4a4438c28ac5c9169ba17a37119d6cedf04a022b40da09f35f44a3739bdfb9486703f39e2
+SHA512 (SIGNATURES-2.6.2.txt) = fbce4e0fefa12f285335264e0870f3576923aeb00b0a60ed77024ea6831cd07086988bcbdeee10556437b0d63e4b285596a27c155d06d83ea18fe0534431e0d7

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

@@ -34,7 +34,7 @@ index 2f9d2cc..b18e47f 100644
  
          /* Exit with "_exit()", so that we don't close the connection
 @@ -826,6 +830,7 @@ sync_pipe_open_command(char** argv, int *data_read_fd,
-     PROCESS_INFORMATION pi;
+     int i;
  #else
      char errmsg[1024+1];
 +    const char *securitymsg = "";

wireshark-0003-fix-string-overrun-in-plugins-profinet.patch

@@ -3,10 +3,10 @@ Date: Wed, 4 Sep 2013 10:03:57 +0200
 Subject: [PATCH] fix string overrun in plugins/profinet
 
 
-diff --git a/plugins/profinet/packet-dcom-cba.c b/plugins/profinet/packet-dcom-cba.c
+diff --git a/plugins/epan/profinet/packet-dcom-cba.c b/plugins/epan/profinet/packet-dcom-cba.c
 index 0f1658a..f7fd322 100644
---- a/plugins/profinet/packet-dcom-cba.c
-+++ b/plugins/profinet/packet-dcom-cba.c
+--- a/plugins/epan/profinet/packet-dcom-cba.c
++++ b/plugins/epan/profinet/packet-dcom-cba.c
 @@ -555,7 +555,7 @@ dissect_ICBAPhysicalDevice_get_LogicalDevice_rqst(tvbuff_t *tvb, int offset,
      packet_info *pinfo, proto_tree *tree, dcerpc_info *di, guint8 *drep)
  {

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

@@ -30,7 +30,7 @@ index 22ca841..6bcb527 100644
  #include <wsutil/filesystem.h>
 +#include <wsutil/wstmpdir.h> /* for get_tmp_dir() */
  #include <wsutil/copyright_info.h>
- #include <ws_version_info.h>
+ #include <version_info.h>
  #ifdef HAVE_LIBSMI
 @@ -427,7 +428,7 @@ about_folders_page_new(void)
        "capture files");
@@ -51,17 +51,17 @@ index 31dc581..2f74285 100644
  #include <wsutil/filesystem.h>
 +#include <wsutil/wstmpdir.h> /* for get_tmp_dir() */
  
- #ifdef HAVE_LIBSMI
- #include <epan/oids.h>
-@@ -204,7 +205,7 @@ AboutDialog::AboutDialog(QWidget *parent) :
-     message += about_folders_row("\"File\" dialogs", get_last_open_dir(), "capture files");
+ #include <QDesktopServices>
+ #include <QUrl>
+@@ -206,7 +206,7 @@ FolderListModel::FolderListModel(QObject * parent):
+     appendRow( QStringList() << tr("\"File\" dialogs") << get_last_open_dir() << tr("capture files"));
  
      /* temp */
--    message += about_folders_row("Temp", g_get_tmp_dir(), "untitled capture files");
-+    message += about_folders_row("Temp", get_tmp_dir(), "untitled capture files");
+-    appendRow( QStringList() << tr("Temp") << g_get_tmp_dir() << tr("untitled capture files"));
++    appendRow( QStringList() << tr("Temp") << get_tmp_dir() << tr("untitled capture files"));
  
      /* pers conf */
-     message += about_folders_row("Personal configuration",
+     appendRow( QStringList() << tr("Personal configuration")
 diff --git a/ui/qt/iax2_analysis_dialog.cpp b/ui/qt/iax2_analysis_dialog.cpp
 index ee4e5fd..fe17a95 100644
 --- a/ui/qt/iax2_analysis_dialog.cpp
@@ -97,8 +97,8 @@ index 5d82e46..8008984 100644
  #include <wsutil/pint.h>
 +#include <wsutil/wstmpdir.h> /* for get_tmp_dir() */
  
- #include <QFileDialog>
  #include <QMessageBox>
+ #include <QPushButton>
 @@ -331,10 +332,10 @@ RtpAnalysisDialog::RtpAnalysisDialog(QWidget &parent, CaptureFile &cf, struct _r
  
      // We keep our temp files open for the lifetime of the dialog. The GTK+
@@ -137,26 +137,22 @@ diff --git a/wsutil/Makefile.am b/wsutil/Makefile.am
 index 2af1b6c..aa149a2 100644
 --- a/wsutil/Makefile.am
 +++ b/wsutil/Makefile.am
-@@ -91,7 +91,8 @@ libwsutil_nonrepl_INCLUDES = \
- 	ws_mempbrk.h		\
- 	ws_mempbrk_int.h	\
+@@ -90,6 +90,7 @@ WSUTIL_PUBLIC_INCLUDES = \
+ 	ws_pipe.h		\
  	ws_printf.h		\
--	wsjsmn.h
-+	wsjsmn.h		\
-+	wstmpdir.h
- 
- # Header files for functions in libwsutil's ABI on this platform.
- libwsutil_abi_INCLUDES = \
-@@ -155,7 +156,8 @@ libwsutil_la_SOURCES = \
- 	unicode-utils.c		\
- 	ws_mempbrk.c		\
+ 	wsjsmn.h		\
++	wstmpdir.h		\
+ 	wsgcrypt.h		\
+ 	wsgetopt.h		\
+ 	wspcap.h		\
+@@ -168,6 +169,7 @@ libwsutil_la_SOURCES = \
+ 	ws_pipe.c		\
  	wsgcrypt.c		\
--	wsjsmn.c
-+	wsjsmn.c		\
-+	wstmpdir.c
+ 	wsjsmn.c		\
++	wstmpdir.c		\
+ 	xtea.c
  
- if HAVE_MACOS_FRAMEWORKS
- libwsutil_la_SOURCES += cfutils.c cfutils.h
+ if HAVE_PLUGINS
 diff --git a/wsutil/tempfile.c b/wsutil/tempfile.c
 index 8e1f8dc..dcf2f78 100644
 --- a/wsutil/tempfile.c
@@ -169,7 +165,7 @@ index 8e1f8dc..dcf2f78 100644
  
  #ifndef __set_errno
  #define __set_errno(x) errno=(x)
-@@ -142,7 +143,7 @@ mkdtemp (char *path_template)
+@@ -83,13 +83,14 @@ mkstemps(char *path_template, int suffixlen)
   */
  char *get_tempfile_path(const char *filename)
  {
@@ -178,6 +174,14 @@ index 8e1f8dc..dcf2f78 100644
  }
  
  #define MAX_TEMPFILES   3
+ 
+ /**
+- * Create a tempfile with the given prefix (e.g. "wireshark").
++ * Create a tempfile with the given prefix (e.g. "wireshark"). The path
++ * is created using get_tmp_dir and mkdtemp
+  *
+  * @param namebuf If not NULL, receives the full path of the temp file.
+  *                Should NOT be freed.
 @@ -199,7 +200,7 @@ create_tempfile(char **namebuf, const char *pfx, const char *sfx)
      tf[idx].path = (char *)g_malloc(tf[idx].len);
    }
@@ -187,24 +191,6 @@ index 8e1f8dc..dcf2f78 100644
  
  #ifdef _WIN32
    _tzset();
-@@ -237,7 +238,7 @@ create_tempfile(char **namebuf, const char *pfx, const char *sfx)
- 
- /**
-  * Create a directory with the given prefix (e.g. "wireshark"). The path
-- * is created using g_get_tmp_dir and mkdtemp.
-+ * is created using get_tmp_dir and mkdtemp.
-  *
-  * @param namebuf
-  * @param pfx A prefix for the temporary directory.
-@@ -265,7 +266,7 @@ create_tempdir(char **namebuf, const char *pfx)
-   /*
-    * We can't use get_tempfile_path here because we're called from dumpcap.c.
-    */
--  tmp_dir = g_get_tmp_dir();
-+  tmp_dir = get_tmp_dir();
- 
-   while (g_snprintf(td_path[idx], td_path_len[idx], "%s%c%s" TMP_FILE_SUFFIX, tmp_dir, G_DIR_SEPARATOR, pfx) > td_path_len[idx]) {
-     td_path_len[idx] *= 2;
 diff --git a/wsutil/tempfile.h b/wsutil/tempfile.h
 index 1dca2df..bb3160c 100644
 --- a/wsutil/tempfile.h
@@ -218,15 +204,6 @@ index 1dca2df..bb3160c 100644
   *
   * @param namebuf [in,out] If not NULL, receives the full path of the temp file.
   *                Must NOT be freed.
-@@ -58,7 +58,7 @@ WS_DLL_PUBLIC int create_tempfile(char **namebuf, const char *pfx, const char *s
- 
- /**
-  * Create a directory with the given prefix (e.g. "wireshark"). The path
-- * is created using g_get_tmp_dir and mkdtemp.
-+ * is created using get_tmp_dir and mkdtemp.
-  *
-  * @param namebuf If not NULL, receives the full path of the temp directory.
-  *                Must NOT be freed.
 diff --git a/wsutil/wstmpdir.c b/wsutil/wstmpdir.c
 new file mode 100644
 index 0000000..d8b733b

wireshark.spec

@@ -1,14 +1,15 @@
 %global with_lua 1
 %global with_portaudio 1
-%global with_GeoIP 1
+#libmaxmind is a substitute for GeoIP
+%global with_maxminddb 1
+%global plugins_version 2.6
 
 Summary:	Network traffic analyzer
 Name:		wireshark
-Version:	2.4.0
-Release:	6%{?dist}
+Version:	2.6.2
+Release:	1%{?dist}
 Epoch:          1
 License:	GPL+
-Group:		Applications/Internet
 Url:		http://www.wireshark.org/
 
 Source0:	https://wireshark.org/download/src/%{name}-%{version}.tar.xz
@@ -16,6 +17,7 @@ Source1:        https://www.wireshark.org/download/src/all-versions/SIGNATURES-%
 Source2:	90-wireshark-usbmon.rules
 
 Requires:	%{name}-cli = %{epoch}:%{version}-%{release}
+Requires:	%{name}-qt = %{epoch}:%{version}-%{release}
 # Fedora-specific
 %if %{with_lua}
 Patch1:		wireshark-0001-enable-Lua-support.patch
@@ -60,8 +62,8 @@ BuildRequires:	qt5-qtbase-devel
 BuildRequires:	qt5-qtmultimedia-devel
 BuildRequires:	qt5-qtsvg-devel
 BuildRequires:	zlib-devel
-%if %{with_GeoIP}
-BuildRequires:	GeoIP-devel
+%if %{with_maxminddb}
+BuildRequires:  libmaxminddb-devel
 %endif
 %if %{with_lua}
 BuildRequires:	compat-lua-devel
@@ -75,8 +77,6 @@ Metapackage with installs %{name}-cli and %{name}-qt.
 
 %package	cli
 Summary:	Network traffic analyzer
-Group:		Applications/Internet
-Requires:	%{name} = %{epoch}:%{version}-%{release}
 Requires(pre):	shadow-utils
 Requires(post): systemd-udev
 
@@ -96,7 +96,6 @@ Wireshark.
 
 %package	qt
 Summary:	Wireshark's Qt-based GUI
-Group:		Applications/Internet
 Requires:	%{name}-cli = %{epoch}:%{version}-%{release}
 Requires:	xdg-utils
 Requires:	hicolor-icon-theme
@@ -104,8 +103,8 @@ Requires:	hicolor-icon-theme
 Requires:	portaudio
 BuildRequires:	portaudio-devel
 %endif
-%if %{with_GeoIP}
-Requires:	GeoIP
+%if %{with_maxminddb}
+Requires:	libmaxminddb
 %endif
 Requires(post):	/usr/sbin/update-alternatives
 Requires(postun):	/usr/sbin/update-alternatives
@@ -115,7 +114,6 @@ This package contains the Qt Wireshark GUI and desktop integration files.
 
 %package	gtk
 Summary:	Wireshark's GTK+-based GUI
-Group:		Applications/Internet
 
 Requires:	%{name}-cli = %{epoch}:%{version}-%{release}
 Requires:	%{name} = %{epoch}:%{version}-%{release}
@@ -126,8 +124,8 @@ Obsoletes:	wireshark-gnome < 2.0.0
 Requires:	portaudio
 BuildRequires:	portaudio-devel
 %endif
-%if %{with_GeoIP}
-Requires:	GeoIP
+%if %{with_maxminddb}
+Requires:	libmaxminddb
 %endif
 Requires:	xdg-utils
 Requires:	hicolor-icon-theme
@@ -141,7 +139,6 @@ This package contains the GTK+ Wireshark GUI and desktop integration files.
 
 %package devel
 Summary:	Development headers and libraries for wireshark
-Group:		Development/Libraries
 Requires:	%{name} = %{epoch}:%{version}-%{release} glibc-devel glib2-devel
 
 %description devel
@@ -154,18 +151,6 @@ and plugins.
 %autosetup -S git
 
 %build
-%ifarch s390 s390x sparcv9 sparc64
-export PIECFLAGS="-fPIE -fPIC"
-%else
-export PIECFLAGS="-fpie -fPIC"
-%endif
-
-# FC5+ automatic -fstack-protector-all switch
-export RPM_OPT_FLAGS=${RPM_OPT_FLAGS//-fstack-protector-strong/-fstack-protector-all}
-export CFLAGS="$RPM_OPT_FLAGS $CPPFLAGS $PIECFLAGS -D_LARGEFILE64_SOURCE"
-export CXXFLAGS="$RPM_OPT_FLAGS $CPPFLAGS $PIECFLAGS -D_LARGEFILE64_SOURCE"
-export LDFLAGS="$LDFLAGS -pie -fPIC"
-
 autoreconf -ivf
 
 %configure \
@@ -185,14 +170,13 @@ autoreconf -ivf
 %else
   --with-portaudio=no \
 %endif
-%if %{with_GeoIP}
-   --with-geoip \
+%if %{with_maxminddb}
+  --with-maxminddb \
 %else
-   --with-geoip=no \
+  --with-maxminddb=no \
 %endif
-   --with-ssl \
    --disable-warnings-as-errors \
-   --with-plugins=%{_libdir}/%{name}/plugins \
+   --enable-plugins \
    --with-libnl \
    --disable-androiddump \
    --disable-randpktdump
@@ -225,7 +209,7 @@ mkdir -p "${IDIR}/epan/wmem"
 mkdir -p "${IDIR}/wiretap"
 mkdir -p "${IDIR}/wsutil"
 mkdir -p %{buildroot}%{_udevrulesdir}
-install -m 644 config.h register.h	"${IDIR}/"
+install -m 644 config.h epan/register.h	"${IDIR}/"
 install -m 644 cfile.h file.h		"${IDIR}/"
 install -m 644 ws_symbol_export.h	"${IDIR}/"
 install -m 644 epan/*.h			"${IDIR}/epan/"
@@ -329,8 +313,8 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
 %license COPYING
 %doc AUTHORS INSTALL NEWS README*
 %{_bindir}/capinfos
+%{_bindir}/mmdbresolve
 %{_bindir}/captype
-%{_bindir}/dftest
 %{_bindir}/editcap
 %{_bindir}/mergecap
 %{_bindir}/randpkt
@@ -349,12 +333,17 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
 %{_libdir}/wireshark/extcap/ciscodump
 %{_libdir}/wireshark/extcap/udpdump
 %{_libdir}/wireshark/extcap/sshdump
-%{_libdir}/wireshark/plugins/*.so
+#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}/codecs/*.so
+%{_libdir}/wireshark/plugins/%{plugins_version}/wiretap/*.so
 %{_mandir}/man1/editcap.*
 %{_mandir}/man1/tshark.*
 %{_mandir}/man1/mergecap.*
 %{_mandir}/man1/text2pcap.*
 %{_mandir}/man1/capinfos.*
+%{_mandir}/man1/captype.*
+%{_mandir}/man1/ciscodump.*
 %{_mandir}/man1/dumpcap.*
 %{_mandir}/man4/wireshark-filter.*
 %{_mandir}/man1/rawshark.*
@@ -362,7 +351,9 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
 %{_mandir}/man1/randpkt.*
 %{_mandir}/man1/reordercap.*
 %{_mandir}/man1/sshdump.*
+%{_mandir}/man1/udpdump.*
 %{_mandir}/man4/extcap.*
+%{_mandir}/man1/mmdbresolve.*
 %dir %{_datadir}/wireshark
 %{_datadir}/wireshark/*
 %if %{with_lua}
@@ -396,6 +387,49 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
 %{_libdir}/pkgconfig/%{name}.pc
 
 %changelog
+* Tue Jul 24 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
+
+* Thu May 24 2018 Michal Ruprich <mruprich@redhat.com> - 1:2.6.1-1
+- New version 2.6.1
+
+* Tue May 15 2018 Michal Ruprich <mruprich@redhat.com> - 1:2.6.0-3
+- Fixed undefined reference error in tshark (rhbz#1573906)
+- Correcting usage of build flags (rhbz#1548665)
+
+* Fri Apr 27 2018 Michal Ruprich <mruprich@redhat.com> - 1:2.6.0-2
+- Uploading sources for version 2.6.0
+
+* Fri Apr 27 2018 Michal Ruprich <mruprich@redhat.com> - 1:2.6.0-1
+- New version 2.6.0
+- Removed GeoIP support, libmaxminddb is used instead
+- Removed dftest binary
+
+* Thu Mar 15 2018 Michal Ruprich <mruprich@redhat.com> - 1:2.4.5-3
+- Removing dependency on wireshark from wireshark-cli (rhbz#1554818)
+- Removing deprecated Group tags
+
+* Tue Mar 13 2018 Michal Ruprich <mruprich@redhat.com> - 1:2.4.5-2
+- Added wireshark-qt package to wireshark metapackage (rhbz#1506859)
+
+* Tue Mar 13 2018 Michal Ruprich <mruprich@redhat.com> - 1:2.4.5-1
+- New version 2.4.5
+- Contains fixes for CVE-2018-7419, CVE-2018-7418, CVE-2018-7417, CVE-2018-7420, CVE-2018-7320, CVE-2018-7336, CVE-2018-7337, CVE-2018-7334, CVE-2018-7335, CVE-2018-6836, CVE-2018-5335, CVE-2018-5334, CVE-2017-6014, CVE-2017-9616, CVE-2017-9617, CVE-2017-9766
+- Corrected LDFLAGS in spec (rhbz#1548665)
+
+* Fri Jan 19 2018 Michal Ruprich <mruprich@redhat.com> - 1:2.4.4-1
+- New upstream version 2.4.4
+- Contains fix for CVE-2017-17935
+
+* Wed Dec 20 2017 Michal Ruprich <mruprich@redhat.com> - 1:2.4.3-1
+- New upstream version 2.4.3
+- Contains fixes for CVE-2017-17085, CVE-2017-17084, CVE-2017-17083
+
+* Thu Oct 12 2017 Michal Ruprich <mruprich@redhat.com> - 1:2.4.2-1
+- New upstream version 2.4.2
+- Contains fixes for CVE-2017-15189, CVE-2017-15190, CVE-2017-15191, CVE-2017-15192, CVE-2017-15193, CVE-2017-13764, CVE-2017-13765, CVE-2017-13766, CVE-2017-13767
+
 * Tue Aug 08 2017 Martin Sehnoutka <msehnout@redhat.com> - 1:2.4.0-6
 - Use epoch in Requires (rhbz#1478501)