diff options
author | taca <taca> | 2008-09-12 15:09:19 +0000 |
---|---|---|
committer | taca <taca> | 2008-09-12 15:09:19 +0000 |
commit | c3887e2203077acfb4d787668bcc295f41ceb544 (patch) | |
tree | 18c57fc0c39181bfd863f70fbaf58fe499f83eb1 /www | |
parent | ec9fb96d962329220a9030352e3ae6ea9e71124e (diff) | |
download | pkgsrc-c3887e2203077acfb4d787668bcc295f41ceb544.tar.gz |
Importing squid-2.6.21 (2.6.STABLE21) package as www/squid26.
* This is legacy stable release but I keep it for a while.
* Switch to new squid package frame work.
* Drop RunCache support.
Bump PKGREVISION.
Diffstat (limited to 'www')
-rw-r--r-- | www/squid26/DESCR | 6 | ||||
-rw-r--r-- | www/squid26/Makefile | 22 | ||||
-rw-r--r-- | www/squid26/PLIST | 41 | ||||
-rw-r--r-- | www/squid26/PLIST.common_end | 5 | ||||
-rw-r--r-- | www/squid26/distinfo | 19 | ||||
-rw-r--r-- | www/squid26/patches/patch-aa | 15 | ||||
-rw-r--r-- | www/squid26/patches/patch-ab | 56 | ||||
-rw-r--r-- | www/squid26/patches/patch-ac | 109 | ||||
-rw-r--r-- | www/squid26/patches/patch-ad | 16 | ||||
-rw-r--r-- | www/squid26/patches/patch-ae | 20 | ||||
-rw-r--r-- | www/squid26/patches/patch-af | 14 | ||||
-rw-r--r-- | www/squid26/patches/patch-ag | 22 | ||||
-rw-r--r-- | www/squid26/patches/patch-ah | 13 | ||||
-rw-r--r-- | www/squid26/patches/patch-ai | 26 | ||||
-rw-r--r-- | www/squid26/patches/patch-aj | 64 | ||||
-rw-r--r-- | www/squid26/patches/patch-ak | 38 | ||||
-rw-r--r-- | www/squid26/patches/patch-al | 17 | ||||
-rw-r--r-- | www/squid26/patches/patch-am | 12 | ||||
-rw-r--r-- | www/squid26/patches/patch-an | 13 |
19 files changed, 528 insertions, 0 deletions
diff --git a/www/squid26/DESCR b/www/squid26/DESCR new file mode 100644 index 00000000000..4778d8061c9 --- /dev/null +++ b/www/squid26/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 Squid 2.6 is legacy release for now and it will retire in the future. diff --git a/www/squid26/Makefile b/www/squid26/Makefile new file mode 100644 index 00000000000..f4d8baaf489 --- /dev/null +++ b/www/squid26/Makefile @@ -0,0 +1,22 @@ +# $NetBSD: Makefile,v 1.1.1.1 2008/09/12 15:09:19 taca Exp $ + +DISTNAME= squid-2.6.STABLE21 +PKGNAME= ${DISTNAME:S/STABLE//} +PKGREVISION= 1 +CATEGORIES= www +MASTER_SITES= http://www.squid-cache.org/Versions/v2/2.6/ +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/squid26/PLIST b/www/squid26/PLIST new file mode 100644 index 00000000000..4971eb7c06a --- /dev/null +++ b/www/squid26/PLIST @@ -0,0 +1,41 @@ +@comment $NetBSD: PLIST,v 1.1.1.1 2008/09/12 15:09:19 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 +${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/squid26/PLIST.common_end b/www/squid26/PLIST.common_end new file mode 100644 index 00000000000..d7179479818 --- /dev/null +++ b/www/squid26/PLIST.common_end @@ -0,0 +1,5 @@ +@comment $NetBSD: PLIST.common_end,v 1.1.1.1 2008/09/12 15:09:19 taca Exp $ +@dirrm share/squid/icons +@dirrm share/squid +@dirrm share/doc/squid +@dirrm share/examples/squid diff --git a/www/squid26/distinfo b/www/squid26/distinfo new file mode 100644 index 00000000000..31afe54cc7b --- /dev/null +++ b/www/squid26/distinfo @@ -0,0 +1,19 @@ +$NetBSD: distinfo,v 1.1.1.1 2008/09/12 15:09:19 taca Exp $ + +SHA1 (squid-2.6.STABLE21.tar.bz2) = 727196f92d168c7594bc19f908aef762aeb85ea8 +RMD160 (squid-2.6.STABLE21.tar.bz2) = 54f27e08ecdff1cf7b13e4c029596e5a02fa4a6e +Size (squid-2.6.STABLE21.tar.bz2) = 1294517 bytes +SHA1 (patch-aa) = b7c4019a0f71e473c150f25da4abf8f36e4b8be1 +SHA1 (patch-ab) = 8938b3ac064b10cccae43b37aa972c330905678c +SHA1 (patch-ac) = 910b2467ab948180b2d9ba02ab8c72cf21a6375b +SHA1 (patch-ad) = 20eec1bcc0a12e3ea47fda7a6ff14d781c0334c5 +SHA1 (patch-ae) = a78e762c1ad928eef66b12395d48bc69542e32d9 +SHA1 (patch-af) = 22e5a32ef7992fa10db8a124a22325a4ae2a44fb +SHA1 (patch-ag) = 0b87eb5f4ccc06a0e59ed298fc3203b1b2641969 +SHA1 (patch-ah) = fef3dc16ef9e3177bd2e3b27778b3bcd765bf30e +SHA1 (patch-ai) = 3d83a89909148c7f960abe379538f7832d55b8bb +SHA1 (patch-aj) = 533c4cdd3b5cb9f060d5c61c6e06e1d7d6059187 +SHA1 (patch-ak) = 8b50cc1a631b86442619ba16a356de697c78cf5c +SHA1 (patch-al) = 79593e8f2cd5f5c3e58901a69e2d0376fd634bab +SHA1 (patch-am) = f6913c9898e7242e3317597ca5847b63d49ac6be +SHA1 (patch-an) = 985c192662d41264012a76248e9bea0662cec8f5 diff --git a/www/squid26/patches/patch-aa b/www/squid26/patches/patch-aa new file mode 100644 index 00000000000..88707c97e85 --- /dev/null +++ b/www/squid26/patches/patch-aa @@ -0,0 +1,15 @@ +$NetBSD: patch-aa,v 1.1.1.1 2008/09/12 15:09:19 taca Exp $ + +--- Makefile.in.orig 2007-08-12 21:40:44.000000000 +0900 ++++ Makefile.in +@@ -727,8 +727,8 @@ dist-hook: + fi + + install-pinger: +- chown root $(DEFAULT_PINGER) +- chmod 4711 $(DEFAULT_PINGER) ++ chown root $(DESTDIR)$(DEFAULT_PINGER) ++ chmod 4511 $(DESTDIR)$(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/squid26/patches/patch-ab b/www/squid26/patches/patch-ab new file mode 100644 index 00000000000..fef22e32d5a --- /dev/null +++ b/www/squid26/patches/patch-ab @@ -0,0 +1,56 @@ +$NetBSD: patch-ab,v 1.1.1.1 2008/09/12 15:09:19 taca Exp $ + +--- configure.in.orig 2008-06-28 06:55:39.000000000 +0900 ++++ configure.in +@@ -1609,11 +1609,13 @@ 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/pfvar.h \ ++ net/pf/pfvar.h \ + netdb.h \ + netinet/if_ether.h \ + netinet/tcp.h \ +@@ -1975,7 +1977,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) +@@ -2254,8 +2265,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 +@@ -2649,7 +2660,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/squid26/patches/patch-ac b/www/squid26/patches/patch-ac new file mode 100644 index 00000000000..5c95b5f3ec7 --- /dev/null +++ b/www/squid26/patches/patch-ac @@ -0,0 +1,109 @@ +$NetBSD: patch-ac,v 1.1.1.1 2008/09/12 15:09:19 taca Exp $ + +--- configure.orig 2008-06-28 06:55:39.000000000 +0900 ++++ configure +@@ -8040,11 +8040,13 @@ 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/pfvar.h \ ++ net/pf/pfvar.h \ + netdb.h \ + netinet/if_ether.h \ + netinet/tcp.h \ +@@ -21448,11 +21450,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 +@@ -21460,35 +21464,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 +@@ -21509,30 +21492,19 @@ 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/squid26/patches/patch-ad b/www/squid26/patches/patch-ad new file mode 100644 index 00000000000..cd35997de03 --- /dev/null +++ b/www/squid26/patches/patch-ad @@ -0,0 +1,16 @@ +$NetBSD: patch-ad,v 1.1.1.1 2008/09/12 15:09:19 taca Exp $ + +--- helpers/basic_auth/MSNT/Makefile.in.orig 2007-08-12 21:40:48.000000000 +0900 ++++ helpers/basic_auth/MSNT/Makefile.in +@@ -532,9 +532,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/squid26/patches/patch-ae b/www/squid26/patches/patch-ae new file mode 100644 index 00000000000..71e54fbe589 --- /dev/null +++ b/www/squid26/patches/patch-ae @@ -0,0 +1,20 @@ +$NetBSD: patch-ae,v 1.1.1.1 2008/09/12 15:09:19 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/squid26/patches/patch-af b/www/squid26/patches/patch-af new file mode 100644 index 00000000000..f2479a5be22 --- /dev/null +++ b/www/squid26/patches/patch-af @@ -0,0 +1,14 @@ +$NetBSD: patch-af,v 1.1.1.1 2008/09/12 15:09:19 taca Exp $ + +--- include/autoconf.h.in.orig 2007-09-02 09:14:59.000000000 +0900 ++++ include/autoconf.h.in +@@ -231,6 +231,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 + diff --git a/www/squid26/patches/patch-ag b/www/squid26/patches/patch-ag new file mode 100644 index 00000000000..f3c8e83945c --- /dev/null +++ b/www/squid26/patches/patch-ag @@ -0,0 +1,22 @@ +$NetBSD: patch-ag,v 1.1.1.1 2008/09/12 15:09:19 taca Exp $ + +--- include/ntlmauth.h.orig 2007-03-13 11:12:39.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/squid26/patches/patch-ah b/www/squid26/patches/patch-ah new file mode 100644 index 00000000000..e2e18ddaead --- /dev/null +++ b/www/squid26/patches/patch-ah @@ -0,0 +1,13 @@ +$NetBSD: patch-ah,v 1.1.1.1 2008/09/12 15:09:19 taca Exp $ + +--- scripts/Makefile.in.orig 2007-08-12 21:41:06.000000000 +0900 ++++ scripts/Makefile.in +@@ -388,7 +388,7 @@ info-am: + + install-data-am: + +-install-exec-am: install-binSCRIPTS ++install-exec-am: + + install-info: install-info-am + diff --git a/www/squid26/patches/patch-ai b/www/squid26/patches/patch-ai new file mode 100644 index 00000000000..77fe7ac48bf --- /dev/null +++ b/www/squid26/patches/patch-ai @@ -0,0 +1,26 @@ +$NetBSD: patch-ai,v 1.1.1.1 2008/09/12 15:09:19 taca Exp $ + +--- src/Makefile.in.orig 2007-09-06 06:57:25.000000000 +0900 ++++ src/Makefile.in +@@ -629,7 +629,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_SWAP_DIR = $(localstatedir)/cache + DEFAULT_PINGER = $(libexecdir)/`echo pinger | sed '$(transform);s/$$/$(EXEEXT)/'` + DEFAULT_UNLINKD = $(libexecdir)/`echo unlinkd | sed '$(transform);s/$$/$(EXEEXT)/'` +@@ -1148,10 +1148,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/squid26/patches/patch-aj b/www/squid26/patches/patch-aj new file mode 100644 index 00000000000..05604012983 --- /dev/null +++ b/www/squid26/patches/patch-aj @@ -0,0 +1,64 @@ +$NetBSD: patch-aj,v 1.1.1.1 2008/09/12 15:09:19 taca Exp $ + +--- src/access_log.c.orig 2008-03-18 11:58:47.000000000 +0900 ++++ src/access_log.c +@@ -90,6 +90,8 @@ log_quote(const char *header) + { + int c; + int i; ++ int log_all, check_name, log_this; ++ const struct _wordlist *wl; + char *buf; + char *buf_cursor; + if (header == NULL) { +@@ -99,13 +101,41 @@ log_quote(const char *header) + } + buf = xcalloc(1, (strlen(header) * 3) + 1); + buf_cursor = buf; ++ ++ /* if empty or first keyword is "all", log all mime headers */ ++ log_all = (!Config.log_mime_hdrs_list ++ || strcasecmp(Config.log_mime_hdrs_list->key, "all") == 0); ++ + /* + * We escape: \x00-\x1F"#%;<>?{}|\\\\^~`\[\]\x7F-\xFF + * which is the default escape list for the CPAN Perl5 URI module + * modulo the inclusion of space (x40) to make the raw logs a bit + * more readable. + */ +- while ((c = *(const unsigned char *) header++) != '\0') { ++ check_name = 1; ++ log_this = 1; ++ for(; (c = *(const unsigned char *) header) != '\0'; header++) { ++ if (!log_all && check_name) { ++ /* loop over configured header names and only continue ++ * if the current header is on the list */ ++ wl = Config.log_mime_hdrs_list; ++ log_this = 0; ++ for(; wl; wl = wl->next) { ++ if (strncasecmp(wl->key, header, strlen(wl->key)) == 0){ ++ log_this = 1; ++ break; ++ } ++ } ++ check_name = 0; ++ } ++ if (!log_this) { ++ if (c == '\n') { ++ /* check header name in next iteration */ ++ check_name = 1; ++ } ++ continue; ++ } ++ + #if !OLD_LOG_MIME + if (c == '\r') { + *buf_cursor++ = '\\'; +@@ -113,6 +143,7 @@ log_quote(const char *header) + } else if (c == '\n') { + *buf_cursor++ = '\\'; + *buf_cursor++ = 'n'; ++ check_name = 1; + } else + #endif + if (c <= 0x1F diff --git a/www/squid26/patches/patch-ak b/www/squid26/patches/patch-ak new file mode 100644 index 00000000000..1f59c61ca0f --- /dev/null +++ b/www/squid26/patches/patch-ak @@ -0,0 +1,38 @@ +$NetBSD: patch-ak,v 1.1.1.1 2008/09/12 15:09:19 taca Exp $ + +--- src/cf.data.pre.orig 2008-06-28 06:05:08.000000000 +0900 ++++ src/cf.data.pre +@@ -2292,6 +2292,18 @@ DOC_START + formats). To enable this logging set log_mime_hdrs to 'on'. + DOC_END + ++NAME: log_mime_hdrs_list ++TYPE: wordlist ++LOC: Config.log_mime_hdrs_list ++DEFAULT: all ++DOC_START ++ This list specifies which headers should be passed when ++ header logging is enabled by 'log_mime_hdrs on'. You can ++ specify list of header names or 'all'. ++ ++log_mime_hdrs_list all ++DOC_END ++ + NAME: useragent_log + TYPE: string + LOC: Config.Log.useragent +@@ -3392,12 +3404,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/squid26/patches/patch-al b/www/squid26/patches/patch-al new file mode 100644 index 00000000000..e0c7dfc11bc --- /dev/null +++ b/www/squid26/patches/patch-al @@ -0,0 +1,17 @@ +$NetBSD: patch-al,v 1.1.1.1 2008/09/12 15:09:19 taca Exp $ + +--- src/client_side.c.orig 2008-06-28 06:06:39.000000000 +0900 ++++ src/client_side.c +@@ -88,8 +88,12 @@ + #include <sys/fcntl.h> + #include <net/if.h> + #include <netinet/in.h> ++#ifdef __DragonFly__ ++#include <net/pf/pfvar.h> ++#else + #include <net/pfvar.h> + #endif ++#endif + + #if LINUX_NETFILTER + #include <linux/netfilter_ipv4.h> diff --git a/www/squid26/patches/patch-am b/www/squid26/patches/patch-am new file mode 100644 index 00000000000..8112f914589 --- /dev/null +++ b/www/squid26/patches/patch-am @@ -0,0 +1,12 @@ +$NetBSD: patch-am,v 1.1.1.1 2008/09/12 15:09:19 taca Exp $ + +--- src/structs.h.orig 2008-06-28 06:07:15.000000000 +0900 ++++ src/structs.h +@@ -600,6 +600,7 @@ struct _SquidConfig { + wordlist *mcast_group_list; + wordlist *dns_testname_list; + wordlist *dns_nameservers; ++ wordlist *log_mime_hdrs_list; + peer *peers; + int npeers; + struct { diff --git a/www/squid26/patches/patch-an b/www/squid26/patches/patch-an new file mode 100644 index 00000000000..0617e60683c --- /dev/null +++ b/www/squid26/patches/patch-an @@ -0,0 +1,13 @@ +$NetBSD: patch-an,v 1.1.1.1 2008/09/12 15:09:19 taca Exp $ + +--- tools/Makefile.in.orig 2007-08-12 21:41:09.000000000 +0900 ++++ tools/Makefile.in +@@ -739,7 +739,7 @@ info: info-recursive + + info-am: + +-install-data-am: install-data-local ++install-data-am: + + install-exec-am: install-binPROGRAMS install-libexecPROGRAMS + |