878295ccf1
--enable-ntlm-fail-open was specified as an additional configuration option (squid bug #1022). The port does not enable this option by default; document it, while at it. - Add SHA256 checksum for the squid tarball - Integrate ICAP client support based upon the icap project's CVS repository, turned off by default. To activate it, build the port with WITH_SQUID_ICAP defined or rerun 'make config'. - Bump PORTREVISION PR: ports/90688 Submitted by: maintainer
422 lines
16 KiB
Diff
422 lines
16 KiB
Diff
Patch 2 of 2 to integrate the icap-2_5 branch into the FreeBSD squid port.
|
|
|
|
Created by Thomas-Martin Seck <tmseck@netcologne.de>.
|
|
|
|
This patch simulates the autotools bootstrap necessary after applying the
|
|
ICAP patchset.
|
|
|
|
Please see icap-2.5-core.patch for further information.
|
|
|
|
Patch last updated: 2005-12-17
|
|
|
|
--- configure.orig Sat Oct 22 11:56:01 2005
|
|
+++ configure Sat Dec 17 17:45:21 2005
|
|
@@ -70,6 +70,8 @@
|
|
ac_help="$ac_help
|
|
--enable-delay-pools Enable delay pools to limit bandwidth usage"
|
|
ac_help="$ac_help
|
|
+ --enable-icap-support Enable iCAP client capability"
|
|
+ac_help="$ac_help
|
|
--enable-useragent-log Enable logging of User-Agent header"
|
|
ac_help="$ac_help
|
|
--enable-referer-log Enable logging of Referer header"
|
|
@@ -2170,6 +2172,38 @@
|
|
|
|
|
|
|
|
+
|
|
+if false; then
|
|
+ USE_ICAP_TRUE=
|
|
+ USE_ICAP_FALSE='#'
|
|
+else
|
|
+ USE_ICAP_TRUE='#'
|
|
+ USE_ICAP_FALSE=
|
|
+fi
|
|
+# Check whether --enable-icap-support or --disable-icap-support was given.
|
|
+if test "${enable_icap_support+set}" = set; then
|
|
+ enableval="$enable_icap_support"
|
|
+ if test "$enableval" = "yes" ; then
|
|
+ echo "ICAP support enabled"
|
|
+ cat >> confdefs.h <<\EOF
|
|
+#define HS_FEAT_ICAP 1
|
|
+EOF
|
|
+
|
|
+
|
|
+
|
|
+if true; then
|
|
+ USE_ICAP_TRUE=
|
|
+ USE_ICAP_FALSE='#'
|
|
+else
|
|
+ USE_ICAP_TRUE='#'
|
|
+ USE_ICAP_FALSE=
|
|
+fi
|
|
+ fi
|
|
+
|
|
+fi
|
|
+
|
|
+
|
|
+
|
|
# Check whether --enable-useragent-log or --disable-useragent-log was given.
|
|
if test "${enable_useragent_log+set}" = set; then
|
|
enableval="$enable_useragent_log"
|
|
@@ -7428,14 +7462,14 @@
|
|
fi
|
|
;;
|
|
esac
|
|
- echo $ac_n "checking for main in -lpthread""... $ac_c" 1>&6
|
|
-echo "configure:7433: checking for main in -lpthread" >&5
|
|
+ echo $ac_n "checking for main in -pthread""... $ac_c" 1>&6
|
|
+echo "configure:7433: checking for main in -pthread" >&5
|
|
ac_lib_var=`echo pthread'_'main | sed 'y%./+-%__p_%'`
|
|
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
ac_save_LIBS="$LIBS"
|
|
-LIBS="-lpthread $LIBS"
|
|
+LIBS="-pthread $LIBS"
|
|
cat > conftest.$ac_ext <<EOF
|
|
#line 7441 "configure"
|
|
#include "confdefs.h"
|
|
@@ -7465,7 +7499,7 @@
|
|
#define $ac_tr_lib 1
|
|
EOF
|
|
|
|
- LIBS="-lpthread $LIBS"
|
|
+ LIBS="-pthread $LIBS"
|
|
|
|
else
|
|
echo "$ac_t""no" 1>&6
|
|
@@ -7769,6 +7803,8 @@
|
|
srand48 \
|
|
srandom \
|
|
statfs \
|
|
+ strnstr \
|
|
+ strcasestr \
|
|
strtoll \
|
|
sysconf \
|
|
syslog \
|
|
@@ -7898,6 +7934,50 @@
|
|
fi
|
|
fi
|
|
|
|
+
|
|
+if false; then
|
|
+ NEED_OWN_STRNSTR_TRUE=
|
|
+ NEED_OWN_STRNSTR_FALSE='#'
|
|
+else
|
|
+ NEED_OWN_STRNSTR_TRUE='#'
|
|
+ NEED_OWN_STRNSTR_FALSE=
|
|
+fi
|
|
+if test "$ac_cv_func_strnstr" = "no" || test "$ac_cv_func_vstrnstr" = "no" ; then
|
|
+
|
|
+
|
|
+if true; then
|
|
+ NEED_OWN_STRNSTR_TRUE=
|
|
+ NEED_OWN_STRNSTR_FALSE='#'
|
|
+else
|
|
+ NEED_OWN_STRNSTR_TRUE='#'
|
|
+ NEED_OWN_STRNSTR_FALSE=
|
|
+fi
|
|
+fi
|
|
+
|
|
+
|
|
+
|
|
+if false; then
|
|
+ NEED_OWN_STRCASESTR_TRUE=
|
|
+ NEED_OWN_STRCASESTR_FALSE='#'
|
|
+else
|
|
+ NEED_OWN_STRCASESTR_TRUE='#'
|
|
+ NEED_OWN_STRCASESTR_FALSE=
|
|
+fi
|
|
+if test "$ac_cv_func_strcasestr" = "no" || test "$ac_cv_func_vstrcasestr" = "no"; then
|
|
+
|
|
+
|
|
+if true; then
|
|
+ NEED_OWN_STRCASESTR_TRUE=
|
|
+ NEED_OWN_STRCASESTR_FALSE='#'
|
|
+else
|
|
+ NEED_OWN_STRCASESTR_TRUE='#'
|
|
+ NEED_OWN_STRCASESTR_FALSE=
|
|
+fi
|
|
+fi
|
|
+
|
|
+
|
|
+
|
|
+
|
|
echo $ac_n "checking if va_copy is implemented""... $ac_c" 1>&6
|
|
echo "configure:7903: checking if va_copy is implemented" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_func_va_copy'+set}'`\" = set"; then
|
|
@@ -9072,6 +9152,8 @@
|
|
s%@ENABLE_PINGER_FALSE@%$ENABLE_PINGER_FALSE%g
|
|
s%@USE_DELAY_POOLS_TRUE@%$USE_DELAY_POOLS_TRUE%g
|
|
s%@USE_DELAY_POOLS_FALSE@%$USE_DELAY_POOLS_FALSE%g
|
|
+s%@USE_ICAP_TRUE@%$USE_ICAP_TRUE%g
|
|
+s%@USE_ICAP_FALSE@%$USE_ICAP_FALSE%g
|
|
s%@USE_SNMP_TRUE@%$USE_SNMP_TRUE%g
|
|
s%@USE_SNMP_FALSE@%$USE_SNMP_FALSE%g
|
|
s%@SNMPLIB@%$SNMPLIB%g
|
|
@@ -9118,6 +9200,10 @@
|
|
s%@LIB_LBER@%$LIB_LBER%g
|
|
s%@NEED_OWN_SNPRINTF_TRUE@%$NEED_OWN_SNPRINTF_TRUE%g
|
|
s%@NEED_OWN_SNPRINTF_FALSE@%$NEED_OWN_SNPRINTF_FALSE%g
|
|
+s%@NEED_OWN_STRNSTR_TRUE@%$NEED_OWN_STRNSTR_TRUE%g
|
|
+s%@NEED_OWN_STRNSTR_FALSE@%$NEED_OWN_STRNSTR_FALSE%g
|
|
+s%@NEED_OWN_STRCASESTR_TRUE@%$NEED_OWN_STRCASESTR_TRUE%g
|
|
+s%@NEED_OWN_STRCASESTR_FALSE@%$NEED_OWN_STRCASESTR_FALSE%g
|
|
s%@REGEXLIB@%$REGEXLIB%g
|
|
s%@LIBREGEX@%$LIBREGEX%g
|
|
s%@LIBOBJS@%$LIBOBJS%g
|
|
--- include/autoconf.h.in.orig Tue Sep 13 02:12:34 2005
|
|
+++ include/autoconf.h.in Sat Dec 17 17:45:21 2005
|
|
@@ -124,6 +124,11 @@
|
|
*/
|
|
#undef DELAY_POOLS
|
|
|
|
+/*
|
|
+ * ICAP - Internet Content Adaptation Protocol
|
|
+ */
|
|
+#undef HS_FEAT_ICAP
|
|
+
|
|
/*
|
|
* If you want to log User-Agent request header values, define this.
|
|
* By default, they are written to useragent.log in the Squid log
|
|
@@ -574,6 +579,12 @@
|
|
|
|
/* Define if you have the statfs function. */
|
|
#undef HAVE_STATFS
|
|
+
|
|
+/* Define if you have the strcasestr function. */
|
|
+#undef HAVE_STRCASESTR
|
|
+
|
|
+/* Define if you have the strnstr function. */
|
|
+#undef HAVE_STRNSTR
|
|
|
|
/* Define if you have the strerror function. */
|
|
#undef HAVE_STRERROR
|
|
--- lib/Makefile.in.orig Wed Sep 28 22:57:20 2005
|
|
+++ lib/Makefile.in Sat Dec 17 17:45:21 2005
|
|
@@ -123,6 +123,13 @@
|
|
|
|
@NEED_OWN_SNPRINTF_TRUE@SNPRINTFSOURCE = snprintf.c
|
|
@NEED_OWN_SNPRINTF_FALSE@SNPRINTFSOURCE =
|
|
+
|
|
+@NEED_OWN_STRNSTR_TRUE@STRNSTRSOURCE = strnstr.c
|
|
+@NEED_OWN_STRNSTR_FALSE@STRNSTRSOURCE =
|
|
+
|
|
+@NEED_OWN_STRCASESTR_TRUE@STRCASESTRSOURCE = strcasestr.c
|
|
+@NEED_OWN_STRCASESTR_FALSE@STRCASESTRSOURCE =
|
|
+
|
|
@NEED_OWN_MD5_TRUE@MD5SOURCE = md5.c
|
|
@NEED_OWN_MD5_FALSE@MD5SOURCE =
|
|
|
|
@@ -158,6 +165,8 @@
|
|
$(SNPRINTFSOURCE) \
|
|
splay.c \
|
|
Stack.c \
|
|
+ $(STRNSTRSOURCE) \
|
|
+ $(STRCASESTRSOURCE) \
|
|
stub_memaccount.c \
|
|
util.c \
|
|
uudecode.c
|
|
@@ -196,13 +205,18 @@
|
|
@NEED_OWN_MD5_FALSE@am__objects_1 =
|
|
@NEED_OWN_SNPRINTF_FALSE@am__objects_2 =
|
|
@NEED_OWN_SNPRINTF_TRUE@am__objects_2 = snprintf.$(OBJEXT)
|
|
+@NEED_OWN_STRNSTR_FALSE@am__objects_3 =
|
|
+@NEED_OWN_STRNSTR_TRUE@am__objects_3 = strnstr.$(OBJEXT)
|
|
+@NEED_OWN_STRCASESTR_TRUE@am__objects_4 = strcasestr.$(OBJEXT)
|
|
+@NEED_OWN_STRCASESTR_FALSE@am__objects_4 =
|
|
am_libmiscutil_a_OBJECTS = Array.$(OBJEXT) base64.$(OBJEXT) \
|
|
getfullhostname.$(OBJEXT) hash.$(OBJEXT) heap.$(OBJEXT) \
|
|
html_quote.$(OBJEXT) iso3307.$(OBJEXT) $(am__objects_1) \
|
|
radix.$(OBJEXT) rfc1035.$(OBJEXT) rfc1123.$(OBJEXT) \
|
|
rfc1738.$(OBJEXT) rfc2617.$(OBJEXT) safe_inet_addr.$(OBJEXT) \
|
|
$(am__objects_2) splay.$(OBJEXT) Stack.$(OBJEXT) \
|
|
- stub_memaccount.$(OBJEXT) util.$(OBJEXT) uudecode.$(OBJEXT)
|
|
+ $(am__objects_3) $(am__objects_4) stub_memaccount.$(OBJEXT) \
|
|
+ util.$(OBJEXT) uudecode.$(OBJEXT)
|
|
libmiscutil_a_OBJECTS = $(am_libmiscutil_a_OBJECTS)
|
|
libntlmauth_a_AR = $(AR) cru
|
|
libntlmauth_a_DEPENDENCIES = @LIBOBJS@
|
|
@@ -224,15 +238,16 @@
|
|
@AMDEP_TRUE@ $(DEPDIR)/dlmalloc.Po $(DEPDIR)/drand48.Po \
|
|
@AMDEP_TRUE@ $(DEPDIR)/getfullhostname.Po $(DEPDIR)/hash.Po \
|
|
@AMDEP_TRUE@ $(DEPDIR)/heap.Po $(DEPDIR)/html_quote.Po \
|
|
-@AMDEP_TRUE@ $(DEPDIR)/inet_ntoa.Po $(DEPDIR)/initgroups.Po \
|
|
-@AMDEP_TRUE@ $(DEPDIR)/iso3307.Po $(DEPDIR)/md5.Po \
|
|
-@AMDEP_TRUE@ $(DEPDIR)/ntlmauth.Po $(DEPDIR)/radix.Po \
|
|
-@AMDEP_TRUE@ $(DEPDIR)/rfc1035.Po $(DEPDIR)/rfc1123.Po \
|
|
-@AMDEP_TRUE@ $(DEPDIR)/rfc1738.Po $(DEPDIR)/rfc2617.Po \
|
|
-@AMDEP_TRUE@ $(DEPDIR)/safe_inet_addr.Po $(DEPDIR)/snprintf.Po \
|
|
-@AMDEP_TRUE@ $(DEPDIR)/splay.Po $(DEPDIR)/strerror.Po \
|
|
-@AMDEP_TRUE@ $(DEPDIR)/stub_memaccount.Po $(DEPDIR)/tempnam.Po \
|
|
-@AMDEP_TRUE@ $(DEPDIR)/util.Po $(DEPDIR)/uudecode.Po
|
|
+@AMDEP_TRUE@ $(DEPDIR)/inet_ntoa.Po $(DEPDIR)/iso3307.Po \
|
|
+@AMDEP_TRUE@ $(DEPDIR)/md5.Po $(DEPDIR)/ntlmauth.Po \
|
|
+@AMDEP_TRUE@ $(DEPDIR)/radix.Po $(DEPDIR)/rfc1035.Po \
|
|
+@AMDEP_TRUE@ $(DEPDIR)/rfc1123.Po $(DEPDIR)/rfc1738.Po \
|
|
+@AMDEP_TRUE@ $(DEPDIR)/rfc2617.Po $(DEPDIR)/safe_inet_addr.Po \
|
|
+@AMDEP_TRUE@ $(DEPDIR)/snprintf.Po $(DEPDIR)/splay.Po \
|
|
+@AMDEP_TRUE@ $(DEPDIR)/strcasestr.Po $(DEPDIR)/strerror.Po \
|
|
+@AMDEP_TRUE@ $(DEPDIR)/strnstr.Po $(DEPDIR)/stub_memaccount.Po \
|
|
+@AMDEP_TRUE@ $(DEPDIR)/tempnam.Po $(DEPDIR)/util.Po \
|
|
+@AMDEP_TRUE@ $(DEPDIR)/uudecode.Po
|
|
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
|
|
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
|
|
CCLD = $(CC)
|
|
@@ -241,8 +256,8 @@
|
|
DIST_SOURCES = $(libdlmalloc_a_SOURCES) $(libmiscutil_a_SOURCES) \
|
|
$(EXTRA_libmiscutil_a_SOURCES) $(libntlmauth_a_SOURCES) \
|
|
$(libregex_a_SOURCES)
|
|
-DIST_COMMON = Makefile.am Makefile.in drand48.c inet_ntoa.c \
|
|
- initgroups.c strerror.c tempnam.c
|
|
+DIST_COMMON = Makefile.am Makefile.in drand48.c inet_ntoa.c strerror.c \
|
|
+ tempnam.c
|
|
SOURCES = $(libdlmalloc_a_SOURCES) $(libmiscutil_a_SOURCES) $(EXTRA_libmiscutil_a_SOURCES) $(libntlmauth_a_SOURCES) $(libregex_a_SOURCES)
|
|
|
|
all: all-am
|
|
@@ -295,7 +310,6 @@
|
|
@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/heap.Po@am__quote@
|
|
@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/html_quote.Po@am__quote@
|
|
@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/inet_ntoa.Po@am__quote@
|
|
-@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/initgroups.Po@am__quote@
|
|
@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/iso3307.Po@am__quote@
|
|
@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/md5.Po@am__quote@
|
|
@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/ntlmauth.Po@am__quote@
|
|
@@ -307,7 +321,9 @@
|
|
@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/safe_inet_addr.Po@am__quote@
|
|
@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)/strcasestr.Po@am__quote@
|
|
@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/strerror.Po@am__quote@
|
|
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/strnstr.Po@am__quote@
|
|
@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/stub_memaccount.Po@am__quote@
|
|
@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/tempnam.Po@am__quote@
|
|
@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/util.Po@am__quote@
|
|
--- src/Makefile.in.orig Wed Sep 28 22:57:21 2005
|
|
+++ src/Makefile.in Sat Dec 17 17:45:21 2005
|
|
@@ -125,6 +125,9 @@
|
|
install_sh = @install_sh@
|
|
makesnmplib = @makesnmplib@
|
|
|
|
+@USE_ICAP_TRUE@ICAPSOURCE = icap_common.c icap_reqmod.c icap_respmod.c icap_opt.c
|
|
+@USE_ICAP_FALSE@ICAPSOURCE =
|
|
+
|
|
@USE_DNSSERVER_TRUE@DNSSOURCE = dns.c
|
|
@USE_DNSSERVER_FALSE@DNSSOURCE = dns_internal.c
|
|
@USE_DNSSERVER_TRUE@DNSSERVER = dnsserver
|
|
@@ -249,6 +252,7 @@
|
|
HttpMsg.c \
|
|
HttpReply.c \
|
|
HttpRequest.c \
|
|
+ $(ICAPSOURCE) \
|
|
icmp.c \
|
|
icp_v2.c \
|
|
icp_v3.c \
|
|
@@ -468,54 +472,58 @@
|
|
pinger_LDADD = $(LDADD)
|
|
pinger_DEPENDENCIES =
|
|
pinger_LDFLAGS =
|
|
-@USE_DELAY_POOLS_TRUE@am__objects_3 = delay_pools.$(OBJEXT)
|
|
-@USE_DELAY_POOLS_FALSE@am__objects_3 =
|
|
-@USE_DNSSERVER_FALSE@am__objects_4 = dns_internal.$(OBJEXT)
|
|
-@USE_DNSSERVER_TRUE@am__objects_4 = dns.$(OBJEXT)
|
|
-@ENABLE_HTCP_TRUE@am__objects_5 = htcp.$(OBJEXT)
|
|
-@MAKE_LEAKFINDER_FALSE@am__objects_6 =
|
|
-@MAKE_LEAKFINDER_TRUE@am__objects_6 = leakfinder.$(OBJEXT)
|
|
-@USE_SNMP_TRUE@am__objects_7 = snmp_core.$(OBJEXT) snmp_agent.$(OBJEXT)
|
|
-@USE_SNMP_FALSE@am__objects_7 =
|
|
-@ENABLE_SSL_TRUE@am__objects_8 = ssl_support.$(OBJEXT)
|
|
-@ENABLE_SSL_FALSE@am__objects_8 =
|
|
-@ENABLE_UNLINKD_FALSE@am__objects_9 =
|
|
-@ENABLE_UNLINKD_TRUE@am__objects_9 = unlinkd.$(OBJEXT)
|
|
-@ENABLE_WIN32SPECIFIC_TRUE@am__objects_10 = win32.$(OBJEXT)
|
|
-@ENABLE_WIN32SPECIFIC_FALSE@am__objects_10 =
|
|
+@USE_DELAY_POOLS_FALSE@am__objects_5 =
|
|
+@USE_DELAY_POOLS_TRUE@am__objects_5 = delay_pools.$(OBJEXT)
|
|
+@USE_DNSSERVER_FALSE@am__objects_6 = dns_internal.$(OBJEXT)
|
|
+@USE_DNSSERVER_TRUE@am__objects_6 = dns.$(OBJEXT)
|
|
+@ENABLE_HTCP_TRUE@am__objects_7 = htcp.$(OBJEXT)
|
|
+@USE_ICAP_TRUE@am__objects_8 = icap_common.$(OBJEXT) \
|
|
+@USE_ICAP_TRUE@ icap_reqmod.$(OBJEXT) icap_respmod.$(OBJEXT) \
|
|
+@USE_ICAP_TRUE@ icap_opt.$(OBJEXT)
|
|
+@USE_ICAP_FALSE@am__objects_8 =
|
|
+@MAKE_LEAKFINDER_TRUE@am__objects_9 = leakfinder.$(OBJEXT)
|
|
+@MAKE_LEAKFINDER_FALSE@am__objects_9 =
|
|
+@USE_SNMP_TRUE@am__objects_10 = snmp_core.$(OBJEXT) snmp_agent.$(OBJEXT)
|
|
+@USE_SNMP_FALSE@am__objects_10 =
|
|
+@ENABLE_SSL_FALSE@am__objects_11 =
|
|
+@ENABLE_SSL_TRUE@am__objects_11 = ssl_support.$(OBJEXT)
|
|
+@ENABLE_UNLINKD_TRUE@am__objects_12 = unlinkd.$(OBJEXT)
|
|
+@ENABLE_UNLINKD_FALSE@am__objects_12 =
|
|
+@ENABLE_WIN32SPECIFIC_FALSE@am__objects_13 =
|
|
+@ENABLE_WIN32SPECIFIC_TRUE@am__objects_13 = win32.$(OBJEXT)
|
|
am_squid_OBJECTS = access_log.$(OBJEXT) acl.$(OBJEXT) asn.$(OBJEXT) \
|
|
authenticate.$(OBJEXT) cache_cf.$(OBJEXT) CacheDigest.$(OBJEXT) \
|
|
cache_manager.$(OBJEXT) carp.$(OBJEXT) cbdata.$(OBJEXT) \
|
|
client_db.$(OBJEXT) client_side.$(OBJEXT) comm.$(OBJEXT) \
|
|
- comm_select.$(OBJEXT) debug.$(OBJEXT) $(am__objects_3) \
|
|
- disk.$(OBJEXT) $(am__objects_4) errorpage.$(OBJEXT) \
|
|
+ comm_select.$(OBJEXT) debug.$(OBJEXT) $(am__objects_5) \
|
|
+ disk.$(OBJEXT) $(am__objects_6) errorpage.$(OBJEXT) \
|
|
ETag.$(OBJEXT) event.$(OBJEXT) external_acl.$(OBJEXT) \
|
|
fd.$(OBJEXT) filemap.$(OBJEXT) forward.$(OBJEXT) \
|
|
fqdncache.$(OBJEXT) ftp.$(OBJEXT) gopher.$(OBJEXT) \
|
|
- helper.$(OBJEXT) $(am__objects_5) http.$(OBJEXT) \
|
|
+ helper.$(OBJEXT) $(am__objects_7) http.$(OBJEXT) \
|
|
HttpStatusLine.$(OBJEXT) HttpHdrCc.$(OBJEXT) \
|
|
HttpHdrRange.$(OBJEXT) HttpHdrContRange.$(OBJEXT) \
|
|
HttpHeader.$(OBJEXT) HttpHeaderTools.$(OBJEXT) \
|
|
HttpBody.$(OBJEXT) HttpMsg.$(OBJEXT) HttpReply.$(OBJEXT) \
|
|
- HttpRequest.$(OBJEXT) icmp.$(OBJEXT) icp_v2.$(OBJEXT) \
|
|
- icp_v3.$(OBJEXT) ident.$(OBJEXT) internal.$(OBJEXT) \
|
|
- ipc.$(OBJEXT) ipcache.$(OBJEXT) $(am__objects_6) \
|
|
- logfile.$(OBJEXT) main.$(OBJEXT) mem.$(OBJEXT) \
|
|
+ HttpRequest.$(OBJEXT) $(am__objects_8) icmp.$(OBJEXT) \
|
|
+ icp_v2.$(OBJEXT) icp_v3.$(OBJEXT) ident.$(OBJEXT) \
|
|
+ internal.$(OBJEXT) ipc.$(OBJEXT) ipcache.$(OBJEXT) \
|
|
+ $(am__objects_9) logfile.$(OBJEXT) main.$(OBJEXT) mem.$(OBJEXT) \
|
|
MemPool.$(OBJEXT) MemBuf.$(OBJEXT) mime.$(OBJEXT) \
|
|
multicast.$(OBJEXT) neighbors.$(OBJEXT) net_db.$(OBJEXT) \
|
|
Packer.$(OBJEXT) pconn.$(OBJEXT) peer_digest.$(OBJEXT) \
|
|
peer_select.$(OBJEXT) redirect.$(OBJEXT) referer.$(OBJEXT) \
|
|
- refresh.$(OBJEXT) send-announce.$(OBJEXT) $(am__objects_7) \
|
|
- ssl.$(OBJEXT) $(am__objects_8) stat.$(OBJEXT) \
|
|
+ refresh.$(OBJEXT) send-announce.$(OBJEXT) $(am__objects_10) \
|
|
+ ssl.$(OBJEXT) $(am__objects_11) stat.$(OBJEXT) \
|
|
StatHist.$(OBJEXT) String.$(OBJEXT) stmem.$(OBJEXT) \
|
|
store.$(OBJEXT) store_io.$(OBJEXT) store_client.$(OBJEXT) \
|
|
store_digest.$(OBJEXT) store_dir.$(OBJEXT) \
|
|
store_key_md5.$(OBJEXT) store_log.$(OBJEXT) \
|
|
store_rebuild.$(OBJEXT) store_swapin.$(OBJEXT) \
|
|
store_swapmeta.$(OBJEXT) store_swapout.$(OBJEXT) \
|
|
- tools.$(OBJEXT) $(am__objects_9) url.$(OBJEXT) urn.$(OBJEXT) \
|
|
+ tools.$(OBJEXT) $(am__objects_12) url.$(OBJEXT) urn.$(OBJEXT) \
|
|
useragent.$(OBJEXT) wais.$(OBJEXT) wccp.$(OBJEXT) \
|
|
- whois.$(OBJEXT) $(am__objects_10)
|
|
+ whois.$(OBJEXT) $(am__objects_13)
|
|
nodist_squid_OBJECTS = repl_modules.$(OBJEXT) auth_modules.$(OBJEXT) \
|
|
store_modules.$(OBJEXT) globals.$(OBJEXT) \
|
|
string_arrays.$(OBJEXT)
|
|
@@ -563,7 +571,9 @@
|
|
@AMDEP_TRUE@ $(DEPDIR)/fqdncache.Po $(DEPDIR)/ftp.Po \
|
|
@AMDEP_TRUE@ $(DEPDIR)/globals.Po $(DEPDIR)/gopher.Po \
|
|
@AMDEP_TRUE@ $(DEPDIR)/helper.Po $(DEPDIR)/htcp.Po \
|
|
-@AMDEP_TRUE@ $(DEPDIR)/http.Po $(DEPDIR)/icmp.Po \
|
|
+@AMDEP_TRUE@ $(DEPDIR)/http.Po $(DEPDIR)/icap_common.Po \
|
|
+@AMDEP_TRUE@ $(DEPDIR)/icap_opt.Po $(DEPDIR)/icap_reqmod.Po \
|
|
+@AMDEP_TRUE@ $(DEPDIR)/icap_respmod.Po $(DEPDIR)/icmp.Po \
|
|
@AMDEP_TRUE@ $(DEPDIR)/icp_v2.Po $(DEPDIR)/icp_v3.Po \
|
|
@AMDEP_TRUE@ $(DEPDIR)/ident.Po $(DEPDIR)/internal.Po \
|
|
@AMDEP_TRUE@ $(DEPDIR)/ipc.Po $(DEPDIR)/ipcache.Po \
|
|
@@ -777,6 +787,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@
|
|
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/icap_common.Po@am__quote@
|
|
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/icap_opt.Po@am__quote@
|
|
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/icap_reqmod.Po@am__quote@
|
|
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/icap_respmod.Po@am__quote@
|
|
@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/icmp.Po@am__quote@
|
|
@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/icp_v2.Po@am__quote@
|
|
@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/icp_v3.Po@am__quote@
|