- up to 2.2.0

diff --git a/wireshark-krb5-defines.patch b/wireshark-krb5-defines.patch
new file mode 100644 (file)
index 0000000..a7342db
--- /dev/null
+++ b/wireshark-krb5-defines.patch
@@ -0,0 +1,96 @@
+diff -ruNp wireshark-2.2.0.orig/epan/dissectors/asn1/kerberos/packet-kerberos-template.c wireshark-2.2.0/epan/dissectors/asn1/kerberos/packet-kerberos-template.c
+--- wireshark-2.2.0.orig/epan/dissectors/asn1/kerberos/packet-kerberos-template.c      2016-09-07 18:59:02.000000000 +0200
++++ wireshark-2.2.0/epan/dissectors/asn1/kerberos/packet-kerberos-template.c   2016-09-12 15:31:55.598702256 +0200
+@@ -810,10 +810,6 @@ decrypt_krb5_data(proto_tree *tree, pack
+ #define KRB5_MSG_ERROR                        30      /* KRB-ERROR type */
+ 
+ /* encryption type constants */
+-#define KRB5_ENCTYPE_NULL             0
+-#define KRB5_ENCTYPE_DES_CBC_CRC      1
+-#define KRB5_ENCTYPE_DES_CBC_MD4      2
+-#define KRB5_ENCTYPE_DES_CBC_MD5      3
+ #define KRB5_ENCTYPE_DES_CBC_RAW      4
+ #define KRB5_ENCTYPE_DES3_CBC_SHA     5
+ #define KRB5_ENCTYPE_DES3_CBC_RAW     6
+@@ -825,9 +821,6 @@ decrypt_krb5_data(proto_tree *tree, pack
+ #define KRB5_ENCTYPE_RSA_ENV          13
+ #define KRB5_ENCTYPE_RSA_ES_OEAP_ENV  14
+ #define KRB5_ENCTYPE_DES_EDE3_CBC_ENV 15
+-#define KRB5_ENCTYPE_DES3_CBC_SHA1    16
+-#define KRB5_ENCTYPE_AES128_CTS_HMAC_SHA1_96 17
+-#define KRB5_ENCTYPE_AES256_CTS_HMAC_SHA1_96 18
+ #define KRB5_ENCTYPE_DES_CBC_MD5_NT   20
+ #define KERB_ENCTYPE_RC4_HMAC         23
+ #define KERB_ENCTYPE_RC4_HMAC_EXP     24
+diff -ruNp wireshark-2.2.0.orig/epan/dissectors/asn1/kerberos/packet-kerberos-template.h wireshark-2.2.0/epan/dissectors/asn1/kerberos/packet-kerberos-template.h
+--- wireshark-2.2.0.orig/epan/dissectors/asn1/kerberos/packet-kerberos-template.h      2016-09-07 18:59:02.000000000 +0200
++++ wireshark-2.2.0/epan/dissectors/asn1/kerberos/packet-kerberos-template.h   2016-09-12 15:31:55.171703765 +0200
+@@ -101,10 +101,6 @@ void read_keytab_file_from_preferences(v
+ #endif /* HAVE_KERBEROS */
+ 
+ /* encryption type constants */
+-#define KRB5_ENCTYPE_NULL             0
+-#define KRB5_ENCTYPE_DES_CBC_CRC      1
+-#define KRB5_ENCTYPE_DES_CBC_MD4      2
+-#define KRB5_ENCTYPE_DES_CBC_MD5      3
+ #define KRB5_ENCTYPE_DES_CBC_RAW      4
+ #define KRB5_ENCTYPE_DES3_CBC_SHA     5
+ #define KRB5_ENCTYPE_DES3_CBC_RAW     6
+@@ -116,9 +112,6 @@ void read_keytab_file_from_preferences(v
+ #define KRB5_ENCTYPE_RSA_ENV          13
+ #define KRB5_ENCTYPE_RSA_ES_OEAP_ENV  14
+ #define KRB5_ENCTYPE_DES_EDE3_CBC_ENV 15
+-#define KRB5_ENCTYPE_DES3_CBC_SHA1    16
+-#define KRB5_ENCTYPE_AES128_CTS_HMAC_SHA1_96 17
+-#define KRB5_ENCTYPE_AES256_CTS_HMAC_SHA1_96 18
+ #define KRB5_ENCTYPE_DES_CBC_MD5_NT   20
+ #define KERB_ENCTYPE_RC4_HMAC         23
+ #define KERB_ENCTYPE_RC4_HMAC_EXP     24
+diff -ruNp wireshark-2.2.0.orig/epan/dissectors/packet-kerberos.c wireshark-2.2.0/epan/dissectors/packet-kerberos.c
+--- wireshark-2.2.0.orig/epan/dissectors/packet-kerberos.c     2016-09-07 18:59:03.000000000 +0200
++++ wireshark-2.2.0/epan/dissectors/packet-kerberos.c  2016-09-12 15:31:56.421699346 +0200
+@@ -1069,10 +1069,6 @@ decrypt_krb5_data(proto_tree *tree, pack
+ #define KRB5_MSG_ERROR                        30      /* KRB-ERROR type */
+ 
+ /* encryption type constants */
+-#define KRB5_ENCTYPE_NULL             0
+-#define KRB5_ENCTYPE_DES_CBC_CRC      1
+-#define KRB5_ENCTYPE_DES_CBC_MD4      2
+-#define KRB5_ENCTYPE_DES_CBC_MD5      3
+ #define KRB5_ENCTYPE_DES_CBC_RAW      4
+ #define KRB5_ENCTYPE_DES3_CBC_SHA     5
+ #define KRB5_ENCTYPE_DES3_CBC_RAW     6
+@@ -1084,9 +1080,6 @@ decrypt_krb5_data(proto_tree *tree, pack
+ #define KRB5_ENCTYPE_RSA_ENV          13
+ #define KRB5_ENCTYPE_RSA_ES_OEAP_ENV  14
+ #define KRB5_ENCTYPE_DES_EDE3_CBC_ENV 15
+-#define KRB5_ENCTYPE_DES3_CBC_SHA1    16
+-#define KRB5_ENCTYPE_AES128_CTS_HMAC_SHA1_96 17
+-#define KRB5_ENCTYPE_AES256_CTS_HMAC_SHA1_96 18
+ #define KRB5_ENCTYPE_DES_CBC_MD5_NT   20
+ #define KERB_ENCTYPE_RC4_HMAC         23
+ #define KERB_ENCTYPE_RC4_HMAC_EXP     24
+diff -ruNp wireshark-2.2.0.orig/epan/dissectors/packet-kerberos.h wireshark-2.2.0/epan/dissectors/packet-kerberos.h
+--- wireshark-2.2.0.orig/epan/dissectors/packet-kerberos.h     2016-09-07 18:59:03.000000000 +0200
++++ wireshark-2.2.0/epan/dissectors/packet-kerberos.h  2016-09-12 15:31:56.003700824 +0200
+@@ -109,10 +109,6 @@ void read_keytab_file_from_preferences(v
+ #endif /* HAVE_KERBEROS */
+ 
+ /* encryption type constants */
+-#define KRB5_ENCTYPE_NULL             0
+-#define KRB5_ENCTYPE_DES_CBC_CRC      1
+-#define KRB5_ENCTYPE_DES_CBC_MD4      2
+-#define KRB5_ENCTYPE_DES_CBC_MD5      3
+ #define KRB5_ENCTYPE_DES_CBC_RAW      4
+ #define KRB5_ENCTYPE_DES3_CBC_SHA     5
+ #define KRB5_ENCTYPE_DES3_CBC_RAW     6
+@@ -124,9 +120,6 @@ void read_keytab_file_from_preferences(v
+ #define KRB5_ENCTYPE_RSA_ENV          13
+ #define KRB5_ENCTYPE_RSA_ES_OEAP_ENV  14
+ #define KRB5_ENCTYPE_DES_EDE3_CBC_ENV 15
+-#define KRB5_ENCTYPE_DES3_CBC_SHA1    16
+-#define KRB5_ENCTYPE_AES128_CTS_HMAC_SHA1_96 17
+-#define KRB5_ENCTYPE_AES256_CTS_HMAC_SHA1_96 18
+ #define KRB5_ENCTYPE_DES_CBC_MD5_NT   20
+ #define KERB_ENCTYPE_RC4_HMAC         23
+ #define KERB_ENCTYPE_RC4_HMAC_EXP     24

diff --git a/wireshark.spec b/wireshark.spec
index 5b13d3fe8e007383427e440b8bd5083293cffc40..2acc9a2d51205d568bbfbaa6147d19c10b9d1900 100644 (file)
--- a/wireshark.spec
+++ b/wireshark.spec
@@ -22,15 +22,16 @@ Summary(pt_BR.UTF-8):       Analisador de tráfego de rede
 Summary(ru.UTF-8):     Анализатор сетевого траффика
 Summary(uk.UTF-8):     Аналізатор мережевого трафіку
 Name:          wireshark
-Version:       2.0.3
-Release:       2
+Version:       2.2.0
+Release:       1
 License:       GPL v2+
 Group:         Networking/Utilities
 Source0:       http://www.wireshark.org/download/src/%{name}-%{version}.tar.bz2
-# Source0-md5: 62dc20f5a77542feed2e38f18db8ae3b
+# Source0-md5: c7de0997f74934f25b456846cf75cb81
 Patch0:                %{name}-Werror.patch
 Patch1:                %{name}-ac.patch
 Patch2:                %{name}-desktop.patch
+Patch3:                %{name}-krb5-defines.patch
 URL:           http://www.wireshark.org/
 BuildRequires: GeoIP-devel
 BuildRequires: asciidoc
@@ -70,6 +71,7 @@ BuildRequires:        Qt5PrintSupport-devel
 BuildRequires: Qt5Widgets-devel
 BuildRequires: libstdc++-devel
 BuildRequires: qt5-build
+BuildRequires: qt5-linguist
 %endif
 Requires:      %{name}-gui-common = %{version}-%{release}
 %if %{with gtk2}
@@ -284,6 +286,7 @@ pakietów.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 find -name Makefile.am | xargs sed -i -e 's/-Werror//g'
 
 %build
@@ -404,10 +407,12 @@ fi
 %defattr(644,root,root,755)
 %doc AUTHORS* ChangeLog NEWS README README.linux README.vmware doc/README.*
 %dir %{_libdir}/%{name}
+%dir %{_libdir}/%{name}/extcap
 %dir %{_libdir}/%{name}/plugins
 %dir %{_libdir}/%{name}/plugins/%{version}*
+%attr(755,root,root) %{_libdir}/%{name}/extcap/androiddump
+%attr(755,root,root) %{_libdir}/%{name}/extcap/randpktdump
 %attr(755,root,root) %{_libdir}/%{name}/plugins/%{version}*/*.so
-%attr(755,root,root) %{_bindir}/androiddump
 %attr(755,root,root) %{_bindir}/capinfos
 %attr(755,root,root) %{_bindir}/captype
 %attr(755,root,root) %{_bindir}/dftest
@@ -420,7 +425,7 @@ fi
 %attr(755,root,root) %{_bindir}/reordercap
 %attr(755,root,root) %{_bindir}/text2pcap
 %attr(755,root,root) %{_libdir}/libwireshark.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libwireshark.so.6
+%attr(755,root,root) %ghost %{_libdir}/libwireshark.so.8
 %{_mandir}/man1/androiddump.1*
 %{_mandir}/man1/capinfos.1*
 %{_mandir}/man1/dftest.1*
@@ -429,8 +434,10 @@ fi
 %{_mandir}/man1/mergecap.1*
 %{_mandir}/man1/rawshark.1*
 %{_mandir}/man1/randpkt.1*
+%{_mandir}/man1/randpktdump.1*
 %{_mandir}/man1/reordercap.1*
 %{_mandir}/man1/text2pcap.1*
+%{_mandir}/man4/extcap.4*
 %{_mandir}/man4/wireshark-filter.4*
 
 %if %{with qt}
@@ -449,14 +456,18 @@ fi
 %defattr(644,root,root,755)
 %doc wiretap/README*
 %attr(755,root,root) %{_libdir}/libwiretap.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libwiretap.so.5
+%attr(755,root,root) %ghost %{_libdir}/libwiretap.so.6
+%attr(755,root,root) %{_libdir}/libwscodecs.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libwscodecs.so.1
 %attr(755,root,root) %{_libdir}/libwsutil.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libwsutil.so.6
+%attr(755,root,root) %ghost %{_libdir}/libwsutil.so.7
 
 %files -n libwiretap-devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libwiretap.so
+%attr(755,root,root) %{_libdir}/libwscodecs.so
 %attr(755,root,root) %{_libdir}/libwsutil.so
 %{_libdir}/libwiretap.la
+%{_libdir}/libwscodecs.la
 %{_libdir}/libwsutil.la
 %{_includedir}/wiretap