Attachment 156777 Details for Bug 196671 – be more explicit to deconfuse wireshark port regarding kerberos detection/compiling/linking

[patch] be more explicit to deconfuse wireshark port regarding kerberos detection/compiling/linking

pr-196671-patch.diff (text/plain), 1.71 KB, created by John Hein on 2015-05-14 14:19:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: John Hein

Created: 2015-05-14 14:19:05 UTC

Size: 1.71 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 385242)
>+++ Makefile	(working copy)
>@@ -180,6 +180,14 @@
> 
> .if ! ${PORT_OPTIONS:MGSSAPI}
> CONFIGURE_ARGS+=--with-krb5=no
>+KRB_INCDIR_SUB=
>+.else
>+KRB5_PREFIX?=	/usr
>+KRB5_CONFIG?=	${KRB5_PREFIX}/bin/krb5-config
>+CONFIGURE_ENV+=	KRB5_CONFIG=${KRB5_CONFIG}
>+LDFLAGS+=	-L${KRB5_PREFIX}/lib
>+KRB_INCDIR_SUB=	${KRB5_PREFIX}/include/
>+EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-epan-dissectors-packet-kerberos.c
> .endif
> 
> PKG_MESSAGE=	${FILESDIR}/pkg-message
>@@ -189,6 +197,10 @@
> 		s|-DGDK_PIXBUF_DISABLE_DEPRECATED||g ; \
> 		s|-Wl,--as-needed|| ' \
> 		${WRKSRC}/configure
>+.if ${PORT_OPTIONS:MGSSAPI}
>+	@${REINPLACE_CMD} 's|%%KRB_INCDIR%%|${KRB_INCDIR_SUB}|' \
>+		${WRKSRC}/epan/dissectors/packet-kerberos.c
>+.endif
> 
> post-install:
> 	${INSTALL_DATA} ${WRKSRC}/image/hi48-app-wireshark.png \
>Index: files/extra-patch-epan-dissectors-packet-kerberos.c
>===================================================================
>--- files/extra-patch-epan-dissectors-packet-kerberos.c	(revision 0)
>+++ files/extra-patch-epan-dissectors-packet-kerberos.c	(working copy)
>@@ -0,0 +1,16 @@
>+gcc will find /usr/local/include/krb5.h before /usr/include/krb5.h if
>+-I/usr/local/include is specified (even if you put -I/usr/include before
>+it).  It's hard to get around that, so just specify the absolute path in
>+the #include.
>+
>+--- epan/dissectors/packet-kerberos.c.orig	2015-03-04 10:08:43.000000000 -0700
>++++ epan/dissectors/packet-kerberos.c	2015-05-12 08:23:23.736721000 -0600
>+@@ -505,7 +505,7 @@
>+ #undef HAVE_STDARG_H
>+ #undef HAVE_SYS_TYPES_H
>+ #endif
>+-#include <krb5.h>
>++#include <%%KRB_INCDIR%%/krb5.h>
>+ enc_key_t *enc_key_list=NULL;
>+ 
>+ static void

Actions: View | Diff

Attachments on bug 196671: 156777 | 156779