diff --git a/SOURCES/wireshark-1.10.14-display-data-len.patch b/SOURCES/wireshark-1.10.14-display-data-len.patch new file mode 100644 index 0000000..0fb004e --- /dev/null +++ b/SOURCES/wireshark-1.10.14-display-data-len.patch @@ -0,0 +1,13 @@ +diff --git a/epan/ftypes/ftype-integer.c b/epan/ftypes/ftype-integer.c +index 71b045a..1a71a04 100644 +--- a/epan/ftypes/ftype-integer.c ++++ b/epan/ftypes/ftype-integer.c +@@ -237,6 +237,8 @@ integer_to_repr(fvalue_t *fv, ftrepr_t rtype, char *buf) + val = -fv->value.sinteger; + } else + val = fv->value.sinteger; ++ ++ guint32_to_str_buf(val, buf, 11); + } + + static int diff --git a/SOURCES/wireshark-1.10.14-read-from-stdin.patch b/SOURCES/wireshark-1.10.14-read-from-stdin.patch new file mode 100644 index 0000000..e66f4ca --- /dev/null +++ b/SOURCES/wireshark-1.10.14-read-from-stdin.patch @@ -0,0 +1,27 @@ +diff --git a/tshark.c b/tshark.c +index 8c8de07..8cc4fae 100644 +--- a/tshark.c ++++ b/tshark.c +@@ -286,7 +286,7 @@ print_usage(gboolean print_ver) + #endif + /*fprintf(output, "\n");*/ + fprintf(output, "Input file:\n"); +- fprintf(output, " -r set the filename to read from (no pipes or stdin!)\n"); ++ fprintf(output, " -r set the filename to read from (no stdin!)\n"); + + fprintf(output, "\n"); + fprintf(output, "Processing:\n"); +diff --git a/wiretap/file_wrappers.c b/wiretap/file_wrappers.c +index c670c6e..e359cd7 100644 +--- a/wiretap/file_wrappers.c ++++ b/wiretap/file_wrappers.c +@@ -1046,7 +1046,8 @@ file_seek(FILE_T file, gint64 offset, int whence, int *err) + + /* if within raw area while reading, just go there */ + if (file->compression == UNCOMPRESSED && file->pos + offset >= file->raw +- && (offset < 0 || offset >= file->have) /* seek only when we don't have that offset in buffer */) ++ && (offset < 0 || offset >= file->have) /* seek only when we don't have that offset in buffer */ ++ && (file->fast_seek) /* seek only when random access is supported */) + { + if (ws_lseek64(file->fd, offset - file->have, SEEK_CUR) == -1) { + *err = errno; diff --git a/SPECS/wireshark.spec b/SPECS/wireshark.spec index 11f2f53..073e5fa 100644 --- a/SPECS/wireshark.spec +++ b/SPECS/wireshark.spec @@ -21,7 +21,7 @@ Summary: Network traffic analyzer Name: wireshark Version: 1.10.14 -Release: 7%{?dist} +Release: 10%{?dist} License: GPL+ Group: Applications/Internet Source0: http://wireshark.org/download/src/%{name}-%{version}.tar.bz2 @@ -65,6 +65,8 @@ Patch26: wireshark-1.10.14-CVE-2015-6246.patch Patch27: wireshark-1.10.14-CVE-2015-6248.patch Patch28: wireshark-1.10.14-gdk-pixbuf-deprecated-segfault.patch Patch29: wireshark-1.10.14-CVE-2015-3182.patch +Patch30: wireshark-1.10.14-display-data-len.patch +Patch31: wireshark-1.10.14-read-from-stdin.patch Url: http://www.wireshark.org/ BuildRequires: libpcap-devel >= 0.9 @@ -186,6 +188,8 @@ and plugins. %patch27 -p1 -b .cve-2015-6248 %patch28 -p1 -b .gdk-deprecated %patch29 -p1 -b .cve-2015-3182 +%patch30 -p1 -b .display-data-len +%patch31 -p1 -b .read-from-stdin %build %ifarch s390 s390x sparcv9 sparc64 @@ -427,6 +431,16 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_datadir}/aclocal/* %changelog +* Thu Aug 18 2016 Martin Sehnoutka - 1.10.14-10 +- Rebuild package +- Related to: #1233966 + +* Wed Jul 27 2016 Martin Sehnoutka - 1.10.14-9 +- Resolves: #1233966 support for reading from stdin/pipes + +* Tue Jul 26 2016 Martin Sehnoutka - 1.10.14-8 +- Resolves: #1337695 tshark failing to display data.len + * Tue Oct 6 2015 Peter Hatina - 1.10.14-7 - Rebase some tvbuff API from upstream to 1.10.14 - Fixes crash when tvb_length_remaining() is used