diff --git a/.gitignore b/.gitignore index 7e86eee..bf85af0 100644 --- a/.gitignore +++ b/.gitignore @@ -36,3 +36,4 @@ wireshark-1.2.10.tar.bz2 /wireshark-1.10.9.tar.bz2 /wireshark-1.12.0.tar.bz2 /wireshark-1.12.1.tar.bz2 +/wireshark-1.12.2.tar.bz2 diff --git a/sources b/sources index 625a6bc..7e204d4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -14b3e3d8979d1eb27ff085bb5f400e67 wireshark-1.12.1.tar.bz2 +2f2a16be8b087227cb17733c72288ae4 wireshark-1.12.2.tar.bz2 diff --git a/wireshark-0008-move-default-temporary-directory-to-var-tmp.patch b/wireshark-0008-move-default-temporary-directory-to-var-tmp.patch index 9378f72..70f9a52 100644 --- a/wireshark-0008-move-default-temporary-directory-to-var-tmp.patch +++ b/wireshark-0008-move-default-temporary-directory-to-var-tmp.patch @@ -45,13 +45,16 @@ index 75c31bd..81648a7 100644 # Header files that are not generated from other files LIBWSUTIL_INCLUDES = \ -@@ -104,4 +105,5 @@ LIBWSUTIL_INCLUDES = \ +@@ -104,7 +105,8 @@ LIBWSUTIL_INCLUDES = \ time_util.h \ type_util.h \ u3.h \ - unicode-utils.h + unicode-utils.h \ + wstmpdir.h + + # + # Editor modelines - https://www.wireshark.org/tools/modelines.html diff --git a/wsutil/tempfile.c b/wsutil/tempfile.c index ccefe30..ac40319 100644 --- a/wsutil/tempfile.c diff --git a/wireshark-0010-fields-print-format.patch b/wireshark-0010-fields-print-format.patch index 550cb66..913dbc0 100644 --- a/wireshark-0010-fields-print-format.patch +++ b/wireshark-0010-fields-print-format.patch @@ -46,7 +46,7 @@ diff --git a/epan/ftypes/ftype-string.c b/epan/ftypes/ftype-string.c index 3893823..7e67292 100644 --- a/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) { case FTREPR_DISPLAY: @@ -54,7 +54,7 @@ index 3893823..7e67292 100644 return (int)strlen(fv->value.string); 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) { case FTREPR_DISPLAY: @@ -78,7 +78,7 @@ diff --git a/epan/print.c b/epan/print.c index 5a7ed61..6dd2222 100644 --- a/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 */ return g_strdup("1"); default: diff --git a/wireshark.spec b/wireshark.spec index acad8ec..55815a4 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -20,7 +20,7 @@ Summary: Network traffic analyzer Name: wireshark -Version: 1.12.1 +Version: 1.12.2 Release: 1%{?dist} License: GPL+ Group: Applications/Internet @@ -370,6 +370,9 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : %{_datadir}/aclocal/* %changelog +* Mon Nov 17 2014 Peter Hatina - 1.12.2-1 +- Ver. 1.12.2 + * Mon Sep 22 2014 Peter Hatina - 1.12.1-1 - Ver. 1.12.1