- Update to 3.0.p7

Include patches up to 2007-09-19 (later patches are difficult to include as
provided because they will not apply cleanly and would need to be recreated
as a cumulative FreeBSD port patch).

Add the HTTP mirrors to MASTER_SITES as in www/squid and remove a dead
FTP mirror.

Use the new configuration directive squid-default-user and remove code
from the port that implemented that functionality.

Remove reference to squid.sh from pkg-message.in because the rc script
does no longer have a .sh suffix on any supported FreeBSD version.

Notable change: SNMP support is now enabled by default, mirroring the
change in Squid itself. To disable it, specify WITHOUT_SQUID_SNMP or
reconfigure the port accordingly with "make config".

PR:		116581
Submitted by:	Thomas-Martin Seck <tmseck@netcologne.de> (maintainer)

4 files changed, 180 insertions, 234 deletions

diff --git a/www/squid30/Makefile b/www/squid30/Makefile
index bd946746422b..a811e13343fc 100644
--- a/www/squid30/Makefile
+++ b/www/squid30/Makefile
@@ -40,8 +40,6 @@
 #   Note that you probably do not need to worry about these options in most
 #   cases, they are included in case you want to experiment with them.
 #
-#    --enable-dlmalloc
-#     Compile and use the malloc package from Doug Lea
 #    --enable-xmalloc-statistics
 #     Show malloc statistics in status page
 #    --enable-cachemgr-hostname=some.hostname
@@ -64,19 +62,26 @@
 #     requests.
 
 PORTNAME=	squid
-PORTVERSION=	3.0.p6.${PATCHSET_DATE}
+PORTVERSION=	3.0.p7.${PATCHSET_DATE}
 CATEGORIES=	www
 MASTER_SITES=	ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
-		ftp://ftp.vistech.net/pub/squid/%SUBDIR%/ \
 		ftp://mirrors.24-7-solutions.net/pub/squid/%SUBDIR%/ \
 		ftp://ftp.belnet.be/packages/squid/pub/%SUBDIR%/ \
 		ftp://ftp.nl.uu.net/pub/unix/www/squid/%SUBDIR%/ \
 		ftp://ftp.mirrorservice.org/sites/ftp.squid-cache.org/pub/%SUBDIR%/ \
 		ftp://ftp.ntua.gr/pub/www/Squid/%SUBDIR%/ \
 		ftp://ftp.ccs.neu.edu/pub/mirrors/squid.nlanr.net/pub/%SUBDIR%/ \
-		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/www/squid/&,}
+		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/www/squid/&,} \
+		http://www.squid-cache.org/Versions/v3/3.0/ \
+		http://www3.us.squid-cache.org/Versions/v3/3.0/ \
+		http://www1.at.squid-cache.org/Versions/v3/3.0/ \
+		http://www2.nl.squid-cache.org/Versions/v3/3.0/ \
+		http://www1.ru.squid-cache.org/Versions/v3/3.0/ \
+		http://www1.uk.squid-cache.org/Versions/v3/3.0/ \
+		http://www1.jp.squid-cache.org/Versions/v3/3.0/ \
+		http://www2.tw.squid-cache.org/Versions/v3/3.0/
 MASTER_SITE_SUBDIR=	squid-3/DEVEL
-DISTNAME=	squid-3.0.PRE6
+DISTNAME=	squid-3.0.PRE7
 DIST_SUBDIR=	squid3.0
 
 PATCH_SITES=	http://www.squid-cache.org/%SUBDIR%/ \
@@ -92,11 +97,11 @@ PATCH_SITE_SUBDIR=	Versions/v3/3.0/changesets
 # Inspired by editors/vim:
 # (I know that portlint is not happy with this, but putting this code at any
 # other location makes it even unhappier.)
-PATCHSET_DATE=		20070623
-FIRST_PATCHSET=		10789
-LAST_PATCHSET=		10865
-IGNORE_PATCHSETS=	10792 10793 10794 10795 10796 10798 10799 10803 10807 \
-			10810 10814 10819 10835 10842 10847 10862 10864
+PATCHSET_DATE=		20070919
+FIRST_PATCHSET=		11069
+LAST_PATCHSET=		11107
+IGNORE_PATCHSETS=	11070 11071 11077 11080 11083 11087 11090 11095 \
+			11097 11103 11105 11106
 PATCHFILES!=	jot -w "%d.patch" - ${FIRST_PATCHSET} ${LAST_PATCHSET} 1
 .for ps in ${IGNORE_PATCHSETS}
 PATCHFILES:=	${PATCHFILES:N${ps}\.patch}
@@ -110,7 +115,7 @@ LATEST_LINK=	squid30
 
 CONFLICTS=	squid-2.[0-9].*
 GNU_CONFIGURE=	yes
-USE_AUTOTOOLS=	autoconf:259 automake:19 libtool:15
+USE_AUTOTOOLS=	autoconf:261 automake:19 libtool:15
 USE_BZIP2=	yes
 USE_PERL5=	yes
 USE_RC_SUBR=	squid
@@ -128,7 +133,7 @@ SUB_LIST+=	SQUID_UID=${SQUID_UID} SQUID_GID=${SQUID_GID}
 OPTIONS=	SQUID_LDAP_AUTH "Install LDAP authentication helpers" off \
 		SQUID_SASL_AUTH "Install SASL authentication helpers" off \
 		SQUID_DELAY_POOLS "Enable delay pools" off \
-		SQUID_SNMP "Enable SNMP support" off \
+		SQUID_SNMP "Enable SNMP support" on \
 		SQUID_CARP "Enable CARP support" on \
 		SQUID_SSL "Enable SSL support for reverse proxies" off \
 		SQUID_PINGER "Install the icmp helper" off \
@@ -181,9 +186,9 @@ error_files=	ERR_ACCESS_DENIED ERR_CACHE_ACCESS_DENIED \
 		ERR_SHUTTING_DOWN ERR_SOCKET_FAILURE ERR_TOO_BIG ERR_UNSUP_REQ \
 		ERR_URN_RESOLVE ERR_WRITE_ERROR ERR_ZERO_SIZE_OBJECT
 
-libexec=	cachemgr.cgi db_auth.pl digest_pw_auth diskd ip_user_check \
-		msnt_auth ncsa_auth ntlm_auth \
-		pam_auth smb_auth smb_auth.sh squid_session squid_unix_group \
+libexec=	cachemgr.cgi digest_pw_auth diskd ip_user_check \
+		msnt_auth ncsa_auth ntlm_auth pam_auth smb_auth \
+		smb_auth.sh squid_db_auth squid_session squid_unix_group \
 		wbinfo_group.pl
 .if !defined(SQUID_CONFIGURE_ARGS) || ${SQUID_CONFIGURE_ARGS:M*--disable-unlinkd*} == ""
 libexec+=	unlinkd
@@ -191,7 +196,8 @@ libexec+=	unlinkd
 
 sbin=		RunAccel RunCache squidclient squid
 
-CONFIGURE_ARGS=	--bindir=${PREFIX}/sbin  \
+CONFIGURE_ARGS=	--with-default-user=${SQUID_UID} \
+		--bindir=${PREFIX}/sbin  \
 		--sbindir=${PREFIX}/sbin  \
 		--datadir=${PREFIX}/etc/squid \
 		--libexecdir=${PREFIX}/libexec/squid \
@@ -209,7 +215,8 @@ CONFIGURE_ARGS=	--bindir=${PREFIX}/sbin  \
 basic_auth=	DB NCSA PAM MSNT SMB
 digest_auth=	password
 external_acl=	ip_user session unix_group wbinfo_group
-MAN8+=		pam_auth.8 squid_session.8 squid_unix_group.8
+MAN8+=		ncsa_auth.8 pam_auth.8 squid_db_auth.8 squid_session.8 \
+		squid_unix_group.8
 .if defined(WITH_SQUID_LDAP_AUTH)
 USE_OPENLDAP=	yes
 CFLAGS+=	-I${LOCALBASE}/include
@@ -262,8 +269,8 @@ CONFIGURE_ARGS+=	--enable-storeio="${storage_schemes}"
 .if defined(WITH_SQUID_DELAY_POOLS)
 CONFIGURE_ARGS+=	--enable-delay-pools
 .endif
-.if defined(WITH_SQUID_SNMP)
-CONFIGURE_ARGS+=	--enable-snmp
+.if defined(WITHOUT_SQUID_SNMP)
+CONFIGURE_ARGS+=	--disable-snmp
 .endif
 .if defined(WITHOUT_SQUID_CARP)
 CONFIGURE_ARGS+=	--disable-carp
@@ -372,10 +379,13 @@ WITH_DEBUG?=		yes
 #
 # If you do not define SQUID_LANGUAGES yourself, all available language files
 # will be installed; the default language will be English.
+#
+# XXX: Support for Armenian error pages is disabled for now because two
+#      pages are lacking from the distribution.
 
-SQUID_LANGUAGES?=	Azerbaijani Bulgarian Catalan Czech Danish Dutch \
-			English Estonian Finnish French German Greek Hebrew \
-			Hungarian Italian Japanese Korean Lithuanian \
+SQUID_LANGUAGES?=	Azerbaijani Bulgarian Catalan Czech Danish \
+			Dutch English Estonian Finnish French German Greek \
+			Hebrew Hungarian Italian Japanese Korean Lithuanian \
 			Polish Portuguese Romanian Russian-1251 Russian-koi8-r \
 			Serbian Simplify_Chinese Slovak Spanish Swedish \
 			Traditional_Chinese Turkish
@@ -400,21 +410,12 @@ PLIST_FILES+=	${error_files:S,^,etc/squid/errors/${d}/,}
 .endfor
 PLIST_DIRS+=	etc/squid/errors etc/squid squid/logs squid/cache squid
 
-pre-patch:
-# special handling for PatchSet 10817 that relies on metadata information
-# supplied by a non applicable earlier patch; can be removed when the port
-# is updated to a post-pre6 tarball:
-	@${REINPLACE_CMD} -e 's|v 1.453 2007/05/09 22:14:24 wessels|v 1.454 2007/05/13 10:57:41 hno|' \
-	    -e 's|\(Revision:\) 1.453|\1 1.454|' \
-	    ${WRKSRC}/configure.in
-
 post-patch:
 # add this version's datestamp so that Squid identifies itself as patched-up:
-	@${REINPLACE_CMD} -e 's|3.0.PRE6|&+PatchSets-${PATCHSET_DATE}|' \
+	@${REINPLACE_CMD} -e 's|3.0.PRE7|&+PatchSets-${PATCHSET_DATE}|' \
 	    ${WRKSRC}/configure.in
-	@${REINPLACE_CMD} -e 's|%%SQUID_UID%%|${SQUID_UID}|g' \
-	    -e 's|%%SQUID_GID%%|${SQUID_GID}|g' \
-	    -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/src/cf.data.pre
+	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \
+	    ${WRKSRC}/src/cf.data.pre
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
 	    ${WRKSRC}/helpers/basic_auth/SMB/Makefile.in \
 	    ${WRKSRC}/helpers/basic_auth/SMB/smb_auth.sh
@@ -433,8 +434,10 @@ post-install:
 # unfortunately fails to do so (as it did in the old 2.5 days...):
 	${INSTALL_DATA} ${WRKSRC}/tools/cachemgr.conf \
 	    ${PREFIX}/etc/squid/cachemgr.conf.default
+.if !defined(NOPORTEXAMPLES)
 	@${MKDIR} ${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/helpers/basic_auth/DB/passwd.sql ${EXAMPLESDIR}
+.endif
 .if defined(WITH_SQUID_PINGER)
 	${CHMOD} 4510 ${PREFIX}/libexec/squid/pinger; \
 	${CHGRP} ${SQUID_GID} ${PREFIX}/libexec/squid/pinger
diff --git a/www/squid30/distinfo b/www/squid30/distinfo
index 794d601ad59b..0b4d57debdc1 100644
--- a/www/squid30/distinfo
+++ b/www/squid30/distinfo
@@ -1,183 +1,141 @@
-MD5 (squid3.0/squid-3.0.PRE6.tar.bz2) = 6ddabb29bec3ed502a37e8a10437203b
-SHA256 (squid3.0/squid-3.0.PRE6.tar.bz2) = d15f63fa8ca579218fdf267451db3b49fcf8b1a1ad6182514c954e76acb8d115
-SIZE (squid3.0/squid-3.0.PRE6.tar.bz2) = 1771634
-MD5 (squid3.0/10789.patch) = bdb57a1bb9e966a37abff388c5ac4d1f
-SHA256 (squid3.0/10789.patch) = 6efd1da087c4f0f31bcdb496decbc700efba347c4a7eff017f8c911bed0cb254
-SIZE (squid3.0/10789.patch) = 1029
-MD5 (squid3.0/10790.patch) = bd7e8d453e6cf5cb94e073575236afc2
-SHA256 (squid3.0/10790.patch) = b4eb7d60cefef3647b1fe7e39132ac2dd9ff151d6d92d80f85feb10fc5cc00fb
-SIZE (squid3.0/10790.patch) = 1142
-MD5 (squid3.0/10791.patch) = a595ec1dfc798ea64099eeb7926d63d6
-SHA256 (squid3.0/10791.patch) = 48cc55197d2cfe109704d389a3b1f9c45a83cde2d7cfd7914beefe030d1c26ce
-SIZE (squid3.0/10791.patch) = 6586
-MD5 (squid3.0/10797.patch) = 5ce98f17800a3be13648b366672313cd
-SHA256 (squid3.0/10797.patch) = 0d16cab5a17e339324af1c2f15f22cfcb4e0bf5bebecf8f8e30b4920c731b51a
-SIZE (squid3.0/10797.patch) = 12730
-MD5 (squid3.0/10800.patch) = 95ab5c8f3455c540a62b66fa3be58c44
-SHA256 (squid3.0/10800.patch) = 6236cb5569ba8724bfff0130fe09375c718acb8ac8850a507768bf1e0a2f5f20
-SIZE (squid3.0/10800.patch) = 2842
-MD5 (squid3.0/10801.patch) = 387bdf6b0ff2a120cd007fd513438d8b
-SHA256 (squid3.0/10801.patch) = c3f73a9aadb3c1c46532b34bbeb60760d7c2be51e1318e2dd5481c1787546be0
-SIZE (squid3.0/10801.patch) = 1461
-MD5 (squid3.0/10802.patch) = cae41b31039efca1da3d6bba61eabb3c
-SHA256 (squid3.0/10802.patch) = 0f361376094616c1f057cc4b65d7a7d1343471aa23edafa5a827da903b70c8f2
-SIZE (squid3.0/10802.patch) = 13794
-MD5 (squid3.0/10804.patch) = 976ab82b0b8434ccb5247f62cfbf867c
-SHA256 (squid3.0/10804.patch) = 89e00641ea64f2cb0f4c39778556914ed16a18c455fd373397054f2d6ac0e4d3
-SIZE (squid3.0/10804.patch) = 217554
-MD5 (squid3.0/10805.patch) = c8e81da97440ef7fb4dcd0643260f71a
-SHA256 (squid3.0/10805.patch) = 996266ff19a4e2391e712e30a6a5a363466a6fa588599055617ce3df88cedfd4
-SIZE (squid3.0/10805.patch) = 16432
-MD5 (squid3.0/10806.patch) = 9150ecfd5f4ed91ad9a6df8a1832787f
-SHA256 (squid3.0/10806.patch) = 38589e1002be8e6106e1fcdec48ccf81cc693c8ef011955aca8bc200e62dce83
-SIZE (squid3.0/10806.patch) = 3832
-MD5 (squid3.0/10808.patch) = fc61e61ba4419d142bd3d2a9bbbd44f7
-SHA256 (squid3.0/10808.patch) = 6a62a3467da832a592bc3d542c56cbc1c56dc7e4986ad4cc080126590265ef12
-SIZE (squid3.0/10808.patch) = 2526
-MD5 (squid3.0/10809.patch) = 8ef1c68b6e77863044aa5c7628b48a9f
-SHA256 (squid3.0/10809.patch) = 96d9d60c3f8af6d1ca96dc5a1249002127ff5ba3eef02e0e0cd270098ccf03ec
-SIZE (squid3.0/10809.patch) = 3220
-MD5 (squid3.0/10811.patch) = c24002ade68da71773a0ff854a8602ec
-SHA256 (squid3.0/10811.patch) = b37be2880950a773c6933ff8056ea0e04cbd8091514cb59b02b66e32a82eed73
-SIZE (squid3.0/10811.patch) = 1182
-MD5 (squid3.0/10812.patch) = fd7a9f5ea21bb5e129bd866c3905905c
-SHA256 (squid3.0/10812.patch) = 93b98037bd4dffa3c259b19332f61730cc6cca292054adc6fe2e3b7069a5d497
-SIZE (squid3.0/10812.patch) = 913
-MD5 (squid3.0/10813.patch) = af3e07c9775b2dd9dece35f1c9cfdf41
-SHA256 (squid3.0/10813.patch) = 63ba3ea34f934b7f3ae8354c287da3a54f0474e13b9648c3415904c046f4b3bf
-SIZE (squid3.0/10813.patch) = 1445
-MD5 (squid3.0/10815.patch) = dee9162e92725aefe84d546646509cd6
-SHA256 (squid3.0/10815.patch) = d936e9ba919a0d23a0585b1611bec5335b0d092421d989035526df07892cb8b8
-SIZE (squid3.0/10815.patch) = 1467
-MD5 (squid3.0/10816.patch) = cf17537fab0c0078c72715835b38f832
-SHA256 (squid3.0/10816.patch) = 6f7dec0fcdc3eaf6a08a98de3d21d0badf6cd2fe01431ec289057e90c3e6b794
-SIZE (squid3.0/10816.patch) = 912
-MD5 (squid3.0/10817.patch) = cb0e4dd7fc425c0d5d1c3eeb4669c2eb
-SHA256 (squid3.0/10817.patch) = 58522e4ea3e4426d6b963ba341c768595d47193b854f47a7e7ffe7288d501f9a
-SIZE (squid3.0/10817.patch) = 4010
-MD5 (squid3.0/10818.patch) = 2a9313c5b3f0820ee7ddfdca669b12a2
-SHA256 (squid3.0/10818.patch) = 4dd6c6253fe91ca1500e1d2c49472a8bb051f7c143ba76aec0531b7a7030b880
-SIZE (squid3.0/10818.patch) = 6385
-MD5 (squid3.0/10820.patch) = 8b9ef243e4d25e2e34a0403e73e5afad
-SHA256 (squid3.0/10820.patch) = 91592ccbc13db348c51eae78f7f8bfefdaaf70ca98ec10e2a6d3be8db98d7f96
-SIZE (squid3.0/10820.patch) = 3069
-MD5 (squid3.0/10821.patch) = db87b6ffd7f1085af069e70d4e33123a
-SHA256 (squid3.0/10821.patch) = 1d23430baae03e838c7dc3dc6bee7dae527be3576c3f6c9d018db7903ce7fda0
-SIZE (squid3.0/10821.patch) = 1178
-MD5 (squid3.0/10822.patch) = f65507d7d2721f199221fdfbed1d53e3
-SHA256 (squid3.0/10822.patch) = 7f42a6a3fffa32d159f59a33f965e02639c0151ac18e1660707aa934987ba03b
-SIZE (squid3.0/10822.patch) = 2844
-MD5 (squid3.0/10823.patch) = bbc4557aadbb25ecdd26c70c012de2b2
-SHA256 (squid3.0/10823.patch) = 37da30fc68dc0be138bd1b1e69cf4450c14779b129dae710af79add48160cbb0
-SIZE (squid3.0/10823.patch) = 811
-MD5 (squid3.0/10824.patch) = b8c996266a16ab113e83b77ec5640ac7
-SHA256 (squid3.0/10824.patch) = f5db6d9a2bdabcc2ad95ff0e950c7153386b562b63255cfa85f4cdad713e7be9
-SIZE (squid3.0/10824.patch) = 1494
-MD5 (squid3.0/10825.patch) = 8c5022bda2cb6e49cf2de5cf36137cfe
-SHA256 (squid3.0/10825.patch) = 9b2b22ac18c5444231e63ec426adaed6b6864bd40b54ccb779d6d01080cc3233
-SIZE (squid3.0/10825.patch) = 3518
-MD5 (squid3.0/10826.patch) = b51f7fc584b5c1ed00b323026b7cfe58
-SHA256 (squid3.0/10826.patch) = 79ac1553a83d52c692bf619d7e0ea268c2f56f9735ce463c5b62e4f9c7fbb6c2
-SIZE (squid3.0/10826.patch) = 988
-MD5 (squid3.0/10827.patch) = 41260a2675b232ae1340d5440a0355be
-SHA256 (squid3.0/10827.patch) = a9436726cb5915e1f35420ecce43136e62f8637f52405f25abef4e5d7bb89f44
-SIZE (squid3.0/10827.patch) = 1394
-MD5 (squid3.0/10828.patch) = b827d024b6892b899e57c90e2a99ec36
-SHA256 (squid3.0/10828.patch) = f5a22c9a5a4116f39aa09741d40ce9f4cd978ab13e6758ebec2609a5803e5720
-SIZE (squid3.0/10828.patch) = 13150
-MD5 (squid3.0/10829.patch) = aeef564bf7d8e4d97ee90059dde308bf
-SHA256 (squid3.0/10829.patch) = 60733da98549895b8d93c62b050f5d3022ada83ca1c5a44883875f5ce59cd531
-SIZE (squid3.0/10829.patch) = 3278
-MD5 (squid3.0/10830.patch) = 160578416e1a5f14a959b8512e0cc71d
-SHA256 (squid3.0/10830.patch) = 579fcb3f6f48848a4567ac2ef5a8b338143b6c4439fde18f729c33279e050493
-SIZE (squid3.0/10830.patch) = 3296
-MD5 (squid3.0/10831.patch) = 739da567f8fb6cd9f583c42da8ae54a5
-SHA256 (squid3.0/10831.patch) = 4fa9333acaf84c615b4e0b267ff8afa3da99bf9ad529383c1df7f2b9c2a02598
-SIZE (squid3.0/10831.patch) = 934
-MD5 (squid3.0/10832.patch) = d613ffaa146751afe5aa02acce1ccaa6
-SHA256 (squid3.0/10832.patch) = c6199890b7829b15047f06faf5a22a1e22c3f4bbdd61ed31031d3a7952cf81bb
-SIZE (squid3.0/10832.patch) = 1302
-MD5 (squid3.0/10833.patch) = 0300674c4024cd44e7506f048c9b5750
-SHA256 (squid3.0/10833.patch) = 37b77100539c6751c4636b31484ea761e9de7e1e5347610b06c5f789e8bfd4c3
-SIZE (squid3.0/10833.patch) = 6761
-MD5 (squid3.0/10834.patch) = ff5c484e43e3d1c52d0ebb5d2cfb88f5
-SHA256 (squid3.0/10834.patch) = 422db18eefe0f65f67191ecf14cd3ff8732da56149ac087f50a4470f78a1fce4
-SIZE (squid3.0/10834.patch) = 235371
-MD5 (squid3.0/10836.patch) = fe487c42e4af8eaff1ac03ee04423c59
-SHA256 (squid3.0/10836.patch) = d5d3d115ffcbdf286506f7f0fcd6fff83297dc2ebea152f26de78306561b2a78
-SIZE (squid3.0/10836.patch) = 1345
-MD5 (squid3.0/10837.patch) = 032bce55fb09bcafee33a1c0b6214548
-SHA256 (squid3.0/10837.patch) = b8507ad105fe88659c1e6996a8f4723b905b893bf5c45f882e8c7d853ea2d7cb
-SIZE (squid3.0/10837.patch) = 26380
-MD5 (squid3.0/10838.patch) = 74214a7b15612d92d286b3fffa9a07ca
-SHA256 (squid3.0/10838.patch) = 785637b460f760c071505332240086623b034210164261899da13f63edbf8e4a
-SIZE (squid3.0/10838.patch) = 12288
-MD5 (squid3.0/10839.patch) = 08315200e037969512320b081b9bfae5
-SHA256 (squid3.0/10839.patch) = e626c7f6de437123db0f15fc8e1d00525d98435c7dfdcc5e76a0c66968c8b4a6
-SIZE (squid3.0/10839.patch) = 1075
-MD5 (squid3.0/10840.patch) = 7e1519d8211076ecb750f9fdecb35a40
-SHA256 (squid3.0/10840.patch) = 3b473062be4a7c4b75d92e7700c5f4c0aee19779d0cc757147c6238baa8e94df
-SIZE (squid3.0/10840.patch) = 1573
-MD5 (squid3.0/10841.patch) = 0d1eefd047d01e71180d71da08a7613b
-SHA256 (squid3.0/10841.patch) = af4664965865aa4de16a9d17f8ed253a576e52376aed26a1dfc77bedceef5591
-SIZE (squid3.0/10841.patch) = 5602
-MD5 (squid3.0/10843.patch) = 541faf0e0da0d096fb21078a610e9c19
-SHA256 (squid3.0/10843.patch) = 828741d29bc90b10eefc45348a446f8b3c5907a0e73b3fba891fe39313bb2bd1
-SIZE (squid3.0/10843.patch) = 1124
-MD5 (squid3.0/10844.patch) = 5c6a131e7d8ec1189900bc5dcf310d0e
-SHA256 (squid3.0/10844.patch) = 7af29cbad7f06092a16d6353e148b74bf4bd3299836f02d4452b811eeeed2946
-SIZE (squid3.0/10844.patch) = 5939
-MD5 (squid3.0/10845.patch) = 0d33aa300edc65fc928efa7285af4d9e
-SHA256 (squid3.0/10845.patch) = ba17e486602598500c9d71ae735c88bc358979b2b7b2aae3525e3413e333859b
-SIZE (squid3.0/10845.patch) = 5576
-MD5 (squid3.0/10846.patch) = 430aac93b9b5c55e9303d14e2ee526a2
-SHA256 (squid3.0/10846.patch) = 3f4d58bb14ae35df3251a88f4bee9ec5b22e61cf297bcfd247626a4bdd98f2d4
-SIZE (squid3.0/10846.patch) = 1200
-MD5 (squid3.0/10848.patch) = b174826341ce82d9943c2d1d47097f45
-SHA256 (squid3.0/10848.patch) = 777eae566843141c0419a9e9ebd54293f26cfd6f784b253f26323265985d79a9
-SIZE (squid3.0/10848.patch) = 5969
-MD5 (squid3.0/10849.patch) = 5e124e2fb799f41448ca0c01f64c5881
-SHA256 (squid3.0/10849.patch) = d2c0c854188a1a2770399d3148e82604bd43db7cd161af28d95adc28e1ab9077
-SIZE (squid3.0/10849.patch) = 2979
-MD5 (squid3.0/10850.patch) = ad526c71720022a092dba3a080631ae0
-SHA256 (squid3.0/10850.patch) = 216fc243a7b0e067328de61458001454c7f8cbc6e121886cabe001b4ed8e10d8
-SIZE (squid3.0/10850.patch) = 2908
-MD5 (squid3.0/10851.patch) = 9a9aa6920e4d13c4add02db508826d16
-SHA256 (squid3.0/10851.patch) = a8c00fa83a52ad365e09aebd45f5da90e3d04fd0ce7c866a1cdf0ca10f960077
-SIZE (squid3.0/10851.patch) = 1061
-MD5 (squid3.0/10852.patch) = 4c1886d2c1ea43465e1bfec8f3a26493
-SHA256 (squid3.0/10852.patch) = ca326d4da21b86dac1988fe6c54042e1fca6c22b5c7a927c3ca80564f35fa576
-SIZE (squid3.0/10852.patch) = 5530
-MD5 (squid3.0/10853.patch) = a2b774f2b040cf494548f8a4aaae5548
-SHA256 (squid3.0/10853.patch) = 54e3f491dbed76811873abfde14782f043cb2d5e29d9fe7ad4f2a83a63ae2838
-SIZE (squid3.0/10853.patch) = 1279
-MD5 (squid3.0/10854.patch) = f362d6cead3577ad9002876adb855204
-SHA256 (squid3.0/10854.patch) = d6b16e049b2fd333b1365ec7704114e92fc1cea2256b515f4977253f4e5ae7e0
-SIZE (squid3.0/10854.patch) = 1174
-MD5 (squid3.0/10855.patch) = 80d3d8b2cfd9186da758dcf542430bfe
-SHA256 (squid3.0/10855.patch) = f9ddfb59efdaf34a5a1952ce54c0db7516bb291cc68dd453904398022330efb9
-SIZE (squid3.0/10855.patch) = 1201
-MD5 (squid3.0/10856.patch) = ba3f49c2c18e54a1aaa02054922e7146
-SHA256 (squid3.0/10856.patch) = 98b830b1bdcf1cf874c0f25c749a803dee1d7205acb127b26758ab1967426783
-SIZE (squid3.0/10856.patch) = 4953
-MD5 (squid3.0/10857.patch) = a41c7dddbf979fda444d67aa7feec264
-SHA256 (squid3.0/10857.patch) = 6bb2cef93fe4b1a8b6e157ace00c55b9b00943e30baaa247e7be80d60107da3a
-SIZE (squid3.0/10857.patch) = 5344
-MD5 (squid3.0/10858.patch) = 99c73ebf1feec4214dc28bdfde6c32bb
-SHA256 (squid3.0/10858.patch) = 7c87c3c94d3ab2cdda301311d001d8d963e0603a96a38bf9cf80a257a53e9ace
-SIZE (squid3.0/10858.patch) = 12497
-MD5 (squid3.0/10859.patch) = ac486bbf95679ebac1312b4ed05dca09
-SHA256 (squid3.0/10859.patch) = c4b44f58f518c42de10486d5fd93f175840ea94a910f33cbe7e5bae51dbfb15f
-SIZE (squid3.0/10859.patch) = 7648
-MD5 (squid3.0/10860.patch) = 1e35cadbe1782e3dde075ee037f19346
-SHA256 (squid3.0/10860.patch) = dfdd77a030d7108037dc2f6047031a3b0c4bb9275055e5a91de3f4b4758d5cf2
-SIZE (squid3.0/10860.patch) = 1741
-MD5 (squid3.0/10861.patch) = f50c5c0bd85f9c736e22f806f5ee80d0
-SHA256 (squid3.0/10861.patch) = fcca4e89dc7dd491e8559bf269171577f199df3676efd81edee9ba96fbdb70e9
-SIZE (squid3.0/10861.patch) = 1522
-MD5 (squid3.0/10863.patch) = 4a1774a937bcaf303cd61cb896b07015
-SHA256 (squid3.0/10863.patch) = 17ab47053ade5f20622f282b05eddc2eafb57a5e357332b1984a5b353a2c46ac
-SIZE (squid3.0/10863.patch) = 398
-MD5 (squid3.0/10865.patch) = 809045dd8d8e505e5763aa0114e31743
-SHA256 (squid3.0/10865.patch) = aa5b874484011c807c61f06bba9e75943d8c689fbe7d4623a3684a848e1adf5a
-SIZE (squid3.0/10865.patch) = 2519
+MD5 (squid3.0/squid-3.0.PRE7.tar.bz2) = 3b774e6b089c45fab2afbf3123f9f3c1
+SHA256 (squid3.0/squid-3.0.PRE7.tar.bz2) = ad6612b551c97ccd7fb494032d664102ddd317ec5e204c40338b77c88cc4d09c
+SIZE (squid3.0/squid-3.0.PRE7.tar.bz2) = 1807811
+MD5 (squid3.0/11069.patch) = a3e1a701fe254448be75cd81c1391886
+SHA256 (squid3.0/11069.patch) = 44d29714625e759fe38c19cd22ccb6936b95a0bcc5d6948f12862df492543d61
+SIZE (squid3.0/11069.patch) = 982
+MD5 (squid3.0/11072.patch) = b03399f1ea7c062a14c52ab898f8d9bb
+SHA256 (squid3.0/11072.patch) = 26c6bfe9a9ac7bd7e62d534b9aacc2ae42a5a2813319afee9559a122effb0661
+SIZE (squid3.0/11072.patch) = 1976
+MD5 (squid3.0/11073.patch) = 79fe27dc5259289ce811d0ad33a09f18
+SHA256 (squid3.0/11073.patch) = a7dec8d3ceb983f245a23bcbdc38060f82f69e292207fa97fa3cdee56a977f38
+SIZE (squid3.0/11073.patch) = 9046
+MD5 (squid3.0/11074.patch) = 476e98681d8ca0b178c65b6545cb59a4
+SHA256 (squid3.0/11074.patch) = e128d270ee1bbc0fe5730428bcb1b1e1e3089002736683e7f412fc72944a0d0b
+SIZE (squid3.0/11074.patch) = 4151
+MD5 (squid3.0/11075.patch) = 06bf6b45d97165c0e02f3a53bdfc6472
+SHA256 (squid3.0/11075.patch) = 76407927157ce92949edf45d8842890b2b8fe6cd3779c455a235f26a1e3557dc
+SIZE (squid3.0/11075.patch) = 23969
+MD5 (squid3.0/11076.patch) = e4e7dcbf6a0f410ab3dfd1225b09f1dc
+SHA256 (squid3.0/11076.patch) = 50535cbb88186c83e80e6c61d9a69bfc0763fde44fe7142e4fd85327c046b13e
+SIZE (squid3.0/11076.patch) = 1112
+MD5 (squid3.0/11078.patch) = 4e6bef27dd52ffe3cc25c77f70804912
+SHA256 (squid3.0/11078.patch) = dcb8d41d7daeb7b0f985414bfb6fad4d78d41e01045715e7f91602279636b341
+SIZE (squid3.0/11078.patch) = 1835
+MD5 (squid3.0/11079.patch) = b7e05b850e747151c0432a13334902a0
+SHA256 (squid3.0/11079.patch) = 550a9ded9adf948054d9b6d17a57b6b90f7ab881454b6aa54674c726bd59f35b
+SIZE (squid3.0/11079.patch) = 1556
+MD5 (squid3.0/11081.patch) = a0384b0559604c072abd77f6de54c8b6
+SHA256 (squid3.0/11081.patch) = 5c9bd9738e7c603f4b087a9b6ff528fe399257e8468e2a2be4d9ae47b0d5e755
+SIZE (squid3.0/11081.patch) = 203838
+MD5 (squid3.0/11082.patch) = 459cfe82d3c8c9cdbd341e952bfb6a4e
+SHA256 (squid3.0/11082.patch) = f94db038c0d61da616a3d43ef3647abc38c851935ffdc4b09d4ad11c2e482e30
+SIZE (squid3.0/11082.patch) = 930
+MD5 (squid3.0/11084.patch) = 0e89aecbcc591bed9bbce12c7132dd95
+SHA256 (squid3.0/11084.patch) = f03b446fc734dc6da6ff8b68f2d2c0555cc092b0cfbc560bae1376631a08eab7
+SIZE (squid3.0/11084.patch) = 2778
+MD5 (squid3.0/11085.patch) = 6963562fc0cf42506132ce84c09122a5
+SHA256 (squid3.0/11085.patch) = 58ad94fe604a3196afc3be0745fea433a7b3988dbab84f84e76c3bd4edb30ab8
+SIZE (squid3.0/11085.patch) = 1160
+MD5 (squid3.0/11086.patch) = eb392846d7341e0b5cc73ef4b04b401d
+SHA256 (squid3.0/11086.patch) = 0091d675bd4f8ebc69236660504acd9df6cd476ceddf3566fe26a5dfdd8b07cd
+SIZE (squid3.0/11086.patch) = 18688
+MD5 (squid3.0/11088.patch) = 5899d46640880572374f3b13ec13317e
+SHA256 (squid3.0/11088.patch) = f7bc94a33882d45796d4267ba0724f2d0aea2eff9f5e45c8095684749b086407
+SIZE (squid3.0/11088.patch) = 1365
+MD5 (squid3.0/11089.patch) = f0868f1010d6bb9d1078c1009b4e9a42
+SHA256 (squid3.0/11089.patch) = 83166ce50312b9af1b8abf43cf7894d91233c0ff9da29d7852f8ebb818406634
+SIZE (squid3.0/11089.patch) = 997
+MD5 (squid3.0/11091.patch) = 576b59067e2b3a7e4a17f1355fdb1510
+SHA256 (squid3.0/11091.patch) = 0759cb35fca3cae595a5b2cc26729a2da5e66b1ef19c00704fc58a3ac244f2eb
+SIZE (squid3.0/11091.patch) = 1083
+MD5 (squid3.0/11092.patch) = 006c7d7bb958a1e4200e7e3ace453e4e
+SHA256 (squid3.0/11092.patch) = 30cd978df8327e6e4324fdff73370cad6ca2399530cbfb4f981f7e219ea55802
+SIZE (squid3.0/11092.patch) = 1367
+MD5 (squid3.0/11093.patch) = 51591a8d58266ef4747151e5f11a26a0
+SHA256 (squid3.0/11093.patch) = c15f053abed89dcd07b6412014969921f0e5ab7b824ad479fd35b8a428a1fca2
+SIZE (squid3.0/11093.patch) = 1515
+MD5 (squid3.0/11094.patch) = 268523d58735e1d980b9c15cb41770aa
+SHA256 (squid3.0/11094.patch) = 543c10f09c9d45db11e746cb952cdde6c17ed55e28c3e739c4e3e1d4801be55a
+SIZE (squid3.0/11094.patch) = 1214
+MD5 (squid3.0/11096.patch) = b241a11dffd6f3006917a61083fc1a54
+SHA256 (squid3.0/11096.patch) = 430bd1aad4887c7536afeb641014a5556de13128432f36e937751b3166fe6242
+SIZE (squid3.0/11096.patch) = 1250
+MD5 (squid3.0/11098.patch) = 6defca62a09a22a6d1639ed07079a049
+SHA256 (squid3.0/11098.patch) = f96aa882aad8838b2c0924b5c45f1586367710185a6457874e09f650f32fc62c
+SIZE (squid3.0/11098.patch) = 2152
+MD5 (squid3.0/11099.patch) = d5e906b030b1d0856e09bc78567bdb15
+SHA256 (squid3.0/11099.patch) = addac90866112e2aab824595cf1061ed8090365671cfd5356a80347341669b30
+SIZE (squid3.0/11099.patch) = 1144
+MD5 (squid3.0/11100.patch) = 7dfad56be4b89c90ddd8249c4e4fe48e
+SHA256 (squid3.0/11100.patch) = 44daa008f4c81060b066cb8ca81201999f3f0fc5a2803b3a8714869efc02f74b
+SIZE (squid3.0/11100.patch) = 1149
+MD5 (squid3.0/11101.patch) = ec74f734ba8b0719d2c36f3f35d40019
+SHA256 (squid3.0/11101.patch) = fe60dd79aeef7afd7c63db16dfef1a5f100a39a032303dd088d480bc3aa21509
+SIZE (squid3.0/11101.patch) = 1943
+MD5 (squid3.0/11102.patch) = 296ffa972e96b21ba1c9b36112d8adb9
+SHA256 (squid3.0/11102.patch) = eebf3c65862fcb2e3559cc33376b6ff6c2bb89e9e7d4f4a6e6c430d910e00a25
+SIZE (squid3.0/11102.patch) = 1254
+MD5 (squid3.0/11103.patch) = 09d6103cdcf358b93a9fc1a87c684966
+SHA256 (squid3.0/11103.patch) = b21244eb588bfd5669cd6d287974a0f3426a14041fa8e2043c153cc015fc37a3
+SIZE (squid3.0/11103.patch) = 4054
+MD5 (squid3.0/11104.patch) = 87fe49a6cd0ef5bbdf17d8cfbc83d222
+SHA256 (squid3.0/11104.patch) = faefd03cd40ffcf9b5a5bdffefdbc440da97040f25bca7ff3a5a6f56eb0ac7a4
+SIZE (squid3.0/11104.patch) = 1278
+MD5 (squid3.0/11105.patch) = ea32f36fd5219a80e63b910e14b3787f
+SHA256 (squid3.0/11105.patch) = 4fdbfae8be2c172a109232f0a82d0ca892374b4cb36416be086f823542233795
+SIZE (squid3.0/11105.patch) = 29877
+MD5 (squid3.0/11107.patch) = 7599037492801fbc32c500be0051ac7f
+SHA256 (squid3.0/11107.patch) = ec65bed4329343bcc90f9f5570162430ba3a933d3e75569fffa89327dd2942dc
+SIZE (squid3.0/11107.patch) = 4106
+MD5 (squid3.0/11108.patch) = 80d3160e29f0bd34a285b12c587197c1
+SHA256 (squid3.0/11108.patch) = bbc6beec6674f793b9a47423860fb94eaa438cbcc49376c72ece2e1e1c1fc3c3
+SIZE (squid3.0/11108.patch) = 1381
+MD5 (squid3.0/11109.patch) = f99c38049ce3609bd05a249edea6cbb6
+SHA256 (squid3.0/11109.patch) = f05874c6ff6a3a34e4dd7fc6ed3d31a09d632ea7959ddb1f18f5022d6678c544
+SIZE (squid3.0/11109.patch) = 5403
+MD5 (squid3.0/11111.patch) = 62255b7fff26e08f0163e251ee3af283
+SHA256 (squid3.0/11111.patch) = c210464fff2a349d11e90a317db4a6fd6f75f5ea368f76d87974b329bf7a2e4e
+SIZE (squid3.0/11111.patch) = 994
+MD5 (squid3.0/11112.patch) = f1fd72bad3761cf0eba5c289862f03bf
+SHA256 (squid3.0/11112.patch) = d45456f4eaefc39055302e820a4074f88d7bbc09ec32bb7773f8665f23955c42
+SIZE (squid3.0/11112.patch) = 1911
+MD5 (squid3.0/11113.patch) = b30d429d3477cad481e1becdc68237a9
+SHA256 (squid3.0/11113.patch) = d60e818f6a2849081bdfa5bf50b69d576d1dca845ea528e86bc8ccd512e74e62
+SIZE (squid3.0/11113.patch) = 2171
+MD5 (squid3.0/11115.patch) = c4255a5a0c63f8fb078e426ddaffd157
+SHA256 (squid3.0/11115.patch) = 999f7a5ceef96f0ab0206cb991b3bcd0c2422c051a24596e7ee2a8792859e1c1
+SIZE (squid3.0/11115.patch) = 916
+MD5 (squid3.0/11116.patch) = a4803b64951047ffe7b4212d458d6803
+SHA256 (squid3.0/11116.patch) = 7ca2db30b64e7c236967d6f55b5461e34f99cb627188307441ed8d47776f4554
+SIZE (squid3.0/11116.patch) = 8214
+MD5 (squid3.0/11117.patch) = 80de32e73c559175dccc85bb12a95fa2
+SHA256 (squid3.0/11117.patch) = fba30bbc0f9ae77d592ebaa0cd0598e8b9c347ae6a806d6a0a88cd9369678119
+SIZE (squid3.0/11117.patch) = 1581
+MD5 (squid3.0/11118.patch) = 4fa9a82de7f11833faea594a8d5664eb
+SHA256 (squid3.0/11118.patch) = 2ef3a35375ab3ed8baee56bf08e4f226e057b052ba2b01487cec17cc82df5ded
+SIZE (squid3.0/11118.patch) = 901
+MD5 (squid3.0/11119.patch) = b7988ec78046e6710af795ea1cae60fe
+SHA256 (squid3.0/11119.patch) = 47b2d315439b2a185fdde690a84b7eb3b197c366cef0cfffad3f03b5fead6150
+SIZE (squid3.0/11119.patch) = 1129
+MD5 (squid3.0/11120.patch) = 3bc71fe6b7bdbf2ffa1f8e66e9af2110
+SHA256 (squid3.0/11120.patch) = 07b5dafe58401999f65c4e285b208fb62ba5cd74393a9caf16a679e6d61d2192
+SIZE (squid3.0/11120.patch) = 99604
+MD5 (squid3.0/11121.patch) = c1a2bd5c050afab7f28922cb6cfaf63f
+SHA256 (squid3.0/11121.patch) = 3c438d2e39851d6e4cfe8c481072b0766cfd915d407ac960a0457e5c5533fb3f
+SIZE (squid3.0/11121.patch) = 13181
+MD5 (squid3.0/11122.patch) = 83c575764752364c6ef9b7d4acc16f27
+SHA256 (squid3.0/11122.patch) = 8c77985192e5211d41f6f3996f4809afc83b4a2c019e8efbf1c3e85e545177e6
+SIZE (squid3.0/11122.patch) = 1555
+MD5 (squid3.0/11123.patch) = 6e7044eed718316790f3fa6ee5f8fc7d
+SHA256 (squid3.0/11123.patch) = 0f7d383349e7455a1a2f6870ee122934a3b05348f3d0f149a38f5a6815670dd5
+SIZE (squid3.0/11123.patch) = 4274
+MD5 (squid3.0/11124.patch) = 427e868b28ea6a7b7e407f5e1eb8e90e
+SHA256 (squid3.0/11124.patch) = d0efa7429f68f911bd3dd358eabdc6387d13ebe5e7a58a602dd0ee4272c44742
+SIZE (squid3.0/11124.patch) = 1319
+MD5 (squid3.0/11125.patch) = 221d8fe35654dc03113b1507842d95e3
+SHA256 (squid3.0/11125.patch) = 69aee1addecc3a5998135156401b73f92749f1cea4e31a5fa1e06fed53ac253a
+SIZE (squid3.0/11125.patch) = 1085
+MD5 (squid3.0/11126.patch) = 9a3697c3fdf582972031c6e1551fc4dd
+SHA256 (squid3.0/11126.patch) = 7e60baa56f3202735075d6a96ad214db7113d224e4da93f01fc2e197563056eb
+SIZE (squid3.0/11126.patch) = 8646
diff --git a/www/squid30/files/patch-src-cf.data.pre b/www/squid30/files/patch-src-cf.data.pre
index f13df792fa56..b2b4e55db81f 100644
--- a/www/squid30/files/patch-src-cf.data.pre
+++ b/www/squid30/files/patch-src-cf.data.pre
@@ -11,18 +11,3 @@
  DOC_END
  
  
-@@ -3047,12 +3062,12 @@
- 
- NAME: cache_effective_user
- TYPE: string
--DEFAULT: nobody
-+DEFAULT: %%SQUID_UID%%
- LOC: Config.effectiveUser
- DOC_START
- 	If you start Squid as root, it will change its effective/real
- 	UID/GID to the user specified below.  The default is to change
--	to UID to nobody.  If you define cache_effective_user, but not
-+	to UID to %%SQUID_UID%%.  If you define cache_effective_user, but not
- 	cache_effective_group, Squid sets the GID to the effective
- 	user's default group ID (taken from the password file) and
- 	supplementary group list from the from groups membership of
diff --git a/www/squid30/files/pkg-message.in b/www/squid30/files/pkg-message.in
index 69fbbdd49dc5..6182fdea0f63 100644
--- a/www/squid30/files/pkg-message.in
+++ b/www/squid30/files/pkg-message.in
@@ -20,7 +20,7 @@
 
      To enable Squid, set squid_enable=yes in either
      /etc/rc.conf, /etc/rc.conf.local or /etc/rc.conf.d/squid
-     Please see %%PREFIX%%/etc/rc.d/squid(.sh) for further details.
+     Please see %%PREFIX%%/etc/rc.d/squid for further details.
 
      Note:
      If you just updated your Squid installation from an earlier version,