From owner-svn-ports-all@FreeBSD.ORG Fri May 15 23:47:44 2015 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id AB75A211; Fri, 15 May 2015 23:47:44 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 986EA1639; Fri, 15 May 2015 23:47:44 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4FNli0L063003; Fri, 15 May 2015 23:47:44 GMT (envelope-from marcus@FreeBSD.org) Received: (from marcus@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4FNlhWp062997; Fri, 15 May 2015 23:47:43 GMT (envelope-from marcus@FreeBSD.org) Message-Id: <201505152347.t4FNlhWp062997@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: marcus set sender to marcus@FreeBSD.org using -f From: Joe Marcus Clarke Date: Fri, 15 May 2015 23:47:43 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r386492 - in head/net/wireshark: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 May 2015 23:47:44 -0000 Author: marcus Date: Fri May 15 23:47:43 2015 New Revision: 386492 URL: https://svnweb.freebsd.org/changeset/ports/386492 Log: Update to 1.12.5 and fix the build with GSSAPI by requiring KRB from ports. PR: 196671 Modified: head/net/wireshark/Makefile head/net/wireshark/distinfo head/net/wireshark/files/patch-configure head/net/wireshark/pkg-plist Modified: head/net/wireshark/Makefile ============================================================================== --- head/net/wireshark/Makefile Fri May 15 23:20:41 2015 (r386491) +++ head/net/wireshark/Makefile Fri May 15 23:47:43 2015 (r386492) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME?= wireshark -PORTVERSION= 1.12.4 +PORTVERSION= 1.12.5 CATEGORIES= net ipv6 MASTER_SITES= http://www.wireshark.org/download/src/ \ http://ftp.uni-kl.de/pub/wireshark/src/ \ @@ -181,6 +181,10 @@ CONFIGURE_ARGS+=--with-libgcrypt-prefix= .if ! ${PORT_OPTIONS:MGSSAPI} CONFIGURE_ARGS+=--with-krb5=no +.else +KRB5_CONFIG?= ${LOCALBASE}/bin/krb5-config +CONFIGURE_ENV+= KRB5_CONFIG=${KRB5_CONFIG} +LIB_DEPENDS+= libkrb5.so:${PORTSDIR}/security/krb5 .endif PKG_MESSAGE= ${FILESDIR}/pkg-message Modified: head/net/wireshark/distinfo ============================================================================== --- head/net/wireshark/distinfo Fri May 15 23:20:41 2015 (r386491) +++ head/net/wireshark/distinfo Fri May 15 23:47:43 2015 (r386492) @@ -1,2 +1,2 @@ -SHA256 (wireshark-1.12.4.tar.bz2) = de804e98e252e4b795d28d6ac2d48d7f5aacd9b046ee44d44266983795ebc312 -SIZE (wireshark-1.12.4.tar.bz2) = 29257016 +SHA256 (wireshark-1.12.5.tar.bz2) = d0f177b2ef49e4deae4ff7d3299bdd295ba558a3934ce8ae489b2f13927cbd82 +SIZE (wireshark-1.12.5.tar.bz2) = 29208507 Modified: head/net/wireshark/files/patch-configure ============================================================================== --- head/net/wireshark/files/patch-configure Fri May 15 23:20:41 2015 (r386491) +++ head/net/wireshark/files/patch-configure Fri May 15 23:47:43 2015 (r386492) @@ -1,6 +1,6 @@ ---- configure.orig 2012-11-28 13:51:02.000000000 -0500 -+++ configure 2012-12-17 01:11:49.000000000 -0500 -@@ -26487,7 +26487,7 @@ $as_echo "yes" >&6; } +--- configure.orig 2015-05-12 20:26:44 UTC ++++ configure +@@ -35189,7 +35189,7 @@ $as_echo "yes" >&6; } # searches the specified directory. # CPPFLAGS="$CPPFLAGS -I$krb5_dir/include" @@ -9,7 +9,7 @@ # MIT Kerberos moved krb5.h to krb5/krb5.h starting with release 1.5 ac_mit_version_olddir=`grep 'Massachusetts Institute of Technology' $krb5_dir/include/krb5.h | head -n 1 | sed 's/^.*Massachusetts Institute of Technology.*$/MIT/'` ac_mit_version_newdir=`grep 'Massachusetts Institute of Technology' $krb5_dir/include/krb5/krb5.h | head -n 1 | sed 's/^.*Massachusetts Institute of Technology.*$/MIT/'` -@@ -26547,7 +26547,7 @@ fi +@@ -35249,7 +35249,7 @@ fi if test -x "$KRB5_CONFIG" then Modified: head/net/wireshark/pkg-plist ============================================================================== --- head/net/wireshark/pkg-plist Fri May 15 23:20:41 2015 (r386491) +++ head/net/wireshark/pkg-plist Fri May 15 23:47:43 2015 (r386492) @@ -16,13 +16,13 @@ bin/tshark %%TEXT2PCAP%% lib/libfiletap.so lib/libfiletap.so.0 -lib/libfiletap.so.0.0.4 +lib/libfiletap.so.0.0.5 lib/libwireshark.so lib/libwireshark.so.5 -lib/libwireshark.so.5.0.4 +lib/libwireshark.so.5.0.5 lib/libwiretap.so lib/libwiretap.so.4 -lib/libwiretap.so.4.0.4 +lib/libwiretap.so.4.0.5 lib/libwsutil.so lib/libwsutil.so.4 lib/libwsutil.so.4.1.0