Date: Tue, 4 Sep 2007 20:57:46 +0200 (CEST) From: Thomas-Martin Seck <tmseck@netcologne.de> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/116093: [Maintainer] www/squid: update to 2.6.STABLE15 plus patches Message-ID: <200709041857.l84Ivksn034323@hardy.tmseck.homedns.org> Resent-Message-ID: <200709041900.l84J06Dw002722@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 116093 >Category: ports >Synopsis: [Maintainer] www/squid: update to 2.6.STABLE15 plus patches >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Tue Sep 04 19:00:05 GMT 2007 >Closed-Date: >Last-Modified: >Originator: Thomas-Martin Seck >Release: FreeBSD 6.2-STABLE i386 >Organization: a private site in Germany >Environment: FreeBSD ports collection as of September 4, 2007. >Description: - update to 2.6.STABLE15 and add all applicable vendor patches that were available up to 2007-09-03 (see http://www.squid-cache.org/Versions/v2/2.6/changesets/) - add a substitution rule to the post-patch target that hints that this version of squid was built from patched sources - update the ICAP bootstrap patch to adapt to the changes that arose from the fact that the configure script was generated with autoconf 2.61 instead of 2.59 >How-To-Repeat: >Fix: Apply this patch: Index: Makefile =================================================================== --- Makefile (.../www/squid) (revision 1237) +++ Makefile (.../local/squid) (revision 1237) @@ -75,7 +75,7 @@ # Enable experimental multicast notification of cachemisses. PORTNAME= squid -PORTVERSION= 2.6.14 +PORTVERSION= 2.6.15 CATEGORIES= www MASTER_SITES= ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \ ftp://mirrors.24-7-solutions.net/pub/squid/%SUBDIR%/ \ @@ -94,7 +94,7 @@ 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 +DISTNAME= squid-2.6.STABLE15 DIST_SUBDIR= squid2.6 PATCH_SITES= http://www.squid-cache.org/%SUBDIR%/ \ @@ -106,7 +106,7 @@ 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 +PATCHFILES= 11624.patch 11629.patch 11631.patch 11635.patch PATCH_DIST_STRIP= -p1 MAINTAINER= tmseck@netcologne.de @@ -378,9 +378,9 @@ # 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 \ +SQUID_LANGUAGES?= Armenian 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 @@ -406,7 +406,9 @@ 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|-lpthread|${PTHREAD_LIBS}|g' \ + -e 's|VERSION=.*2\.6\.STABLE15|&+PatchSets-20070903|' \ + ${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 Index: distinfo =================================================================== --- distinfo (.../www/squid) (revision 1237) +++ distinfo (.../local/squid) (revision 1237) @@ -1,12 +1,15 @@ -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 +MD5 (squid2.6/squid-2.6.STABLE15.tar.bz2) = 2a21d5c64af8bc164b8d8be980aede6a +SHA256 (squid2.6/squid-2.6.STABLE15.tar.bz2) = ccd306b5ef56afeefbaa96db006f051fd966f610524a530596668a95d1c0b0bc +SIZE (squid2.6/squid-2.6.STABLE15.tar.bz2) = 1292222 +MD5 (squid2.6/11624.patch) = af5e027668cf87a9e6528b7b879cf85f +SHA256 (squid2.6/11624.patch) = 18e441a06d6face56d74321683bfa982c043ea1272cc1ce2fc8af74d714206bd +SIZE (squid2.6/11624.patch) = 1457 +MD5 (squid2.6/11629.patch) = 2c24e03a5a66993cd3b26d8925baae84 +SHA256 (squid2.6/11629.patch) = c8357fac5c09221afbc12208eb194ca1abea86e566a54cec926a5cccd62305e6 +SIZE (squid2.6/11629.patch) = 2459 +MD5 (squid2.6/11631.patch) = 4d4482db46b942cbf84c254f3dc43a53 +SHA256 (squid2.6/11631.patch) = 089ea0d4f04bfcceb79d9742f75dc2a728b2c7312732a4dc9a9363bfa5d5bedf +SIZE (squid2.6/11631.patch) = 1134 +MD5 (squid2.6/11635.patch) = d6fc4153e67f6e5a4a16eaa41ca21292 +SHA256 (squid2.6/11635.patch) = 26d5684182359ca7ef097a464947c019512ecbb15d90d00dbe8afc8302b4604d +SIZE (squid2.6/11635.patch) = 1918 Index: files/icap-2.6-bootstrap.patch =================================================================== --- files/icap-2.6-bootstrap.patch (.../www/squid) (revision 1237) +++ files/icap-2.6-bootstrap.patch (.../local/squid) (revision 1237) @@ -7,20 +7,31 @@ Please see icap-2.6-core.patch for further information. -Patch last updated: 2007-07-16 +Patch last updated: 2007-09-01 ---- 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 WI N32_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_EPO LL_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 WI N32_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_SE! LECT_FAL SE 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 @@ +--- configure.orig Fri Aug 31 16:55:13 2007 ++++ configure Sat Sep 1 16:56:36 2007 +@@ -728,6 +728,8 @@ + ENABLE_PINGER_FALSE + USE_DELAY_POOLS_TRUE + USE_DELAY_POOLS_FALSE ++USE_ICAP_TRUE ++USE_ICAP_FALSE + USE_SNMP_TRUE + USE_SNMP_FALSE + SNMPLIB +@@ -794,6 +796,10 @@ + 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 +@@ -1427,6 +1433,7 @@ to build your custom policy --enable-icmp Enable ICMP pinging --enable-delay-pools Enable delay pools to limit bandwidth usage @@ -28,19 +39,19 @@ --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 @@ +@@ -2349,7 +2356,7 @@ # Define the identity of the package. PACKAGE='squid' -- VERSION='2.6.STABLE14' -+ VERSION='2.6.STABLE14+ICAP' +- VERSION='2.6.STABLE15' ++ VERSION='2.6.STABLE15+ICAP' cat >>confdefs.h <<_ACEOF -@@ -3955,6 +3956,40 @@ - fi; +@@ -4543,6 +4550,40 @@ + + +if false; then + USE_ICAP_TRUE= @@ -50,10 +61,9 @@ + USE_ICAP_FALSE= +fi + -+# Check whether --enable-icap-support or --disable-icap-support was given. ++# Check whether --enable-icap-support was given. +if test "${enable_icap_support+set}" = set; then -+ enableval="$enable_icap_support" -+ if test "$enableval" = "yes" ; then ++ enableval=$enable_icap_support; if test "$enableval" = "yes" ; then + echo "ICAP support enabled" + +cat >>confdefs.h <<\_ACEOF @@ -72,22 +82,14 @@ + + fi + -+fi; ++fi + + - # Check whether --enable-useragent-log or --disable-useragent-log was given. ++ + # Check whether --enable-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 @@ + enableval=$enable_useragent_log; if test "$enableval" = "yes" ; then +@@ -24504,6 +24545,8 @@ srand48 \ srandom \ statfs \ @@ -96,7 +98,7 @@ strsep \ strtoll \ sysconf \ -@@ -24888,6 +24927,52 @@ +@@ -25209,6 +25252,52 @@ if false; then @@ -149,7 +151,7 @@ NEED_OWN_STRSEP_TRUE= NEED_OWN_STRSEP_FALSE='#' else -@@ -26405,6 +26490,20 @@ +@@ -26799,6 +26888,20 @@ Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi @@ -170,50 +172,70 @@ 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 @@ +@@ -26960,6 +27063,34 @@ 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. ++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_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." >&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 +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_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 -@@ -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 +@@ -27705,6 +27836,8 @@ + ENABLE_PINGER_FALSE!$ENABLE_PINGER_FALSE$ac_delim + USE_DELAY_POOLS_TRUE!$USE_DELAY_POOLS_TRUE$ac_delim + USE_DELAY_POOLS_FALSE!$USE_DELAY_POOLS_FALSE$ac_delim ++USE_ICAP_TRUE!$USE_ICAP_TRUE$ac_delim ++USE_ICAP_FALSE!$USE_ICAP_FALSE$ac_delim + USE_SNMP_TRUE!$USE_SNMP_TRUE$ac_delim + USE_SNMP_FALSE!$USE_SNMP_FALSE$ac_delim + SNMPLIB!$SNMPLIB$ac_delim +@@ -27771,6 +27904,10 @@ + USE_DEVPOLL_FALSE!$USE_DEVPOLL_FALSE$ac_delim + NEED_OWN_SNPRINTF_TRUE!$NEED_OWN_SNPRINTF_TRUE$ac_delim + NEED_OWN_SNPRINTF_FALSE!$NEED_OWN_SNPRINTF_FALSE$ac_delim ++NEED_OWN_STRNSTR_TRUE!$NEED_OWN_STRNSTR_TRUE$ac_delim ++NEED_OWN_STRNSTR_FALSE!$NEED_OWN_STRNSTR_FALSE$ac_delim ++NEED_OWN_STRCASESTR_TRUE!$NEED_OWN_STRCASESTR_TRUE$ac_delim ++NEED_OWN_STRCASESTR_FALSE!$NEED_OWN_STRCASESTR_FALSE$ac_delim + NEED_OWN_STRSEP_TRUE!$NEED_OWN_STRSEP_TRUE$ac_delim + NEED_OWN_STRSEP_FALSE!$NEED_OWN_STRSEP_FALSE$ac_delim + REGEXLIB!$REGEXLIB$ac_delim +@@ -27781,7 +27918,7 @@ + LTLIBOBJS!$LTLIBOBJS$ac_delim + _ACEOF + +- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 89; then ++ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 95; then + break + elif $ac_last_try; then + { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 --- 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 @@ >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200709041857.l84Ivksn034323>