Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.netbsd.org", Issuer "Postmaster NetBSD.org" (verified OK)) by mollari.NetBSD.org (Postfix) with ESMTPS id 4FAB07A26F for ; Thu, 29 Sep 2016 20:11:11 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id E55C285F38; Thu, 29 Sep 2016 20:11:10 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 7599B85EF3 for ; Thu, 29 Sep 2016 20:11:10 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id VQEclz5CwPBM for ; Thu, 29 Sep 2016 20:11:09 +0000 (UTC) Received: from cvs.NetBSD.org (unknown [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 3F48585E79 for ; Thu, 29 Sep 2016 20:11:09 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 354ECFBD2; Thu, 29 Sep 2016 20:11:09 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1475179869232340" MIME-Version: 1.0 Date: Thu, 29 Sep 2016 20:11:09 +0000 From: "Mark Davies" Subject: CVS commit: pkgsrc/net/wireshark To: pkgsrc-changes@NetBSD.org Reply-To: markd@netbsd.org X-Mailer: log_accum Message-Id: <20160929201109.354ECFBD2@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk This is a multi-part message in MIME format. --_----------=_1475179869232340 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: markd Date: Thu Sep 29 20:11:09 UTC 2016 Modified Files: pkgsrc/net/wireshark: Makefile distinfo Added Files: pkgsrc/net/wireshark/patches: patch-epan_dissectors_packet-kerberos.c patch-epan_dissectors_packet-kerberos.h Log Message: Allow build with heimdal again. Bump PKGREVISION. To generate a diff of this commit: cvs rdiff -u -r1.155 -r1.156 pkgsrc/net/wireshark/Makefile cvs rdiff -u -r1.93 -r1.94 pkgsrc/net/wireshark/distinfo cvs rdiff -u -r0 -r1.1 \ pkgsrc/net/wireshark/patches/patch-epan_dissectors_packet-kerberos.c \ pkgsrc/net/wireshark/patches/patch-epan_dissectors_packet-kerberos.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1475179869232340 Content-Disposition: inline Content-Length: 4989 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/net/wireshark/Makefile diff -u pkgsrc/net/wireshark/Makefile:1.155 pkgsrc/net/wireshark/Makefile:1.156 --- pkgsrc/net/wireshark/Makefile:1.155 Mon Sep 19 13:04:26 2016 +++ pkgsrc/net/wireshark/Makefile Thu Sep 29 20:11:08 2016 @@ -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_DI .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" Index: pkgsrc/net/wireshark/distinfo diff -u pkgsrc/net/wireshark/distinfo:1.93 pkgsrc/net/wireshark/distinfo:1.94 --- pkgsrc/net/wireshark/distinfo:1.93 Mon Sep 12 11:04:54 2016 +++ pkgsrc/net/wireshark/distinfo Thu Sep 29 20:11:08 2016 @@ -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 Added files: Index: pkgsrc/net/wireshark/patches/patch-epan_dissectors_packet-kerberos.c diff -u /dev/null pkgsrc/net/wireshark/patches/patch-epan_dissectors_packet-kerberos.c:1.1 --- /dev/null Thu Sep 29 20:11:09 2016 +++ pkgsrc/net/wireshark/patches/patch-epan_dissectors_packet-kerberos.c Thu Sep 29 20:11:09 2016 @@ -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 Index: pkgsrc/net/wireshark/patches/patch-epan_dissectors_packet-kerberos.h diff -u /dev/null pkgsrc/net/wireshark/patches/patch-epan_dissectors_packet-kerberos.h:1.1 --- /dev/null Thu Sep 29 20:11:09 2016 +++ pkgsrc/net/wireshark/patches/patch-epan_dissectors_packet-kerberos.h Thu Sep 29 20:11:09 2016 @@ -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" --_----------=_1475179869232340--