Squid 3.3 represents a new feature release above 3.2.

The most important of these new features are:
* SQL Database logging helper
* Time-Quota session helper
* SSL-Bump Server First
* Server Certificate Mimic
* Custom HTTP request headers

20 files changed, 385 insertions, 104 deletions

diff --git a/www/Makefile b/www/Makefile
index 8fdb30ace1b..a2a39941b3e 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.931 2013/01/30 18:52:13 wiz Exp $
+# $NetBSD: Makefile,v 1.932 2013/02/10 18:16:53 adam Exp $
 #
 
 COMMENT=	Packages related to the World Wide Web
@@ -666,7 +666,7 @@ SUBDIR+=	snownews
 SUBDIR+=	spawn-fcgi
 #SUBDIR+=	squid		# only contains Makefile fragments
 SUBDIR+=	squid27
-SUBDIR+=	squid31
+SUBDIR+=	squid3
 SUBDIR+=	squidGuard
 SUBDIR+=	squidclamav
 SUBDIR+=	squidpurge
diff --git a/www/squid31/DESCR b/www/squid3/DESCR
index 283cb06bc8c..283cb06bc8c 100644
--- a/www/squid31/DESCR
+++ b/www/squid3/DESCR
diff --git a/www/squid31/Makefile b/www/squid3/Makefile
index 046e08fbf45..a631a8740e6 100644
--- a/www/squid31/Makefile
+++ b/www/squid3/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.43 2013/01/11 13:32:56 taca Exp $
+# $NetBSD: Makefile,v 1.1 2013/02/10 18:16:53 adam Exp $
 
-DISTNAME=	squid-3.1.23
-PKGNAME=	${DISTNAME}	# Necessary for "pkgsrc/www/squid/options.mk"
+DISTNAME=	squid-3.3.1
 CATEGORIES=	www
-MASTER_SITES=	http://www.squid-cache.org/Versions/v3/3.1/ \
+MASTER_SITES=	http://www.squid-cache.org/Versions/v3/${PKGVERSION_NOREV:R}/ \
 		${SQUID_MASTER_SITES}
-EXTRACT_SUFX=	.tar.bz2
+EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER=	tron@NetBSD.org
 HOMEPAGE=	http://www.squid-cache.org/
@@ -19,17 +18,19 @@ GNU_CONFIGURE=		yes
 .include "../../www/squid/Makefile.squid"
 
 CONFIGURE_ARGS+=	--disable-strict-error-checking
-CONFIGURE_ARGS+=	--enable-auth=basic,digest,ntlm
+CONFIGURE_ARGS+=	--enable-auth
 CONFIGURE_ARGS+=	--enable-icap-client
 CONFIGURE_ARGS+=	--with-default-user=${SQUID_USER}
 CONFIGURE_ARGS+=	--with-pidfile=${VARBASE}/run/squid.pid
 
+REPLACE_PERL+=		tools/helper-mux.pl
+
 EGFILES+=	errors/errorpage.css
 CONF_FILES+=	${PREFIX}/${EGDIR}/errorpage.css ${PKG_SYSCONFDIR}/errorpage.css
 
 SQUID_BACKENDS?=	ufs
 SQUID_NTLM_AUTH_HELPERS?= fakeauth
-.include "../../www/squid/options.mk"
+.include "options.mk"
 
 post-build:
 	cd ${WRKSRC}/src && ${CP} -pf squid.conf.documented squid.conf.default
diff --git a/www/squid31/PLIST b/www/squid3/PLIST
index bdd2d78b276..aff802751d2 100644
--- a/www/squid31/PLIST
+++ b/www/squid3/PLIST
@@ -1,30 +1,38 @@
-@comment $NetBSD: PLIST,v 1.5 2011/01/15 10:32:08 adam Exp $
+@comment $NetBSD: PLIST,v 1.1 2013/02/10 18:16:53 adam Exp $
+bin/purge
 bin/squidclient
+${PLIST.ba_getpwnam}libexec/basic_getpwnam_auth
+${PLIST.ba_MSNT}libexec/basic_msnt_auth
+${PLIST.ba_NCSA}libexec/basic_ncsa_auth
+${PLIST.ba_NIS}libexec/basic_nis_auth
+${PLIST.ba_PAM}libexec/basic_pam_auth
 libexec/cachemgr.cgi
 ${PLIST.da_ldap}libexec/digest_ldap_auth
-${PLIST.da_password}libexec/digest_pw_auth
 ${PLIST.diskd}libexec/diskd
-${PLIST.na_fakeauth}libexec/fakeauth_auth
-${PLIST.ba_getpwnam}libexec/getpwname_auth
-${PLIST.eacl_ip_user}libexec/ip_user_check
-${PLIST.ba_MSNT}libexec/msnt_auth
-${PLIST.ba_NCSA}libexec/ncsa_auth
+${PLIST.eacl_unix_group}libexec/ext_unix_group_acl
+libexec/helper-mux.pl
+libexec/log_db_daemon
+libexec/log_file_daemon
+${PLIST.ta_kerberos}libexec/negotiate_kerberos_auth
+${PLIST.ta_kerberos}libexec/negotiate_kerberos_auth_test
 ${PLIST.na_SMB}libexec/ntlm_auth
-${PLIST.ba_PAM}libexec/pam_auth
 libexec/pinger
 ${PLIST.ba_LDAP}libexec/squid_ldap_auth
 ${PLIST.eacl_ldap_group}libexec/squid_ldap_group
-${PLIST.eacl_unix_group}libexec/squid_unix_group
 ${PLIST.unlinkd}libexec/unlinkd
-${PLIST.ba_YP}libexec/yp_auth
+libexec/url_fake_rewrite
+libexec/url_fake_rewrite.sh
 man/man1/squidclient.1
 man/man8/cachemgr.cgi.8
-${PLIST.ba_NCSA}man/man8/ncsa_auth.8
-${PLIST.ba_PAM}man/man8/pam_auth.8
+${PLIST.ba_getpwnam}man/man8/basic_getpwnam_auth.8
+${PLIST.ba_NCSA}man/man8/basic_ncsa_auth.8
+${PLIST.ba_PAM}man/man8/basic_pam_auth.8
+${PLIST.eacl_unix_group}man/man8/ext_unix_group_acl.8
+${PLIST.ta_kerberos}man/man8/negotiate_kerberos_auth.8
+man/man8/log_db_daemon.8
 man/man8/squid.8
 ${PLIST.ba_LDAP}man/man8/squid_ldap_auth.8
 ${PLIST.eacl_ldap_group}man/man8/squid_ldap_group.8
-${PLIST.eacl_unix_group}man/man8/squid_unix_group.8
 sbin/squid
 share/doc/squid/ChangeLog
 share/doc/squid/README.FreeBSD
diff --git a/www/squid3/distinfo b/www/squid3/distinfo
new file mode 100644
index 00000000000..ca463ae18f9
--- /dev/null
+++ b/www/squid3/distinfo
@@ -0,0 +1,15 @@
+$NetBSD: distinfo,v 1.1 2013/02/10 18:16:53 adam Exp $
+
+SHA1 (squid-3.3.1.tar.xz) = d996c5b49bb244aad69e45c85499c8cb1f2c4716
+RMD160 (squid-3.3.1.tar.xz) = 1419cc29351a5a784456fb0f447fced59f42f0fd
+Size (squid-3.3.1.tar.xz) = 2173060 bytes
+SHA1 (patch-configure) = 8e5eb49a8d04c77f3cf9de9390a8992268421cb6
+SHA1 (patch-errors_Makefile.in) = afbac822ac84d5e1734d55fc625e949ae0b85289
+SHA1 (patch-helpers_basic_auth_MSNT_Makefile.in) = 74a0379d3ec0c2601dbb62b16df889bf4edcaedf
+SHA1 (patch-src_Makefile.in) = 919797e74c378daad88b5ac1ee7efe6f5f580a33
+SHA1 (patch-src_acl_DomainData.cc) = 19b223e4c976179f40343074d531434c1ed78b9b
+SHA1 (patch-src_acl_Url.cc) = 418a4d8bf9600601363c5353e063a5eeced81088
+SHA1 (patch-src_base_TidyPointer.h) = 93428d26bb2479fc845764a324658eaacd26588e
+SHA1 (patch-src_ip_Intercept.cc) = 972ad12063bcf3d24704976960f1a71452d0aa87
+SHA1 (patch-src_store.cc) = 055d98a59103b02a51876a5c8ffed9514954beb4
+SHA1 (patch-tools_Makefile.in) = 3a7678c63a11a35fabef091a3b18e63859f0796f
diff --git a/www/squid3/options.mk b/www/squid3/options.mk
new file mode 100644
index 00000000000..08900e944e6
--- /dev/null
+++ b/www/squid3/options.mk
@@ -0,0 +1,212 @@
+# $NetBSD: options.mk,v 1.1 2013/02/10 18:16:53 adam Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.squid
+PKG_SUPPORTED_OPTIONS=	snmp ssl \
+		squid-backend-aufs squid-backend-null squid-backend-ufs \
+		squid-carp squid-unlinkd \
+		squid-kerberos-helper squid-ldap-helper squid-pam-helper
+
+PKG_OPTIONS_LEGACY_OPTS=	aufs:squid-backend-aufs \
+	coss:squid-backend-coss diskd:squid-backend-diskd \
+	null:squid-backend-null ufs:squid-backend-ufs \
+	linux-netfilter:squid-netfilter ipf-transparent:squid-ipf \
+	pf-transparent:squid-pf unlinkd:squid-unlinkd \
+	arp-acl:squid-arp-acl pam-helper:squid-pam-helper carp:squid-carp
+
+PLIST_VARS+=	coss diskd snmp unlinkd
+PLIST_VARS+=	ba_LDAP ba_MSNT ba_NCSA ba_NIS ba_PAM ba_getpwnam
+PLIST_VARS+=	da_ldap
+PLIST_VARS+=	na_SMB
+PLIST_VARS+=	ta_kerberos
+PLIST_VARS+=	eacl_ip_user eacl_ldap_group eacl_unix_group
+
+# most of options are enabled by default except aufs.
+# aufs backend isn't # tested well.
+PKG_SUGGESTED_OPTIONS=	squid-carp snmp ssl squid-pam-helper squid-unlinkd
+
+.include "../../mk/bsd.prefs.mk"
+
+# Squid 3.1 and above include IPv6 support
+.if empty(PKGNAME:Msquid-[0-2].*) && empty(PKGNAME:Msquid-3.0.*)
+PKG_SUPPORTED_OPTIONS+=	inet6
+PKG_SUGGESTED_OPTIONS+=	inet6
+.endif
+
+# Squid 3.0's COSS support is not stable now.
+.if !empty(PKGNAME:Msquid-2.[0-9]*.[0-9]*)
+PKG_SUPPORTED_OPTIONS+=	squid-backend-coss
+PKG_SUGGESTED_OPTIONS+=	squid-backend-coss
+.endif
+
+.if !empty(OPSYS:MLinux)
+PKG_SUPPORTED_OPTIONS+=	squid-netfilter
+.endif
+
+# some release of NetBSD lacks <ipl.h> header of IP Filter 4.x
+.if ${OPSYS} != "NetBSD" || ${OS_VERSION:M[01].*} || exists(/usr/include/netinet/ipl.h)
+PKG_SUPPORTED_OPTIONS+=	squid-ipf
+.endif
+
+.if ${OPSYS} == "FreeBSD" || ${OPSYS} == "NetBSD" || ${OPSYS} == "OpenBSD" || ${OPSYS} == "DragonFly"
+PKG_SUPPORTED_OPTIONS+=	squid-pf
+.endif
+
+.if (${OPSYS} == "FreeBSD" || ${OPSYS} == "NetBSD") && \
+	!empty(PKG_SUPPORTED_OPTIONS:Msquid-ipf)
+PKG_SUGGESTED_OPTIONS+=	squid-ipf
+.endif
+
+.if ${OPSYS} == "OpenBSD"
+PKG_SUGGESTED_OPTIONS+=	squid-pf
+.endif
+
+.if ${OPSYS} == "Darwin"
+PKG_SUPPORTED_OPTIONS+=	squid-ipfw
+PKG_SUGGESTED_OPTIONS+=	squid-ipfw
+.endif
+
+# Darwin doesn't support System V IPC support.
+.if empty(PKGNAME:Msquid-[0-2].*) || empty(OPSYS:MDarwin)
+PKG_SUPPORTED_OPTIONS+=	squid-backend-diskd
+PKG_SUGGESTED_OPTIONS+=	squid-backend-diskd
+.endif
+
+# limited platform support squid-arp-acl
+.if !empty(OPSYS:MFreeBSD) || !empty(OPSYS:MNetBSD) || !empty(OPSYS:MOpenBSD) || !empty(OPSYS:MLinux) || !empty(OPSYS:MSunOS)
+PKG_SUPPORTED_OPTIONS+=	squid-arp-acl
+.endif
+
+.include "../../mk/bsd.options.mk"
+
+SQUID_BACKENDS?=		ufs null
+SQUID_BASIC_AUTH_HELPERS?=	MSNT NCSA NIS getpwnam
+SQUID_DIGEST_AUTH_HELPERS?=	password
+SQUID_NTLM_AUTH_HELPERS?=	SMB
+SQUID_EXTERNAL_ACL_HELPERS?=	fileuser_ip unix_group
+
+# squid's code has preference as:
+#	squid-ipf > squid-pf > squid-netfilter
+# So, options.mk introduce preference as:
+#	squid-netfilter > squid-pf > squid-ipf
+.if !empty(PKG_OPTIONS:Msquid-netfilter)
+CONFIGURE_ARGS+=	--enable-linux-netfilter
+.elif !empty(PKG_OPTIONS:Msquid-pf)
+CONFIGURE_ARGS+=	--enable-pf-transparent
+.elif !empty(PKG_OPTIONS:Msquid-ipf)
+CONFIGURE_ARGS+=	--enable-ipf-transparent
+.elif !empty(PKG_OPTIONS:Msquid-ipfw)
+CONFIGURE_ARGS+=	--enable-ipfw-transparent
+.endif
+
+.if !empty(PKG_OPTIONS:Msquid-arp-acl)
+CONFIGURE_ARGS+=	--enable-arp-acl
+.endif
+
+.if !empty(PKG_OPTIONS:Msquid-carp)
+CONFIGURE_ARGS+=	--enable-carp
+.endif
+
+.if !empty(PKG_SUPPORTED_OPTIONS:Minet6) && empty(PKG_OPTIONS:Minet6)
+CONFIGURE_ARGS+=	--disable-ipv6
+.endif
+
+.if !empty(PKG_OPTIONS:Msquid-kerberos-helper)
+.include "../../mk/krb5.buildlink3.mk"
+SQUID_NEGOTIATE_AUTH_HELPERS+=	kerberos
+.endif
+
+.if !empty(PKG_OPTIONS:Msquid-ldap-helper)
+.include "../../databases/openldap-client/buildlink3.mk"
+SQUID_BASIC_AUTH_HELPERS+=	LDAP
+SQUID_DIGEST_AUTH_HELPERS+=	ldap
+SQUID_EXTERNAL_ACL_HELPERS+=	ldap_group
+.endif
+
+.if !empty(PKG_OPTIONS:Msquid-pam-helper)
+.  include "../../mk/pam.buildlink3.mk"
+SQUID_BASIC_AUTH_HELPERS+=	PAM
+.endif
+
+.if !empty(PKG_OPTIONS:Msnmp)
+CONFIGURE_ARGS+=	--enable-snmp
+PLIST.snmp=		yes
+.else
+CONFIGURE_ARGS+=	--disable-snmp
+.endif
+
+.if !empty(PKG_OPTIONS:Mssl)
+CONFIGURE_ARGS+=	--enable-ssl --with-openssl=${SSLBASE:Q}
+.  include "../../security/openssl/buildlink3.mk"
+.endif
+
+.if !empty(PKG_OPTIONS:Msquid-backend-aufs)
+SQUID_BACKENDS+=	aufs
+PTHREAD_AUTO_VARS=	yes
+.  include "../../mk/pthread.buildlink3.mk"
+.endif
+
+.if !empty(PKG_OPTIONS:Msquid-backend-coss)
+.  if empty(PKG_OPTIONS:Msquid-backend-aufs)
+SQUID_BACKENDS+=	aufs
+PTHREAD_AUTO_VARS=	yes
+.    include "../../mk/pthread.buildlink3.mk"
+.  endif
+SQUID_BACKENDS+=	coss
+PLIST.coss=		yes
+.endif
+
+.if !empty(PKG_OPTIONS:Msquid-backend-diskd)
+SQUID_BACKENDS+=	diskd
+PLIST.diskd=		yes
+.endif
+
+.if empty(PKG_OPTIONS:Msquid-unlinkd)
+CONFIGURE_ARGS+=	--disable-unlinkd
+.else
+PLIST.unlinkd=		yes
+.endif
+
+.if empty(SQUID_BASIC_AUTH_HELPERS)
+CONFIGURE_ARGS+=	--disable-auth-basic
+.else
+CONFIGURE_ARGS+=	--enable-auth-basic=${SQUID_BASIC_AUTH_HELPERS:Q}
+.  for i in ${SQUID_BASIC_AUTH_HELPERS}
+PLIST.ba_${i}=		yes
+.  endfor
+.endif
+
+.if empty(SQUID_DIGEST_AUTH_HELPERS)
+CONFIGURE_ARGS+=	--disable-auth-digest
+.else
+CONFIGURE_ARGS+=	--enable-auth-digest=${SQUID_DIGEST_AUTH_HELPERS:Q}
+.  for i in ${SQUID_DIGEST_AUTH_HELPERS}
+PLIST.da_${i}=		yes
+.  endfor
+.endif
+
+.if empty(SQUID_NEGOTIATE_AUTH_HELPERS)
+CONFIGURE_ARGS+=	--disable-auth-negotiate
+.else
+CONFIGURE_ARGS+=	--enable-auth-negotiate=${SQUID_NEGOTIATE_AUTH_HELPERS:Q}
+.  for i in ${SQUID_NEGOTIATE_AUTH_HELPERS}
+PLIST.ta_${i}=		yes
+.  endfor
+.endif
+
+.if empty(SQUID_NTLM_AUTH_HELPERS)
+CONFIGURE_ARGS+=	--disable-auth-ntlm
+.else
+CONFIGURE_ARGS+=	--enable-auth-ntlm=${SQUID_NTLM_AUTH_HELPERS:Q}
+.  for i in ${SQUID_NTLM_AUTH_HELPERS}
+PLIST.na_${i}=		yes
+.  endfor
+.endif
+
+.if empty(SQUID_EXTERNAL_ACL_HELPERS)
+CONFIGURE_ARGS+=	--disable-external-acl-helpers
+.else
+CONFIGURE_ARGS+=	--enable-external-acl-helpers=${SQUID_EXTERNAL_ACL_HELPERS:Q}
+.  for i in ${SQUID_EXTERNAL_ACL_HELPERS}
+PLIST.eacl_${i}=	yes
+.  endfor
+.endif
diff --git a/www/squid3/patches/patch-configure b/www/squid3/patches/patch-configure
new file mode 100644
index 00000000000..018fbeff965
--- /dev/null
+++ b/www/squid3/patches/patch-configure
@@ -0,0 +1,51 @@
+$NetBSD: patch-configure,v 1.1 2013/02/10 18:16:53 adam Exp $
+
+Compatibility problems.
+
+--- configure.orig	2013-02-09 07:30:57.000000000 +0000
++++ configure
+@@ -22437,7 +22437,7 @@ fi
+ 
+ done
+ 
+-  if test "x$ac_heimdal" == "x" ; then
++  if test "x$ac_heimdal" = "x" ; then
+     for ac_header in gssapi/gssapi_generic.h
+ do :
+   ac_fn_cxx_check_header_mongrel "$LINENO" "gssapi/gssapi_generic.h" "ac_cv_header_gssapi_gssapi_generic_h" "$ac_includes_default"
+@@ -22634,7 +22634,7 @@ done
+ 
+ 
+   ac_com_error_message=no
+-  if test "x$ac_cv_header_com_err_h" == "xyes" ; then
++  if test "x$ac_cv_header_com_err_h" = "xyes" ; then
+       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ #include <com_err.h>
+@@ -22646,7 +22646,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&
+ fi
+ rm -f conftest*
+ 
+-  elif test "x$ac_cv_header_et_com_err_h" == "xyes" ; then
++  elif test "x$ac_cv_header_et_com_err_h" = "xyes" ; then
+       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ #include <et/com_err.h>
+@@ -22707,7 +22707,7 @@ $as_echo "#define HAVE_MAX_SKEW_IN_KRB5_
+ 
+   fi
+ 
+-  if test `echo $KRB5LIBS | grep -c com_err` -ne 0 -a "x$ac_com_error_message" == "xyes" ; then
++  if test `echo $KRB5LIBS | grep -c com_err` -ne 0 -a "x$ac_com_error_message" = "xyes" ; then
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for error_message in -lcom_err" >&5
+ $as_echo_n "checking for error_message in -lcom_err... " >&6; }
+ if ${ac_cv_lib_com_err_error_message+:} false; then :
+@@ -22750,7 +22750,7 @@ $as_echo "#define HAVE_ERROR_MESSAGE 1" 
+ 
+ fi
+ 
+-  elif test  "x$ac_com_error_message" == "xyes" ; then
++  elif test  "x$ac_com_error_message" = "xyes" ; then
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for error_message in -lkrb5" >&5
+ $as_echo_n "checking for error_message in -lkrb5... " >&6; }
+ if ${ac_cv_lib_krb5_error_message+:} false; then :
diff --git a/www/squid31/patches/patch-ae b/www/squid3/patches/patch-errors_Makefile.in
index 95b2f7df701..a5ebca25dda 100644
--- a/www/squid31/patches/patch-ae
+++ b/www/squid3/patches/patch-errors_Makefile.in
@@ -1,8 +1,10 @@
-$NetBSD: patch-ae,v 1.6 2011/01/15 10:32:08 adam Exp $
+$NetBSD: patch-errors_Makefile.in,v 1.1 2013/02/10 18:16:53 adam Exp $
 
---- errors/Makefile.in.orig	2010-12-22 05:47:42.000000000 +0000
+Don't install errorpage.css.
+
+--- errors/Makefile.in.orig	2013-02-01 10:56:12.000000000 +0000
 +++ errors/Makefile.in
-@@ -473,7 +473,7 @@ install-dvi: install-dvi-am
+@@ -501,7 +501,7 @@ install-dvi: install-dvi-am
  
  install-dvi-am:
  
@@ -11,12 +13,11 @@ $NetBSD: patch-ae,v 1.6 2011/01/15 10:32:08 adam Exp $
  
  install-html: install-html-am
  
-@@ -589,7 +589,7 @@ install-data-local: translate
+@@ -618,7 +618,6 @@ install-data-local: translate
  	done; \
  	$(INSTALL_DATA) $(srcdir)/TRANSLATORS $(DESTDIR)$(DEFAULT_ERROR_DIR)/TRANSLATORS; \
  	$(INSTALL_DATA) $(srcdir)/COPYRIGHT $(DESTDIR)$(DEFAULT_ERROR_DIR)/COPYRIGHT; \
 -	$(INSTALL_DATA) $(srcdir)/errorpage.css $(DESTDIR)$(DEFAULT_STYLESHEET).default; \
-+#	$(INSTALL_DATA) $(srcdir)/errorpage.css $(DESTDIR)$(DEFAULT_STYLESHEET).default; \
  	$(SHELL) $(srcdir)/alias-link.sh "$(LN)" "$(RM)" "$(DESTDIR)$(DEFAULT_ERROR_DIR)" "$(srcdir)/aliases" || exit 1 ;
  
  uninstall-local:
diff --git a/www/squid31/patches/patch-al b/www/squid3/patches/patch-helpers_basic_auth_MSNT_Makefile.in
index 8235cd05f0a..c2d72ed1994 100644
--- a/www/squid31/patches/patch-al
+++ b/www/squid3/patches/patch-helpers_basic_auth_MSNT_Makefile.in
@@ -1,8 +1,10 @@
-$NetBSD: patch-al,v 1.5 2011/01/15 10:32:08 adam Exp $
+$NetBSD: patch-helpers_basic_auth_MSNT_Makefile.in,v 1.1 2013/02/10 18:16:53 adam Exp $
 
---- helpers/basic_auth/MSNT/Makefile.in.orig	2010-12-22 05:47:43.000000000 +0000
+Don't install msntauth.conf.
+
+--- helpers/basic_auth/MSNT/Makefile.in.orig	2013-02-01 10:56:13.000000000 +0000
 +++ helpers/basic_auth/MSNT/Makefile.in
-@@ -718,13 +718,13 @@ info: info-am
+@@ -756,13 +756,13 @@ info: info-am
  
  info-am:
  
diff --git a/www/squid31/patches/patch-aj b/www/squid3/patches/patch-src_Makefile.in
index 95b3623a517..215d819448d 100644
--- a/www/squid31/patches/patch-aj
+++ b/www/squid3/patches/patch-src_Makefile.in
@@ -1,13 +1,13 @@
-$NetBSD: patch-aj,v 1.6 2012/01/08 10:06:59 adam Exp $
+$NetBSD: patch-src_Makefile.in,v 1.1 2013/02/10 18:16:53 adam Exp $
 
---- src/Makefile.in.orig	2011-12-03 06:20:35.000000000 +0000
+--- src/Makefile.in.orig	2013-02-09 07:30:35.000000000 +0000
 +++ src/Makefile.in
-@@ -4712,14 +4712,14 @@ info: info-recursive
+@@ -7163,14 +7163,14 @@ info: info-recursive
  
  info-am:
  
--install-data-am: install-data-local install-dataDATA
-+install-data-am: install-dataDATA
+-install-data-am: install-data-local install-dataDATA install-man
++install-data-am: install-dataDATA install-man
  
  install-dvi: install-dvi-recursive
  
@@ -19,7 +19,7 @@ $NetBSD: patch-aj,v 1.6 2012/01/08 10:06:59 adam Exp $
  
  install-html: install-html-recursive
  
-@@ -4814,7 +4814,7 @@ cache_cf.o: cf_parser.cci
+@@ -7283,7 +7283,7 @@ cache_cf.o: cf_parser.cci
  
  # cf_gen builds the configuration files.
  cf_gen$(EXEEXT): $(cf_gen_SOURCES) $(cf_gen_DEPENDENCIES)
diff --git a/www/squid3/patches/patch-src_acl_DomainData.cc b/www/squid3/patches/patch-src_acl_DomainData.cc
new file mode 100644
index 00000000000..157e9358922
--- /dev/null
+++ b/www/squid3/patches/patch-src_acl_DomainData.cc
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_acl_DomainData.cc,v 1.1 2013/02/10 18:16:53 adam Exp $
+
+On case-insensitive file systems acl/Url.h might get included.
+
+--- src/acl/DomainData.cc.orig	2013-02-10 13:30:18.000000000 +0000
++++ src/acl/DomainData.cc
+@@ -38,7 +38,7 @@
+ #include "cache_cf.h"
+ #include "Debug.h"
+ #include "wordlist.h"
+-#include "URL.h"
++#include "../URL.h"
+ 
+ template<class T>
+ inline void
diff --git a/www/squid3/patches/patch-src_acl_Url.cc b/www/squid3/patches/patch-src_acl_Url.cc
new file mode 100644
index 00000000000..7d202461162
--- /dev/null
+++ b/www/squid3/patches/patch-src_acl_Url.cc
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_acl_Url.cc,v 1.1 2013/02/10 18:16:53 adam Exp $
+
+On case-insensitive file systems acl/Url.h might get included.
+
+--- src/acl/Url.cc.orig	2013-02-10 13:41:53.000000000 +0000
++++ src/acl/Url.cc
+@@ -37,7 +37,7 @@
+ #include "acl/Checklist.h"
+ #include "acl/RegexData.h"
+ #include "rfc1738.h"
+-#include "URL.h"
++#include "../URL.h"
+ 
+ int
+ ACLUrlStrategy::match (ACLData<char const *> * &data, ACLFilledChecklist *checklist)
diff --git a/www/squid31/patches/patch-src_base_TidyPointer.h b/www/squid3/patches/patch-src_base_TidyPointer.h
index c3827e4c6b1..6b58fc04f87 100644
--- a/www/squid31/patches/patch-src_base_TidyPointer.h
+++ b/www/squid3/patches/patch-src_base_TidyPointer.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-src_base_TidyPointer.h,v 1.1 2011/07/20 11:44:27 adam Exp $
+$NetBSD: patch-src_base_TidyPointer.h,v 1.1 2013/02/10 18:16:53 adam Exp $
 
 Define NULL if not defined.
 
 --- src/base/TidyPointer.h.orig	2011-07-08 09:42:57.000000000 +0000
 +++ src/base/TidyPointer.h
-@@ -5,6 +5,10 @@
+@@ -1,6 +1,10 @@
  #ifndef SQUID_BASE_TIDYPOINTER_H
  #define SQUID_BASE_TIDYPOINTER_H
  
diff --git a/www/squid31/patches/patch-src_ip_IpIntercept.cc b/www/squid3/patches/patch-src_ip_Intercept.cc
index a91d2404d0c..b12b0e736b2 100644
--- a/www/squid31/patches/patch-src_ip_IpIntercept.cc
+++ b/www/squid3/patches/patch-src_ip_Intercept.cc
@@ -1,10 +1,14 @@
-$NetBSD: patch-src_ip_IpIntercept.cc,v 1.1 2012/02/23 05:26:52 taca Exp $
+$NetBSD: patch-src_ip_Intercept.cc,v 1.1 2013/02/10 18:16:53 adam Exp $
 
 Avoid conflict with IP Fitler's debug().
 
---- src/ip/IpIntercept.cc.orig	2012-02-05 11:51:32.000000000 +0000
-+++ src/ip/IpIntercept.cc
-@@ -36,6 +36,10 @@
+--- src/ip/Intercept.cc.orig	2013-02-09 07:30:01.000000000 +0000
++++ src/ip/Intercept.cc
+@@ -34,9 +34,14 @@
+ #include "comm/Connection.h"
+ #include "ip/Intercept.h"
+ #include "fde.h"
++#include "../tools.h"
  
  #if IPF_TRANSPARENT
  
@@ -15,8 +19,8 @@ Avoid conflict with IP Fitler's debug().
  #if HAVE_SYS_IOCTL_H
  #include <sys/ioctl.h>
  #endif
-@@ -70,6 +74,10 @@
- #include <netinet/ip_nat.h>
+@@ -74,6 +79,10 @@
+ #include <errno.h>
  #endif
  
 +// Stolen from src/defines.h
diff --git a/www/squid31/patches/patch-src_store.cc b/www/squid3/patches/patch-src_store.cc
index d12e266210e..f1402892ef0 100644
--- a/www/squid31/patches/patch-src_store.cc
+++ b/www/squid3/patches/patch-src_store.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-src_store.cc,v 1.1 2012/01/08 10:07:27 adam Exp $
+$NetBSD: patch-src_store.cc,v 1.1 2013/02/10 18:16:53 adam Exp $
 
 Fix compiling with Clang.
 
 --- src/store.cc.orig	2012-01-08 10:01:40.000000000 +0000
 +++ src/store.cc
-@@ -374,7 +374,7 @@ StoreEntry::deferProducer(const AsyncCal
+@@ -425,7 +425,7 @@ StoreEntry::deferProducer(const AsyncCal
          deferredProducer = producer;
      else
          debugs(20, 5, HERE << "Deferred producer call is allready set to: " <<
diff --git a/www/squid3/patches/patch-tools_Makefile.in b/www/squid3/patches/patch-tools_Makefile.in
new file mode 100644
index 00000000000..dd49b88935f
--- /dev/null
+++ b/www/squid3/patches/patch-tools_Makefile.in
@@ -0,0 +1,15 @@
+$NetBSD: patch-tools_Makefile.in,v 1.1 2013/02/10 18:16:53 adam Exp $
+
+Don't install cachemgr.conf.
+
+--- tools/Makefile.in.orig	2013-02-01 10:56:31.000000000 +0000
++++ tools/Makefile.in
+@@ -1146,7 +1146,7 @@ info: info-recursive
+ 
+ info-am:
+ 
+-install-data-am: install-data-local install-man
++install-data-am: install-man
+ 
+ install-dvi: install-dvi-recursive
+ 
diff --git a/www/squid31/distinfo b/www/squid31/distinfo
deleted file mode 100644
index 5ebf55cfa21..00000000000
--- a/www/squid31/distinfo
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: distinfo,v 1.38 2013/01/11 13:32:56 taca Exp $
-
-SHA1 (squid-3.1.23.tar.bz2) = ae988fc253b0cf556ab7617c72097ae1031f0248
-RMD160 (squid-3.1.23.tar.bz2) = 952fa538f1267c7121d00779172f20464430d12a
-Size (squid-3.1.23.tar.bz2) = 2560454 bytes
-SHA1 (patch-ad) = 2e8c05f220374240e5681efdd46379851c6bb50e
-SHA1 (patch-ae) = 944c24b28cf11f7a876150f8f0e131af5f3e354d
-SHA1 (patch-aj) = b49b2549b125ec465e414445404ac759f3e54490
-SHA1 (patch-al) = 6fec093f8969aed96cb8ffb115d96f9d21ac1f63
-SHA1 (patch-am) = d6d52948f883d983b114c68cffb392cb8295f847
-SHA1 (patch-src_base_TidyPointer.h) = d616bc21f7ab640622b7c34cf9da8222d2ddb5cf
-SHA1 (patch-src_ip_IpIntercept.cc) = 68d8add9cfde8e8770f2c75de7eb9d04708eea1f
-SHA1 (patch-src_ssl_gadgets.cc) = c631940ffd3fc7f44bc1586169eb4fe13a79ab35
-SHA1 (patch-src_store.cc) = 0f439a4440bb501459464916e7ab39472b95f0d4
diff --git a/www/squid31/patches/patch-ad b/www/squid31/patches/patch-ad
deleted file mode 100644
index 384bc663c7f..00000000000
--- a/www/squid31/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.6 2011/01/15 10:32:08 adam Exp $
-
---- tools/Makefile.in.orig	2010-12-22 05:47:59.000000000 +0000
-+++ tools/Makefile.in
-@@ -1008,7 +1008,7 @@ info: info-recursive
- 
- info-am:
- 
--install-data-am: install-data-local install-man
-+install-data-am: install-man
- 
- install-dvi: install-dvi-recursive
- 
diff --git a/www/squid31/patches/patch-am b/www/squid31/patches/patch-am
deleted file mode 100644
index ed2fa93860d..00000000000
--- a/www/squid31/patches/patch-am
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-am,v 1.4 2011/11/28 15:26:26 drochner Exp $
-
-protect against CVE-2011-4122
-
---- helpers/basic_auth/PAM/pam_auth.c.orig	2011-10-13 08:30:05.000000000 +0000
-+++ helpers/basic_auth/PAM/pam_auth.c
-@@ -196,6 +196,11 @@ start:
-         exit(1);
-     }
- 
-+    if (strchr(service, '/')) {
-+	fprintf(stderr, "Illegal service '%s'\n", service);
-+	exit(1);
-+    }
-+
-     while (fgets(buf, BUFSIZE, stdin)) {
-         user = buf;
-         password_buf = strchr(buf, '\n');
diff --git a/www/squid31/patches/patch-src_ssl_gadgets.cc b/www/squid31/patches/patch-src_ssl_gadgets.cc
deleted file mode 100644
index 276efc0f955..00000000000
--- a/www/squid31/patches/patch-src_ssl_gadgets.cc
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-src_ssl_gadgets.cc,v 1.1 2011/07/20 11:44:27 adam Exp $
-
-Include correct config.h as there might be other impostors wandering around.
-
---- src/ssl/gadgets.cc.orig	2011-07-20 10:55:12.000000000 +0000
-+++ src/ssl/gadgets.cc
-@@ -3,5 +3,5 @@
-  */
- 
--#include "config.h"
-+#include "include/config.h"
- #include "ssl/gadgets.h"
-