Ver. 1.12.2

This commit is contained in:
Peter Hatina 2014-11-17 10:16:52 +01:00
parent 9604b4688b
commit 05ceca548a
5 changed files with 13 additions and 6 deletions

1
.gitignore vendored
View File

@ -36,3 +36,4 @@ wireshark-1.2.10.tar.bz2
/wireshark-1.10.9.tar.bz2 /wireshark-1.10.9.tar.bz2
/wireshark-1.12.0.tar.bz2 /wireshark-1.12.0.tar.bz2
/wireshark-1.12.1.tar.bz2 /wireshark-1.12.1.tar.bz2
/wireshark-1.12.2.tar.bz2

View File

@ -1 +1 @@
14b3e3d8979d1eb27ff085bb5f400e67 wireshark-1.12.1.tar.bz2 2f2a16be8b087227cb17733c72288ae4 wireshark-1.12.2.tar.bz2

View File

@ -45,13 +45,16 @@ index 75c31bd..81648a7 100644
# Header files that are not generated from other files # Header files that are not generated from other files
LIBWSUTIL_INCLUDES = \ LIBWSUTIL_INCLUDES = \
@@ -104,4 +105,5 @@ LIBWSUTIL_INCLUDES = \ @@ -104,7 +105,8 @@ LIBWSUTIL_INCLUDES = \
time_util.h \ time_util.h \
type_util.h \ type_util.h \
u3.h \ u3.h \
- unicode-utils.h - unicode-utils.h
+ unicode-utils.h \ + unicode-utils.h \
+ wstmpdir.h + wstmpdir.h
#
# Editor modelines - https://www.wireshark.org/tools/modelines.html
diff --git a/wsutil/tempfile.c b/wsutil/tempfile.c diff --git a/wsutil/tempfile.c b/wsutil/tempfile.c
index ccefe30..ac40319 100644 index ccefe30..ac40319 100644
--- a/wsutil/tempfile.c --- a/wsutil/tempfile.c

View File

@ -46,7 +46,7 @@ diff --git a/epan/ftypes/ftype-string.c b/epan/ftypes/ftype-string.c
index 3893823..7e67292 100644 index 3893823..7e67292 100644
--- a/epan/ftypes/ftype-string.c --- a/epan/ftypes/ftype-string.c
+++ b/epan/ftypes/ftype-string.c +++ b/epan/ftypes/ftype-string.c
@@ -58,6 +58,7 @@ string_repr_len(fvalue_t *fv, ftrepr_t rtype) @@ -57,6 +57,7 @@ string_repr_len(fvalue_t *fv, ftrepr_t rtype)
{ {
switch (rtype) { switch (rtype) {
case FTREPR_DISPLAY: case FTREPR_DISPLAY:
@ -54,7 +54,7 @@ index 3893823..7e67292 100644
return (int)strlen(fv->value.string); return (int)strlen(fv->value.string);
case FTREPR_DFILTER: case FTREPR_DFILTER:
@@ -72,6 +73,7 @@ string_to_repr(fvalue_t *fv, ftrepr_t rtype, char *buf) @@ -71,6 +72,7 @@ string_to_repr(fvalue_t *fv, ftrepr_t rtype, char *buf)
{ {
switch (rtype) { switch (rtype) {
case FTREPR_DISPLAY: case FTREPR_DISPLAY:
@ -78,7 +78,7 @@ diff --git a/epan/print.c b/epan/print.c
index 5a7ed61..6dd2222 100644 index 5a7ed61..6dd2222 100644
--- a/epan/print.c --- a/epan/print.c
+++ b/epan/print.c +++ b/epan/print.c
@@ -1797,7 +1797,10 @@ gchar* get_node_field_value(field_info* fi, epan_dissect_t* edt) @@ -1799,7 +1799,10 @@ gchar* get_node_field_value(field_info* fi, epan_dissect_t* edt)
* FT_NONE can be checked when using -T fields */ * FT_NONE can be checked when using -T fields */
return g_strdup("1"); return g_strdup("1");
default: default:

View File

@ -20,7 +20,7 @@
Summary: Network traffic analyzer Summary: Network traffic analyzer
Name: wireshark Name: wireshark
Version: 1.12.1 Version: 1.12.2
Release: 1%{?dist} Release: 1%{?dist}
License: GPL+ License: GPL+
Group: Applications/Internet Group: Applications/Internet
@ -370,6 +370,9 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
%{_datadir}/aclocal/* %{_datadir}/aclocal/*
%changelog %changelog
* Mon Nov 17 2014 Peter Hatina <phatina@redhat.com> - 1.12.2-1
- Ver. 1.12.2
* Mon Sep 22 2014 Peter Hatina <phatina@redhat.com> - 1.12.1-1 * Mon Sep 22 2014 Peter Hatina <phatina@redhat.com> - 1.12.1-1
- Ver. 1.12.1 - Ver. 1.12.1