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

10 files changed, 235 insertions, 0 deletions

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/squid3/patches/patch-errors_Makefile.in b/www/squid3/patches/patch-errors_Makefile.in
new file mode 100644
index 00000000000..a5ebca25dda
--- /dev/null
+++ b/www/squid3/patches/patch-errors_Makefile.in
@@ -0,0 +1,23 @@
+$NetBSD: patch-errors_Makefile.in,v 1.1 2013/02/10 18:16:53 adam Exp $
+
+Don't install errorpage.css.
+
+--- errors/Makefile.in.orig	2013-02-01 10:56:12.000000000 +0000
++++ errors/Makefile.in
+@@ -501,7 +501,7 @@ install-dvi: install-dvi-am
+ 
+ install-dvi-am:
+ 
+-install-exec-am: install-exec-local
++install-exec-am:
+ 
+ install-html: install-html-am
+ 
+@@ -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; \
+ 	$(SHELL) $(srcdir)/alias-link.sh "$(LN)" "$(RM)" "$(DESTDIR)$(DEFAULT_ERROR_DIR)" "$(srcdir)/aliases" || exit 1 ;
+ 
+ uninstall-local:
diff --git a/www/squid3/patches/patch-helpers_basic_auth_MSNT_Makefile.in b/www/squid3/patches/patch-helpers_basic_auth_MSNT_Makefile.in
new file mode 100644
index 00000000000..c2d72ed1994
--- /dev/null
+++ b/www/squid3/patches/patch-helpers_basic_auth_MSNT_Makefile.in
@@ -0,0 +1,22 @@
+$NetBSD: patch-helpers_basic_auth_MSNT_Makefile.in,v 1.1 2013/02/10 18:16:53 adam Exp $
+
+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
+@@ -756,13 +756,13 @@ info: info-am
+ 
+ info-am:
+ 
+-install-data-am: install-data-local
++install-data-am:
+ 
+ install-dvi: install-dvi-am
+ 
+ install-dvi-am:
+ 
+-install-exec-am: install-libexecPROGRAMS install-sysconfDATA
++install-exec-am: install-libexecPROGRAMS
+ 
+ install-html: install-html-am
+ 
diff --git a/www/squid3/patches/patch-src_Makefile.in b/www/squid3/patches/patch-src_Makefile.in
new file mode 100644
index 00000000000..215d819448d
--- /dev/null
+++ b/www/squid3/patches/patch-src_Makefile.in
@@ -0,0 +1,30 @@
+$NetBSD: patch-src_Makefile.in,v 1.1 2013/02/10 18:16:53 adam Exp $
+
+--- src/Makefile.in.orig	2013-02-09 07:30:35.000000000 +0000
++++ src/Makefile.in
+@@ -7163,14 +7163,14 @@ info: info-recursive
+ 
+ info-am:
+ 
+-install-data-am: install-data-local install-dataDATA install-man
++install-data-am: install-dataDATA install-man
+ 
+ install-dvi: install-dvi-recursive
+ 
+ install-dvi-am:
+ 
+ install-exec-am: install-binPROGRAMS install-libexecPROGRAMS \
+-	install-sbinPROGRAMS install-sysconfDATA
++	install-sbinPROGRAMS
+ 
+ install-html: install-html-recursive
+ 
+@@ -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)
+-	$(HOSTCXX) -o $@ $(srcdir)/cf_gen.cc -I$(srcdir) -I$(top_builddir)/include/ -I$(top_builddir)/src
++	$(HOSTCXX) $(CXXFLAGS) -o $@ $(srcdir)/cf_gen.cc -I$(srcdir) -I$(top_builddir)/include/ -I$(top_builddir)/src
+ 
+ # squid.conf.default is built by cf_gen when making cf_parser.cci
+ squid.conf.default squid.conf.documented: cf_parser.cci
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/squid3/patches/patch-src_base_TidyPointer.h b/www/squid3/patches/patch-src_base_TidyPointer.h
new file mode 100644
index 00000000000..6b58fc04f87
--- /dev/null
+++ b/www/squid3/patches/patch-src_base_TidyPointer.h
@@ -0,0 +1,17 @@
+$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
+@@ -1,6 +1,10 @@
+ #ifndef SQUID_BASE_TIDYPOINTER_H
+ #define SQUID_BASE_TIDYPOINTER_H
+ 
++#ifndef NULL
++#define NULL ((void *)0)
++#endif
++
+ /**
+  * A pointer that deletes the object it points to when the pointer's owner or
+  * context is gone. Similar to std::auto_ptr but without confusing assignment
diff --git a/www/squid3/patches/patch-src_ip_Intercept.cc b/www/squid3/patches/patch-src_ip_Intercept.cc
new file mode 100644
index 00000000000..b12b0e736b2
--- /dev/null
+++ b/www/squid3/patches/patch-src_ip_Intercept.cc
@@ -0,0 +1,32 @@
+$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/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
+ 
++#ifdef debug
++#undef debug			// XXX: IP Filter might declare debug().
++#endif
++
+ #if HAVE_SYS_IOCTL_H
+ #include <sys/ioctl.h>
+ #endif
+@@ -74,6 +79,10 @@
+ #include <errno.h>
+ #endif
+ 
++// Stolen from src/defines.h
++#define debug(SECTION, LEVEL) \
++        do_debug(SECTION, LEVEL) ? (void) 0 : _db_print
++
+ #endif /* IPF_TRANSPARENT required headers */
+ 
+ #if PF_TRANSPARENT
diff --git a/www/squid3/patches/patch-src_store.cc b/www/squid3/patches/patch-src_store.cc
new file mode 100644
index 00000000000..f1402892ef0
--- /dev/null
+++ b/www/squid3/patches/patch-src_store.cc
@@ -0,0 +1,15 @@
+$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
+@@ -425,7 +425,7 @@ StoreEntry::deferProducer(const AsyncCal
+         deferredProducer = producer;
+     else
+         debugs(20, 5, HERE << "Deferred producer call is allready set to: " <<
+-               *deferredProducer << ", requested call: " << *producer);
++               *deferredProducer);
+ }
+ 
+ void
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
+