Attachment #163683 for bug #204913

View | Details | Raw Unified | Return to bug 204913
Collapse All | Expand All

Lines 1-7 Link Here

(-)squid/Makefile (-1 / +1 lines)
1	# $FreeBSD: head/www/squid/Makefile 401286 2015-11-11 17:24:31Z junovitch $	1	# $FreeBSD: head/www/squid/Makefile 401286 2015-11-11 17:24:31Z junovitch $
2		2
3	PORTNAME= squid	3	PORTNAME= squid
4	PORTVERSION= 3.5.11	4	PORTVERSION= 3.5.12
5	CATEGORIES= www ipv6	5	CATEGORIES= www ipv6
6	MASTER_SITES= http://www.squid-cache.org/Versions/v3/${PORTVERSION:R}/ \	6	MASTER_SITES= http://www.squid-cache.org/Versions/v3/${PORTVERSION:R}/ \
7	http://www2.us.squid-cache.org/Versions/v3/${PORTVERSION:R}/ \	7	http://www2.us.squid-cache.org/Versions/v3/${PORTVERSION:R}/ \

Lines 1-2 Link Here

(-)squid/distinfo (-2 / +2 lines)
1	SHA256 (squid3.5/squid-3.5.11.tar.xz) = c26211b8e349fd9a5fd357da33074ff6523c111024dd3a5a1f77153538aa40cf	1	SHA256 (squid3.5/squid-3.5.12.tar.xz) = 8bc83f3869f7404aefb10883109e28443255cf6dde50a13904c7954619707a42
2	SIZE (squid3.5/squid-3.5.11.tar.xz) = 2298436	2	SIZE (squid3.5/squid-3.5.12.tar.xz) = 2299644




--- configure.orig	2015-11-01 10:46:19 UTC
+++ configure
@@ -23624,7 +23624,9 @@ fi
 
 if test $ac_with_krb5_count -gt 1 ; then
   as_fn_error $? "Please choose only one Kerberos library." "$LINENO" 5
-elif test $ac_with_krb5_count -eq 0 ; then
+# XXX: On FreeBSD we don't need to involve krb5-config.
+# This change makes GSSAPI_NONE work properly.
+elif test $ac_with_krb5_count -eq 100 ; then
   # find installed libs via pkg-config or krb5-config
   if test -n "$PKG_CONFIG" && \
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gssapi-krb5 krb5\""; } >&5
@@ -32038,7 +32040,7 @@ done
 ##
 

Return to bug 204913

Lines 1-16 Link Here

(-)squid/files/patch-configure (-11 lines)
1	--- configure.orig 2015-11-01 10:46:19 UTC	1	--- configure.orig 2015-11-01 10:46:19 UTC
2	+++ configure	2	+++ configure
3	@@ -23624,7 +23624,9 @@ fi
4
5	if test $ac_with_krb5_count -gt 1 ; then
6	as_fn_error $? "Please choose only one Kerberos library." "$LINENO" 5
7	-elif test $ac_with_krb5_count -eq 0 ; then
8	+# XXX: On FreeBSD we don't need to involve krb5-config.
9	+# This change makes GSSAPI_NONE work properly.
10	+elif test $ac_with_krb5_count -eq 100 ; then
11	# find installed libs via pkg-config or krb5-config
12	if test -n "$PKG_CONFIG" && \
13	{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gssapi-krb5 krb5\""; } >&5
14	@@ -32038,7 +32040,7 @@ done	3	@@ -32038,7 +32040,7 @@ done
15	##	4	##
16		5