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

(-)Makefile (-7 / +9 lines)
Lines 75-81 Link Here
75
#     Enable experimental multicast notification of cachemisses.
75
#     Enable experimental multicast notification of cachemisses.
76
76
77
PORTNAME=	squid
77
PORTNAME=	squid
78
PORTVERSION=	2.6.14
78
PORTVERSION=	2.6.15
79
CATEGORIES=	www
79
CATEGORIES=	www
80
MASTER_SITES=	ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
80
MASTER_SITES=	ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
81
		ftp://mirrors.24-7-solutions.net/pub/squid/%SUBDIR%/ \
81
		ftp://mirrors.24-7-solutions.net/pub/squid/%SUBDIR%/ \
Lines 94-100 Link Here
94
		http://www1.jp.squid-cache.org/Versions/v2/2.6/ \
94
		http://www1.jp.squid-cache.org/Versions/v2/2.6/ \
95
		http://www2.tw.squid-cache.org/Versions/v2/2.6/
95
		http://www2.tw.squid-cache.org/Versions/v2/2.6/
96
MASTER_SITE_SUBDIR=	squid-2/STABLE
96
MASTER_SITE_SUBDIR=	squid-2/STABLE
97
DISTNAME=	squid-2.6.STABLE14
97
DISTNAME=	squid-2.6.STABLE15
98
DIST_SUBDIR=	squid2.6
98
DIST_SUBDIR=	squid2.6
99
99
100
PATCH_SITES=	http://www.squid-cache.org/%SUBDIR%/ \
100
PATCH_SITES=	http://www.squid-cache.org/%SUBDIR%/ \
Lines 106-112 Link Here
106
		http://www1.jp.squid-cache.org/%SUBDIR%/ \
106
		http://www1.jp.squid-cache.org/%SUBDIR%/ \
107
		http://www2.tw.squid-cache.org/%SUBDIR%/
107
		http://www2.tw.squid-cache.org/%SUBDIR%/
108
PATCH_SITE_SUBDIR=	Versions/v2/2.6/changesets
108
PATCH_SITE_SUBDIR=	Versions/v2/2.6/changesets
109
PATCHFILES=	11534.patch 11547.patch 11548.patch
109
PATCHFILES=	11624.patch 11629.patch 11631.patch 11635.patch
110
PATCH_DIST_STRIP=	-p1
110
PATCH_DIST_STRIP=	-p1
111
111
112
MAINTAINER=	tmseck@netcologne.de
112
MAINTAINER=	tmseck@netcologne.de
Lines 378-386 Link Here
378
# If you do not define SQUID_LANGUAGES yourself, all available language files
378
# If you do not define SQUID_LANGUAGES yourself, all available language files
379
# will be installed; the default language will be English.
379
# will be installed; the default language will be English.
380
380
381
SQUID_LANGUAGES?=	Azerbaijani Bulgarian Catalan Czech Danish Dutch \
381
SQUID_LANGUAGES?=	Armenian Azerbaijani Bulgarian Catalan Czech Danish \
382
			English Estonian Finnish French German Greek Hebrew \
382
			Dutch English Estonian Finnish French German Greek \
383
			Hungarian Italian Japanese Korean Lithuanian \
383
			Hebrew Hungarian Italian Japanese Korean Lithuanian \
384
			Polish Portuguese Romanian Russian-1251 Russian-koi8-r \
384
			Polish Portuguese Romanian Russian-1251 Russian-koi8-r \
385
			Serbian Simplify_Chinese Slovak Spanish Swedish \
385
			Serbian Simplify_Chinese Slovak Spanish Swedish \
386
			Traditional_Chinese Turkish
386
			Traditional_Chinese Turkish
Lines 406-412 Link Here
406
PLIST_DIRS+=	etc/squid/errors etc/squid squid/logs squid/cache squid
406
PLIST_DIRS+=	etc/squid/errors etc/squid squid/logs squid/cache squid
407
407
408
post-patch:
408
post-patch:
409
	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure
409
	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' \
410
	    -e 's|VERSION=.*2\.6\.STABLE15|&+PatchSets-20070903|' \
411
	    ${WRKSRC}/configure
410
	@${REINPLACE_CMD} -e 's|%%SQUID_UID%%|${SQUID_UID}|g' \
412
	@${REINPLACE_CMD} -e 's|%%SQUID_UID%%|${SQUID_UID}|g' \
411
	    -e 's|%%SQUID_GID%%|${SQUID_GID}|g' \
413
	    -e 's|%%SQUID_GID%%|${SQUID_GID}|g' \
412
	    -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/src/cf.data.pre
414
	    -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/src/cf.data.pre
(-)distinfo (-12 / +15 lines)
Lines 1-12 Link Here
1
MD5 (squid2.6/squid-2.6.STABLE14.tar.bz2) = eadb138d48320df8b99349121159c6bf
1
MD5 (squid2.6/squid-2.6.STABLE15.tar.bz2) = 2a21d5c64af8bc164b8d8be980aede6a
2
SHA256 (squid2.6/squid-2.6.STABLE14.tar.bz2) = dcb0c10965430862721b675e2f9f6a30819880e03124b5e9403bfce2c7f3b69a
2
SHA256 (squid2.6/squid-2.6.STABLE15.tar.bz2) = ccd306b5ef56afeefbaa96db006f051fd966f610524a530596668a95d1c0b0bc
3
SIZE (squid2.6/squid-2.6.STABLE14.tar.bz2) = 1291509
3
SIZE (squid2.6/squid-2.6.STABLE15.tar.bz2) = 1292222
4
MD5 (squid2.6/11534.patch) = bbdda88fd922c0b08fa054354bef4f83
4
MD5 (squid2.6/11624.patch) = af5e027668cf87a9e6528b7b879cf85f
5
SHA256 (squid2.6/11534.patch) = 9422fa99337e6b0dde8ce6930a663988640cf96a2e9457439d6156daf4f8748f
5
SHA256 (squid2.6/11624.patch) = 18e441a06d6face56d74321683bfa982c043ea1272cc1ce2fc8af74d714206bd
6
SIZE (squid2.6/11534.patch) = 1187
6
SIZE (squid2.6/11624.patch) = 1457
7
MD5 (squid2.6/11547.patch) = 91a09aa1afe524fec45938eba1b9ccaa
7
MD5 (squid2.6/11629.patch) = 2c24e03a5a66993cd3b26d8925baae84
8
SHA256 (squid2.6/11547.patch) = b9dc9ca5ed52287d1f7d96023b16ba3d2f761e95fdb86d45a953da7789d4635e
8
SHA256 (squid2.6/11629.patch) = c8357fac5c09221afbc12208eb194ca1abea86e566a54cec926a5cccd62305e6
9
SIZE (squid2.6/11547.patch) = 2504
9
SIZE (squid2.6/11629.patch) = 2459
10
MD5 (squid2.6/11548.patch) = e82b317555fe58a6c550363fa6f4b5a4
10
MD5 (squid2.6/11631.patch) = 4d4482db46b942cbf84c254f3dc43a53
11
SHA256 (squid2.6/11548.patch) = 8e8ef65102aa56603dae9d7362a552d4de29701f9569dafd6ea6afe9e93e2ec1
11
SHA256 (squid2.6/11631.patch) = 089ea0d4f04bfcceb79d9742f75dc2a728b2c7312732a4dc9a9363bfa5d5bedf
12
SIZE (squid2.6/11548.patch) = 1448
12
SIZE (squid2.6/11631.patch) = 1134
13
MD5 (squid2.6/11635.patch) = d6fc4153e67f6e5a4a16eaa41ca21292
14
SHA256 (squid2.6/11635.patch) = 26d5684182359ca7ef097a464947c019512ecbb15d90d00dbe8afc8302b4604d
15
SIZE (squid2.6/11635.patch) = 1918
(-)files/icap-2.6-bootstrap.patch (-71 / +93 lines)
Lines 7-26 Link Here
7
7
8
Please see icap-2.6-core.patch for further information.
8
Please see icap-2.6-core.patch for further information.
9
9
10
Patch last updated: 2007-07-16
10
Patch last updated: 2007-09-01
11
11
12
--- configure.orig	Sun Jul 15 16:21:59 2007
13
+++ configure	Mon Jul 16 22:37:43 2007
14
@@ -312,7 +312,7 @@
15
 # include <unistd.h>
16
 #endif"
17
 
18
-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
19
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
12
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
20
LL_FALSE USE_SELECT_TRUE USE_SELECT_FALSE USE_SELECT_SIMPLE_!
13
LL_FALSE USE_SELECT_TRUE USE_SELECT_FALSE USE_SELECT_SIMPLE_!
21
TRUE USE
14
TRUE USE
22
+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
23
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
15
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
24
_FALSE USE_EPOLL_TRUE USE_EPOLL_FALSE USE_SELECT_TRUE USE_SE!
16
_FALSE USE_EPOLL_TRUE USE_EPOLL_FALSE USE_SELECT_TRUE USE_SE!
25
LECT_FAL
17
LECT_FAL
26
 ac_subst_files=''
18
--- configure.orig	Fri Aug 31 16:55:13 2007
27
 
19
+++ configure	Sat Sep  1 16:56:36 2007
28
 # Initialize some variables set by options.
20
@@ -728,6 +728,8 @@
29
@@ -890,6 +890,7 @@
21
 ENABLE_PINGER_FALSE
22
 USE_DELAY_POOLS_TRUE
23
 USE_DELAY_POOLS_FALSE
24
+USE_ICAP_TRUE
25
+USE_ICAP_FALSE
26
 USE_SNMP_TRUE
27
 USE_SNMP_FALSE
28
 SNMPLIB
29
@@ -794,6 +796,10 @@
30
 USE_DEVPOLL_FALSE
31
 NEED_OWN_SNPRINTF_TRUE
32
 NEED_OWN_SNPRINTF_FALSE
33
+NEED_OWN_STRNSTR_TRUE
34
+NEED_OWN_STRNSTR_FALSE
35
+NEED_OWN_STRCASESTR_TRUE
36
+NEED_OWN_STRCASESTR_FALSE
37
 NEED_OWN_STRSEP_TRUE
38
 NEED_OWN_STRSEP_FALSE
39
 REGEXLIB
40
@@ -1427,6 +1433,7 @@
30
 			  to build your custom policy
41
 			  to build your custom policy
31
   --enable-icmp           Enable ICMP pinging
42
   --enable-icmp           Enable ICMP pinging
32
   --enable-delay-pools    Enable delay pools to limit bandwidth usage
43
   --enable-delay-pools    Enable delay pools to limit bandwidth usage
Lines 28-46 Link Here
28
   --enable-useragent-log  Enable logging of User-Agent header
39
   --enable-useragent-log  Enable logging of User-Agent header
29
   --enable-referer-log    Enable logging of Referer header
40
   --enable-referer-log    Enable logging of Referer header
30
   --disable-wccp          Disable Web Cache Coordination V1 Protocol
41
   --disable-wccp          Disable Web Cache Coordination V1 Protocol
31
@@ -1819,7 +1820,7 @@
42
@@ -2349,7 +2356,7 @@
32
 
43
 
33
 # Define the identity of the package.
44
 # Define the identity of the package.
34
  PACKAGE='squid'
45
  PACKAGE='squid'
35
- VERSION='2.6.STABLE14'
46
- VERSION='2.6.STABLE15'
36
+ VERSION='2.6.STABLE14+ICAP'
47
+ VERSION='2.6.STABLE15+ICAP'
37
 
48
 
38
 
49
 
39
 cat >>confdefs.h <<_ACEOF
50
 cat >>confdefs.h <<_ACEOF
40
@@ -3955,6 +3956,40 @@
51
@@ -4543,6 +4550,40 @@
41
 fi;
42
 
52
 
43
 
53
 
54
 
44
+
55
+
45
+if false; then
56
+if false; then
46
+  USE_ICAP_TRUE=
57
+  USE_ICAP_TRUE=
Lines 50-59 Link Here
50
+  USE_ICAP_FALSE=
61
+  USE_ICAP_FALSE=
51
+fi
62
+fi
52
+
63
+
53
+# Check whether --enable-icap-support or --disable-icap-support was given.
64
+# Check whether --enable-icap-support was given.
54
+if test "${enable_icap_support+set}" = set; then
65
+if test "${enable_icap_support+set}" = set; then
55
+  enableval="$enable_icap_support"
66
+  enableval=$enable_icap_support;  if test "$enableval" = "yes" ; then
56
+   if test "$enableval" = "yes" ; then
57
+    echo "ICAP support enabled"
67
+    echo "ICAP support enabled"
58
+
68
+
59
+cat >>confdefs.h <<\_ACEOF
69
+cat >>confdefs.h <<\_ACEOF
Lines 72-93 Link Here
72
+
82
+
73
+  fi
83
+  fi
74
+
84
+
75
+fi;
85
+fi
76
+
86
+
77
+
87
+
78
 # Check whether --enable-useragent-log or --disable-useragent-log was given.
88
+
89
 # Check whether --enable-useragent-log was given.
79
 if test "${enable_useragent_log+set}" = set; then
90
 if test "${enable_useragent_log+set}" = set; then
80
   enableval="$enable_useragent_log"
91
   enableval=$enable_useragent_log;  if test "$enableval" = "yes" ; then
81
@@ -24144,6 +24179,8 @@
92
@@ -24504,6 +24545,8 @@
82
 
83
 
84
 
85
+
86
+
87
 for ac_func in \
88
 	bcopy \
89
 	backtrace_symbols_fd \
90
@@ -24192,6 +24229,8 @@
91
 	srand48 \
93
 	srand48 \
92
 	srandom \
94
 	srandom \
93
 	statfs \
95
 	statfs \
Lines 96-102 Link Here
96
 	strsep \
98
 	strsep \
97
 	strtoll \
99
 	strtoll \
98
 	sysconf \
100
 	sysconf \
99
@@ -24888,6 +24927,52 @@
101
@@ -25209,6 +25252,52 @@
100
 
102
 
101
 
103
 
102
 if false; then
104
 if false; then
Lines 149-155 Link Here
149
   NEED_OWN_STRSEP_TRUE=
151
   NEED_OWN_STRSEP_TRUE=
150
   NEED_OWN_STRSEP_FALSE='#'
152
   NEED_OWN_STRSEP_FALSE='#'
151
 else
153
 else
152
@@ -26405,6 +26490,20 @@
154
@@ -26799,6 +26888,20 @@
153
 Usually this means the macro was only invoked conditionally." >&2;}
155
 Usually this means the macro was only invoked conditionally." >&2;}
154
    { (exit 1); exit 1; }; }
156
    { (exit 1); exit 1; }; }
155
 fi
157
 fi
Lines 170-219 Link Here
170
 if test -z "${USE_SNMP_TRUE}" && test -z "${USE_SNMP_FALSE}"; then
172
 if test -z "${USE_SNMP_TRUE}" && test -z "${USE_SNMP_FALSE}"; then
171
   { { echo "$as_me:$LINENO: error: conditional \"USE_SNMP\" was never defined.
173
   { { echo "$as_me:$LINENO: error: conditional \"USE_SNMP\" was never defined.
172
 Usually this means the macro was only invoked conditionally." >&5
174
 Usually this means the macro was only invoked conditionally." >&5
173
@@ -26559,17 +26658,17 @@
175
@@ -26960,6 +27063,34 @@
174
 Usually this means the macro was only invoked conditionally." >&2;}
176
 Usually this means the macro was only invoked conditionally." >&2;}
175
    { (exit 1); exit 1; }; }
177
    { (exit 1); exit 1; }; }
176
 fi
178
 fi
177
-if test -z "${NEED_OWN_SNPRINTF_TRUE}" && test -z "${NEED_OWN_SNPRINTF_FALSE}"; then
178
-  { { echo "$as_me:$LINENO: error: conditional \"NEED_OWN_SNPRINTF\" was never defined.
179
+if test -z "${NEED_OWN_STRNSTR_TRUE}" && test -z "${NEED_OWN_STRNSTR_FALSE}"; then
179
+if test -z "${NEED_OWN_STRNSTR_TRUE}" && test -z "${NEED_OWN_STRNSTR_FALSE}"; then
180
+  { { echo "$as_me:$LINENO: error: conditional \"NEED_OWN_STRNSTR\" was never defined.
180
+  { { echo "$as_me:$LINENO: error: conditional \"NEED_OWN_STRNSTR\" was never defined.
181
 Usually this means the macro was only invoked conditionally." >&5
181
+Usually this means the macro was only invoked conditionally." >&5
182
-echo "$as_me: error: conditional \"NEED_OWN_SNPRINTF\" was never defined.
183
+echo "$as_me: error: conditional \"NEED_OWN_STRNSTR\" was never defined.
182
+echo "$as_me: error: conditional \"NEED_OWN_STRNSTR\" was never defined.
184
 Usually this means the macro was only invoked conditionally." >&2;}
183
+Usually this means the macro was only invoked conditionally." >&2;}
185
    { (exit 1); exit 1; }; }
184
+   { (exit 1); exit 1; }; }
186
 fi
185
+fi
187
-if test -z "${NEED_OWN_STRSEP_TRUE}" && test -z "${NEED_OWN_STRSEP_FALSE}"; then
186
+if test -z "${NEED_OWN_STRNSTR_TRUE}" && test -z "${NEED_OWN_STRNSTR_FALSE}"; then
188
-  { { echo "$as_me:$LINENO: error: conditional \"NEED_OWN_STRSEP\" was never defined.
187
+  { { echo "$as_me:$LINENO: error: conditional \"NEED_OWN_STRNSTR\" was never defined.
188
+Usually this means the macro was only invoked conditionally." >&5
189
+echo "$as_me: error: conditional \"NEED_OWN_STRNSTR\" was never defined.
190
+Usually this means the macro was only invoked conditionally." >&2;}
191
+   { (exit 1); exit 1; }; }
192
+fi
189
+if test -z "${NEED_OWN_STRCASESTR_TRUE}" && test -z "${NEED_OWN_STRCASESTR_FALSE}"; then
193
+if test -z "${NEED_OWN_STRCASESTR_TRUE}" && test -z "${NEED_OWN_STRCASESTR_FALSE}"; then
190
+  { { echo "$as_me:$LINENO: error: conditional \"NEED_OWN_STRCASESTR\" was never defined.
194
+  { { echo "$as_me:$LINENO: error: conditional \"NEED_OWN_STRCASESTR\" was never defined.
195
+Usually this means the macro was only invoked conditionally." >&5
196
+echo "$as_me: error: conditional \"NEED_OWN_STRCASESTR\" was never defined.
197
+Usually this means the macro was only invoked conditionally." >&2;}
198
+   { (exit 1); exit 1; }; }
199
+fi
200
+if test -z "${NEED_OWN_STRCASESTR_TRUE}" && test -z "${NEED_OWN_STRCASESTR_FALSE}"; then
201
+  { { echo "$as_me:$LINENO: error: conditional \"NEED_OWN_STRCASESTR\" was never defined.
202
+Usually this means the macro was only invoked conditionally." >&5
203
+echo "$as_me: error: conditional \"NEED_OWN_STRCASESTR\" was never defined.
204
+Usually this means the macro was only invoked conditionally." >&2;}
205
+   { (exit 1); exit 1; }; }
206
+fi
207
 if test -z "${NEED_OWN_STRSEP_TRUE}" && test -z "${NEED_OWN_STRSEP_FALSE}"; then
208
   { { echo "$as_me:$LINENO: error: conditional \"NEED_OWN_STRSEP\" was never defined.
191
 Usually this means the macro was only invoked conditionally." >&5
209
 Usually this means the macro was only invoked conditionally." >&5
192
-echo "$as_me: error: conditional \"NEED_OWN_STRSEP\" was never defined.
210
@@ -27705,6 +27836,8 @@
193
+echo "$as_me: error: conditional \"NEED_OWN_STRCASESTR\" was never defined.
211
 ENABLE_PINGER_FALSE!$ENABLE_PINGER_FALSE$ac_delim
194
 Usually this means the macro was only invoked conditionally." >&2;}
212
 USE_DELAY_POOLS_TRUE!$USE_DELAY_POOLS_TRUE$ac_delim
195
    { (exit 1); exit 1; }; }
213
 USE_DELAY_POOLS_FALSE!$USE_DELAY_POOLS_FALSE$ac_delim
196
 fi
214
+USE_ICAP_TRUE!$USE_ICAP_TRUE$ac_delim
197
@@ -27235,6 +27334,8 @@
215
+USE_ICAP_FALSE!$USE_ICAP_FALSE$ac_delim
198
 s,@ENABLE_PINGER_FALSE@,$ENABLE_PINGER_FALSE,;t t
216
 USE_SNMP_TRUE!$USE_SNMP_TRUE$ac_delim
199
 s,@USE_DELAY_POOLS_TRUE@,$USE_DELAY_POOLS_TRUE,;t t
217
 USE_SNMP_FALSE!$USE_SNMP_FALSE$ac_delim
200
 s,@USE_DELAY_POOLS_FALSE@,$USE_DELAY_POOLS_FALSE,;t t
218
 SNMPLIB!$SNMPLIB$ac_delim
201
+s,@USE_ICAP_TRUE@,$USE_ICAP_TRUE,;t t
219
@@ -27771,6 +27904,10 @@
202
+s,@USE_ICAP_FALSE@,$USE_ICAP_FALSE,;t t
220
 USE_DEVPOLL_FALSE!$USE_DEVPOLL_FALSE$ac_delim
203
 s,@USE_SNMP_TRUE@,$USE_SNMP_TRUE,;t t
221
 NEED_OWN_SNPRINTF_TRUE!$NEED_OWN_SNPRINTF_TRUE$ac_delim
204
 s,@USE_SNMP_FALSE@,$USE_SNMP_FALSE,;t t
222
 NEED_OWN_SNPRINTF_FALSE!$NEED_OWN_SNPRINTF_FALSE$ac_delim
205
 s,@SNMPLIB@,$SNMPLIB,;t t
223
+NEED_OWN_STRNSTR_TRUE!$NEED_OWN_STRNSTR_TRUE$ac_delim
206
@@ -27301,6 +27402,10 @@
224
+NEED_OWN_STRNSTR_FALSE!$NEED_OWN_STRNSTR_FALSE$ac_delim
207
 s,@USE_DEVPOLL_FALSE@,$USE_DEVPOLL_FALSE,;t t
225
+NEED_OWN_STRCASESTR_TRUE!$NEED_OWN_STRCASESTR_TRUE$ac_delim
208
 s,@NEED_OWN_SNPRINTF_TRUE@,$NEED_OWN_SNPRINTF_TRUE,;t t
226
+NEED_OWN_STRCASESTR_FALSE!$NEED_OWN_STRCASESTR_FALSE$ac_delim
209
 s,@NEED_OWN_SNPRINTF_FALSE@,$NEED_OWN_SNPRINTF_FALSE,;t t
227
 NEED_OWN_STRSEP_TRUE!$NEED_OWN_STRSEP_TRUE$ac_delim
210
+s,@NEED_OWN_STRNSTR_TRUE@,$NEED_OWN_STRNSTR_TRUE,;t t
228
 NEED_OWN_STRSEP_FALSE!$NEED_OWN_STRSEP_FALSE$ac_delim
211
+s,@NEED_OWN_STRNSTR_FALSE@,$NEED_OWN_STRNSTR_FALSE,;t t
229
 REGEXLIB!$REGEXLIB$ac_delim
212
+s,@NEED_OWN_STRCASESTR_TRUE@,$NEED_OWN_STRCASESTR_TRUE,;t t
230
@@ -27781,7 +27918,7 @@
213
+s,@NEED_OWN_STRCASESTR_FALSE@,$NEED_OWN_STRCASESTR_FALSE,;t t
231
 LTLIBOBJS!$LTLIBOBJS$ac_delim
214
 s,@NEED_OWN_STRSEP_TRUE@,$NEED_OWN_STRSEP_TRUE,;t t
232
 _ACEOF
215
 s,@NEED_OWN_STRSEP_FALSE@,$NEED_OWN_STRSEP_FALSE,;t t
233
 
216
 s,@REGEXLIB@,$REGEXLIB,;t t
234
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 89; then
235
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 95; then
236
     break
237
   elif $ac_last_try; then
238
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
217
--- include/autoconf.h.in.orig	Sat Jun 23 23:51:56 2007
239
--- include/autoconf.h.in.orig	Sat Jun 23 23:51:56 2007
218
+++ include/autoconf.h.in	Mon Jul 16 22:21:25 2007
240
+++ include/autoconf.h.in	Mon Jul 16 22:21:25 2007
219
@@ -457,6 +457,9 @@
241
@@ -457,6 +457,9 @@

Return to bug 116093