Importing squid-2.7.4 (2.7.STABLE4) package as www/squid27.

This is current stable release of Squid.

pkgsrc change:

* Drop support for pkgsrc original log_mime_hdrs_list.  If someone
  want to use it, please feedback it to upstream.

Changes from squid 2.6.

* Experimental support for HTTP/1.1, mainly targeted at reverse proxy
  installations. Not yet HTTP/1.1 compliant hoewever.
* A number of performance improvements; including request/reply parser,
  eliminating various redundant data copies and some completely rewritten
  sections.
* Support for WAIS has been removed.
* "act-as-origin" option for http_port - Squid can now emulate an origin
  server when acting as an accelerator.
* "min-size" option for cache_dir - the minimum object size to store in a
  cache directory. Previously objects of any size up to a "max-size" maximum
  size would be considered as candidated for storing in a store_dir; this
  option allows the administrator to tune various stores for small and large
  objects rather than trying to tune it for both.
* Support for Solaris /dev/poll for network IO - more efficient than poll()
  or select() and backwards compatible to Solaris 7. This must be manually
  enabled during configure by specifying "--enable-devpoll".
* Support for FreeBSD accept filters. Use "accept_filter httpready" in
  squid.conf to enable this.
* A semi-modular logging framework has been introduced, which both allows
  for more efficient non-blocking logging with the supplied logging daemon,
  but also allows for third-party modules to intercept the squid logs and
  process them. An example "UDP" logging helper, thanks to the Wikimedia
  Foundation, is included.
* Support for rewriting URLs into canonical forms when storing and
  retrieving objects. A common practice seen in Content Delivery Networks is
  to serve the same content from a variety of different URLs or hosts; this
  makes efficient caching difficult. The store URL rewriting framework
  allows the administrator to rewrite a variety of URLs into one canonical
  form, so matching content from a variety of sources can be stored and
  retrieved as if they came from the same source, whilst still fetching the
  content from the original destination. See the "storeurl_rewrite_program"
  option for more information, and
  http://wiki.squid-cache.org/Features/StoreURLRewrite for some examples.
* Object revalidation can now occur in the background. Cache validation can
  now occur in the background without requiring an active client to drive
  it. Stale content being revalidated can be served in situ whilst the
  object is being refreshed. See the "max_stale" and "refresh_pattern"
  options for more information.
* introduce a new option, "zero_buffers", which controls whether Squid will
  zero the memory used for buffers and other data structures before
  use. This may or may not improve performance on specific workloads.
* Cache authentication based on source IP address. This reduces the pressure
  on external authenticators which may not be able to keep up under high
  load - NTLM/winbind is a good example of this. See the
  "authenticate_ip_shortcircuit_access" and
  "authenticate_ip_shortcircuit_ttl" options for more information.
* Support for configuration file includes has been added. "include" can now
  be used to include a configuration file or a glob of configuration files
  in a directory.
* The default rules to not cache dynamic content from cgi-bin and query URLs
  have been altered. Previously, the "cache" ACL was used to mark requests
  as non-cachable - this is enforced even on dynamic content which returns
  cachability information. This has changed in Squid-2.7 to use the default
  refresh pattern. Dynamic content is now cached if it is marked as
  cachable. You should remove the default configuration lines with QUERY
  (acl, and cache) and replace them with the correct refresh_pattern
  entries.
* Accelerator mode support cleaned up to behave more consistent when
  combining multiple accelerator mode options
* Zero Penalty Hit support, allowing cache misses to be marked by custom
  TOS/priority values, useful when using packet shaping/prioritization
  outside Squid and needing to separate cache hits from misses.

17 files changed, 437 insertions, 0 deletions

diff --git a/www/squid27/DESCR b/www/squid27/DESCR
new file mode 100644
index 00000000000..9a00667e917
--- /dev/null
+++ b/www/squid27/DESCR
@@ -0,0 +1,6 @@
+Squid is a fully-featured HTTP/1.0 proxy which is almost (but not
+quite - we're getting there!) HTTP/1.1 compliant. Squid offers a rich
+access control, authorization and logging environment to develop web
+proxy and content serving applications.
+
+This is current stable release.
diff --git a/www/squid27/Makefile b/www/squid27/Makefile
new file mode 100644
index 00000000000..a0810cfaf56
--- /dev/null
+++ b/www/squid27/Makefile
@@ -0,0 +1,21 @@
+# $NetBSD: Makefile,v 1.1.1.1 2008/09/12 15:02:47 taca Exp $
+
+DISTNAME=	squid-2.7.STABLE4
+PKGNAME=	${DISTNAME:S/STABLE//}
+CATEGORIES=	www
+MASTER_SITES=	http://www.squid-cache.org/Versions/v2/2.7/
+EXTRACT_SUFX=	.tar.bz2
+
+MAINTAINER=	taca@NetBSD.org
+HOMEPAGE=	http://www.squid-cache.org/
+COMMENT=	Post-Harvest_cached WWW proxy cache and accelerator
+
+WRKSRC=		${WRKDIR}/${DISTNAME:S/-src//}
+
+USE_TOOLS+=		perl
+GNU_CONFIGURE=		yes
+PKG_DESTDIR_SUPPORT=	destdir
+
+.include "../../www/squid/Makefile.squid"
+.include "../../www/squid/options.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/www/squid27/PLIST b/www/squid27/PLIST
new file mode 100644
index 00000000000..d54df379f5f
--- /dev/null
+++ b/www/squid27/PLIST
@@ -0,0 +1,42 @@
+@comment $NetBSD: PLIST,v 1.1.1.1 2008/09/12 15:02:47 taca Exp $
+${PLIST.coss}bin/cossdump
+bin/squidclient
+libexec/cachemgr.cgi
+${PLIST.da_ldap}libexec/digest_ldap_auth
+${PLIST.da_password}libexec/digest_pw_auth
+${PLIST.diskd}libexec/diskd-daemon
+${PLIST.na_fakeauth}libexec/fakeauth_auth
+${PLIST.ba_getpwnam}libexec/getpwname_auth
+${PLIST.eacl_ip_user}libexec/ip_user_check
+libexec/logfile-daemon
+${PLIST.ba_MSNT}libexec/msnt_auth
+${PLIST.ba_NCSA}libexec/ncsa_auth
+${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
+man/man8/cachemgr.cgi.8
+${PLIST.ba_NCSA}man/man8/ncsa_auth.8
+${PLIST.ba_PAM}man/man8/pam_auth.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
+share/doc/squid/README.NetBSD
+share/doc/squid/README.OpenBSD
+share/doc/squid/README.Solaris
+share/doc/squid/RELEASENOTES.html
+share/doc/squid/debug-sections.txt
+share/examples/rc.d/squid
+share/examples/squid/cachemgr.conf
+share/examples/squid/mime.conf
+share/examples/squid/msntauth.conf
+share/examples/squid/squid.conf
+${PLIST.snmp}share/squid/mib.txt
diff --git a/www/squid27/PLIST.common_end b/www/squid27/PLIST.common_end
new file mode 100644
index 00000000000..e74ade376b8
--- /dev/null
+++ b/www/squid27/PLIST.common_end
@@ -0,0 +1,5 @@
+@comment $NetBSD: PLIST.common_end,v 1.1.1.1 2008/09/12 15:02:47 taca Exp $
+@dirrm share/squid/icons
+@dirrm share/squid
+@dirrm share/doc/squid
+@dirrm share/examples/squid
diff --git a/www/squid27/distinfo b/www/squid27/distinfo
new file mode 100644
index 00000000000..44e01511faf
--- /dev/null
+++ b/www/squid27/distinfo
@@ -0,0 +1,17 @@
+$NetBSD: distinfo,v 1.1.1.1 2008/09/12 15:02:47 taca Exp $
+
+SHA1 (squid-2.7.STABLE4.tar.bz2) = 1195a43a9d364220abc8454fa9ee56c375bf597c
+RMD160 (squid-2.7.STABLE4.tar.bz2) = 492f324f58ab312b9fa33bdf5e4576552bc8162d
+Size (squid-2.7.STABLE4.tar.bz2) = 1333891 bytes
+SHA1 (patch-aa) = 88f2b22c90f15b1f3fcaf41ae20ce6bdde7a1206
+SHA1 (patch-ab) = cb8757a2f68f20284fdfefb29b84829c2b72fc0d
+SHA1 (patch-ac) = 47f2457400e03c26227d234064491bf8202c7916
+SHA1 (patch-ad) = 3b0a8cf357d97053c52cd7429db621ea61932ba2
+SHA1 (patch-ae) = a78e762c1ad928eef66b12395d48bc69542e32d9
+SHA1 (patch-af) = d8bfc5e92988ffa37d39c799e62176974fb9c27a
+SHA1 (patch-ag) = b375ecb8eefb4059642450fd25a0ec8e0d74efd7
+SHA1 (patch-ah) = 6732a21860216e58322ab084e3d525237811cc89
+SHA1 (patch-ai) = bf6438e8fb577342c782d2b729add0698bf99e9c
+SHA1 (patch-aj) = f1d18a900d7ada0985499979398bb12dace3ee40
+SHA1 (patch-ak) = 6863cac0fe9100f4b8c3c05cb321324a4abf0a4c
+SHA1 (patch-al) = 43ff4508d964d273227263b7a623d67725e8b7bd
diff --git a/www/squid27/patches/patch-aa b/www/squid27/patches/patch-aa
new file mode 100644
index 00000000000..8def0ed92b5
--- /dev/null
+++ b/www/squid27/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.1.1.1 2008/09/12 15:02:47 taca Exp $
+
+--- Makefile.in.orig	2008-01-26 08:24:17.000000000 +0900
++++ Makefile.in
+@@ -726,7 +726,7 @@ dist-hook:
+ 
+ install-pinger:
+ 	chown root $(DEFAULT_PINGER) 
+-	chmod 4711 $(DEFAULT_PINGER)
++	chmod 4511 $(DEFAULT_PINGER)
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
diff --git a/www/squid27/patches/patch-ab b/www/squid27/patches/patch-ab
new file mode 100644
index 00000000000..a36912cf9b0
--- /dev/null
+++ b/www/squid27/patches/patch-ab
@@ -0,0 +1,55 @@
+$NetBSD: patch-ab,v 1.1.1.1 2008/09/12 15:02:47 taca Exp $
+
+--- configure.in.orig	2008-06-26 07:18:55.000000000 +0900
++++ configure.in
+@@ -1629,10 +1629,12 @@ AC_CHECK_HEADERS(
+ 	linux/netfilter_ipv4.h \
+ 	linux/netfilter_ipv4/ip_tproxy.h \
+ 	malloc.h \
++  	machine/byte_swap.h \
+ 	math.h \
+ 	memory.h \
+ 	mount.h \
+ 	net/if.h \
++	net/pf/pfvar.h \
+ 	net/pfvar.h \
+ 	netdb.h \
+ 	netinet/if_ether.h \
+@@ -1997,7 +1999,16 @@ AC_CHECK_SYSTYPE(size_t, unsigned int)
+ AC_CHECK_SYSTYPE(ssize_t, int)
+ AC_CHECK_SYSTYPE(off_t, int)
+ AC_CHECK_SYSTYPE(mode_t, unsigned short)
+-AC_CHECK_SYSTYPE(fd_mask, int)
++
++dnl Check for type fd_mask
++AC_CACHE_CHECK(for fd_set,ac_cv_have_fd_mask, [
++  AC_TRY_COMPILE([#include <sys/types.h>
++#include <sys/time.h>
++#include <sys/unistd.h>],
++    [fd_mask fds;],
++    ac_cv_have_fd_mask="yes",
++    ac_cv_have_fd_mask="no")
++])
+ 
+ AC_CHECK_SIZEOF_SYSTYPE(off_t, 4)
+ AC_CHECK_SIZEOF_SYSTYPE(size_t, 4)
+@@ -2292,8 +2303,8 @@ if test "$GCC" = "yes"; then
+ 	GCCVER=`$CC -v 2>&1 | awk '$2 ==  "version" {print $3}'`
+ 	case "$GCCVER" in
+ 	[2.95.[123]])
+-		echo "Removing -O for gcc on $host with GCC $GCCVER"
+-		CFLAGS="`echo $CFLAGS | sed -e 's/-O[[0-9]]*//'`"
++		echo "Making -O\[[2-9\]] to -O for gcc on $host with GCC $GCCVER"
++		CFLAGS="`echo $CFLAGS | sed -e 's/-O[[0-9]]*/-O/'`"
+ 		;;
+ 	esac
+ fi
+@@ -2689,7 +2700,7 @@ dnl PF support requires a header file.
+ if test "$PF_TRANSPARENT" ; then
+     AC_MSG_CHECKING(if PF header file is installed)
+     # hold on to your hats...
+-    if test "$ac_cv_header_net_pfvar_h" = "yes"; then
++    if test "$ac_cv_header_net_pfvar_h" = "yes" || test "$ac_cv_header_net_pf_pfvar_h" = "yes"; then
+ 	PF_TRANSPARENT="yes"
+ 	AC_DEFINE(PF_TRANSPARENT, 1, [Enable support for Transparent Proxy on systems using PF address
+ 	redirection. This provides "masquerading" support for OpenBSD.])
diff --git a/www/squid27/patches/patch-ac b/www/squid27/patches/patch-ac
new file mode 100644
index 00000000000..4fc7094f56b
--- /dev/null
+++ b/www/squid27/patches/patch-ac
@@ -0,0 +1,108 @@
+$NetBSD: patch-ac,v 1.1.1.1 2008/09/12 15:02:47 taca Exp $
+
+--- configure.orig	2008-06-26 07:18:55.000000000 +0900
++++ configure
+@@ -8046,10 +8046,12 @@ for ac_header in sys/types.h \
+ 	linux/netfilter_ipv4.h \
+ 	linux/netfilter_ipv4/ip_tproxy.h \
+ 	malloc.h \
++  	machine/byte_swap.h \
+ 	math.h \
+ 	memory.h \
+ 	mount.h \
+ 	net/if.h \
++	net/pf/pfvar.h \
+ 	net/pfvar.h \
+ 	netdb.h \
+ 	netinet/if_ether.h \
+@@ -21456,11 +21458,13 @@ _ACEOF
+ fi
+ 
+ 
+-{ echo "$as_me:$LINENO: checking for fd_mask" >&5
+-echo $ECHO_N "checking for fd_mask... $ECHO_C" >&6; }
+-if test "${ac_cv_type_fd_mask+set}" = set; then
++
++{ echo "$as_me:$LINENO: checking for fd_set" >&5
++echo $ECHO_N "checking for fd_set... $ECHO_C" >&6; }
++if test "${ac_cv_have_fd_mask+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
++
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -21468,35 +21472,14 @@ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* What a mess.. many systems have added the (now standard) bit types
+- * in their own ways, so we need to scan a wide variety of headers to
+- * find them..
+- */
+-#include <sys/types.h>
+-#if STDC_HEADERS
+-#include <stdlib.h>
+-#include <stddef.h>
+-#endif
+-#if HAVE_INTTYPES_H
+-#include <inttypes.h>
+-#endif
+-#if HAVE_SYS_TYPES_H
+ #include <sys/types.h>
+-#endif
+-#if HAVE_SYS_BITYPES_H
+-#include <sys/bitypes.h>
+-#endif
+-
+-
++#include <sys/time.h>
++#include <sys/unistd.h>
+ typedef fd_mask ac__type_new_;
+ int
+ main ()
+ {
+-if ((ac__type_new_ *) 0)
+-  return 0;
+-if (sizeof (ac__type_new_))
+-  return 0;
+-  ;
++ac__type_new_ fds;
+   return 0;
+ }
+ _ACEOF
+@@ -21517,30 +21500,20 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+-  ac_cv_type_fd_mask=yes
++  ac_cv_have_fd_mask=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-	ac_cv_type_fd_mask=no
++	ac_cv_have_fd_mask=no
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
+-{ echo "$as_me:$LINENO: result: $ac_cv_type_fd_mask" >&5
+-echo "${ECHO_T}$ac_cv_type_fd_mask" >&6; }
+-if test $ac_cv_type_fd_mask = yes; then
+-  :
+-else
+-
+-cat >>confdefs.h <<_ACEOF
+-#define fd_mask int
+-_ACEOF
+ 
+ fi
+ 
+-
+-
++{ echo "$as_me:$LINENO: result: $ac_cv_have_fd_mask" >&5
++echo "${ECHO_T}$ac_cv_have_fd_mask" >&6; }
+ 
+ { echo "$as_me:$LINENO: checking for off_t" >&5
+ echo $ECHO_N "checking for off_t... $ECHO_C" >&6; }
diff --git a/www/squid27/patches/patch-ad b/www/squid27/patches/patch-ad
new file mode 100644
index 00000000000..0c5a3d39f8c
--- /dev/null
+++ b/www/squid27/patches/patch-ad
@@ -0,0 +1,16 @@
+$NetBSD: patch-ad,v 1.1.1.1 2008/09/12 15:02:47 taca Exp $
+
+--- helpers/basic_auth/MSNT/Makefile.in.orig	2007-11-12 10:13:58.000000000 +0900
++++ helpers/basic_auth/MSNT/Makefile.in
+@@ -530,9 +530,9 @@ info: info-am
+ 
+ info-am:
+ 
+-install-data-am: install-data-local
++install-data-am:
+ 
+-install-exec-am: install-libexecPROGRAMS install-sysconfDATA
++install-exec-am: install-libexecPROGRAMS
+ 
+ install-info: install-info-am
+ 
diff --git a/www/squid27/patches/patch-ae b/www/squid27/patches/patch-ae
new file mode 100644
index 00000000000..4a74401f807
--- /dev/null
+++ b/www/squid27/patches/patch-ae
@@ -0,0 +1,20 @@
+$NetBSD: patch-ae,v 1.1.1.1 2008/09/12 15:02:47 taca Exp $
+
+--- helpers/ntlm_auth/SMB/smbval/smblib-util.c.orig	2005-05-18 01:56:33.000000000 +0900
++++ helpers/ntlm_auth/SMB/smbval/smblib-util.c
+@@ -60,6 +60,7 @@ static char *SMB_Prots[] =
+     "NT LANMAN 1.0",
+     NULL};
+ 
++#if 0
+ /* Print out an SMB pkt in all its gory detail ... */
+ 
+ void
+@@ -78,6 +79,7 @@ SMB_Print_Pkt(FILE fd, RFCNB_Pkt * pkt, 
+     /* etc                                                 */
+ 
+ }
++#endif
+ 
+ /* Convert a DOS Date_Time to a local host type date time for printing */
+ 
diff --git a/www/squid27/patches/patch-af b/www/squid27/patches/patch-af
new file mode 100644
index 00000000000..beeec712699
--- /dev/null
+++ b/www/squid27/patches/patch-af
@@ -0,0 +1,24 @@
+$NetBSD: patch-af,v 1.1.1.1 2008/09/12 15:02:47 taca Exp $
+
+--- include/autoconf.h.in.orig	2008-06-05 09:18:07.000000000 +0900
++++ include/autoconf.h.in
+@@ -243,6 +243,9 @@
+ /* Define to 1 if you have the `lrand48' function. */
+ #undef HAVE_LRAND48
+ 
++/* Define if you have the <machine/byte_swap.h> header file.  */
++#undef HAVE_MACHINE_BYTE_SWAP_H
++
+ /* Define to 1 if you have the `mallinfo' function. */
+ #undef HAVE_MALLINFO
+ 
+@@ -324,6 +327,9 @@
+ /* Define to 1 if you have the <net/pfvar.h> header file. */
+ #undef HAVE_NET_PFVAR_H
+ 
++/* Define to 1 if you have the <net/pf/pfvar.h> header file. */
++#undef HAVE_NET_PF_PFVAR_H
++
+ /* Define to 1 if you have the <nss_common.h> header file. */
+ #undef HAVE_NSS_COMMON_H
+ 
diff --git a/www/squid27/patches/patch-ag b/www/squid27/patches/patch-ag
new file mode 100644
index 00000000000..d5cbded3349
--- /dev/null
+++ b/www/squid27/patches/patch-ag
@@ -0,0 +1,22 @@
+$NetBSD: patch-ag,v 1.1.1.1 2008/09/12 15:02:47 taca Exp $
+
+--- include/ntlmauth.h.orig	2007-03-04 03:25:31.000000000 +0900
++++ include/ntlmauth.h
+@@ -70,6 +70,9 @@
+ #define bswap16(x) bswap_16(x)
+ #define bswap32(x) bswap_32(x)
+ #else	 /* HAVE_BISTWAP_H */
++#ifdef HAVE_MACHINE_BYTE_SWAP_H
++#include <machine/byte_swap.h>
++#else	/* HAVE_MACHINE_BYTE_SWAP_H */
+ #ifndef bswap16
+ #define bswap16(x) (((((u_int16_t)x) >> 8) & 0xff) | ((((u_int16_t)x) & 0xff) << 8))
+ #endif
+@@ -78,6 +81,7 @@
+     (((((u_int32_t)x) & 0xff000000) >> 24) | ((((u_int32_t)x) & 0x00ff0000) >>  8) | \
+      ((((u_int32_t)x) & 0x0000ff00) <<  8) | ((((u_int32_t)x) & 0x000000ff) << 24))
+ #endif
++#endif	/* HAVE_MACHINE_BYTE_SWAP_H */
+ #endif /* HAVE_BITSWAP_H */
+ 
+ /* Used internally. Microsoft seems to think this is right, I believe them.
diff --git a/www/squid27/patches/patch-ah b/www/squid27/patches/patch-ah
new file mode 100644
index 00000000000..682090d2449
--- /dev/null
+++ b/www/squid27/patches/patch-ah
@@ -0,0 +1,13 @@
+$NetBSD: patch-ah,v 1.1.1.1 2008/09/12 15:02:47 taca Exp $
+
+--- scripts/Makefile.in.orig	2007-11-12 10:14:20.000000000 +0900
++++ scripts/Makefile.in
+@@ -386,7 +386,7 @@ info-am:
+ 
+ install-data-am:
+ 
+-install-exec-am: install-binSCRIPTS
++install-exec-am:
+ 
+ install-info: install-info-am
+ 
diff --git a/www/squid27/patches/patch-ai b/www/squid27/patches/patch-ai
new file mode 100644
index 00000000000..d5957c1196f
--- /dev/null
+++ b/www/squid27/patches/patch-ai
@@ -0,0 +1,26 @@
+$NetBSD: patch-ai,v 1.1.1.1 2008/09/12 15:02:47 taca Exp $
+
+--- src/Makefile.in.orig	2008-01-03 10:16:40.000000000 +0900
++++ src/Makefile.in
+@@ -657,7 +657,7 @@ DEFAULT_LOG_PREFIX = $(localstatedir)/lo
+ DEFAULT_CACHE_LOG = $(DEFAULT_LOG_PREFIX)/cache.log
+ DEFAULT_ACCESS_LOG = $(DEFAULT_LOG_PREFIX)/access.log
+ DEFAULT_STORE_LOG = $(DEFAULT_LOG_PREFIX)/store.log
+-DEFAULT_PID_FILE = $(DEFAULT_LOG_PREFIX)/squid.pid
++DEFAULT_PID_FILE = $(VARBASE)/run/squid.pid
+ DEFAULT_NETDB_FILE = $(DEFAULT_LOG_PREFIX)/netdb.state
+ DEFAULT_SWAP_DIR = $(localstatedir)/cache
+ DEFAULT_PINGER = $(libexecdir)/`echo pinger | sed '$(transform);s/$$/$(EXEEXT)/'`
+@@ -1190,10 +1190,9 @@ info: info-recursive
+ 
+ info-am:
+ 
+-install-data-am: install-data-local install-dataDATA
++install-data-am: install-dataDATA
+ 
+-install-exec-am: install-libexecPROGRAMS install-sbinPROGRAMS \
+-	install-sysconfDATA
++install-exec-am: install-libexecPROGRAMS install-sbinPROGRAMS
+ 
+ install-info: install-info-recursive
+ 
diff --git a/www/squid27/patches/patch-aj b/www/squid27/patches/patch-aj
new file mode 100644
index 00000000000..8e0cdd069f6
--- /dev/null
+++ b/www/squid27/patches/patch-aj
@@ -0,0 +1,19 @@
+$NetBSD: patch-aj,v 1.1.1.1 2008/09/12 15:02:47 taca Exp $
+
+--- src/cf.data.pre.orig	2008-06-25 07:54:18.000000000 +0900
++++ src/cf.data.pre
+@@ -3753,12 +3753,12 @@ DOC_END
+ 
+ NAME: cache_effective_user
+ TYPE: string
+-DEFAULT: nobody
++DEFAULT: @USER@
+ 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 @USER@.  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/squid27/patches/patch-ak b/www/squid27/patches/patch-ak
new file mode 100644
index 00000000000..244a72d8ebc
--- /dev/null
+++ b/www/squid27/patches/patch-ak
@@ -0,0 +1,17 @@
+$NetBSD: patch-ak,v 1.1.1.1 2008/09/12 15:02:47 taca Exp $
+
+--- src/client_side.c.orig	2008-06-25 07:54:47.000000000 +0900
++++ src/client_side.c
+@@ -88,7 +88,12 @@
+ #include <sys/fcntl.h>
+ #include <net/if.h>
+ #include <netinet/in.h>
++#ifdef HAVE_NET_PF_PFVAR_H
++#include <net/pf/pfvar.h>
++#endif /* HAVE_NET_PF_PFVAR_H */
++#ifdef HAVE_NET_PFVAR_H
+ #include <net/pfvar.h>
++#endif /* HAVE_NET_PFVAR_H */
+ #endif
+ 
+ #if LINUX_NETFILTER
diff --git a/www/squid27/patches/patch-al b/www/squid27/patches/patch-al
new file mode 100644
index 00000000000..5f96ba67d76
--- /dev/null
+++ b/www/squid27/patches/patch-al
@@ -0,0 +1,13 @@
+$NetBSD: patch-al,v 1.1.1.1 2008/09/12 15:02:47 taca Exp $
+
+--- tools/Makefile.in.orig	2007-11-12 10:14:28.000000000 +0900
++++ tools/Makefile.in
+@@ -737,7 +737,7 @@ info: info-recursive
+ 
+ info-am:
+ 
+-install-data-am: install-data-local
++install-data-am:
+ 
+ install-exec-am: install-binPROGRAMS install-libexecPROGRAMS
+