diff options
| author | Florian Smeets <flo@FreeBSD.org> | 2015-06-07 21:03:25 +0000 |
|---|---|---|
| committer | Florian Smeets <flo@FreeBSD.org> | 2015-06-07 21:03:25 +0000 |
| commit | 671f31feb3d52ccbd053e540a2355c4dc81e0391 (patch) | |
| tree | f945982d07fd26ba03a8c5c46122bf2ae37dcdcb /www/squid | |
| parent | - Update to 5.6.24-72.2 (diff) | |
- 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)
Notes
Notes:
svn path=/head/; revision=388783
Diffstat (limited to 'www/squid')
| -rw-r--r-- | www/squid/Makefile | 7 | ||||
| -rw-r--r-- | www/squid/distinfo | 4 | ||||
| -rw-r--r-- | www/squid/files/patch-configure_GSSAPI_NONE | 11 |
3 files changed, 17 insertions, 5 deletions
diff --git a/www/squid/Makefile b/www/squid/Makefile index 3ab3debf6a11..1f05c948d705 100644 --- a/www/squid/Makefile +++ b/www/squid/Makefile @@ -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="${basic_auth}" \ --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: diff --git a/www/squid/distinfo b/www/squid/distinfo index 4227fec24064..717261a7dc1f 100644 --- a/www/squid/distinfo +++ b/www/squid/distinfo @@ -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 diff --git a/www/squid/files/patch-configure_GSSAPI_NONE b/www/squid/files/patch-configure_GSSAPI_NONE new file mode 100644 index 000000000000..224dfa120ac1 --- /dev/null +++ b/www/squid/files/patch-configure_GSSAPI_NONE @@ -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 |