Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 7 Jun 2015 21:03:25 +0000 (UTC)
From:      Florian Smeets <flo@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r388783 - in head/www/squid: . files
Message-ID:  <201506072103.t57L3P2Y005420@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: flo
Date: Sun Jun  7 21:03:25 2015
New Revision: 388783
URL: https://svnweb.freebsd.org/changeset/ports/388783

Log:
  - update to 3.5.5
  - fix GASSAPI_NONE handling;
  - unbreak eCAP option, but only for FreeBSD < 10, no luck with clang.
  
  PR:		200070
  Submitted by:	<timp87@gmail.com> (maintainer)

Added:
  head/www/squid/files/patch-configure_GSSAPI_NONE   (contents, props changed)
Modified:
  head/www/squid/Makefile
  head/www/squid/distinfo

Modified: head/www/squid/Makefile
==============================================================================
--- head/www/squid/Makefile	Sun Jun  7 20:57:49 2015	(r388782)
+++ head/www/squid/Makefile	Sun Jun  7 21:03:25 2015	(r388783)
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	squid
-PORTVERSION=	3.5.3
-PORTREVISION=	1
+PORTVERSION=	3.5.5
 CATEGORIES=	www ipv6
 MASTER_SITES=	http://www.squid-cache.org/Versions/v3/${PORTVERSION:R}/ \
 		http://www2.us.squid-cache.org/Versions/v3/${PORTVERSION:R}/ \
@@ -257,7 +256,9 @@ CONFIGURE_ARGS+=	--enable-auth-basic="${
 			--enable-auth-ntlm="${ntlm_auth}"
 
 .if ${PORT_OPTIONS:MECAP}
-BROKEN=			It needs eCAP 1.0 lib, which isn't in ports tree now
+. if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000000
+BROKEN=			Squid with eCAP enabled can't be compiled by clang
+. endif
 .endif
 
 # Storage schemes:

Modified: head/www/squid/distinfo
==============================================================================
--- head/www/squid/distinfo	Sun Jun  7 20:57:49 2015	(r388782)
+++ head/www/squid/distinfo	Sun Jun  7 21:03:25 2015	(r388783)
@@ -1,2 +1,2 @@
-SHA256 (squid3.5/squid-3.5.3.tar.xz) = 73ec65a08384a3ec93ccc17e89ef7a06ba221816551946f2f051cc736c2981c0
-SIZE (squid3.5/squid-3.5.3.tar.xz) = 2283580
+SHA256 (squid3.5/squid-3.5.5.tar.xz) = 23793da6b23871765188becae59a6f4b6c3672c256ba9be90743b46a3c7921cf
+SIZE (squid3.5/squid-3.5.5.tar.xz) = 2290016

Added: head/www/squid/files/patch-configure_GSSAPI_NONE
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/squid/files/patch-configure_GSSAPI_NONE	Sun Jun  7 21:03:25 2015	(r388783)
@@ -0,0 +1,11 @@
+--- configure.orig	2015-05-28 21:06:54.111809946 +0300
++++ configure	2015-05-28 21:07:20.776834346 +0300
+@@ -23549,7 +23549,7 @@
+ 
+ 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
++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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201506072103.t57L3P2Y005420>