Allow build with heimdal again. Bump PKGREVISION.

4 files changed, 64 insertions, 8 deletions

diff --git a/net/wireshark/Makefile b/net/wireshark/Makefile
index 00cec44d39d..bd444f5e97f 100644
--- a/net/wireshark/Makefile
+++ b/net/wireshark/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.155 2016/09/19 13:04:26 wiz Exp $
+# $NetBSD: Makefile,v 1.156 2016/09/29 20:11:08 markd Exp $
 
 DISTNAME=	wireshark-2.2.0
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	https://www.wireshark.org/download/src/
 EXTRACT_SUFX=	.tar.bz2
@@ -22,9 +22,6 @@ CHECK_PORTABILITY_SKIP+=packaging/macosx/*/*
 
 PKGCONFIG_OVERRIDE+=	wireshark.pc.in
 
-# https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12831
-KRB5_ACCEPTED=		mit-krb5
-
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--enable-static=no
 CONFIGURE_ARGS+=	--with-ssl=${SSLBASE:Q}
@@ -85,7 +82,6 @@ BUILDLINK_TRANSFORM+=	rm:-DGDK_PIXBUF_DISABLE_DEPRECATED
 .include "../../security/openssl/buildlink3.mk"
 
 .include "../../lang/python/application.mk"
-.include "../../security/mit-krb5/buildlink3.mk"
-#.include "../../mk/krb5.buildlink3.mk"
+.include "../../mk/krb5.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/wireshark/distinfo b/net/wireshark/distinfo
index b64ecd40cb8..f72538171ca 100644
--- a/net/wireshark/distinfo
+++ b/net/wireshark/distinfo
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.93 2016/09/12 11:04:54 wiz Exp $
+$NetBSD: distinfo,v 1.94 2016/09/29 20:11:08 markd Exp $
 
 SHA1 (wireshark-2.2.0.tar.bz2) = 4b47bf8e2053073585318646e27d2aa9dc7c7238
 RMD160 (wireshark-2.2.0.tar.bz2) = bfcd77da458dc9f427cd423876a60968e8fa66ad
 SHA512 (wireshark-2.2.0.tar.bz2) = 03dd1ce686b0e012d3498d6966382db1ff39844e2b03286eded5d77062a958d2dc939b00558708ae37b8e354d95ee6c4aa32023477d862b35bff4e2a0f8f3326
 Size (wireshark-2.2.0.tar.bz2) = 32141141 bytes
+SHA1 (patch-epan_dissectors_packet-kerberos.c) = 8069e9cdf997b1e32c149e3351ec39e400c3c81b
+SHA1 (patch-epan_dissectors_packet-kerberos.h) = ef0d17c9d7b7f49677abd32b87f3767b5c194a9a
 SHA1 (patch-extcap.c) = 70615218f803d24c89ad8237d6ede2119606a21b
diff --git a/net/wireshark/patches/patch-epan_dissectors_packet-kerberos.c b/net/wireshark/patches/patch-epan_dissectors_packet-kerberos.c
new file mode 100644
index 00000000000..25306573fc7
--- /dev/null
+++ b/net/wireshark/patches/patch-epan_dissectors_packet-kerberos.c
@@ -0,0 +1,23 @@
+$NetBSD: patch-epan_dissectors_packet-kerberos.c,v 1.1 2016/09/29 20:11:09 markd Exp $
+
+#if 0 out some defines that clash with heimdal but wireshark doesn't
+actually use.  Allows build with heimdal
+
+--- epan/dissectors/packet-kerberos.c.orig	2016-09-07 16:59:03.000000000 +0000
++++ epan/dissectors/packet-kerberos.c
+@@ -1068,6 +1068,7 @@ decrypt_krb5_data(proto_tree *tree, pack
+ #define KRB5_MSG_ENC_KRB_CRED_PART	29	/* EncKrbCredPart */
+ #define KRB5_MSG_ERROR			30	/* KRB-ERROR type */
+ 
++#if 0
+ /* encryption type constants */
+ #define KRB5_ENCTYPE_NULL		0
+ #define KRB5_ENCTYPE_DES_CBC_CRC	1
+@@ -1103,6 +1104,7 @@ decrypt_krb5_data(proto_tree *tree, pack
+ #define KRB5_ENCTYPE_RC4_LM		0xffffff7e
+ #define KRB5_ENCTYPE_RC4_PLAIN2		0xffffff7f
+ #define KRB5_ENCTYPE_RC4_MD4		0xffffff80
++#endif
+ 
+ /* checksum types */
+ #define KRB5_CHKSUM_NONE		0
diff --git a/net/wireshark/patches/patch-epan_dissectors_packet-kerberos.h b/net/wireshark/patches/patch-epan_dissectors_packet-kerberos.h
new file mode 100644
index 00000000000..1118f0ebeb1
--- /dev/null
+++ b/net/wireshark/patches/patch-epan_dissectors_packet-kerberos.h
@@ -0,0 +1,35 @@
+$NetBSD: patch-epan_dissectors_packet-kerberos.h,v 1.1 2016/09/29 20:11:09 markd Exp $
+
+#if 0 out some defines that clash with heimdal but wireshark doesn't
+actually use.  Allows build with heimdal
+
+--- epan/dissectors/packet-kerberos.h.orig	2016-09-07 16:59:03.000000000 +0000
++++ epan/dissectors/packet-kerberos.h
+@@ -108,6 +108,7 @@ void read_keytab_file_from_preferences(v
+ 
+ #endif /* HAVE_KERBEROS */
+ 
++#if 0
+ /* encryption type constants */
+ #define KRB5_ENCTYPE_NULL		0
+ #define KRB5_ENCTYPE_DES_CBC_CRC	1
+@@ -128,8 +129,10 @@ void read_keytab_file_from_preferences(v
+ #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
++#endif
+ #define KERB_ENCTYPE_RC4_HMAC		23
+ #define KERB_ENCTYPE_RC4_HMAC_EXP	24
++#if 0
+ #define KRB5_ENCTYPE_UNKNOWN		0x1ff
+ #define KRB5_ENCTYPE_LOCAL_DES3_HMAC_SHA1	0x7007
+ #define KRB5_ENCTYPE_RC4_PLAIN_EXP	0xffffff73
+@@ -143,7 +146,7 @@ void read_keytab_file_from_preferences(v
+ #define KRB5_ENCTYPE_RC4_LM		0xffffff7e
+ #define KRB5_ENCTYPE_RC4_PLAIN2		0xffffff7f
+ #define KRB5_ENCTYPE_RC4_MD4		0xffffff80
+-
++#endif
+ 
+ /*--- Included file: packet-kerberos-exp.h ---*/
+ #line 1 "./asn1/kerberos/packet-kerberos-exp.h"