Attachment #156777 for bug #196671

Lines 180-185 Link Here

(-)Makefile (+12 lines)
180		180
181	.if ! ${PORT_OPTIONS:MGSSAPI}	181	.if ! ${PORT_OPTIONS:MGSSAPI}
182	CONFIGURE_ARGS+=--with-krb5=no	182	CONFIGURE_ARGS+=--with-krb5=no
		183	KRB_INCDIR_SUB=
		184	.else
		185	KRB5_PREFIX?= /usr
		186	KRB5_CONFIG?= ${KRB5_PREFIX}/bin/krb5-config
		187	CONFIGURE_ENV+= KRB5_CONFIG=${KRB5_CONFIG}
		188	LDFLAGS+= -L${KRB5_PREFIX}/lib
		189	KRB_INCDIR_SUB= ${KRB5_PREFIX}/include/
		190	EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-epan-dissectors-packet-kerberos.c
183	.endif	191	.endif
184		192
185	PKG_MESSAGE= ${FILESDIR}/pkg-message	193	PKG_MESSAGE= ${FILESDIR}/pkg-message
Lines 189-194 Link Here
189	s\|-DGDK_PIXBUF_DISABLE_DEPRECATED\|\|g ; \	197	s\|-DGDK_PIXBUF_DISABLE_DEPRECATED\|\|g ; \
190	s\|-Wl,--as-needed\|\| ' \	198	s\|-Wl,--as-needed\|\| ' \
191	${WRKSRC}/configure	199	${WRKSRC}/configure
		200	.if ${PORT_OPTIONS:MGSSAPI}
		201	@${REINPLACE_CMD} 's\|%%KRB_INCDIR%%\|${KRB_INCDIR_SUB}\|' \
		202	${WRKSRC}/epan/dissectors/packet-kerberos.c
		203	.endif
192		204
193	post-install:	205	post-install:
194	${INSTALL_DATA} ${WRKSRC}/image/hi48-app-wireshark.png \	206	${INSTALL_DATA} ${WRKSRC}/image/hi48-app-wireshark.png \




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

Return to bug 196671

Line 0 Link Here

(-)files/extra-patch-epan-dissectors-packet-kerberos.c (+16 lines)
	1	gcc will find /usr/local/include/krb5.h before /usr/include/krb5.h if
	2	-I/usr/local/include is specified (even if you put -I/usr/include before
	3	it). It's hard to get around that, so just specify the absolute path in
	4	the #include.
	5
	6	--- epan/dissectors/packet-kerberos.c.orig 2015-03-04 10:08:43.000000000 -0700
	7	+++ epan/dissectors/packet-kerberos.c 2015-05-12 08:23:23.736721000 -0600
	8	@@ -505,7 +505,7 @@
	9	#undef HAVE_STDARG_H
	10	#undef HAVE_SYS_TYPES_H
	11	#endif
	12	-#include <krb5.h>
	13	+#include <%%KRB_INCDIR%%/krb5.h>
	14	enc_key_t *enc_key_list=NULL;
	15
	16	static void