- up to 2.2.7

- removed unnecessary wireshark-krb5-defines.patch

diff --git a/wireshark-krb5-defines.patch b/wireshark-krb5-defines.patch
deleted file mode 100644 (file)
index a7342db..0000000
--- a/wireshark-krb5-defines.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-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 f59bf23e7f7bc87773a899b7da9638262acdc14c..7703b2c863216d765df27b2ed1c276acc4ec15ed 100644 (file)
--- a/wireshark.spec
+++ b/wireshark.spec
@@ -22,16 +22,15 @@ Summary(pt_BR.UTF-8):       Analisador de tráfego de rede
 Summary(ru.UTF-8):     Анализатор сетевого траффика
 Summary(uk.UTF-8):     Аналізатор мережевого трафіку
 Name:          wireshark
-Version:       2.2.1
-Release:       2
+Version:       2.2.7
+Release:       1
 License:       GPL v2+
 Group:         Networking/Utilities
 Source0:       http://www.wireshark.org/download/src/%{name}-%{version}.tar.bz2
-# Source0-md5: 49a1023a69ac108ca089d750eee50e37
+# Source0-md5: a4d880554c7f925dafef60fa313b580d
 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
@@ -286,7 +285,6 @@ pakietów.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
 find -name Makefile.am | xargs sed -i -e 's/-Werror//g'
 
 %build