Index: head/www/squid/Makefile =================================================================== --- head/www/squid/Makefile (revision 197624) +++ head/www/squid/Makefile (revision 197625) @@ -1,428 +1,445 @@ # New ports collection makefile for: squid24 # Date created: Tue Mar 27 14:56:08 CEST 2001 # Whom: Adrian Chadd # # $FreeBSD$ # # Tunables not (yet) configurable via 'make config': # SQUID_{U,G}ID # Which user/group Squid should run as (default: squid/squid). # The user and group will be created if they do not already exist using # a uid:gid of 100:100. # NOTE: older versions of Squid defaulted to nobody/nogroup. # If you wish to run Squid as "nobody" (which is not recommended), please # define SQUID_UID=nobody and SQUID_GID=nogroup in your make environment # before you start the update or installation of this port. # # SQUID_LANGUAGES # A list of languages for which error page files should be installed # (default: all) # # E.g. use `make SQUID_LANGUAGES="English French"' if you want to # install the files for these languages only. # Use `make -VSQUID_LANGUAGES' or scroll down to this variable's # definition to see which values are valid. # # SQUID_DEFAULT_LANG # If you define SQUID_LANGUAGES, select which language should be the default # one (this variable defaults to English). This setting can be overwritten # with squid.conf's error_directory directive. # # SQUID_CONFIGURE_ARGS # Additional configuration options. # # To enable them, use e.g # `make SQUID_CONFIGURE_ARGS="--enable-dlmalloc --enable-truncate" install' # # The list below may be incomplete, please see the configure script # in the Squid source distribution for the complete list of additional # options. # Note that you probably do not need to worry about these options in most # cases, they are included in case you want to experiment with them. # # --enable-dlmalloc # Compile and use the malloc package from Doug Lea # --enable-gnuregex # Compile and use the supplied GNUregex routines instead of BSD regex # (not recommended). # --enable-xmalloc-statistics # Show malloc statistics in status page # --enable-cachemgr-hostname=some.hostname # Set an explicit hostname in cachemgr.cgi # --enable-truncate # Use truncate() rather than unlink() # --disable-unlinkd # Do not use "unlinkd" # --with-aufs-threads=N_THREADS # Tune the number of worker threads for the aufs object # --with-coss-membuf-size # COSS membuf size (default: 1048576 bytes) # --with-maxfd=N # Override the maximum number of filedescriptors. Useful if you # build as another user who is not privileged to use the amount # of filedescriptors the resulting binary is expected to support. # --enable-ntlm-fail-open # Enable NTLM fail open, where a helper that fails one of the # Authentication steps can allow Squid to still authenticate the user # --enable-x-accelerator-vary # Enable support for the X-Accelerator-Vary HTTP header. Can be used # to indicate variance within an accelerator setup. Typically used # together with other code that adds custom HTTP headers to the # requests. # --enable-forward-log # Enable experimental forward_log directive. # --enable-multicast-miss # Enable experimental multicast notification of cachemisses. PORTNAME= squid -PORTVERSION= 2.6.13 +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/&,} + ${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.STABLE13 +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://www1.tw.squid-cache.org/%SUBDIR%/ + http://www2.tw.squid-cache.org/%SUBDIR%/ PATCH_SITE_SUBDIR= Versions/v2/2.6/changesets -PATCHFILES= +PATCHFILES= 11534.patch 11547.patch 11548.patch PATCH_DIST_STRIP= -p1 MAINTAINER= tmseck@netcologne.de COMMENT= HTTP Caching Proxy CONFLICTS= squid-2.[^6]* GNU_CONFIGURE= yes USE_BZIP2= yes USE_PERL5= yes USE_RC_SUBR= squid SQUID_UID?= squid SQUID_GID?= squid 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} OPTIONS= SQUID_LDAP_AUTH "Install LDAP authentication helpers" off \ SQUID_SASL_AUTH "Install SASL authentication helpers" off \ SQUID_DELAY_POOLS "Enable delay pools" off \ SQUID_SNMP "Enable SNMP support" off \ SQUID_CARP "Enable CARP support" on \ SQUID_SSL "Enable SSL support for reverse proxies" off \ SQUID_PINGER "Install the icmp helper" off \ SQUID_DNS_HELPER "Use the old 'dnsserver' helper" off \ SQUID_HTCP "Enable HTCP support" off \ SQUID_VIA_DB "Enable forward/via database" off \ SQUID_CACHE_DIGESTS "Enable cache digests" off \ SQUID_WCCP "Enable Web Cache Coordination Prot. v1" on \ SQUID_WCCPV2 "Enable Web Cache Coordination Prot. v2" off \ SQUID_STRICT_HTTP "Be strictly HTTP compliant" off \ SQUID_IDENT "Enable ident (RFC 931) lookups" on \ SQUID_REFERER_LOG "Enable Referer-header logging" off \ SQUID_USERAGENT_LOG "Enable User-Agent-header logging" off \ SQUID_ARP_ACL "Enable ACLs based on ethernet address" off \ SQUID_PF "Enable transparent proxying with PF" off \ SQUID_IPFILTER "Enable transp. proxying with IPFilter" off \ SQUID_FOLLOW_XFF "Follow X-Forwarded-For headers" off \ SQUID_ICAP "Enable ICAP client functionality" off \ SQUID_AUFS "Enable the aufs storage scheme" off \ SQUID_COSS "Enable the COSS storage scheme" off \ SQUID_KQUEUE "Use kqueue(2) instead of poll(2)" on \ SQUID_LARGEFILE "Support log and cache files >2GB" off \ SQUID_STACKTRACES "Create backtraces on fatal errors" off etc_files= squid/cachemgr.conf.default \ squid/mib.txt squid/mime.conf.default \ squid/msntauth.conf.default squid/squid.conf.default icon_files= anthony-binhex.gif anthony-bomb.gif anthony-box.gif \ anthony-box2.gif anthony-c.gif anthony-compressed.gif \ anthony-dir.gif anthony-dirup.gif anthony-dvi.gif \ anthony-f.gif anthony-image.gif anthony-image2.gif \ anthony-layout.gif anthony-link.gif anthony-movie.gif \ anthony-pdf.gif anthony-portal.gif anthony-ps.gif \ anthony-quill.gif anthony-script.gif anthony-sound.gif \ anthony-tar.gif anthony-tex.gif anthony-text.gif \ anthony-unknown.gif anthony-xbm.gif anthony-xpm.gif error_files= ERR_ACCESS_DENIED ERR_CACHE_ACCESS_DENIED \ ERR_CACHE_MGR_ACCESS_DENIED ERR_CANNOT_FORWARD \ ERR_CONNECT_FAIL ERR_DNS_FAIL ERR_FORWARDING_DENIED \ ERR_FTP_DISABLED ERR_FTP_FAILURE ERR_FTP_FORBIDDEN \ ERR_FTP_NOT_FOUND ERR_FTP_PUT_CREATED \ ERR_FTP_PUT_ERROR ERR_FTP_PUT_MODIFIED ERR_FTP_UNAVAILABLE \ ERR_INVALID_REQ ERR_INVALID_RESP ERR_INVALID_URL \ ERR_LIFETIME_EXP ERR_NO_RELAY ERR_ONLY_IF_CACHED_MISS \ ERR_READ_ERROR ERR_READ_TIMEOUT ERR_SHUTTING_DOWN \ 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 \ +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_session squid_unix_group \ - wbinfo_group.pl + 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 sbin= RunCache squidclient squid CONFIGURE_ARGS= --bindir=${PREFIX}/sbin \ --sbindir=${PREFIX}/sbin \ --datadir=${PREFIX}/etc/squid \ --libexecdir=${PREFIX}/libexec/squid \ --localstatedir=${PREFIX}/squid \ --sysconfdir=${PREFIX}/etc/squid \ --enable-removal-policies="lru heap" \ --disable-linux-netfilter \ --disable-linux-tproxy \ --disable-epoll .include # Authentication methods and modules: -basic_auth= NCSA PAM MSNT SMB +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_session.8 squid_unix_group.8 +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 LDFLAGS+= -L${LOCALBASE}/lib MAN8+= squid_ldap_auth.8 squid_ldap_group.8 basic_auth+= LDAP digest_auth+= ldap external_acl+= ldap_group libexec+= digest_ldap_auth squid_ldap_auth squid_ldap_group .endif .if defined(WITH_SQUID_SASL_AUTH) LIB_DEPENDS+= sasl2.2:${PORTSDIR}/security/cyrus-sasl2 CFLAGS+= -I${LOCALBASE}/include CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib basic_auth+= SASL libexec+= sasl_auth .endif .if !defined(NO_NIS) && !defined(WITHOUT_NIS) basic_auth+= YP libexec+= yp_auth .endif CONFIGURE_ARGS+= --enable-auth="basic ntlm digest" \ --enable-basic-auth-helpers="${basic_auth}" \ --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: storage_schemes= ufs diskd null .if defined(WITH_SQUID_AUFS) storage_schemes+= aufs .if ${OSVERSION}>=501000 # Only document libmap.conf where it is available: EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-src-cf.data.pre.aufs .endif # Nil aufs threads is default, set any other value via SQUID_CONFIGURE_ARGS CONFIGURE_ARGS+= --with-pthreads CFLAGS+= ${PTHREAD_CFLAGS} .endif .if defined(WITH_SQUID_COSS) storage_schemes+= coss .if !defined(WITH_SQUID_AUFS) # use Posix AIO instead of aufs' AIO; note that you then need the kernel to # supply AIO support, either by loading the aio(4) module (n/a on 4.x) or by # adding the option VFS_AIO to your kernel configuration if you want to # actually use COSS storage: CONFIGURE_ARGS+= --enable-coss-aio-ops .endif sbin+= cossdump .endif CONFIGURE_ARGS+= --enable-storeio="${storage_schemes}" # Other options set via 'make config': .if defined(WITH_SQUID_DELAY_POOLS) CONFIGURE_ARGS+= --enable-delay-pools .endif .if defined(WITH_SQUID_SNMP) CONFIGURE_ARGS+= --enable-snmp .endif .if defined(WITHOUT_SQUID_CARP) CONFIGURE_ARGS+= --disable-carp .endif .if defined(WITH_SQUID_SSL) # we need to .include bsd.openssl.mk manually here.because USE_OPENSSL only # works when it is defined before bsd.port{.pre}.mk is .included. # This makes it currently impossible to combine this macro with OPTIONS to # conditionally include OpenSSL support. .include "${PORTSDIR}/Mk/bsd.openssl.mk" CONFIGURE_ARGS+= --enable-ssl \ --with-openssl="${OPENSSLBASE}" CFLAGS+= -I${OPENSSLINC} LDFLAGS+= -L${OPENSSLLIB} .endif .if defined(WITH_SQUID_PINGER) CONFIGURE_ARGS+= --enable-icmp libexec+= pinger .endif .if defined(WITH_SQUID_DNS_HELPER) CONFIGURE_ARGS+= --disable-internal-dns libexec+= dnsserver .endif .if defined(WITH_SQUID_HTCP) CONFIGURE_ARGS+= --enable-htcp .endif .if defined(WITH_SQUID_VIA_DB) CONFIGURE_ARGS+= --enable-forw-via-db .endif .if defined(WITH_SQUID_CACHE_DIGESTS) CONFIGURE_ARGS+= --enable-cache-digests .endif .if defined(WITHOUT_SQUID_WCCP) CONFIGURE_ARGS+= --disable-wccp .endif .if defined(WITH_SQUID_WCCPV2) CONFIGURE_ARGS+= --enable-wccpv2 .endif .if defined(WITH_SQUID_STRICT_HTTP) CONFIGURE_ARGS+= --disable-http-violations .endif .if defined(WITHOUT_SQUID_IDENT) CONFIGURE_ARGS+= --disable-ident-lookups .endif .if defined(WITH_SQUID_REFERER_LOG) CONFIGURE_ARGS+= --enable-referer-log .endif .if defined(WITH_SQUID_USERAGENT_LOG) CONFIGURE_ARGS+= --enable-useragent-log .endif .if defined(WITH_SQUID_ARP_ACL) CONFIGURE_ARGS+= --enable-arp-acl .endif .if defined(WITH_SQUID_PF) CONFIGURE_ARGS+= --enable-pf-transparent .if ${OSVERSION} < 502106 IGNORE= pf available only in FreeBSD 5.3 and newer .endif .endif # IPFilter-headers are not installed on FreeBSD 4 since 4.7-RELEASE, # they were not installed on FreeBSD 5 from 2002-03-26 (OSVERSION > 500032) to # 2003-06-27 (OSVERSION < 501101). # # Please see PR misc/44148 and the CVS log of src/include/Makefile for further # information. .if defined(WITH_SQUID_IPFILTER) .if (${OSVERSION} >= 470000 && ${OSVERSION} < 500000) || (${OSVERSION} > 500032 && ${OSVERSION} < 501101) IGNORE= the IPFilter headers are not part of the base system .else CONFIGURE_ARGS+= --enable-ipf-transparent .endif .endif .if defined(WITH_SQUID_FOLLOW_XFF) CONFIGURE_ARGS+= --enable-follow-x-forwarded-for .endif .if defined(WITH_SQUID_ICAP) EXTRA_PATCHES+= ${PATCHDIR}/icap-2.6-bootstrap.patch \ ${PATCHDIR}/icap-2.6-core.patch CONFIGURE_ARGS+= --enable-icap-support error_files+= ERR_ICAP_FAILURE .endif .if defined(WITHOUT_SQUID_KQUEUE) CONFIGURE_ARGS+= --disable-kqueue .endif .if defined(WITH_SQUID_LARGEFILE) CONFIGURE_ARGS+= --with-large-files --enable-large-cache-files .endif -.if defined(WITH_SQUID_STACKTRACES) || defined(WITH_DEBUG) +.if defined(WITH_SQUID_STACKTRACES) CONFIGURE_ARGS+= --enable-stacktraces CFLAGS+= -g -STRIP= "" +STRIP= .endif # Languages: # # If you do not define SQUID_LANGUAGES yourself, all available language files # will be installed; the default language will be English. SQUID_LANGUAGES?= Azerbaijani Bulgarian Catalan Czech Danish Dutch \ English Estonian Finnish French German Greek Hebrew \ Hungarian Italian Japanese Korean Lithuanian \ Polish Portuguese Romanian Russian-1251 Russian-koi8-r \ Serbian Simplify_Chinese Slovak Spanish Swedish \ Traditional_Chinese Turkish SQUID_DEFAULT_LANG?= English CONFIGURE_ARGS+= --enable-err-languages="${SQUID_LANGUAGES}" \ --enable-default-err-language=${SQUID_DEFAULT_LANG} # Finally, add additional user specified configuration options: CONFIGURE_ARGS+= ${SQUID_CONFIGURE_ARGS} CONFIGURE_ENV+= CFLAGS="${CFLAGS}" \ CPPFLAGS="${CPPFLAGS}"\ LDFLAGS="${LDFLAGS}" PLIST_DIRS= etc/squid/icons libexec/squid PLIST_FILES= ${etc_files:S,^,etc/,} ${icon_files:S,^,etc/squid/icons/,} \ ${libexec:S,^,libexec/squid/,} ${sbin:S,^,sbin/,} .for d in ${SQUID_LANGUAGES} PLIST_DIRS+= etc/squid/errors/${d} PLIST_FILES+= ${error_files:S,^,etc/squid/errors/${d}/,} .endfor PLIST_DIRS+= etc/squid/errors etc/squid squid/logs squid/cache squid post-patch: @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|%%SQUID_UID%%|${SQUID_UID}|g' \ -e 's|%%SQUID_GID%%|${SQUID_GID}|g' \ -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/src/cf.data.pre @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ ${WRKSRC}/helpers/basic_auth/SMB/Makefile.in \ ${WRKSRC}/helpers/basic_auth/SMB/smb_auth.sh pre-install: # Prevent installation of .orig files by deleting them. @${FIND} ${WRKSRC} -name '*.bak' -delete @${FIND} ${WRKSRC} -name '*.orig' -delete pre-su-install: @${SETENV} ${SCRIPTS_ENV} PKG_PREFIX=${PREFIX} \ ${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 .endif .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} cd ${WRKSRC} && ${INSTALL_DATA} ${docs} ${DOCSDIR} .endif @${SETENV} PKG_PREFIX=${PREFIX} \ ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL @${ECHO_CMD} "===> post-installation information for ${PKGNAME}:" @${ECHO_CMD} "" @${CAT} ${PKGMESSAGE} @${ECHO_CMD} "" .include Property changes on: head/www/squid/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.199 \ No newline at end of property +1.200 \ No newline at end of property Index: head/www/squid/distinfo =================================================================== --- head/www/squid/distinfo (revision 197624) +++ head/www/squid/distinfo (revision 197625) @@ -1,3 +1,12 @@ -MD5 (squid2.6/squid-2.6.STABLE13.tar.bz2) = fdc4ece264b47bab1b112d8f6f842b8b -SHA256 (squid2.6/squid-2.6.STABLE13.tar.bz2) = 894802914a63992d5c5cf7061e2f242fdefd09b4af79d84b217e977f9195fdad -SIZE (squid2.6/squid-2.6.STABLE13.tar.bz2) = 1263229 +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 Property changes on: head/www/squid/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.154 \ No newline at end of property +1.155 \ No newline at end of property Index: head/www/squid/files/icap-2.6-bootstrap.patch =================================================================== --- head/www/squid/files/icap-2.6-bootstrap.patch (revision 197624) +++ head/www/squid/files/icap-2.6-bootstrap.patch (revision 197625) @@ -1,479 +1,468 @@ Patch 2 of 2 to integrate the icap-2_6 branch into the FreeBSD squid port. Created by Thomas-Martin Seck . This patch simulates the autotools bootstrap necessary after applying the ICAP patchset. Please see icap-2.6-core.patch for further information. -Patch last updated: 2007-05-17 +Patch last updated: 2007-07-16 ---- configure.orig Thu May 17 13:34:14 2007 -+++ configure Thu May 17 13:35:15 2007 +--- configure.orig Sun Jul 15 16:21:59 2007 ++++ configure Mon Jul 16 22:37:43 2007 @@ -312,7 +312,7 @@ # include #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 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 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_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. @@ -890,6 +890,7 @@ to build your custom policy --enable-icmp Enable ICMP pinging --enable-delay-pools Enable delay pools to limit bandwidth usage + --enable-icap-support Enable ICAP client capability --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 -@@ -1818,7 +1818,7 @@ +@@ -1819,7 +1820,7 @@ # Define the identity of the package. PACKAGE='squid' -- VERSION='2.6.STABLE13' -+ VERSION='2.6.STABLE13+ICAP' +- VERSION='2.6.STABLE14' ++ VERSION='2.6.STABLE14+ICAP' cat >>confdefs.h <<_ACEOF -@@ -3954,6 +3955,40 @@ +@@ -3955,6 +3956,40 @@ fi; + +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 <<\_ACEOF +#define HS_FEAT_ICAP 1 +_ACEOF + + + +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" -@@ -15923,6 +15958,8 @@ +@@ -24144,6 +24179,8 @@ + + for ac_func in \ bcopy \ backtrace_symbols_fd \ -@@ -15971,6 +16008,8 @@ +@@ -24192,6 +24229,8 @@ srand48 \ srandom \ statfs \ + strnstr \ + strcasestr \ strsep \ strtoll \ sysconf \ -@@ -16430,6 +16469,52 @@ +@@ -24888,6 +24927,52 @@ 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 + + + +if false; then NEED_OWN_STRSEP_TRUE= NEED_OWN_STRSEP_FALSE='#' else -@@ -17947,6 +18032,20 @@ +@@ -26405,6 +26490,20 @@ Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi +if test -z "${USE_ICAP_TRUE}" && test -z "${USE_ICAP_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"USE_ICAP\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +echo "$as_me: error: conditional \"USE_ICAP\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi +if test -z "${USE_ICAP_TRUE}" && test -z "${USE_ICAP_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"USE_ICAP\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +echo "$as_me: error: conditional \"USE_ICAP\" was never defined. +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 -@@ -18101,6 +18200,34 @@ +@@ -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 + 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_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_STRNSTR\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } -+fi + 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. +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 -@@ -18766,6 +18893,8 @@ +-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_ICAP_TRUE@,$USE_ICAP_TRUE,;t t +s,@USE_ICAP_FALSE@,$USE_ICAP_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 -@@ -18599,6 +18728,10 @@ - s,@USE_KQUEUE_FALSE@,$USE_KQUEUE_FALSE,;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_STRNSTR_FALSE@,$NEED_OWN_STRNSTR_FALSE,;t t +s,@NEED_OWN_STRCASESTR_TRUE@,$NEED_OWN_STRCASESTR_TRUE,;t t +s,@NEED_OWN_STRCASESTR_FALSE@,$NEED_OWN_STRCASESTR_FALSE,;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 Wed Jul 12 17:00:31 2006 -+++ include/autoconf.h.in Sat Aug 5 16:18:25 2006 -@@ -454,6 +454,9 @@ +--- 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 header file. */ #undef HAVE_STDLIB_H +/* Define to 1 if you have the `strcasestr' function. */ +#undef HAVE_STRCASESTR + /* Define to 1 if you have the `strerror' function. */ #undef HAVE_STRERROR -@@ -463,6 +466,9 @@ +@@ -466,6 +469,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_STRING_H +/* Define to 1 if you have the `strnstr' function. */ +#undef HAVE_STRNSTR + /* Define to 1 if you have the `strsep' function. */ #undef HAVE_STRSEP -@@ -587,6 +593,9 @@ +@@ -596,6 +602,9 @@ /* Some systems support __va_copy */ #undef HAVE___VA_COPY + +/* Content filtering via ICAP servers. */ +#undef HS_FEAT_ICAP /* 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 Fri Sep 22 11:09:48 2006 -+++ lib/Makefile.in Sat Sep 19 20:05:28 2006 +--- 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 \ rfc1123.c rfc1738.c rfc2617.c safe_inet_addr.c snprintf.c \ - splay.c Stack.c strsep.c stub_memaccount.c util.c uudecode.c \ - win32lib.c + splay.c Stack.c strnstr.c strcasestr.c strsep.c \ + stub_memaccount.c util.c uudecode.c win32lib.c @NEED_OWN_MD5_TRUE@am__objects_1 = md5.$(OBJEXT) @NEED_OWN_SNPRINTF_TRUE@am__objects_2 = snprintf.$(OBJEXT) -@NEED_OWN_STRSEP_TRUE@am__objects_3 = strsep.$(OBJEXT) -@ENABLE_MINGW32SPECIFIC_TRUE@am__objects_4 = win32lib.$(OBJEXT) +@NEED_OWN_STRNSTR_TRUE@am__objects_3 = strnstr.$(OBJEXT) +@NEED_OWN_STRCASESTR_TRUE@am__objects_4 = strcasestr.$(OBJEXT) +@NEED_OWN_STRSEP_TRUE@am__objects_5 = strsep.$(OBJEXT) +@ENABLE_MINGW32SPECIFIC_TRUE@am__objects_6 = win32lib.$(OBJEXT) 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) \ - $(am__objects_3) stub_memaccount.$(OBJEXT) util.$(OBJEXT) \ - uudecode.$(OBJEXT) $(am__objects_4) + $(am__objects_3) $(am__objects_4) $(am__objects_5) \ + stub_memaccount.$(OBJEXT) util.$(OBJEXT) uudecode.$(OBJEXT) \ + $(am__objects_6) libmiscutil_a_OBJECTS = $(am_libmiscutil_a_OBJECTS) libntlmauth_a_AR = $(AR) $(ARFLAGS) libntlmauth_a_DEPENDENCIES = @LIBOBJS@ -@@ -190,6 +193,10 @@ +@@ -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_STRCASESTR_FALSE = @NEED_OWN_STRCASESTR_FALSE@ +NEED_OWN_STRCASESTR_TRUE = @NEED_OWN_STRCASESTR_TRUE@ +NEED_OWN_STRNSTR_FALSE = @NEED_OWN_STRNSTR_FALSE@ +NEED_OWN_STRNSTR_TRUE = @NEED_OWN_STRNSTR_TRUE@ NEED_OWN_STRSEP_FALSE = @NEED_OWN_STRSEP_FALSE@ NEED_OWN_STRSEP_TRUE = @NEED_OWN_STRSEP_TRUE@ NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@ -@@ -229,6 +236,8 @@ +@@ -230,6 +237,8 @@ USE_DNSSERVER_TRUE = @USE_DNSSERVER_TRUE@ USE_EPOLL_FALSE = @USE_EPOLL_FALSE@ USE_EPOLL_TRUE = @USE_EPOLL_TRUE@ +USE_ICAP_FALSE = @USE_ICAP_FALSE@ +USE_ICAP_TRUE = @USE_ICAP_TRUE@ USE_KQUEUE_FALSE = @USE_KQUEUE_FALSE@ USE_KQUEUE_TRUE = @USE_KQUEUE_TRUE@ USE_POLL_FALSE = @USE_POLL_FALSE@ -@@ -284,6 +293,10 @@ +@@ -287,6 +296,10 @@ target_alias = @target_alias@ @NEED_OWN_SNPRINTF_FALSE@SNPRINTFSOURCE = @NEED_OWN_SNPRINTF_TRUE@SNPRINTFSOURCE = snprintf.c +@NEED_OWN_STRNSTR_FALSE@STRNSTRSOURCE = +@NEED_OWN_STRNSTR_TRUE@STRNSTRSOURCE = strnstr.c +@NEED_OWN_STRCASESTR_FALSE@STRCASESTRSOURCE = +@NEED_OWN_STRCASESTR_TRUE@STRCASESTRSOURCE = strcasestr.c @NEED_OWN_STRSEP_FALSE@STRSEPSOURCE = @NEED_OWN_STRSEP_TRUE@STRSEPSOURCE = strsep.c @NEED_OWN_MD5_FALSE@MD5SOURCE = -@@ -328,6 +341,8 @@ +@@ -331,6 +344,8 @@ $(SNPRINTFSOURCE) \ splay.c \ Stack.c \ + $(STRNSTRSOURCE) \ + $(STRCASESTRSOURCE) \ $(STRSEPSOURCE) \ stub_memaccount.c \ util.c \ -@@ -443,6 +458,8 @@ +@@ -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)/strcasestr.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strnstr.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@ --- src/Makefile.in.orig Sat Nov 4 16:36:15 2006 -+++ src/Makefile.in Sat Nov 4 16:36:27 2006 +--- src/Makefile.in.orig Sat Jun 23 02:14:56 2007 ++++ src/Makefile.in Mon Jul 16 22:21:33 2007 @@ -91,14 +91,15 @@ globals.h gopher.c helper.c htcp.c http.c HttpStatusLine.c \ HttpHdrCc.c HttpHdrRange.c HttpHdrContRange.c HttpHeader.c \ HttpHeaderTools.c HttpBody.c HttpMsg.c HttpReply.c \ - HttpRequest.c icmp.c icp_v2.c icp_v3.c ident.c internal.c \ - ipc.c ipc_win32.c ipcache.c leakfinder.c locrewrite.c \ - logfile.c main.c mem.c MemPool.c MemBuf.c mime.c multicast.c \ - neighbors.c net_db.c Packer.c pconn.c peer_digest.c \ - peer_monitor.c peer_select.c peer_sourcehash.c peer_userhash.c \ - protos.h redirect.c referer.c refresh.c send-announce.c \ - snmp_core.c snmp_agent.c squid.h ssl.c ssl_support.c stat.c \ - StatHist.c String.c stmem.c store.c store_io.c store_client.c \ + HttpRequest.c icap_common.c icap_reqmod.c icap_respmod.c \ + icap_opt.c icmp.c icp_v2.c icp_v3.c ident.c internal.c ipc.c \ + ipc_win32.c ipcache.c leakfinder.c locrewrite.c logfile.c \ + main.c mem.c MemPool.c MemBuf.c mime.c multicast.c neighbors.c \ + net_db.c Packer.c pconn.c peer_digest.c peer_monitor.c \ + peer_select.c peer_sourcehash.c peer_userhash.c protos.h \ + redirect.c referer.c refresh.c send-announce.c snmp_core.c \ + snmp_agent.c squid.h ssl.c ssl_support.c stat.c StatHist.c \ + String.c stmem.c store.c store_io.c store_client.c \ 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 \ -@@ -114,14 +115,17 @@ +@@ -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) -@ENABLE_MINGW32SPECIFIC_FALSE@am__objects_5 = ipc.$(OBJEXT) -@ENABLE_MINGW32SPECIFIC_TRUE@am__objects_5 = ipc_win32.$(OBJEXT) -@MAKE_LEAKFINDER_TRUE@am__objects_6 = leakfinder.$(OBJEXT) -@USE_SNMP_TRUE@am__objects_7 = snmp_core.$(OBJEXT) \ +@USE_ICAP_TRUE@am__objects_5 = icap_common.$(OBJEXT) \ +@USE_ICAP_TRUE@ icap_reqmod.$(OBJEXT) icap_respmod.$(OBJEXT) \ +@USE_ICAP_TRUE@ icap_opt.$(OBJEXT) +@ENABLE_MINGW32SPECIFIC_FALSE@am__objects_6 = ipc.$(OBJEXT) +@ENABLE_MINGW32SPECIFIC_TRUE@am__objects_6 = ipc_win32.$(OBJEXT) +@MAKE_LEAKFINDER_TRUE@am__objects_7 = leakfinder.$(OBJEXT) +@USE_SNMP_TRUE@am__objects_8 = snmp_core.$(OBJEXT) \ @USE_SNMP_TRUE@ snmp_agent.$(OBJEXT) -@ENABLE_SSL_TRUE@am__objects_8 = ssl_support.$(OBJEXT) -@ENABLE_UNLINKD_TRUE@am__objects_9 = unlinkd.$(OBJEXT) -@ENABLE_WIN32SPECIFIC_TRUE@am__objects_10 = win32.$(OBJEXT) +@ENABLE_SSL_TRUE@am__objects_9 = ssl_support.$(OBJEXT) +@ENABLE_UNLINKD_TRUE@am__objects_10 = unlinkd.$(OBJEXT) +@ENABLE_WIN32SPECIFIC_TRUE@am__objects_11 = win32.$(OBJEXT) am_squid_OBJECTS = access_log.$(OBJEXT) acl.$(OBJEXT) asn.$(OBJEXT) \ authenticate.$(OBJEXT) cache_cf.$(OBJEXT) \ CacheDigest.$(OBJEXT) cache_manager.$(OBJEXT) carp.$(OBJEXT) \ -@@ -136,27 +140,27 @@ +@@ -137,27 +141,27 @@ 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) \ - $(am__objects_5) ipcache.$(OBJEXT) $(am__objects_6) \ - locrewrite.$(OBJEXT) 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_monitor.$(OBJEXT) \ + HttpRequest.$(OBJEXT) $(am__objects_5) icmp.$(OBJEXT) \ + icp_v2.$(OBJEXT) icp_v3.$(OBJEXT) ident.$(OBJEXT) \ + internal.$(OBJEXT) $(am__objects_6) ipcache.$(OBJEXT) \ + $(am__objects_7) locrewrite.$(OBJEXT) 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_monitor.$(OBJEXT) \ peer_select.$(OBJEXT) peer_sourcehash.$(OBJEXT) \ peer_userhash.$(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_8) \ + ssl.$(OBJEXT) $(am__objects_9) 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_10) url.$(OBJEXT) urn.$(OBJEXT) \ useragent.$(OBJEXT) wais.$(OBJEXT) wccp.$(OBJEXT) \ - wccp2.$(OBJEXT) whois.$(OBJEXT) $(am__objects_10) + wccp2.$(OBJEXT) whois.$(OBJEXT) $(am__objects_11) nodist_squid_OBJECTS = repl_modules.$(OBJEXT) auth_modules.$(OBJEXT) \ store_modules.$(OBJEXT) globals.$(OBJEXT) \ string_arrays.$(OBJEXT) @@ -282,6 +286,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_STRCASESTR_FALSE = @NEED_OWN_STRCASESTR_FALSE@ +NEED_OWN_STRCASESTR_TRUE = @NEED_OWN_STRCASESTR_TRUE@ +NEED_OWN_STRNSTR_FALSE = @NEED_OWN_STRNSTR_FALSE@ +NEED_OWN_STRNSTR_TRUE = @NEED_OWN_STRNSTR_TRUE@ NEED_OWN_STRSEP_FALSE = @NEED_OWN_STRSEP_FALSE@ NEED_OWN_STRSEP_TRUE = @NEED_OWN_STRSEP_TRUE@ NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@ -@@ -321,6 +329,8 @@ +@@ -323,6 +331,8 @@ USE_DNSSERVER_TRUE = @USE_DNSSERVER_TRUE@ USE_EPOLL_FALSE = @USE_EPOLL_FALSE@ USE_EPOLL_TRUE = @USE_EPOLL_TRUE@ +USE_ICAP_FALSE = @USE_ICAP_FALSE@ +USE_ICAP_TRUE = @USE_ICAP_TRUE@ USE_KQUEUE_FALSE = @USE_KQUEUE_FALSE@ USE_KQUEUE_TRUE = @USE_KQUEUE_TRUE@ USE_POLL_FALSE = @USE_POLL_FALSE@ -@@ -376,6 +386,8 @@ +@@ -378,6 +388,8 @@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +@USE_ICAP_FALSE@ICAPSOURCE = +@USE_ICAP_TRUE@ICAPSOURCE = icap_common.c icap_reqmod.c icap_respmod.c icap_opt.c @USE_DNSSERVER_FALSE@DNSSOURCE = dns_internal.c @USE_DNSSERVER_TRUE@DNSSOURCE = dns.c @USE_DNSSERVER_FALSE@DNSSERVER = -@@ -479,6 +491,7 @@ +@@ -483,6 +495,7 @@ HttpMsg.c \ HttpReply.c \ HttpRequest.c \ + $(ICAPSOURCE) \ icmp.c \ icp_v2.c \ icp_v3.c \ -@@ -791,6 +804,10 @@ +@@ -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@ +@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@ Property changes on: head/www/squid/files/icap-2.6-bootstrap.patch ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.2 \ No newline at end of property +1.3 \ No newline at end of property Index: head/www/squid/files/patch-helpers-negotiate_auth-squid_kerb_auth-Makefile.in =================================================================== --- head/www/squid/files/patch-helpers-negotiate_auth-squid_kerb_auth-Makefile.in (nonexistent) +++ head/www/squid/files/patch-helpers-negotiate_auth-squid_kerb_auth-Makefile.in (revision 197625) @@ -0,0 +1,19 @@ +--- 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: Property changes on: head/www/squid/files/patch-helpers-negotiate_auth-squid_kerb_auth-Makefile.in ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/www/squid/files/patch-helpers-negotiate_auth-squid_kerb_auth-squid_kerb_auth.c =================================================================== --- head/www/squid/files/patch-helpers-negotiate_auth-squid_kerb_auth-squid_kerb_auth.c (nonexistent) +++ head/www/squid/files/patch-helpers-negotiate_auth-squid_kerb_auth-squid_kerb_auth.c (revision 197625) @@ -0,0 +1,10 @@ +--- helpers/negotiate_auth/squid_kerb_auth/squid_kerb_auth.c.orig Mon Jul 16 21:10:10 2007 ++++ helpers/negotiate_auth/squid_kerb_auth/squid_kerb_auth.c Mon Jul 16 21:10:35 2007 +@@ -31,6 +31,7 @@ + #include + #include + #include ++#include + + #include "base64.h" + #ifndef HAVE_SPNEGO Property changes on: head/www/squid/files/patch-helpers-negotiate_auth-squid_kerb_auth-squid_kerb_auth.c ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/www/squid/files/patch-src-cf.data.pre =================================================================== --- head/www/squid/files/patch-src-cf.data.pre (revision 197624) +++ head/www/squid/files/patch-src-cf.data.pre (revision 197625) @@ -1,39 +1,50 @@ ---- src/cf.data.pre.orig Thu Oct 12 22:48:48 2006 -+++ src/cf.data.pre Wed Nov 8 18:56:47 2006 -@@ -1183,6 +1183,21 @@ +--- src/cf.data.pre.orig Tue Jun 26 01:34:57 2007 ++++ src/cf.data.pre Mon Jul 16 20:02:21 2007 +@@ -1207,6 +1207,21 @@ Note that for coss, max-size must be less than COSS_MEMBUF_SZ (hard coded at 1 MB). + + Note for FreeBSD users: + COSS -- like aufs -- uses async IO so if you compiled Squid without + support for the aufs storage type, COSS will use POSIX AIO. + This means that you need to add the line + + options VFS_AIO + + to your kernel configuration in order to use COSS. + + On FreeBSD 5 and higher you can load the aio(4) module and do not + necessarily need to recompile your kernel. + + If you compiled Squid with both support for aufs and COSS, COSS + will use aufs' routines and does not need special kernel support. DOC_END NAME: logformat -@@ -3280,12 +3295,12 @@ +@@ -1439,6 +1454,10 @@ + LOC: Config.pidFilename + DOC_START + A filename to write the process-id to. To disable, enter "none". ++ ++ Note: If you change this setting, you need to set squid_pidfile ++ in /etc/rc.conf to reflect the new value. Please see ++ %%PREFIX%%/etc/rc.d/squid for details. + DOC_END + + NAME: debug_options +@@ -3275,12 +3294,12 @@ NAME: cache_effective_user TYPE: string -DEFAULT: nobody +DEFAULT: %%SQUID_UID%% 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 %%SQUID_UID%%. 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 Property changes on: head/www/squid/files/patch-src-cf.data.pre ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.3 \ No newline at end of property +1.4 \ No newline at end of property Index: head/www/squid/files/squid.in =================================================================== --- head/www/squid/files/squid.in (revision 197624) +++ head/www/squid/files/squid.in (revision 197625) @@ -1,58 +1,60 @@ #!/bin/sh # # $FreeBSD$ # # PROVIDE: squid # REQUIRE: LOGIN # KEYWORD: shutdown # # 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_user, and squid_flags. +# 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. # squid_checkrunning() { ${command} ${squid_flags} -k check 2>/dev/null } squid_stop() { echo "Stopping ${name}." ${command} ${squid_flags} -k shutdown run_rc_command poll } . %%RC_SUBR%% name=squid rcvar=${name}_enable command=%%PREFIX%%/sbin/squid extra_commands=reload reload_cmd="${command} ${squid_flags} -k reconfigure" stop_precmd="squid_checkrunning" stop_cmd="squid_stop" load_rc_config ${name} -squid_chdir=${squid_chdir:-%%PREFIX%%/squid/logs} +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 # to catch that beforehand via ${required_files} rather than make # squid(8) crash. # If you remove the default configuration file make sure to add # '-f /path/to/your/squid.conf' to squid_flags if [ -z "${squid_flags}" ]; then required_files=${default_config} fi run_rc_command "$1" Property changes on: head/www/squid/files/squid.in ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.2 \ No newline at end of property +1.3 \ No newline at end of property