aboutsummaryrefslogtreecommitdiff
path: root/www/squid31
diff options
context:
space:
mode:
authorFlorian Smeets <flo@FreeBSD.org>2011-02-13 15:59:27 +0000
committerFlorian Smeets <flo@FreeBSD.org>2011-02-13 15:59:27 +0000
commit602b9d0432ab872ccdc103bb677180cd70ba61d8 (patch)
treed158b6357699fa0d179c6172c4b16f05567dd6d9 /www/squid31
parent13f7378eaaa7b556a787984a3ba6e84f0ddbe481 (diff)
downloadports-602b9d0432ab872ccdc103bb677180cd70ba61d8.tar.gz
ports-602b9d0432ab872ccdc103bb677180cd70ba61d8.zip
- update to 3.1.11
- remove patches which aren't neccessary anymore due to upstream changes PR: ports/153956, ports/154737
Notes
Notes: svn path=/head/; revision=269083
Diffstat (limited to 'www/squid31')
-rw-r--r--www/squid31/Makefile3
-rw-r--r--www/squid31/distinfo4
-rw-r--r--www/squid31/files/patch-helpers-basic_auth-SMB-Makefile.in11
-rw-r--r--www/squid31/files/patch-helpers-basic_auth-SMB-smb_auth.sh13
4 files changed, 4 insertions, 27 deletions
diff --git a/www/squid31/Makefile b/www/squid31/Makefile
index d25b9f039fbe..9da8beb91790 100644
--- a/www/squid31/Makefile
+++ b/www/squid31/Makefile
@@ -88,7 +88,7 @@ COMMENT= HTTP Caching Proxy
LATEST_LINK= squid31
-SQUID_STABLE_VER= 10
+SQUID_STABLE_VER= 11
CONFLICTS= squid-2.[0-9].* squid-3.[^1].* cacheboy-[0-9]* lusca-head-[0-9]*
GNU_CONFIGURE= yes
@@ -169,6 +169,7 @@ error_files= ERR_ACCESS_DENIED ERR_CACHE_ACCESS_DENIED \
ERR_FTP_DISABLED ERR_FTP_FAILURE ERR_FTP_FORBIDDEN \
ERR_FTP_NOT_FOUND ERR_FTP_PUT_CREATED \
ERR_FTP_PUT_ERROR ERR_FTP_PUT_MODIFIED ERR_FTP_UNAVAILABLE \
+ ERR_GATEWAY_FAILURE \
ERR_ICAP_FAILURE ERR_INVALID_REQ ERR_INVALID_RESP \
ERR_INVALID_URL ERR_LIFETIME_EXP ERR_NO_RELAY \
ERR_ONLY_IF_CACHED_MISS ERR_PRECONDITION_FAILED \
diff --git a/www/squid31/distinfo b/www/squid31/distinfo
index 83b3ee533ba9..2c8fabce0def 100644
--- a/www/squid31/distinfo
+++ b/www/squid31/distinfo
@@ -1,2 +1,2 @@
-SHA256 (squid3.1/squid-3.1.10.tar.bz2) = 7371945cc4ca54c2010815cb1c436748a5425736c0f6e3722aefe0cc5073a94b
-SIZE (squid3.1/squid-3.1.10.tar.bz2) = 2501825
+SHA256 (squid3.1/squid-3.1.11.tar.bz2) = c2433e7c91d71215da683f4ab482cb5e5927d17e7288f3511831b4b026971847
+SIZE (squid3.1/squid-3.1.11.tar.bz2) = 2491932
diff --git a/www/squid31/files/patch-helpers-basic_auth-SMB-Makefile.in b/www/squid31/files/patch-helpers-basic_auth-SMB-Makefile.in
deleted file mode 100644
index 09a82638fd3c..000000000000
--- a/www/squid31/files/patch-helpers-basic_auth-SMB-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- helpers/basic_auth/SMB/Makefile.in.orig Tue Oct 4 07:29:26 2005
-+++ helpers/basic_auth/SMB/Makefile.in Tue Oct 4 07:29:49 2005
-@@ -129,7 +129,7 @@
- makesnmplib = @makesnmplib@
-
- SMB_AUTH_HELPER = smb_auth.sh
--SAMBAPREFIX = /usr/local/samba
-+SAMBAPREFIX = %%LOCALBASE%%
- SMB_AUTH_HELPER_PATH = $(libexecdir)/$(SMB_AUTH_HELPER)
-
- libexec_SCRIPTS = $(SMB_AUTH_HELPER)
diff --git a/www/squid31/files/patch-helpers-basic_auth-SMB-smb_auth.sh b/www/squid31/files/patch-helpers-basic_auth-SMB-smb_auth.sh
deleted file mode 100644
index 8f41fa2ff024..000000000000
--- a/www/squid31/files/patch-helpers-basic_auth-SMB-smb_auth.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-*** helpers/basic_auth/SMB/smb_auth.sh.orig Thu Feb 26 20:58:22 2004
---- helpers/basic_auth/SMB/smb_auth.sh Thu Feb 26 20:59:45 2004
-***************
-*** 17,22 ****
---- 17,24 ----
- # along with this program; if not, write to the Free Software
- # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-+ SAMBAPREFIX=${SAMBAPREFIX:-%%LOCALBASE%%}
-+
- read DOMAINNAME
- read PASSTHROUGH
- read NMBADDR