diff options
| author | marcus <marcus@FreeBSD.org> | 2015-05-16 07:47:43 +0800 |
|---|---|---|
| committer | marcus <marcus@FreeBSD.org> | 2015-05-16 07:47:43 +0800 |
| commit | 120934d2de378956a7d1018e27846d69bc916347 (patch) | |
| tree | 5b7800543be4bf8b3378503dbc8fdff23f1951ec | |
| parent | 17b5c4f797b4e3cfadc6c989b3df227015a80894 (diff) | |
| download | freebsd-ports-gnome-120934d2de378956a7d1018e27846d69bc916347.tar.gz freebsd-ports-gnome-120934d2de378956a7d1018e27846d69bc916347.tar.zst freebsd-ports-gnome-120934d2de378956a7d1018e27846d69bc916347.zip | |
Update to 1.12.5 and fix the build with GSSAPI by requiring KRB from ports.
PR: 196671
| -rw-r--r-- | net/wireshark/Makefile | 6 | ||||
| -rw-r--r-- | net/wireshark/distinfo | 4 | ||||
| -rw-r--r-- | net/wireshark/files/patch-configure | 8 | ||||
| -rw-r--r-- | net/wireshark/pkg-plist | 6 |
4 files changed, 14 insertions, 10 deletions
diff --git a/net/wireshark/Makefile b/net/wireshark/Makefile index 0e89d2eed285..7822b0557614 100644 --- a/net/wireshark/Makefile +++ b/net/wireshark/Makefile @@ -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=${LOCALBASE} .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 diff --git a/net/wireshark/distinfo b/net/wireshark/distinfo index 44136c199ed1..a1097b901703 100644 --- a/net/wireshark/distinfo +++ b/net/wireshark/distinfo @@ -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 diff --git a/net/wireshark/files/patch-configure b/net/wireshark/files/patch-configure index 7e6ea41480ba..ef86572a4913 100644 --- a/net/wireshark/files/patch-configure +++ b/net/wireshark/files/patch-configure @@ -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 diff --git a/net/wireshark/pkg-plist b/net/wireshark/pkg-plist index 41d4700f1960..d336466d938f 100644 --- a/net/wireshark/pkg-plist +++ b/net/wireshark/pkg-plist @@ -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 |