Attachment #80506 for bug #115453

View | Details | Raw Unified | Return to bug 115453
Collapse All | Expand All




#     Enable experimental multicast notification of cachemisses.

PORTNAME=	squid
PORTVERSION=	2.6.14
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/&,} \
		http://www.squid-cache.org/Versions/v2/2.6/ \
		http://www3.us.squid-cache.org/Versions/v2/2.6/ \
		http://www1.at.squid-cache.org/Versions/v2/2.6/ \
		http://www2.nl.squid-cache.org/Versions/v2/2.6/ \
		http://www1.ru.squid-cache.org/Versions/v2/2.6/ \
		http://www1.uk.squid-cache.org/Versions/v2/2.6/ \
		http://www1.jp.squid-cache.org/Versions/v2/2.6/ \
		http://www2.tw.squid-cache.org/Versions/v2/2.6/
MASTER_SITE_SUBDIR=	squid-2/STABLE
DISTNAME=	squid-2.6.STABLE14
DIST_SUBDIR=	squid2.6

PATCH_SITES=	http://www.squid-cache.org/%SUBDIR%/ \
		http://www2.us.squid-cache.org/%SUBDIR%/ \
		http://www3.us.squid-cache.org/%SUBDIR%/ \
		http://www1.at.squid-cache.org/%SUBDIR%/ \
		http://www2.nl.squid-cache.org/%SUBDIR%/ \
		http://www1.ru.squid-cache.org/%SUBDIR%/ \
		http://www1.uk.squid-cache.org/%SUBDIR%/ \
		http://www1.jp.squid-cache.org/%SUBDIR%/ \
		http://www2.tw.squid-cache.org/%SUBDIR%/
PATCH_SITE_SUBDIR=	Versions/v2/2.6/changesets
PATCHFILES=	11534.patch 11547.patch 11548.patch
PATCH_DIST_STRIP=	-p1

MAINTAINER=	tmseck@netcologne.de

MAN8=		cachemgr.cgi.8 squid.8
docs=		QUICKSTART README RELEASENOTES.html doc/debug-sections.txt
PORTDOCS=	${docs:T}
PORTEXAMPLES=	passwd.sql
SUB_FILES+=	pkg-deinstall pkg-install pkg-message
SUB_LIST+=	SQUID_UID=${SQUID_UID} SQUID_GID=${SQUID_GID}


		ERR_SOCKET_FAILURE ERR_TOO_BIG ERR_UNSUP_REQ \
		ERR_URN_RESOLVE ERR_WRITE_ERROR ERR_ZERO_SIZE_OBJECT

libexec=	cachemgr.cgi digest_pw_auth diskd-daemon \
		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
.endif


# Authentication methods and modules:

basic_auth=	DB NCSA PAM MSNT SMB
digest_auth=	password
external_acl=	ip_user session unix_group wbinfo_group
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

			--enable-digest-auth-helpers="${digest_auth}" \
			--enable-external-acl-helpers="${external_acl}" \
			--enable-ntlm-auth-helpers="SMB"
.if !defined(NO_KERBEROS) && !defined(WITHOUT_KERBEROS)
# XXX This currently only works with heimdal from the base system,
#     see files/patch-helpers_negotiate_auth-squid_kerb_auth_*
CONFIGURE_ARGS+=	--enable-negotiate-auth-helpers="squid_kerb_auth"
libexec+=	squid_kerb_auth
.endif

# Storage schemes:


.if defined(WITH_SQUID_LARGEFILE)
CONFIGURE_ARGS+=	--with-large-files --enable-large-cache-files
.endif
.if defined(WITH_SQUID_STACKTRACES)
CONFIGURE_ARGS+=	--enable-stacktraces
CFLAGS+=	-g
STRIP=
.endif

# Languages:

	    ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL

post-install:
	@${MKDIR} ${EXAMPLESDIR}
	${INSTALL_DATA} ${WRKSRC}/helpers/basic_auth/DB/passwd.sql ${EXAMPLESDIR}
.if defined(WITH_SQUID_PINGER)
	${CHMOD} 4510 ${PREFIX}/libexec/squid/pinger; \
	${CHGRP} ${SQUID_GID} ${PREFIX}/libexec/squid/pinger




MD5 (squid2.6/squid-2.6.STABLE14.tar.bz2) = eadb138d48320df8b99349121159c6bf
SHA256 (squid2.6/squid-2.6.STABLE14.tar.bz2) = dcb0c10965430862721b675e2f9f6a30819880e03124b5e9403bfce2c7f3b69a
SIZE (squid2.6/squid-2.6.STABLE14.tar.bz2) = 1291509
MD5 (squid2.6/11534.patch) = bbdda88fd922c0b08fa054354bef4f83
SHA256 (squid2.6/11534.patch) = 9422fa99337e6b0dde8ce6930a663988640cf96a2e9457439d6156daf4f8748f
SIZE (squid2.6/11534.patch) = 1187
MD5 (squid2.6/11547.patch) = 91a09aa1afe524fec45938eba1b9ccaa
SHA256 (squid2.6/11547.patch) = b9dc9ca5ed52287d1f7d96023b16ba3d2f761e95fdb86d45a953da7789d4635e
SIZE (squid2.6/11547.patch) = 2504
MD5 (squid2.6/11548.patch) = e82b317555fe58a6c550363fa6f4b5a4
SHA256 (squid2.6/11548.patch) = 8e8ef65102aa56603dae9d7362a552d4de29701f9569dafd6ea6afe9e93e2ec1
SIZE (squid2.6/11548.patch) = 1448




# Note:
# Set "squid_enable=yes" in either /etc/rc.conf, /etc/rc.conf.local or
# /etc/rc.conf.d/squid to make this script actually do something. There
# you can also set squid_chdir, squid_pidfile, squid_user, and squid_flags.
#
# Please see squid(8), rc.conf(5) and rc(8) for further details.
#


load_rc_config ${name}

squid_chdir=${squid_chdir:-"%%PREFIX%%/squid/logs"}
squid_enable=${squid_enable:-"NO"}
squid_flags=${squid_flags-"-D"}
squid_pidfile=${squid_pidfile:-"%%PREFIX%%/squid/logs/squid.pid"}
squid_user=${squid_user:-%%SQUID_UID%%}
default_config=%%PREFIX%%/etc/squid/squid.conf

pidfile=${squid_pidfile}
required_dirs=${squid_chdir}

# squid(8) will not start if ${default_config} is not present so try




--- helpers/negotiate_auth/squid_kerb_auth/Makefile.in.orig	Mon Jul 16 20:40:58 2007
+++ helpers/negotiate_auth/squid_kerb_auth/Makefile.in	Mon Jul 16 20:44:52 2007
@@ -264,12 +264,12 @@
 #-L$(top_builddir)/lib -lmiscutil $(XTRA_LIBS)
 
 # HEIMDAL
-#KERBINC = -DHEIMDAL -I/usr/include/heimdal
-#KERBLIBS = -lgssapi -lkrb5 -lcom_err -lasn1 -lroken
+KERBINC = -DHEIMDAL -I/usr/include
+KERBLIBS = -lgssapi -lkrb5 -lcom_err -lasn1 -lroken -lcrypt -lcrypto
 
 # MIT
-KERBINC = 
-KERBLIBS = -lgssapi_krb5 -lkrb5 -lcom_err
+#KERBINC = 
+#KERBLIBS = -lgssapi_krb5 -lkrb5 -lcom_err
 all: all-am
 
 .SUFFIXES:

Line 0 Link Here

(-)files/patch-helpers-negotiate_auth-squid_kerb_auth-squid_kerb_auth.c (+10 lines)
	1	--- helpers/negotiate_auth/squid_kerb_auth/squid_kerb_auth.c.orig Mon Jul 16 21:10:10 2007
	2	+++ helpers/negotiate_auth/squid_kerb_auth/squid_kerb_auth.c Mon Jul 16 21:10:35 2007
	3	@@ -31,6 +31,7 @@
	4	#include <unistd.h>
	5	#include <time.h>
	6	#include <sys/time.h>
	7	+#include <sys/param.h>
	8
	9	#include "base64.h"
	10	#ifndef HAVE_SPNEGO

Lines 1-6 Link Here

(-)files/patch-src-cf.data.pre (-4 / +15 lines)
1	--- src/cf.data.pre.orig Thu Oct 12 22:48:48 2006	1	--- src/cf.data.pre.orig Tue Jun 26 01:34:57 2007
2	+++ src/cf.data.pre Wed Nov 8 18:56:47 2006	2	+++ src/cf.data.pre Mon Jul 16 20:02:21 2007
3	@@ -1183,6 +1183,21 @@	3	@@ -1207,6 +1207,21 @@
4		4
5	Note that for coss, max-size must be less than COSS_MEMBUF_SZ	5	Note that for coss, max-size must be less than COSS_MEMBUF_SZ
6	(hard coded at 1 MB).	6	(hard coded at 1 MB).
Lines 22-29 Link Here
22	DOC_END	22	DOC_END
23		23
24	NAME: logformat	24	NAME: logformat
25	@@ -3280,12 +3295,12 @@	25	@@ -1439,6 +1454,10 @@
		26	LOC: Config.pidFilename
		27	DOC_START
		28	A filename to write the process-id to. To disable, enter "none".
		29	+
		30	+ Note: If you change this setting, you need to set squid_pidfile
		31	+ in /etc/rc.conf to reflect the new value. Please see
		32	+ %%PREFIX%%/etc/rc.d/squid for details.
		33	DOC_END
26		34
		35	NAME: debug_options
		36	@@ -3275,12 +3294,12 @@
		37
27	NAME: cache_effective_user	38	NAME: cache_effective_user
28	TYPE: string	39	TYPE: string
29	-DEFAULT: nobody	40	-DEFAULT: nobody





Please see icap-2.6-core.patch for further information.

Patch last updated: 2007-07-16

--- configure.orig	Sun Jul 15 16:21:59 2007
+++ configure	Mon Jul 16 22:37:43 2007
@@ -312,7 +312,7 @@
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE build build_cpu build_vendor build_os host host_cpu host_vendor host_os PKGCONFIG CGIEXT ENABLE_WIN32SPECIFIC_TRUE ENABLE_WIN32SPECIFIC_FALSE ENABLE_MINGW32SPECIFIC_TRUE ENABLE_MINGW32SPECIFIC_FALSE WIN32_PSAPI CACHE_HTTP_PORT CACHE_ICP_PORT LIBDLMALLOC LIB_MALLOC STORE_OBJS STORE_LIBS STORE_MODULES NEED_DISKD_TRUE NEED_DISKD_FALSE USE_AIOPS_WIN32_TRUE USE_AIOPS_WIN32_FALSE NEED_COSSDUMP_TRUE NEED_COSSDUMP_FALSE REPL_POLICIES REPL_OBJS REPL_LIBS ENABLE_PINGER_TRUE ENABLE_PINGER_FALSE USE_DELAY_POOLS_TRUE USE_DELAY_POOLS_FALSE USE_SNMP_TRUE USE_SNMP_FALSE SNMPLIB makesnmplib ENABLE_HTCP_TRUE ENABLE_HTCP_FALSE ENABLE_SSL_TRUE ENABLE_SSL_FALSE NEED_OWN_MD5_TRUE NEED_OWN_MD5_FALSE SSLLIB ERR_DEFAULT_LANGUAGE ERR_LANGUAGES MAKE_LEAKFINDER_TRUE MAKE_LEAKFINDER_FALSE USE_DNSSERVER_TRUE USE_DNSSERVER_FALSE OPT_DEFAULT_HOSTS AUTH_MODULES AUTH_OBJS AUTH_LIBS BASIC_AUTH_HELPERS NTLM_AUTH_HELPERS DIGEST_AUTH_HELPERS NEGOTIATE_AUTH_HELPERS EXTERNAL_ACL_HELPERS CPP EGREP LIBSASL ENABLE_UNLINKD_TRUE ENABLE_UNLINKD_FALSE RANLIB ac_ct_RANLIB LN_S SH FALSE TRUE RM MV MKDIR LN PERL AR AR_R ALLOCA CRYPTLIB LIB_EPOLL LIB_LDAP LIB_LBER LIB_DB USE_POLL_TRUE USE_POLL_FALSE USE_EPOLL_TRUE USE_EPOLL_FALSE USE_SELECT_TRUE USE_SELECT_FALSE USE_SELECT_SIMPLE_TRUE USE_SELECT_SIMPLE_FALSE USE_SELECT_WIN32_TRUE USE_SELECT_WIN32_FALSE USE_KQUEUE_TRUE USE_KQUEUE_FALSE USE_DEVPOLL_TRUE USE_DEVPOLL_FALSE NEED_OWN_SNPRINTF_TRUE NEED_OWN_SNPRINTF_FALSE NEED_OWN_STRSEP_TRUE NEED_OWN_STRSEP_FALSE REGEXLIB LIBREGEX LIBOBJS XTRA_OBJS XTRA_LIBS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE build build_cpu build_vendor build_os host host_cpu host_vendor host_os PKGCONFIG CGIEXT ENABLE_WIN32SPECIFIC_TRUE ENABLE_WIN32SPECIFIC_FALSE ENABLE_MINGW32SPECIFIC_TRUE ENABLE_MINGW32SPECIFIC_FALSE WIN32_PSAPI CACHE_HTTP_PORT CACHE_ICP_PORT LIBDLMALLOC LIB_MALLOC STORE_OBJS STORE_LIBS STORE_MODULES NEED_DISKD_TRUE NEED_DISKD_FALSE USE_AIOPS_WIN32_TRUE USE_AIOPS_WIN32_FALSE NEED_COSSDUMP_TRUE NEED_COSSDUMP_FALSE REPL_POLICIES REPL_OBJS REPL_LIBS ENABLE_PINGER_TRUE ENABLE_PINGER_FALSE USE_DELAY_POOLS_TRUE USE_DELAY_POOLS_FALSE USE_ICAP_TRUE USE_ICAP_FALSE USE_SNMP_TRUE USE_SNMP_FALSE SNMPLIB makesnmplib ENABLE_HTCP_TRUE ENABLE_HTCP_FALSE ENABLE_SSL_TRUE ENABLE_SSL_FALSE NEED_OWN_MD5_TRUE NEED_OWN_MD5_FALSE SSLLIB ERR_DEFAULT_LANGUAGE ERR_LANGUAGES MAKE_LEAKFINDER_TRUE MAKE_LEAKFINDER_FALSE USE_DNSSERVER_TRUE USE_DNSSERVER_FALSE OPT_DEFAULT_HOSTS AUTH_MODULES AUTH_OBJS AUTH_LIBS BASIC_AUTH_HELPERS NTLM_AUTH_HELPERS DIGEST_AUTH_HELPERS NEGOTIATE_AUTH_HELPERS EXTERNAL_ACL_HELPERS CPP EGREP LIBSASL ENABLE_UNLINKD_TRUE ENABLE_UNLINKD_FALSE RANLIB ac_ct_RANLIB LN_S SH FALSE TRUE RM MV MKDIR LN PERL AR AR_R ALLOCA CRYPTLIB LIB_EPOLL LIB_LDAP LIB_LBER LIB_DB USE_POLL_TRUE USE_POLL_FALSE USE_EPOLL_TRUE USE_EPOLL_FALSE USE_SELECT_TRUE USE_SELECT_FALSE USE_SELECT_SIMPLE_TRUE USE_SELECT_SIMPLE_FALSE USE_SELECT_WIN32_TRUE USE_SELECT_WIN32_FALSE USE_KQUEUE_TRUE USE_KQUEUE_FALSE USE_DEVPOLL_TRUE USE_DEVPOLL_FALSE NEED_OWN_SNPRINTF_TRUE NEED_OWN_SNPRINTF_FALSE NEED_OWN_STRNSTR_TRUE NEED_OWN_STRNSTR_FALSE NEED_OWN_STRCASESTR_TRUE NEED_OWN_STRCASESTR_FALSE NEED_OWN_STRSEP_TRUE NEED_OWN_STRSEP_FALSE REGEXLIB LIBREGEX LIBOBJS XTRA_OBJS XTRA_LIBS LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.

   --enable-useragent-log  Enable logging of User-Agent header
   --enable-referer-log    Enable logging of Referer header
   --disable-wccp          Disable Web Cache Coordination V1 Protocol
@@ -1819,7 +1820,7 @@
 
 # Define the identity of the package.
  PACKAGE='squid'
- VERSION='2.6.STABLE14'
+ VERSION='2.6.STABLE14+ICAP'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -3955,6 +3956,40 @@
 fi;
 
 

 # Check whether --enable-useragent-log or --disable-useragent-log was given.
 if test "${enable_useragent_log+set}" = set; then
   enableval="$enable_useragent_log"
@@ -24144,6 +24179,8 @@
 
 
 

 for ac_func in \
 	bcopy \
 	backtrace_symbols_fd \
@@ -24192,6 +24229,8 @@
 	srand48 \
 	srandom \
 	statfs \

 	strsep \
 	strtoll \
 	sysconf \
@@ -24888,6 +24927,52 @@
 
 
 if false; then

   NEED_OWN_STRSEP_TRUE=
   NEED_OWN_STRSEP_FALSE='#'
 else
@@ -26405,6 +26490,20 @@
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi

 if test -z "${USE_SNMP_TRUE}" && test -z "${USE_SNMP_FALSE}"; then
   { { echo "$as_me:$LINENO: error: conditional \"USE_SNMP\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
@@ -26559,17 +26658,17 @@
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
-if test -z "${NEED_OWN_SNPRINTF_TRUE}" && test -z "${NEED_OWN_SNPRINTF_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"NEED_OWN_SNPRINTF\" was never defined.
+if test -z "${NEED_OWN_STRNSTR_TRUE}" && test -z "${NEED_OWN_STRNSTR_FALSE}"; then
+  { { echo "$as_me:$LINENO: error: conditional \"NEED_OWN_STRNSTR\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"NEED_OWN_SNPRINTF\" was never defined.
+echo "$as_me: error: conditional \"NEED_OWN_STRNSTR\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
-if test -z "${NEED_OWN_STRSEP_TRUE}" && test -z "${NEED_OWN_STRSEP_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"NEED_OWN_STRSEP\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"NEED_OWN_STRNSTR\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+if test -z "${NEED_OWN_STRCASESTR_TRUE}" && test -z "${NEED_OWN_STRCASESTR_FALSE}"; then
+  { { echo "$as_me:$LINENO: error: conditional \"NEED_OWN_STRCASESTR\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"NEED_OWN_STRCASESTR\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+if test -z "${NEED_OWN_STRCASESTR_TRUE}" && test -z "${NEED_OWN_STRCASESTR_FALSE}"; then
+  { { echo "$as_me:$LINENO: error: conditional \"NEED_OWN_STRCASESTR\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"NEED_OWN_STRCASESTR\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
 if test -z "${NEED_OWN_STRSEP_TRUE}" && test -z "${NEED_OWN_STRSEP_FALSE}"; then
   { { echo "$as_me:$LINENO: error: conditional \"NEED_OWN_STRSEP\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"NEED_OWN_STRSEP\" was never defined.
+echo "$as_me: error: conditional \"NEED_OWN_STRCASESTR\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -27235,6 +27334,8 @@
 s,@ENABLE_PINGER_FALSE@,$ENABLE_PINGER_FALSE,;t t
 s,@USE_DELAY_POOLS_TRUE@,$USE_DELAY_POOLS_TRUE,;t t
 s,@USE_DELAY_POOLS_FALSE@,$USE_DELAY_POOLS_FALSE,;t t

 s,@USE_SNMP_TRUE@,$USE_SNMP_TRUE,;t t
 s,@USE_SNMP_FALSE@,$USE_SNMP_FALSE,;t t
 s,@SNMPLIB@,$SNMPLIB,;t t
@@ -27301,6 +27402,10 @@
 s,@USE_DEVPOLL_FALSE@,$USE_DEVPOLL_FALSE,;t t
 s,@NEED_OWN_SNPRINTF_TRUE@,$NEED_OWN_SNPRINTF_TRUE,;t t
 s,@NEED_OWN_SNPRINTF_FALSE@,$NEED_OWN_SNPRINTF_FALSE,;t t
+s,@NEED_OWN_STRNSTR_TRUE@,$NEED_OWN_STRNSTR_TRUE,;t t

 s,@NEED_OWN_STRSEP_TRUE@,$NEED_OWN_STRSEP_TRUE,;t t
 s,@NEED_OWN_STRSEP_FALSE@,$NEED_OWN_STRSEP_FALSE,;t t
 s,@REGEXLIB@,$REGEXLIB,;t t
--- include/autoconf.h.in.orig	Sat Jun 23 23:51:56 2007
+++ include/autoconf.h.in	Mon Jul 16 22:21:25 2007
@@ -457,6 +457,9 @@
 /* Define to 1 if you have the <stdlib.h> header file. */
 #undef HAVE_STDLIB_H
 

 /* Define to 1 if you have the `strerror' function. */
 #undef HAVE_STRERROR
 
@@ -466,6 +469,9 @@
 /* Define to 1 if you have the <string.h> header file. */
 #undef HAVE_STRING_H
 

 /* Define to 1 if you have the `strsep' function. */
 #undef HAVE_STRSEP
 
@@ -596,6 +602,9 @@
 
 /* Some systems support __va_copy */
 #undef HAVE___VA_COPY

 
 /* By default (for now anyway) Squid includes options which allows the cache
    administrator to violate the HTTP protocol specification in terms of cache
--- lib/Makefile.in.orig	Sat Jun 23 02:14:55 2007
+++ lib/Makefile.in	Mon Jul 16 22:21:39 2007
@@ -62,20 +62,23 @@
 am__libmiscutil_a_SOURCES_DIST = Array.c base64.c getfullhostname.c \
 	hash.c heap.c html_quote.c iso3307.c md5.c radix.c rfc1035.c \

 libmiscutil_a_OBJECTS = $(am_libmiscutil_a_OBJECTS)
 libntlmauth_a_AR = $(AR) $(ARFLAGS)
 libntlmauth_a_DEPENDENCIES = @LIBOBJS@
@@ -189,6 +192,10 @@
 NEED_OWN_MD5_TRUE = @NEED_OWN_MD5_TRUE@
 NEED_OWN_SNPRINTF_FALSE = @NEED_OWN_SNPRINTF_FALSE@
 NEED_OWN_SNPRINTF_TRUE = @NEED_OWN_SNPRINTF_TRUE@

 NEED_OWN_STRSEP_FALSE = @NEED_OWN_STRSEP_FALSE@
 NEED_OWN_STRSEP_TRUE = @NEED_OWN_STRSEP_TRUE@
 NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@
@@ -230,6 +237,8 @@
 USE_DNSSERVER_TRUE = @USE_DNSSERVER_TRUE@
 USE_EPOLL_FALSE = @USE_EPOLL_FALSE@
 USE_EPOLL_TRUE = @USE_EPOLL_TRUE@

 USE_KQUEUE_FALSE = @USE_KQUEUE_FALSE@
 USE_KQUEUE_TRUE = @USE_KQUEUE_TRUE@
 USE_POLL_FALSE = @USE_POLL_FALSE@
@@ -287,6 +296,10 @@
 target_alias = @target_alias@
 @NEED_OWN_SNPRINTF_FALSE@SNPRINTFSOURCE = 
 @NEED_OWN_SNPRINTF_TRUE@SNPRINTFSOURCE = snprintf.c

 @NEED_OWN_STRSEP_FALSE@STRSEPSOURCE = 
 @NEED_OWN_STRSEP_TRUE@STRSEPSOURCE = strsep.c
 @NEED_OWN_MD5_FALSE@MD5SOURCE = 
@@ -331,6 +344,8 @@
 	$(SNPRINTFSOURCE) \
 	splay.c \
 	Stack.c \

 	$(STRSEPSOURCE) \
 	stub_memaccount.c \
 	util.c \
@@ -446,6 +461,8 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/snprintf.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/splay.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sspwin32.Po@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strsep.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stub_memaccount.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/util.Po@am__quote@




 	store_digest.c store_dir.c store_key_md5.c store_log.c \
 	store_rebuild.c store_swapin.c store_swapmeta.c \
 	store_swapout.c structs.h tools.c typedefs.h unlinkd.c url.c \
@@ -115,14 +116,17 @@
 @USE_DNSSERVER_FALSE@am__objects_3 = dns_internal.$(OBJEXT)
 @USE_DNSSERVER_TRUE@am__objects_3 = dns.$(OBJEXT)
 @ENABLE_HTCP_TRUE@am__objects_4 = htcp.$(OBJEXT)

 am_squid_OBJECTS = access_log.$(OBJEXT) acl.$(OBJEXT) asn.$(OBJEXT) \
 	authenticate.$(OBJEXT) cache_cf.$(OBJEXT) \
 	CacheDigest.$(OBJEXT) cache_manager.$(OBJEXT) carp.$(OBJEXT) \
@@ -137,27 +141,27 @@
 	HttpHdrRange.$(OBJEXT) HttpHdrContRange.$(OBJEXT) \
 	HttpHeader.$(OBJEXT) HttpHeaderTools.$(OBJEXT) \
 	HttpBody.$(OBJEXT) HttpMsg.$(OBJEXT) HttpReply.$(OBJEXT) \

 NEED_OWN_STRSEP_FALSE = @NEED_OWN_STRSEP_FALSE@
 NEED_OWN_STRSEP_TRUE = @NEED_OWN_STRSEP_TRUE@
 NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@
@@ -323,6 +331,8 @@
 USE_DNSSERVER_TRUE = @USE_DNSSERVER_TRUE@
 USE_EPOLL_FALSE = @USE_EPOLL_FALSE@
 USE_EPOLL_TRUE = @USE_EPOLL_TRUE@

 USE_KQUEUE_FALSE = @USE_KQUEUE_FALSE@
 USE_KQUEUE_TRUE = @USE_KQUEUE_TRUE@
 USE_POLL_FALSE = @USE_POLL_FALSE@
@@ -378,6 +388,8 @@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@

 @USE_DNSSERVER_FALSE@DNSSOURCE = dns_internal.c
 @USE_DNSSERVER_TRUE@DNSSOURCE = dns.c
 @USE_DNSSERVER_FALSE@DNSSERVER = 
@@ -483,6 +495,7 @@
 	HttpMsg.c \
 	HttpReply.c \
 	HttpRequest.c \

 	icmp.c \
 	icp_v2.c \
 	icp_v3.c \
@@ -802,6 +815,10 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/helper.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/htcp.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/http.Po@am__quote@

Return to bug 115453

Lines 75-106 Link Here

(-)Makefile (-14 / +31 lines)
75	# Enable experimental multicast notification of cachemisses.	75	# Enable experimental multicast notification of cachemisses.
76		76
77	PORTNAME= squid	77	PORTNAME= squid
78	PORTVERSION= 2.6.13	78	PORTVERSION= 2.6.14
79	CATEGORIES= www	79	CATEGORIES= www
80	MASTER_SITES= ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \	80	MASTER_SITES= ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
81	ftp://ftp.vistech.net/pub/squid/%SUBDIR%/ \
82	ftp://mirrors.24-7-solutions.net/pub/squid/%SUBDIR%/ \	81	ftp://mirrors.24-7-solutions.net/pub/squid/%SUBDIR%/ \
83	ftp://ftp.belnet.be/packages/squid/pub/%SUBDIR%/ \	82	ftp://ftp.belnet.be/packages/squid/pub/%SUBDIR%/ \
84	ftp://ftp.nl.uu.net/pub/unix/www/squid/%SUBDIR%/ \	83	ftp://ftp.nl.uu.net/pub/unix/www/squid/%SUBDIR%/ \
85	ftp://ftp.mirrorservice.org/sites/ftp.squid-cache.org/pub/%SUBDIR%/ \	84	ftp://ftp.mirrorservice.org/sites/ftp.squid-cache.org/pub/%SUBDIR%/ \
86	ftp://ftp.ntua.gr/pub/www/Squid/%SUBDIR%/ \	85	ftp://ftp.ntua.gr/pub/www/Squid/%SUBDIR%/ \
87	ftp://ftp.ccs.neu.edu/pub/mirrors/squid.nlanr.net/pub/%SUBDIR%/ \	86	ftp://ftp.ccs.neu.edu/pub/mirrors/squid.nlanr.net/pub/%SUBDIR%/ \
88	${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/www/squid/&,}	87	${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/www/squid/&,} \
		88	http://www.squid-cache.org/Versions/v2/2.6/ \
		89	http://www3.us.squid-cache.org/Versions/v2/2.6/ \
		90	http://www1.at.squid-cache.org/Versions/v2/2.6/ \
		91	http://www2.nl.squid-cache.org/Versions/v2/2.6/ \
		92	http://www1.ru.squid-cache.org/Versions/v2/2.6/ \
		93	http://www1.uk.squid-cache.org/Versions/v2/2.6/ \
		94	http://www1.jp.squid-cache.org/Versions/v2/2.6/ \
		95	http://www2.tw.squid-cache.org/Versions/v2/2.6/
89	MASTER_SITE_SUBDIR= squid-2/STABLE	96	MASTER_SITE_SUBDIR= squid-2/STABLE
90	DISTNAME= squid-2.6.STABLE13	97	DISTNAME= squid-2.6.STABLE14
91	DIST_SUBDIR= squid2.6	98	DIST_SUBDIR= squid2.6
92		99
93	PATCH_SITES= http://www.squid-cache.org/%SUBDIR%/ \	100	PATCH_SITES= http://www.squid-cache.org/%SUBDIR%/ \
94	http://www2.us.squid-cache.org/%SUBDIR%/ \
95	http://www3.us.squid-cache.org/%SUBDIR%/ \	101	http://www3.us.squid-cache.org/%SUBDIR%/ \
96	http://www1.at.squid-cache.org/%SUBDIR%/ \	102	http://www1.at.squid-cache.org/%SUBDIR%/ \
97	http://www2.nl.squid-cache.org/%SUBDIR%/ \	103	http://www2.nl.squid-cache.org/%SUBDIR%/ \
98	http://www1.ru.squid-cache.org/%SUBDIR%/ \	104	http://www1.ru.squid-cache.org/%SUBDIR%/ \
99	http://www1.uk.squid-cache.org/%SUBDIR%/ \	105	http://www1.uk.squid-cache.org/%SUBDIR%/ \
100	http://www1.jp.squid-cache.org/%SUBDIR%/ \	106	http://www1.jp.squid-cache.org/%SUBDIR%/ \
101	http://www1.tw.squid-cache.org/%SUBDIR%/	107	http://www2.tw.squid-cache.org/%SUBDIR%/
102	PATCH_SITE_SUBDIR= Versions/v2/2.6/changesets	108	PATCH_SITE_SUBDIR= Versions/v2/2.6/changesets
103	PATCHFILES=	109	PATCHFILES= 11534.patch 11547.patch 11548.patch
104	PATCH_DIST_STRIP= -p1	110	PATCH_DIST_STRIP= -p1
105		111
106	MAINTAINER= tmseck@netcologne.de	112	MAINTAINER= tmseck@netcologne.de
Lines 118-123 Link Here
118	MAN8= cachemgr.cgi.8 squid.8	124	MAN8= cachemgr.cgi.8 squid.8
119	docs= QUICKSTART README RELEASENOTES.html doc/debug-sections.txt	125	docs= QUICKSTART README RELEASENOTES.html doc/debug-sections.txt
120	PORTDOCS= ${docs:T}	126	PORTDOCS= ${docs:T}
		127	PORTEXAMPLES= passwd.sql
121	SUB_FILES+= pkg-deinstall pkg-install pkg-message	128	SUB_FILES+= pkg-deinstall pkg-install pkg-message
122	SUB_LIST+= SQUID_UID=${SQUID_UID} SQUID_GID=${SQUID_GID}	129	SUB_LIST+= SQUID_UID=${SQUID_UID} SQUID_GID=${SQUID_GID}
123		130
Lines 175-184 Link Here
175	ERR_SOCKET_FAILURE ERR_TOO_BIG ERR_UNSUP_REQ \	182	ERR_SOCKET_FAILURE ERR_TOO_BIG ERR_UNSUP_REQ \
176	ERR_URN_RESOLVE ERR_WRITE_ERROR ERR_ZERO_SIZE_OBJECT	183	ERR_URN_RESOLVE ERR_WRITE_ERROR ERR_ZERO_SIZE_OBJECT
177		184
178	libexec= cachemgr.cgi digest_pw_auth diskd-daemon ip_user_check \	185	libexec= cachemgr.cgi digest_pw_auth diskd-daemon \
		186	ip_user_check \
179	msnt_auth ncsa_auth ntlm_auth \	187	msnt_auth ncsa_auth ntlm_auth \
180	pam_auth smb_auth smb_auth.sh squid_session squid_unix_group \	188	pam_auth smb_auth smb_auth.sh squid_db_auth squid_session \
181	wbinfo_group.pl	189	squid_unix_group wbinfo_group.pl
182	.if !defined(SQUID_CONFIGURE_ARGS) \|\| ${SQUID_CONFIGURE_ARGS:M--disable-unlinkd} == ""	190	.if !defined(SQUID_CONFIGURE_ARGS) \|\| ${SQUID_CONFIGURE_ARGS:M--disable-unlinkd} == ""
183	libexec+= unlinkd	191	libexec+= unlinkd
184	.endif	192	.endif
Lines 200-209 Link Here
200		208
201	# Authentication methods and modules:	209	# Authentication methods and modules:
202		210
203	basic_auth= NCSA PAM MSNT SMB	211	basic_auth= DB NCSA PAM MSNT SMB
204	digest_auth= password	212	digest_auth= password
205	external_acl= ip_user session unix_group wbinfo_group	213	external_acl= ip_user session unix_group wbinfo_group
206	MAN8+= ncsa_auth.8 pam_auth.8 squid_session.8 squid_unix_group.8	214	MAN8+= ncsa_auth.8 pam_auth.8 squid_db_auth.8 squid_session.8 \
		215	squid_unix_group.8
207	.if defined(WITH_SQUID_LDAP_AUTH)	216	.if defined(WITH_SQUID_LDAP_AUTH)
208	USE_OPENLDAP= yes	217	USE_OPENLDAP= yes
209	CFLAGS+= -I${LOCALBASE}/include	218	CFLAGS+= -I${LOCALBASE}/include
Lines 231-236 Link Here
231	--enable-digest-auth-helpers="${digest_auth}" \	240	--enable-digest-auth-helpers="${digest_auth}" \
232	--enable-external-acl-helpers="${external_acl}" \	241	--enable-external-acl-helpers="${external_acl}" \
233	--enable-ntlm-auth-helpers="SMB"	242	--enable-ntlm-auth-helpers="SMB"
		243	.if !defined(NO_KERBEROS) && !defined(WITHOUT_KERBEROS)
		244	# XXX This currently only works with heimdal from the base system,
		245	# see files/patch-helpers_negotiate_auth-squid_kerb_auth_*
		246	CONFIGURE_ARGS+= --enable-negotiate-auth-helpers="squid_kerb_auth"
		247	libexec+= squid_kerb_auth
		248	.endif
234		249
235	# Storage schemes:	250	# Storage schemes:
236		251
Lines 352-361 Link Here
352	.if defined(WITH_SQUID_LARGEFILE)	367	.if defined(WITH_SQUID_LARGEFILE)
353	CONFIGURE_ARGS+= --with-large-files --enable-large-cache-files	368	CONFIGURE_ARGS+= --with-large-files --enable-large-cache-files
354	.endif	369	.endif
355	.if defined(WITH_SQUID_STACKTRACES) \|\| defined(WITH_DEBUG)	370	.if defined(WITH_SQUID_STACKTRACES)
356	CONFIGURE_ARGS+= --enable-stacktraces	371	CONFIGURE_ARGS+= --enable-stacktraces
357	CFLAGS+= -g	372	CFLAGS+= -g
358	STRIP= ""	373	STRIP=
359	.endif	374	.endif
360		375
361	# Languages:	376	# Languages:
Lines 409-414 Link Here
409	${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL	424	${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
410		425
411	post-install:	426	post-install:
		427	@${MKDIR} ${EXAMPLESDIR}
		428	${INSTALL_DATA} ${WRKSRC}/helpers/basic_auth/DB/passwd.sql ${EXAMPLESDIR}
412	.if defined(WITH_SQUID_PINGER)	429	.if defined(WITH_SQUID_PINGER)
413	${CHMOD} 4510 ${PREFIX}/libexec/squid/pinger; \	430	${CHMOD} 4510 ${PREFIX}/libexec/squid/pinger; \
414	${CHGRP} ${SQUID_GID} ${PREFIX}/libexec/squid/pinger	431	${CHGRP} ${SQUID_GID} ${PREFIX}/libexec/squid/pinger

Lines 1-3 Link Here

(-)distinfo (-3 / +12 lines)
1	MD5 (squid2.6/squid-2.6.STABLE13.tar.bz2) = fdc4ece264b47bab1b112d8f6f842b8b	1	MD5 (squid2.6/squid-2.6.STABLE14.tar.bz2) = eadb138d48320df8b99349121159c6bf
2	SHA256 (squid2.6/squid-2.6.STABLE13.tar.bz2) = 894802914a63992d5c5cf7061e2f242fdefd09b4af79d84b217e977f9195fdad	2	SHA256 (squid2.6/squid-2.6.STABLE14.tar.bz2) = dcb0c10965430862721b675e2f9f6a30819880e03124b5e9403bfce2c7f3b69a
3	SIZE (squid2.6/squid-2.6.STABLE13.tar.bz2) = 1263229	3	SIZE (squid2.6/squid-2.6.STABLE14.tar.bz2) = 1291509
		4	MD5 (squid2.6/11534.patch) = bbdda88fd922c0b08fa054354bef4f83
		5	SHA256 (squid2.6/11534.patch) = 9422fa99337e6b0dde8ce6930a663988640cf96a2e9457439d6156daf4f8748f
		6	SIZE (squid2.6/11534.patch) = 1187
		7	MD5 (squid2.6/11547.patch) = 91a09aa1afe524fec45938eba1b9ccaa
		8	SHA256 (squid2.6/11547.patch) = b9dc9ca5ed52287d1f7d96023b16ba3d2f761e95fdb86d45a953da7789d4635e
		9	SIZE (squid2.6/11547.patch) = 2504
		10	MD5 (squid2.6/11548.patch) = e82b317555fe58a6c550363fa6f4b5a4
		11	SHA256 (squid2.6/11548.patch) = 8e8ef65102aa56603dae9d7362a552d4de29701f9569dafd6ea6afe9e93e2ec1
		12	SIZE (squid2.6/11548.patch) = 1448

Lines 9-15 Link Here

(-)files/squid.in (-2 / +4 lines)
9	# Note:	9	# Note:
10	# Set "squid_enable=yes" in either /etc/rc.conf, /etc/rc.conf.local or	10	# Set "squid_enable=yes" in either /etc/rc.conf, /etc/rc.conf.local or
11	# /etc/rc.conf.d/squid to make this script actually do something. There	11	# /etc/rc.conf.d/squid to make this script actually do something. There
12	# you can also set squid_chdir, squid_user, and squid_flags.	12	# you can also set squid_chdir, squid_pidfile, squid_user, and squid_flags.
13	#	13	#
14	# Please see squid(8), rc.conf(5) and rc(8) for further details.	14	# Please see squid(8), rc.conf(5) and rc(8) for further details.
15	#	15	#
Lines 37-48 Link Here
37		37
38	load_rc_config ${name}	38	load_rc_config ${name}
39		39
40	squid_chdir=${squid_chdir:-%%PREFIX%%/squid/logs}	40	squid_chdir=${squid_chdir:-"%%PREFIX%%/squid/logs"}
41	squid_enable=${squid_enable:-"NO"}	41	squid_enable=${squid_enable:-"NO"}
42	squid_flags=${squid_flags-"-D"}	42	squid_flags=${squid_flags-"-D"}
		43	squid_pidfile=${squid_pidfile:-"%%PREFIX%%/squid/logs/squid.pid"}
43	squid_user=${squid_user:-%%SQUID_UID%%}	44	squid_user=${squid_user:-%%SQUID_UID%%}
44	default_config=%%PREFIX%%/etc/squid/squid.conf	45	default_config=%%PREFIX%%/etc/squid/squid.conf
45		46
		47	pidfile=${squid_pidfile}
46	required_dirs=${squid_chdir}	48	required_dirs=${squid_chdir}
47		49
48	# squid(8) will not start if ${default_config} is not present so try	50	# squid(8) will not start if ${default_config} is not present so try

Lines 364-370 Link Here

(-)src/Makefile.in.orig (-6 / +6 lines)
364	store_digest.c store_dir.c store_key_md5.c store_log.c \	353	store_digest.c store_dir.c store_key_md5.c store_log.c \
365	store_rebuild.c store_swapin.c store_swapmeta.c \	354	store_rebuild.c store_swapin.c store_swapmeta.c \
366	store_swapout.c structs.h tools.c typedefs.h unlinkd.c url.c \	355	store_swapout.c structs.h tools.c typedefs.h unlinkd.c url.c \
367	@@ -114,14 +115,17 @@	356	@@ -115,14 +116,17 @@
368	@USE_DNSSERVER_FALSE@am__objects_3 = dns_internal.$(OBJEXT)	357	@USE_DNSSERVER_FALSE@am__objects_3 = dns_internal.$(OBJEXT)
369	@USE_DNSSERVER_TRUE@am__objects_3 = dns.$(OBJEXT)	358	@USE_DNSSERVER_TRUE@am__objects_3 = dns.$(OBJEXT)
370	@ENABLE_HTCP_TRUE@am__objects_4 = htcp.$(OBJEXT)	359	@ENABLE_HTCP_TRUE@am__objects_4 = htcp.$(OBJEXT)
Lines 389-395 Link Here
389	am_squid_OBJECTS = access_log.$(OBJEXT) acl.$(OBJEXT) asn.$(OBJEXT) \	378	am_squid_OBJECTS = access_log.$(OBJEXT) acl.$(OBJEXT) asn.$(OBJEXT) \
390	authenticate.$(OBJEXT) cache_cf.$(OBJEXT) \	379	authenticate.$(OBJEXT) cache_cf.$(OBJEXT) \
391	CacheDigest.$(OBJEXT) cache_manager.$(OBJEXT) carp.$(OBJEXT) \	380	CacheDigest.$(OBJEXT) cache_manager.$(OBJEXT) carp.$(OBJEXT) \
392	@@ -136,27 +140,27 @@	381	@@ -137,27 +141,27 @@
393	HttpHdrRange.$(OBJEXT) HttpHdrContRange.$(OBJEXT) \	382	HttpHdrRange.$(OBJEXT) HttpHdrContRange.$(OBJEXT) \
394	HttpHeader.$(OBJEXT) HttpHeaderTools.$(OBJEXT) \	383	HttpHeader.$(OBJEXT) HttpHeaderTools.$(OBJEXT) \
395	HttpBody.$(OBJEXT) HttpMsg.$(OBJEXT) HttpReply.$(OBJEXT) \	384	HttpBody.$(OBJEXT) HttpMsg.$(OBJEXT) HttpReply.$(OBJEXT) \
Lines 440-446 Link Here
440	NEED_OWN_STRSEP_FALSE = @NEED_OWN_STRSEP_FALSE@	429	NEED_OWN_STRSEP_FALSE = @NEED_OWN_STRSEP_FALSE@
441	NEED_OWN_STRSEP_TRUE = @NEED_OWN_STRSEP_TRUE@	430	NEED_OWN_STRSEP_TRUE = @NEED_OWN_STRSEP_TRUE@
442	NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@	431	NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@
443	@@ -321,6 +329,8 @@	432	@@ -323,6 +331,8 @@
444	USE_DNSSERVER_TRUE = @USE_DNSSERVER_TRUE@	433	USE_DNSSERVER_TRUE = @USE_DNSSERVER_TRUE@
445	USE_EPOLL_FALSE = @USE_EPOLL_FALSE@	434	USE_EPOLL_FALSE = @USE_EPOLL_FALSE@
446	USE_EPOLL_TRUE = @USE_EPOLL_TRUE@	435	USE_EPOLL_TRUE = @USE_EPOLL_TRUE@
Lines 449-455 Link Here
449	USE_KQUEUE_FALSE = @USE_KQUEUE_FALSE@	438	USE_KQUEUE_FALSE = @USE_KQUEUE_FALSE@
450	USE_KQUEUE_TRUE = @USE_KQUEUE_TRUE@	439	USE_KQUEUE_TRUE = @USE_KQUEUE_TRUE@
451	USE_POLL_FALSE = @USE_POLL_FALSE@	440	USE_POLL_FALSE = @USE_POLL_FALSE@
452	@@ -376,6 +386,8 @@	441	@@ -378,6 +388,8 @@
453	sharedstatedir = @sharedstatedir@	442	sharedstatedir = @sharedstatedir@
454	sysconfdir = @sysconfdir@	443	sysconfdir = @sysconfdir@
455	target_alias = @target_alias@	444	target_alias = @target_alias@
Lines 458-464 Link Here
458	@USE_DNSSERVER_FALSE@DNSSOURCE = dns_internal.c	447	@USE_DNSSERVER_FALSE@DNSSOURCE = dns_internal.c
459	@USE_DNSSERVER_TRUE@DNSSOURCE = dns.c	448	@USE_DNSSERVER_TRUE@DNSSOURCE = dns.c
460	@USE_DNSSERVER_FALSE@DNSSERVER =	449	@USE_DNSSERVER_FALSE@DNSSERVER =
461	@@ -479,6 +491,7 @@	450	@@ -483,6 +495,7 @@
462	HttpMsg.c \	451	HttpMsg.c \
463	HttpReply.c \	452	HttpReply.c \
464	HttpRequest.c \	453	HttpRequest.c \
Lines 466-472 Link Here
466	icmp.c \	455	icmp.c \
467	icp_v2.c \	456	icp_v2.c \
468	icp_v3.c \	457	icp_v3.c \
469	@@ -791,6 +804,10 @@	458	@@ -802,6 +815,10 @@
470	@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/helper.Po@am__quote@	459	@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/helper.Po@am__quote@
471	@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/htcp.Po@am__quote@	460	@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/htcp.Po@am__quote@
472	@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/http.Po@am__quote@	461	@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/http.Po@am__quote@