aboutsummaryrefslogtreecommitdiffstats
path: root/www/squid/Makefile
diff options
context:
space:
mode:
authorsem <sem@FreeBSD.org>2006-01-15 23:44:36 +0800
committersem <sem@FreeBSD.org>2006-01-15 23:44:36 +0800
commit1e518194718eaf786a649191f6cf439253d57c64 (patch)
treee0a42b6e83645438c1491dd11626bd83385377b2 /www/squid/Makefile
parentbdde95634b4ceed62856164b86b00825aaecafd5 (diff)
downloadfreebsd-ports-gnome-1e518194718eaf786a649191f6cf439253d57c64.tar.gz
freebsd-ports-gnome-1e518194718eaf786a649191f6cf439253d57c64.tar.zst
freebsd-ports-gnome-1e518194718eaf786a649191f6cf439253d57c64.zip
Integrate two vendor patches being published on
<http://www.squid-cache.org/Versions/v2/2.5/bugs/>: - Fix wbinfo_group.pl to correctly work with the wbinfo command from samba-3.0.21 (squid bug #1472) - Fix a crash when accessing async IO function counters via the cachemgr CGI in cases where squid was compiled for aufs support but not actually using it (squid bug #1464) While at it, remove an unneeded patch from the ICAP core patchset. PR: ports/91831 Submitted by: maintainer
Diffstat (limited to 'www/squid/Makefile')
-rw-r--r--www/squid/Makefile6
1 files changed, 4 insertions, 2 deletions
diff --git a/www/squid/Makefile b/www/squid/Makefile
index 08f5725df41e..195e0938355c 100644
--- a/www/squid/Makefile
+++ b/www/squid/Makefile
@@ -73,7 +73,7 @@
PORTNAME= squid
PORTVERSION= 2.5.12
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= www
MASTER_SITES= \
ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
@@ -86,7 +86,9 @@ DISTNAME= squid-2.5.STABLE12
DIST_SUBDIR= squid2.5
PATCH_SITES= http://www.squid-cache.org/Versions/v2/2.5/bugs/
-PATCHFILES= squid-2.5.STABLE12-SMB_BadFetch.patch
+PATCHFILES= squid-2.5.STABLE12-SMB_BadFetch.patch \
+ squid-2.5.STABLE12-wbinfo_group.patch \
+ squid-2.5.STABLE12-asyncio_counters.patch
PATCH_DIST_STRIP= -p1
MAINTAINER= tmseck@netcologne.de