Attachment #203477 for bug #236959

Lines 2-7 Link Here

(-)Makefile (-1 / +2 lines)
2		2
3	PORTNAME= squid	3	PORTNAME= squid
4	PORTVERSION= 4.6	4	PORTVERSION= 4.6
		5	PORTREVISION= 1
5	CATEGORIES= www ipv6	6	CATEGORIES= www ipv6
6	MASTER_SITES= http://www.squid-cache.org/Versions/v4/ \	7	MASTER_SITES= http://www.squid-cache.org/Versions/v4/ \
7	http://www2.us.squid-cache.org/Versions/v4/ \	8	http://www2.us.squid-cache.org/Versions/v4/ \
Lines 144-150 Link Here
144	GSSAPI_HEIMDAL_CONFIGURE_ON= --with-heimdal-krb5=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS}	145	GSSAPI_HEIMDAL_CONFIGURE_ON= --with-heimdal-krb5=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS}
145	GSSAPI_HEIMDAL_PLIST_SUB= AUTH_KERB=""	146	GSSAPI_HEIMDAL_PLIST_SUB= AUTH_KERB=""
146		147
147	GSSAPI_MIT_USES= gssapi:mit	148	GSSAPI_MIT_USES= gssapi:mit pkgconfig:build
148	GSSAPI_MIT_CONFIGURE_ON= --with-mit-krb5=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS}	149	GSSAPI_MIT_CONFIGURE_ON= --with-mit-krb5=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS}
149	GSSAPI_MIT_PLIST_SUB= AUTH_KERB=""	150	GSSAPI_MIT_PLIST_SUB= AUTH_KERB=""
150		151

Lines 1-6 Link Here

(-)files/patch-configure (-11 / +20 lines)
1	--- configure.orig 2018-07-02 03:32:06 UTC	1	--- configure.orig 2019-02-19 03:04:42 UTC
2	+++ configure	2	+++ configure
3	@@ -34345,7 +34345,7 @@ done	3	@@ -26173,7 +26173,7 @@ else
		4	;;
		5	*)
		6	as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
		7	-for as_dir in $PATH
		8	+for as_dir in $krb5confpatth
		9	do
		10	IFS=$as_save_IFS
		11	test -z "$as_dir" && as_dir=.
		12	@@ -34701,7 +34701,7 @@ done
4	##	13	##
5		14
6	BUILD_HELPER="NIS"	15	BUILD_HELPER="NIS"
Lines 9-15 Link Here
9	do :	18	do :
10	as_ac_Header=`$as_echo "ac_cv_header_$ac_header" \| $as_tr_sh`	19	as_ac_Header=`$as_echo "ac_cv_header_$ac_header" \| $as_tr_sh`
11	ac_fn_cxx_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "	20	ac_fn_cxx_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "
12	@@ -34360,8 +34360,10 @@ if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :	21	@@ -34716,8 +34716,10 @@ if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
13	#define `$as_echo "HAVE_$ac_header" \| $as_tr_cpp` 1	22	#define `$as_echo "HAVE_$ac_header" \| $as_tr_cpp` 1
14	_ACEOF	23	_ACEOF
15		24
Lines 22-28 Link Here
22	fi	31	fi
23		32
24	done	33	done
25	@@ -34834,7 +34836,7 @@ done	34	@@ -35190,7 +35192,7 @@ done
26		35
27	# unconditionally requires crypt(3), for now	36	# unconditionally requires crypt(3), for now
28	if test "x$ac_cv_func_crypt" != "x"; then	37	if test "x$ac_cv_func_crypt" != "x"; then
Lines 31-37 Link Here
31	do :	40	do :
32	as_ac_Header=`$as_echo "ac_cv_header_$ac_header" \| $as_tr_sh`	41	as_ac_Header=`$as_echo "ac_cv_header_$ac_header" \| $as_tr_sh`
33	ac_fn_cxx_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"	42	ac_fn_cxx_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
34	@@ -37226,7 +37228,7 @@ for ac_header in \	43	@@ -37582,7 +37584,7 @@ for ac_header in \
35	arpa/nameser.h \	44	arpa/nameser.h \
36	assert.h \	45	assert.h \
37	bstring.h \	46	bstring.h \
Lines 40-46 Link Here
40	ctype.h \	49	ctype.h \
41	direct.h \	50	direct.h \
42	errno.h \	51	errno.h \
43	@@ -37434,6 +37436,7 @@ ac_fn_cxx_check_header_compile "$LINENO" "$ac_header"	52	@@ -37790,6 +37792,7 @@ ac_fn_cxx_check_header_compile "$LINENO" "$ac_header"
44	#include <netinet/ip.h>	53	#include <netinet/ip.h>
45	#endif	54	#endif
46	#if HAVE_NETINET_IP_COMPAT_H	55	#if HAVE_NETINET_IP_COMPAT_H
Lines 48-54 Link Here
48	#include <netinet/ip_compat.h>	57	#include <netinet/ip_compat.h>
49	#endif	58	#endif
50	#if HAVE_NETINET_IP_FIL_H	59	#if HAVE_NETINET_IP_FIL_H
51	@@ -41463,6 +41466,7 @@ if test "x$enable_ipf_transparent" != "xno" ; then	60	@@ -41819,6 +41822,7 @@ if test "x$enable_ipf_transparent" != "xno" ; then
52	# include <sys/ioccom.h>	61	# include <sys/ioccom.h>
53	# include <netinet/in.h>	62	# include <netinet/in.h>
54		63
Lines 56-62 Link Here
56	# include <netinet/ip_compat.h>	65	# include <netinet/ip_compat.h>
57	# include <netinet/ip_fil.h>	66	# include <netinet/ip_fil.h>
58	# include <netinet/ip_nat.h>	67	# include <netinet/ip_nat.h>
59	@@ -41493,6 +41497,7 @@ else	68	@@ -41849,6 +41853,7 @@ else
60	# include <sys/ioccom.h>	69	# include <sys/ioccom.h>
61	# include <netinet/in.h>	70	# include <netinet/in.h>
62	#undef minor_t	71	#undef minor_t
Lines 64-70 Link Here
64	# include <netinet/ip_compat.h>	73	# include <netinet/ip_compat.h>
65	# include <netinet/ip_fil.h>	74	# include <netinet/ip_fil.h>
66	# include <netinet/ip_nat.h>	75	# include <netinet/ip_nat.h>
67	@@ -41537,6 +41542,7 @@ _ACEOF	76	@@ -41893,6 +41898,7 @@ _ACEOF
68	ip_fil_compat.h \	77	ip_fil_compat.h \
69	ip_fil.h \	78	ip_fil.h \
70	ip_nat.h \	79	ip_nat.h \
Lines 72-78 Link Here
72	netinet/ip_compat.h \	81	netinet/ip_compat.h \
73	netinet/ip_fil_compat.h \	82	netinet/ip_fil_compat.h \
74	netinet/ip_fil.h \	83	netinet/ip_fil.h \
75	@@ -41566,6 +41572,7 @@ ac_fn_cxx_check_header_compile "$LINENO" "$ac_header"	84	@@ -41922,6 +41928,7 @@ ac_fn_cxx_check_header_compile "$LINENO" "$ac_header"
76	#if HAVE_IP_COMPAT_H	85	#if HAVE_IP_COMPAT_H
77	#include <ip_compat.h>	86	#include <ip_compat.h>
78	#elif HAVE_NETINET_IP_COMPAT_H	87	#elif HAVE_NETINET_IP_COMPAT_H
Lines 80-86 Link Here
80	#include <netinet/ip_compat.h>	89	#include <netinet/ip_compat.h>
81	#endif	90	#endif
82	#if HAVE_IP_FIL_H	91	#if HAVE_IP_FIL_H
83	@@ -41629,8 +41636,7 @@ _ACEOF	92	@@ -41985,8 +41992,7 @@ _ACEOF
84		93
85		94
86	fi	95	fi

Return to bug 236959