| blob | f65e4cd092bce080eb2da38ac56912c098db14e3 |
1 --- misc/curl-7.12.2/configure 2004-10-18 00:22:10.000000000 +0200
2 +++ misc/build/curl-7.12.2/configure 2008-07-08 16:11:12.796875000 +0200
3 @@ -1538,8 +1538,8 @@
5 ac_ext=c
6 ac_cpp='$CPP $CPPFLAGS'
7 -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
8 -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
9 +ac_compile='$CC -c $ADDCFLAGS $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
10 +ac_link='$CC -o conftest$ac_exeext $ADDCFLAGS $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
11 ac_compiler_gnu=$ac_cv_c_compiler_gnu
14 @@ -2314,8 +2314,8 @@
16 ac_ext=c
17 ac_cpp='$CPP $CPPFLAGS'
18 -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
19 -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
20 +ac_compile='$CC -c $ADDCFLAGS $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
21 +ac_link='$CC -o conftest$ac_exeext $ADDCFLAGS $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
22 ac_compiler_gnu=$ac_cv_c_compiler_gnu
23 if test -n "$ac_tool_prefix"; then
24 # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
25 @@ -2967,15 +2967,15 @@
26 CFLAGS=$ac_save_CFLAGS
27 elif test $ac_cv_prog_cc_g = yes; then
28 if test "$GCC" = yes; then
29 - CFLAGS="-g -O2"
30 + CFLAGS="$ADDCFLAGS -g -O2"
31 else
32 - CFLAGS="-g"
33 + CFLAGS="$ADDCFLAGS -g"
34 fi
35 else
36 if test "$GCC" = yes; then
37 - CFLAGS="-O2"
38 + CFLAGS="$ADDCFLAGS -O2"
39 else
40 - CFLAGS=
41 + CFLAGS="$ADDCFLAGS"
42 fi
43 fi
44 echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5
45 @@ -9456,7 +9456,7 @@
46 ;;
48 freebsd*)
49 - objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
50 + objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
51 version_type=freebsd-$objformat
52 case $version_type in
53 freebsd-elf*)
54 @@ -13154,7 +13154,7 @@
55 ;;
57 freebsd*)
58 - objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
59 + objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
60 version_type=freebsd-$objformat
61 case $version_type in
62 freebsd-elf*)
63 @@ -16303,7 +16303,7 @@
64 ;;
66 freebsd*)
67 - objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
68 + objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
69 version_type=freebsd-$objformat
70 case $version_type in
71 freebsd-elf*)
72 @@ -18650,7 +18650,7 @@
73 ;;
75 freebsd*)
76 - objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
77 + objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
78 version_type=freebsd-$objformat
79 case $version_type in
80 freebsd-elf*)
81 --- misc/curl-7.12.2/lib/Makefile.os2 2008-07-09 07:45:49.093750000 +0200
82 +++ misc/build/curl-7.12.2/lib/Makefile.os2 2008-07-08 16:11:13.109375000 +0200
83 @@ -1 +1,79 @@
84 -dummy
85 +#############################################################
86 +# $Id$
87 +#
88 +## Makefile for building libcurl.a with MingW32 (GCC-3.2) and
89 +## optionally OpenSSL (0.9.7)
90 +##
91 +## Use: make -f Makefile.m32
92 +##
93 +## Comments to: Troy Engel <tengel@sonic.net> or
94 +## Joern Hartroth <hartroth@acm.org>
95 +
96 +ifndef OPENSSL_PATH
97 +OPENSSL_PATH = ../../openssl-0.9.7d
98 +endif
99 +ifndef ZLIB_PATH
100 +ZLIB_PATH = ../../zlib-1.2.1
101 +endif
102 +
103 +CC = gcc
104 +AR = emxomfar
105 +RM = rm -f
106 +RANLIB = echo
107 +STRIP = echo
108 +
109 +########################################################
110 +## Nothing more to do below this line!
111 +
112 +INCLUDES = -I. -I.. -I../include -I../src
113 +CFLAGS = -s -Zomf -O2 -DOS2
114 +ifdef SSL
115 + INCLUDES += -I"$(OPENSSL_PATH)/outinc" -I"$(OPENSSL_PATH)/outinc/openssl"
116 + CFLAGS += -DUSE_SSLEAY -DHAVE_OPENSSL_ENGINE_H
117 + DLL_LIBS = -L$(OPENSSL_PATH)/out -leay32 -lssl32
118 +endif
119 +ifdef ZLIB
120 + INCLUDES += -I"$(ZLIB_PATH)"
121 + CFLAGS += -DHAVE_LIBZ -DHAVE_ZLIB_H
122 + DLL_LIBS += -L$(ZLIB_PATH) -lz
123 +endif
124 +COMPILE = $(CC) $(INCLUDES) $(CFLAGS)
125 +
126 +# Makefile.inc provides the CSOURCES and HHEADERS defines
127 +include Makefile.inc
128 +
129 +libcurl_a_OBJECTS := $(patsubst %.c,%.o,$(strip $(CSOURCES)))
130 +
131 +libcurl_a_LIBRARIES = libcurl.a
132 +libcurl_a_DEPENDENCIES = $(strip $(CSOURCES) $(HHEADERS))
133 +
134 +all: libcurl.a libcurl.dll
135 +
136 +libcurl.a: $(libcurl_a_OBJECTS) $(libcurl_a_DEPENDENCIES)
137 + $(RM) libcurl.a
138 + $(AR) cru libcurl.a $(libcurl_a_OBJECTS)
139 + $(STRIP) $@
140 +
141 +# remove the last line above to keep debug info
142 +
143 +libcurl.dll: libcurl.a
144 + $(RM) $@
145 + dllar -omf -libflags "INITINSTANCE TERMINSTANCE" -libdata "MULTIPLE" libcurl.a -lz -lgcc_eh -Zmap -Zno-fork -Zhigh-mem -Zbin-files
146 +
147 +# remove the last line above to keep debug info
148 +
149 +.c.o:
150 + $(COMPILE) -c $<
151 +
152 +.s.o:
153 + $(COMPILE) -c $<
154 +
155 +.S.o:
156 + $(COMPILE) -c $<
157 +
158 +clean:
159 + $(RM) $(libcurl_a_OBJECTS) $(RESOURCE)
160 +
161 +distrib: clean
162 + $(RM) $(libcurl_a_LIBRARIES)
163 +
164 --- misc/curl-7.12.2/lib/Makefile.vc6 2004-09-16 13:13:37.000000000 +0200
165 +++ misc/build/curl-7.12.2/lib/Makefile.vc6 2008-07-08 16:11:16.765625000 +0200
166 @@ -23,7 +23,7 @@
167 ##############################################################
169 LIB_NAME = libcurl
170 -LIB_NAME_DEBUG = libcurld
171 +LIB_NAME_DEBUG = libcurl
172 !IFNDEF OPENSSL_PATH
173 OPENSSL_PATH = ../../openssl-0.9.7d
174 !ENDIF
175 @@ -34,7 +34,7 @@
177 # Use the high resolution time by default. Comment this out to use low
178 # resolution time and not require winmm.lib
179 -USEMM_LIBS = YES
180 +#USEMM_LIBS = YES
182 #############################################################
183 ## Nothing more to do below this line!
184 @@ -43,7 +43,7 @@
185 CCDEBUG = cl.exe /MDd /Od /Gm /Zi /D "_DEBUG" /GZ
186 CFLAGSSSL = /D "USE_SSLEAY" /I "$(OPENSSL_PATH)/inc32" /I "$(OPENSSL_PATH)/inc32/openssl"
187 CFLAGSZLIB = /D "HAVE_ZLIB_H" /D "HAVE_ZLIB" /D "HAVE_LIBZ" /I "$(ZLIB_PATH)"
188 -CFLAGS = /I "." /I "../include" /nologo /W3 /GX /D "WIN32" /D "VC6" /D "_MBCS" /D "_LIB" /YX /FD /c /D "MSDOS"
189 +CFLAGS = /I "." /I "../include" /nologo /W3 $(EXCFLAGS) /D "WIN32" /D "VC6" /D "_MBCS" /D "_LIB" /FD /c /D "MSDOS"
190 LNKDLL = link.exe /DLL /def:libcurl.def
191 LNKLIB = link.exe /lib
192 LFLAGS = /nologo
193 @@ -51,7 +51,11 @@
194 !IFDEF USEMM_LIBS
195 WINLIBS = wsock32.lib winmm.lib
196 !ELSE
197 +!IFDEF WINDOWS_VISTA_PSDK
198 +WINLIBS = wsock32.lib ws2_32.lib
199 +!ELSE
200 WINLIBS = wsock32.lib
201 +!ENDIF
202 CFLAGS = $(CFLAGS) /D "WITHOUT_MM_LIB"
203 !ENDIF
204 # RSAglue.lib was formerly needed in the SSLLIBS
205 --- misc/curl-7.12.2/lib/config-os2.h 2008-07-09 07:45:48.484375000 +0200
206 +++ misc/build/curl-7.12.2/lib/config-os2.h 2008-07-08 16:11:12.859375000 +0200
207 @@ -1 +1,531 @@
208 -dummy
209 +/* lib/config.h. Generated by configure. */
210 +/* lib/config.h.in. Generated from configure.ac by autoheader. */
211 +
212 +/* to disable DICT */
213 +#define CURL_DISABLE_DICT 1
214 +
215 +/* to disable FILE */
216 +#define CURL_DISABLE_FILE 1
217 +
218 +/* to disable FTP */
219 +/* #undef CURL_DISABLE_FTP */
220 +
221 +/* to disable GOPHER */
222 +#define CURL_DISABLE_GOPHER 1
223 +
224 +/* to disable HTTP */
225 +#define CURL_DISABLE_HTTP 1
226 +
227 +/* to disable LDAP */
228 +#define CURL_DISABLE_LDAP 1
229 +
230 +/* to disable TELNET */
231 +#define CURL_DISABLE_TELNET 1
232 +
233 +/* Set to explicitly specify we don't want to use thread-safe functions */
234 +/* #undef DISABLED_THREADSAFE */
235 +
236 +/* your Entropy Gathering Daemon socket pathname */
237 +/* #undef EGD_SOCKET */
238 +
239 +/* Define if you want to enable IPv6 support */
240 +/* #undef ENABLE_IPV6 */
241 +
242 +/* Define to 1 if you have the <alloca.h> header file. */
243 +#define HAVE_ALLOCA_H 1
244 +
245 +/* Define to 1 if you have the <arpa/inet.h> header file. */
246 +#define HAVE_ARPA_INET_H 1
247 +
248 +/* Define to 1 if you have the <assert.h> header file. */
249 +#define HAVE_ASSERT_H 1
250 +
251 +/* Define to 1 if you have the `basename' function. */
252 +#define HAVE_BASENAME 1
253 +
254 +/* Define to 1 if you have the `closesocket' function. */
255 +/* #undef HAVE_CLOSESOCKET */
256 +
257 +/* Define to 1 if you have the `CRYPTO_cleanup_all_ex_data' function. */
258 +/* #undef HAVE_CRYPTO_CLEANUP_ALL_EX_DATA */
259 +
260 +/* Define to 1 if you have the <crypto.h> header file. */
261 +/* #undef HAVE_CRYPTO_H */
262 +
263 +/* Define to 1 if you have the <des.h> header file. */
264 +/* #undef HAVE_DES_H */
265 +
266 +/* disabled non-blocking sockets */
267 +/* #undef HAVE_DISABLED_NONBLOCKING */
268 +
269 +/* Define to 1 if you have the <dlfcn.h> header file. */
270 +#define HAVE_DLFCN_H 1
271 +
272 +/* Define to 1 if you have the `dlopen' function. */
273 +#define HAVE_DLOPEN 1
274 +
275 +/* Define to 1 if you have the <err.h> header file. */
276 +/* #undef HAVE_ERR_H */
277 +
278 +/* Define to 1 if you have the <fcntl.h> header file. */
279 +#define HAVE_FCNTL_H 1
280 +
281 +/* use FIONBIO for non-blocking sockets */
282 +/* #undef HAVE_FIONBIO */
283 +
284 +/* Define if getaddrinfo exists and works */
285 +/* #undef HAVE_GETADDRINFO */
286 +
287 +/* Define to 1 if you have the `geteuid' function. */
288 +#define HAVE_GETEUID 1
289 +
290 +/* Define to 1 if you have the `gethostbyaddr' function. */
291 +#define HAVE_GETHOSTBYADDR 1
292 +
293 +/* If you have gethostbyname */
294 +#define HAVE_GETHOSTBYNAME 1
295 +
296 +/* Define to 1 if you have the `gethostbyname_r' function. */
297 +/* #undef HAVE_GETHOSTBYNAME_R */
298 +
299 +/* gethostbyname_r() takes 3 args */
300 +/* #undef HAVE_GETHOSTBYNAME_R_3 */
301 +
302 +/* gethostbyname_r() takes 5 args */
303 +/* #undef HAVE_GETHOSTBYNAME_R_5 */
304 +
305 +/* gethostbyname_r() takes 6 args */
306 +/* #undef HAVE_GETHOSTBYNAME_R_6 */
307 +
308 +/* Define to 1 if you have the `getpass_r' function. */
309 +/* #undef HAVE_GETPASS_R */
310 +
311 +/* Define to 1 if you have the `getpwuid' function. */
312 +#define HAVE_GETPWUID 1
313 +
314 +/* Define to 1 if you have the `gettimeofday' function. */
315 +#define HAVE_GETTIMEOFDAY 1
316 +
317 +/* we have a glibc-style strerror_r() */
318 +/* #undef HAVE_GLIBC_STRERROR_R */
319 +
320 +/* Define to 1 if you have the `gmtime_r' function. */
321 +#define HAVE_GMTIME_R 1
322 +
323 +/* if you have the gssapi libraries */
324 +/* #undef HAVE_GSSAPI */
325 +
326 +/* if you have the Heimdal gssapi libraries */
327 +/* #undef HAVE_GSSHEIMDAL */
328 +
329 +/* if you have the MIT gssapi libraries */
330 +/* #undef HAVE_GSSMIT */
331 +
332 +/* Define to 1 if you have the `idna_strerror' function. */
333 +/* #undef HAVE_IDNA_STRERROR */
334 +
335 +/* Define to 1 if you have the `idn_free' function. */
336 +/* #undef HAVE_IDN_FREE */
337 +
338 +/* Define to 1 if you have the <idn-free.h> header file. */
339 +/* #undef HAVE_IDN_FREE_H */
340 +
341 +/* Define to 1 if you have the `inet_addr' function. */
342 +#define HAVE_INET_ADDR 1
343 +
344 +/* Define to 1 if you have the `inet_ntoa' function. */
345 +#define HAVE_INET_NTOA 1
346 +
347 +/* Define to 1 if you have the `inet_ntoa_r' function. */
348 +/* #undef HAVE_INET_NTOA_R */
349 +
350 +/* inet_ntoa_r() is declared */
351 +/* #undef HAVE_INET_NTOA_R_DECL */
352 +
353 +/* Define to 1 if you have the `inet_pton' function. */
354 +#define HAVE_INET_PTON 1
355 +
356 +/* Define to 1 if you have the <inttypes.h> header file. */
357 +#define HAVE_INTTYPES_H 1
358 +
359 +/* use ioctlsocket() for non-blocking sockets */
360 +/* #undef HAVE_IOCTLSOCKET */
361 +
362 +/* use Ioctlsocket() for non-blocking sockets */
363 +/* #undef HAVE_IOCTLSOCKET_CASE */
364 +
365 +/* Define to 1 if you have the <io.h> header file. */
366 +#define HAVE_IO_H 1
367 +
368 +/* if you have the Kerberos4 libraries (including -ldes) */
369 +/* #undef HAVE_KRB4 */
370 +
371 +/* Define to 1 if you have the `krb_get_our_ip_for_realm' function. */
372 +/* #undef HAVE_KRB_GET_OUR_IP_FOR_REALM */
373 +
374 +/* Define to 1 if you have the <krb.h> header file. */
375 +/* #undef HAVE_KRB_H */
376 +
377 +/* Define to 1 if you have the `crypto' library (-lcrypto). */
378 +/* #undef HAVE_LIBCRYPTO */
379 +
380 +/* Define to 1 if you have the `dl' library (-ldl). */
381 +/* #undef HAVE_LIBDL */
382 +
383 +/* Define to 1 if you have the <libgen.h> header file. */
384 +#define HAVE_LIBGEN_H 1
385 +
386 +/* Define to 1 if you have the `idn' library (-lidn). */
387 +/* #undef HAVE_LIBIDN */
388 +
389 +/* Define to 1 if you have the `resolv' library (-lresolv). */
390 +/* #undef HAVE_LIBRESOLV */
391 +
392 +/* Define to 1 if you have the `resolve' library (-lresolve). */
393 +/* #undef HAVE_LIBRESOLVE */
394 +
395 +/* Define to 1 if you have the `socket' library (-lsocket). */
396 +/* #undef HAVE_LIBSOCKET */
397 +
398 +/* Define to 1 if you have the `ssl' library (-lssl). */
399 +/* #undef HAVE_LIBSSL */
400 +
401 +/* if zlib is available */
402 +#define HAVE_LIBZ 1
403 +
404 +/* Define to 1 if you have the <limits.h> header file. */
405 +#define HAVE_LIMITS_H 1
406 +
407 +/* if your compiler supports LL */
408 +#define HAVE_LL 1
409 +
410 +/* Define to 1 if you have the `localtime_r' function. */
411 +#define HAVE_LOCALTIME_R 1
412 +
413 +/* if your compiler supports long long */
414 +#define HAVE_LONGLONG 1
415 +
416 +/* Define to 1 if you have the <malloc.h> header file. */
417 +#define HAVE_MALLOC_H 1
418 +
419 +/* Define to 1 if you have the <memory.h> header file. */
420 +#define HAVE_MEMORY_H 1
421 +
422 +/* Define to 1 if you have the <netdb.h> header file. */
423 +#define HAVE_NETDB_H 1
424 +
425 +/* Define to 1 if you have the <netinet/in.h> header file. */
426 +#define HAVE_NETINET_IN_H 1
427 +
428 +/* Define to 1 if you have the <netinet/tcp.h> header file. */
429 +#define HAVE_NETINET_TCP_H 1
430 +
431 +/* Define to 1 if you have the <net/if.h> header file. */
432 +#define HAVE_NET_IF_H 1
433 +
434 +/* Define if NI_WITHSCOPEID exists and works */
435 +/* #undef HAVE_NI_WITHSCOPEID */
436 +
437 +/* we have no strerror_r() proto */
438 +/* #undef HAVE_NO_STRERROR_R_DECL */
439 +
440 +/* Define to 1 if you have the <openssl/crypto.h> header file. */
441 +/* #undef HAVE_OPENSSL_CRYPTO_H */
442 +
443 +/* Define to 1 if you have the <openssl/engine.h> header file. */
444 +/* #undef HAVE_OPENSSL_ENGINE_H */
445 +
446 +/* Define to 1 if you have the <openssl/err.h> header file. */
447 +/* #undef HAVE_OPENSSL_ERR_H */
448 +
449 +/* Define to 1 if you have the <openssl/pem.h> header file. */
450 +/* #undef HAVE_OPENSSL_PEM_H */
451 +
452 +/* Define to 1 if you have the <openssl/rsa.h> header file. */
453 +/* #undef HAVE_OPENSSL_RSA_H */
454 +
455 +/* Define to 1 if you have the <openssl/ssl.h> header file. */
456 +/* #undef HAVE_OPENSSL_SSL_H */
457 +
458 +/* Define to 1 if you have the <openssl/x509.h> header file. */
459 +/* #undef HAVE_OPENSSL_X509_H */
460 +
461 +/* use O_NONBLOCK for non-blocking sockets */
462 +#define HAVE_O_NONBLOCK 1
463 +
464 +/* Define to 1 if you have the <pem.h> header file. */
465 +/* #undef HAVE_PEM_H */
466 +
467 +/* Define to 1 if you have the `perror' function. */
468 +#define HAVE_PERROR 1
469 +
470 +/* Define to 1 if you have the `poll' function. */
471 +/* #undef HAVE_POLL */
472 +
473 +/* If you have a fine poll */
474 +/* #undef HAVE_POLL_FINE */
475 +
476 +/* we have a POSIX-style strerror_r() */
477 +#define HAVE_POSIX_STRERROR_R 1
478 +
479 +/* Define to 1 if you have the <pwd.h> header file. */
480 +#define HAVE_PWD_H 1
481 +
482 +/* Define to 1 if you have the `RAND_egd' function. */
483 +/* #undef HAVE_RAND_EGD */
484 +
485 +/* Define to 1 if you have the `RAND_screen' function. */
486 +/* #undef HAVE_RAND_SCREEN */
487 +
488 +/* Define to 1 if you have the `RAND_status' function. */
489 +/* #undef HAVE_RAND_STATUS */
490 +
491 +/* Define to 1 if you have the <rsa.h> header file. */
492 +/* #undef HAVE_RSA_H */
493 +
494 +/* Define to 1 if you have the `select' function. */
495 +#define HAVE_SELECT 1
496 +
497 +/* Define to 1 if you have the <setjmp.h> header file. */
498 +#define HAVE_SETJMP_H 1
499 +
500 +/* Define to 1 if you have the <sgtty.h> header file. */
501 +#define HAVE_SGTTY_H 1
502 +
503 +/* Define to 1 if you have the `sigaction' function. */
504 +#define HAVE_SIGACTION 1
505 +
506 +/* Define to 1 if you have the `siginterrupt' function. */
507 +#define HAVE_SIGINTERRUPT 1
508 +
509 +/* Define to 1 if you have the `signal' function. */
510 +#define HAVE_SIGNAL 1
511 +
512 +/* If you have sigsetjmp */
513 +#define HAVE_SIGSETJMP 1
514 +
515 +/* Define to 1 if you have the `socket' function. */
516 +#define HAVE_SOCKET 1
517 +
518 +/* use SO_NONBLOCK for non-blocking sockets */
519 +/* #undef HAVE_SO_NONBLOCK */
520 +
521 +/* Define this if you have the SPNEGO library fbopenssl */
522 +/* #undef HAVE_SPNEGO */
523 +
524 +/* Define to 1 if you have the <ssl.h> header file. */
525 +/* #undef HAVE_SSL_H */
526 +
527 +/* Define to 1 if you have the <stdint.h> header file. */
528 +#define HAVE_STDINT_H 1
529 +
530 +/* Define to 1 if you have the <stdlib.h> header file. */
531 +#define HAVE_STDLIB_H 1
532 +
533 +/* Define to 1 if you have the `strcasecmp' function. */
534 +#define HAVE_STRCASECMP 1
535 +
536 +/* Define to 1 if you have the `strcmpi' function. */
537 +/* #undef HAVE_STRCMPI */
538 +
539 +/* Define to 1 if you have the `strdup' function. */
540 +#define HAVE_STRDUP 1
541 +
542 +/* Define to 1 if you have the `strerror_r' function. */
543 +#define HAVE_STRERROR_R 1
544 +
545 +/* Define to 1 if you have the `strftime' function. */
546 +#define HAVE_STRFTIME 1
547 +
548 +/* Define to 1 if you have the `stricmp' function. */
549 +#define HAVE_STRICMP 1
550 +
551 +/* Define to 1 if you have the <strings.h> header file. */
552 +#define HAVE_STRINGS_H 1
553 +
554 +/* Define to 1 if you have the <string.h> header file. */
555 +#define HAVE_STRING_H 1
556 +
557 +/* Define to 1 if you have the `strlcat' function. */
558 +#define HAVE_STRLCAT 1
559 +
560 +/* Define to 1 if you have the `strlcpy' function. */
561 +/* #undef HAVE_STRLCPY */
562 +
563 +/* Define to 1 if you have the `strstr' function. */
564 +#define HAVE_STRSTR 1
565 +
566 +/* Define to 1 if you have the `strtok_r' function. */
567 +#define HAVE_STRTOK_R 1
568 +
569 +/* Define to 1 if you have the `strtoll' function. */
570 +#define HAVE_STRTOLL 1
571 +
572 +/* Define to 1 if you have the <sys/ioctl.h> header file. */
573 +#define HAVE_SYS_IOCTL_H 1
574 +
575 +/* Define to 1 if you have the <sys/param.h> header file. */
576 +#define HAVE_SYS_PARAM_H 1
577 +
578 +/* Define to 1 if you have the <sys/poll.h> header file. */
579 +/* #undef HAVE_SYS_POLL_H */
580 +
581 +/* Define to 1 if you have the <sys/select.h> header file. */
582 +#define HAVE_SYS_SELECT_H 1
583 +
584 +/* Define to 1 if you have the <sys/socket.h> header file. */
585 +#define HAVE_SYS_SOCKET_H 1
586 +
587 +/* Define to 1 if you have the <sys/sockio.h> header file. */
588 +#define HAVE_SYS_SOCKIO_H 1
589 +
590 +/* Define to 1 if you have the <sys/stat.h> header file. */
591 +#define HAVE_SYS_STAT_H 1
592 +
593 +/* Define to 1 if you have the <sys/time.h> header file. */
594 +#define HAVE_SYS_TIME_H 1
595 +
596 +/* Define to 1 if you have the <sys/types.h> header file. */
597 +#define HAVE_SYS_TYPES_H 1
598 +
599 +/* Define to 1 if you have the <sys/utime.h> header file. */
600 +#define HAVE_SYS_UTIME_H 1
601 +
602 +/* Define to 1 if you have the `tcgetattr' function. */
603 +#define HAVE_TCGETATTR 1
604 +
605 +/* Define to 1 if you have the `tcsetattr' function. */
606 +#define HAVE_TCSETATTR 1
607 +
608 +/* Define to 1 if you have the <termios.h> header file. */
609 +#define HAVE_TERMIOS_H 1
610 +
611 +/* Define to 1 if you have the <termio.h> header file. */
612 +#define HAVE_TERMIO_H 1
613 +
614 +/* Define to 1 if you have the <time.h> header file. */
615 +#define HAVE_TIME_H 1
616 +
617 +/* Define to 1 if you have the `tld_strerror' function. */
618 +/* #undef HAVE_TLD_STRERROR */
619 +
620 +/* Define to 1 if you have the `uname' function. */
621 +#define HAVE_UNAME 1
622 +
623 +/* Define to 1 if you have the <unistd.h> header file. */
624 +#define HAVE_UNISTD_H 1
625 +
626 +/* Define to 1 if you have the `utime' function. */
627 +#define HAVE_UTIME 1
628 +
629 +/* Define to 1 if you have the <utime.h> header file. */
630 +#define HAVE_UTIME_H 1
631 +
632 +/* Define to 1 if you have the <winsock.h> header file. */
633 +/* #undef HAVE_WINSOCK_H */
634 +
635 +/* Define this symbol if your OS supports changing the contents of argv */
636 +#define HAVE_WRITABLE_ARGV 1
637 +
638 +/* Define to 1 if you have the <x509.h> header file. */
639 +/* #undef HAVE_X509_H */
640 +
641 +/* if you have the zlib.h header file */
642 +#define HAVE_ZLIB_H 1
643 +
644 +/* If you lack a fine basename() prototype */
645 +/* #undef NEED_BASENAME_PROTO */
646 +
647 +/* need REENTRANT defined */
648 +/* #undef NEED_REENTRANT */
649 +
650 +/* cpu-machine-OS */
651 +#define OS "i386-pc-os2-emx"
652 +
653 +/* Name of package */
654 +#define PACKAGE "curl"
655 +
656 +/* Define to the address where bug reports for this package should be sent. */
657 +#define PACKAGE_BUGREPORT "a suitable curl mailing list => http://curl.haxx.se/mail/"
658 +
659 +/* Define to the full name of this package. */
660 +#define PACKAGE_NAME "curl"
661 +
662 +/* Define to the full name and version of this package. */
663 +#define PACKAGE_STRING "curl -"
664 +
665 +/* Define to the one symbol short name of this package. */
666 +#define PACKAGE_TARNAME "curl"
667 +
668 +/* Define to the version of this package. */
669 +#define PACKAGE_VERSION "-"
670 +
671 +/* a suitable file to read random data from */
672 +/* #undef RANDOM_FILE */
673 +
674 +/* Define as the return type of signal handlers (`int' or `void'). */
675 +#define RETSIGTYPE void
676 +
677 +/* Define to the type of arg 1 for `select'. */
678 +#define SELECT_TYPE_ARG1 int
679 +
680 +/* Define to the type of args 2, 3 and 4 for `select'. */
681 +#define SELECT_TYPE_ARG234 (fd_set *)
682 +
683 +/* Define to the type of arg 5 for `select'. */
684 +#define SELECT_TYPE_ARG5 (struct timeval *)
685 +
686 +/* The size of a `curl_off_t', as computed by sizeof. */
687 +#define SIZEOF_CURL_OFF_T 8
688 +
689 +/* The size of a `long', as computed by sizeof. */
690 +#define SIZEOF_LONG 4
691 +
692 +/* The size of a `size_t', as computed by sizeof. */
693 +#define SIZEOF_SIZE_T 4
694 +
695 +/* Define to 1 if you have the ANSI C header files. */
696 +#define STDC_HEADERS 1
697 +
698 +/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
699 +#define TIME_WITH_SYS_TIME 1
700 +
701 +/* Define if you want to enable ares support */
702 +/* #undef USE_ARES */
703 +
704 +/* If you want to build curl with the built-in manual */
705 +/* #undef USE_MANUAL */
706 +
707 +/* Version number of package */
708 +#define VERSION "7.12.2"
709 +
710 +/* Define to 1 if on AIX 3.
711 + System headers sometimes define this.
712 + We just want to avoid a redefinition error message. */
713 +#ifndef _ALL_SOURCE
714 +/* # undef _ALL_SOURCE */
715 +#endif
716 +
717 +/* Number of bits in a file offset, on hosts where this is settable. */
718 +/* #undef _FILE_OFFSET_BITS */
719 +
720 +/* Define for large files, on AIX-style hosts. */
721 +/* #undef _LARGE_FILES */
722 +
723 +/* define this if you need it to compile thread-safe code */
724 +/* #undef _THREAD_SAFE */
725 +
726 +/* Define to empty if `const' does not conform to ANSI C. */
727 +/* #undef const */
728 +
729 +/* type to use in place of in_addr_t if not defined */
730 +/* #undef in_addr_t */
731 +
732 +/* Define to `unsigned' if <sys/types.h> does not define. */
733 +/* #undef size_t */
734 +
735 +/* type to use in place of socklen_t if not defined */
736 +#define socklen_t int
737 +
738 +/* the signed version of size_t */
739 +/* #undef ssize_t */
740 --- misc/curl-7.12.2/lib/config-win32.h 2004-07-29 15:09:58.000000000 +0200
741 +++ misc/build/curl-7.12.2/lib/config-win32.h 2008-07-08 16:11:12.984375000 +0200
742 @@ -29,6 +29,24 @@
743 /* Define this to 'int' if ssize_t is not an available typedefed type */
744 #define ssize_t int
746 +/* Define to disable DICT */
747 +#define CURL_DISABLE_DICT 1
748 +
749 +/* Define to disable FILE */
750 +#define CURL_DISABLE_FILE 1
751 +
752 +/* Define to disable GOPHER */
753 +#define CURL_DISABLE_GOPHER 1
754 +
755 +/* Define to disable LDAP */
756 +#define CURL_DISABLE_LDAP 1
757 +
758 +/* Define to disable TELNET */
759 +#define CURL_DISABLE_TELNET 1
760 +
761 +/* Define if you want to enable IPv6 support */
762 +#define ENABLE_IPV6 1
763 +
764 /* Define this to 'int' if socklen_t is not an available typedefed type */
765 #if !defined(ENABLE_IPV6) && ((_MSC_VER < 1300) || !defined(USE_SSLEAY))
766 #define socklen_t int
767 --- misc/curl-7.12.2/lib/http_ntlm.c 2004-07-29 15:09:58.000000000 +0200
768 +++ misc/build/curl-7.12.2/lib/http_ntlm.c 2008-07-08 16:11:13.062500000 +0200
769 @@ -528,6 +528,13 @@
770 size=64;
771 ntlmbuf[62]=ntlmbuf[63]=0;
773 + /* Make sure that the user and domain strings fit in the target buffer
774 + before we copy them there. */
775 + if(size + userlen + domlen >= sizeof(ntlmbuf)) {
776 + failf(conn->data, "user + domain name too big");
777 + return CURLE_OUT_OF_MEMORY;
778 + }
779 +
780 memcpy(&ntlmbuf[size], domain, domlen);
781 size += domlen;
783 --- misc/curl-7.12.2/lib/setup.h 2004-10-08 10:06:16.000000000 +0200
784 +++ misc/build/curl-7.12.2/lib/setup.h 2008-07-08 16:23:32.328125000 +0200
785 @@ -44,6 +44,10 @@
786 /* hand-modified win32 config.h! */
787 #include "config-win32.h"
788 #endif
789 +#ifdef OS2
790 +/* hand-modified os2 config.h! */
791 +#include "config-os2.h"
792 +#endif
793 #endif
795 #ifdef macintosh
796 @@ -161,21 +165,11 @@
797 #define WIN32_LEAN_AND_MEAN /* Prevent including <winsock*.h> in <windows.h> */
798 #endif
800 -#if (defined(ENABLE_IPV6) || defined(CURLDEBUG)) && defined(_MSC_VER) && \
801 - (!defined(_WIN32_WINNT) || _WIN32_WINNT < 0x0500)
802 -/*
803 - * Needed to pull in the real getaddrinfo() and not the inline version
804 - * in <wspiAPI.H> which doesn't support IPv6 (IPv4 only). <wspiAPI.H> is
805 - * included from <ws2tcpip.h> for <= 0x0500 SDKs.
806 - */
807 -#undef _WIN32_WINNT
808 -#define _WIN32_WINNT 0x0501
809 -#endif
810 -
811 #include <winsock2.h> /* required by telnet.c */
813 #if defined(ENABLE_IPV6) || defined(USE_SSLEAY)
814 #include <ws2tcpip.h>
815 +#include <wspiapi.h>
816 #endif
818 #if !defined(__GNUC__) || defined(__MINGW32__)
819 --- misc/curl-7.12.2/lib/url.c 2004-10-18 00:21:02.000000000 +0200
820 +++ misc/build/curl-7.12.2/lib/url.c 2008-07-08 16:11:13.375000000 +0200
821 @@ -814,27 +814,6 @@
822 and this just changes the actual request keyword */
823 break;
825 - case CURLOPT_PROXY:
826 - /*
827 - * Set proxy server:port to use as HTTP proxy.
828 - *
829 - * If the proxy is set to "" we explicitly say that we don't want to use a
830 - * proxy (even though there might be environment variables saying so).
831 - *
832 - * Setting it to NULL, means no proxy but allows the environment variables
833 - * to decide for us.
834 - */
835 - if(data->change.proxy_alloc) {
836 - /*
837 - * The already set string is allocated, free that first
838 - */
839 - data->change.proxy_alloc=FALSE;;
840 - free(data->change.proxy);
841 - }
842 - data->set.set_proxy = va_arg(param, char *);
843 - data->change.proxy = data->set.set_proxy;
844 - break;
845 -
846 case CURLOPT_PROXYPORT:
847 /*
848 * Explicitly set HTTP proxy port number.
849 @@ -883,6 +862,27 @@
850 break;
851 #endif /* CURL_DISABLE_HTTP */
853 + case CURLOPT_PROXY:
854 + /*
855 + * Set proxy server:port to use as HTTP proxy.
856 + *
857 + * If the proxy is set to "" we explicitly say that we don't want to use a
858 + * proxy (even though there might be environment variables saying so).
859 + *
860 + * Setting it to NULL, means no proxy but allows the environment variables
861 + * to decide for us.
862 + */
863 + if(data->change.proxy_alloc) {
864 + /*
865 + * The already set string is allocated, free that first
866 + */
867 + data->change.proxy_alloc=FALSE;;
868 + free(data->change.proxy);
869 + }
870 + data->set.set_proxy = va_arg(param, char *);
871 + data->change.proxy = data->set.set_proxy;
872 + break;
873 +
874 case CURLOPT_WRITEHEADER:
875 /*
876 * Custom pointer to pass the header write callback function
877 @@ -1428,7 +1428,7 @@
878 result = CURLE_FAILED_INIT; /* correct this */
879 break;
880 }
881 -
882 +
883 return result;
884 }
886 @@ -2278,12 +2278,18 @@
887 if(urllen < LEAST_PATH_ALLOC)
888 urllen=LEAST_PATH_ALLOC;
890 - conn->pathbuffer=(char *)malloc(urllen);
891 + /*
892 + * We malloc() the buffers below urllen+2 to make room for to possibilities:
893 + * 1 - an extra terminating zero
894 + * 2 - an extra slash (in case a syntax like "www.host.com?moo" is used)
895 + */
896 +
897 + conn->pathbuffer=(char *)malloc(urllen+2);
898 if(NULL == conn->pathbuffer)
899 return CURLE_OUT_OF_MEMORY; /* really bad error */
900 conn->path = conn->pathbuffer;
902 - conn->host.rawalloc=(char *)malloc(urllen);
903 + conn->host.rawalloc=(char *)malloc(urllen+2);
904 if(NULL == conn->host.rawalloc)
905 return CURLE_OUT_OF_MEMORY;
906 conn->host.name = conn->host.rawalloc;
907 @@ -2461,6 +2467,7 @@
908 return CURLE_OUT_OF_MEMORY;
909 }
911 +#ifndef CURL_DISABLE_HTTP
912 /*************************************************************
913 * Detect what (if any) proxy to use
914 *************************************************************/
915 @@ -2625,6 +2632,7 @@
916 if(no_proxy)
917 free(no_proxy);
918 } /* if not using proxy */
919 +#endif /* CURL_DISABLE_HTTP */
921 /*************************************************************
922 * No protocol part in URL was used, add it!
923 @@ -2880,54 +2888,6 @@
924 return CURLE_UNSUPPORTED_PROTOCOL;
925 }
927 - /*************************************************************
928 - * Figure out the remote port number
929 - *
930 - * No matter if we use a proxy or not, we have to figure out the remote
931 - * port number of various reasons.
932 - *
933 - * To be able to detect port number flawlessly, we must not confuse them
934 - * IPv6-specified addresses in the [0::1] style. (RFC2732)
935 - *
936 - * The conn->host.name is currently [user:passwd@]host[:port] where host
937 - * could be a hostname, IPv4 address or IPv6 address.
938 - *************************************************************/
939 - if((1 == sscanf(conn->host.name, "[%*39[0-9a-fA-F:.]%c", &endbracket)) &&
940 - (']' == endbracket)) {
941 - /* this is a RFC2732-style specified IP-address */
942 - conn->bits.ipv6_ip = TRUE;
943 -
944 - conn->host.name++; /* pass the starting bracket */
945 - tmp = strchr(conn->host.name, ']');
946 - *tmp = 0; /* zero terminate */
947 - tmp++; /* pass the ending bracket */
948 - if(':' != *tmp)
949 - tmp = NULL; /* no port number available */
950 - }
951 - else
952 - tmp = strrchr(conn->host.name, ':');
953 -
954 - if (tmp) {
955 - char *rest;
956 - unsigned long port;
957 -
958 - port=strtoul(tmp+1, &rest, 10); /* Port number must be decimal */
959 -
960 - if (rest != (tmp+1) && *rest == '\0') {
961 - /* The colon really did have only digits after it,
962 - * so it is either a port number or a mistake */
963 -
964 - if (port > 0xffff) { /* Single unix standard says port numbers are
965 - * 16 bits long */
966 - failf(data, "Port number too large: %lu", port);
967 - return CURLE_URL_MALFORMAT;
968 - }
969 -
970 - *tmp = '\0'; /* cut off the name there */
971 - conn->remote_port = (unsigned short)port;
972 - }
973 - }
974 -
975 if(data->change.proxy && *data->change.proxy) {
976 /* If this is supposed to use a proxy, we need to figure out the proxy
977 host name name, so that we can re-use an existing connection
978 @@ -3119,6 +3079,54 @@
979 return CURLE_OUT_OF_MEMORY;
981 /*************************************************************
982 + * Figure out the remote port number
983 + *
984 + * No matter if we use a proxy or not, we have to figure out the remote
985 + * port number of various reasons.
986 + *
987 + * To be able to detect port number flawlessly, we must not confuse them
988 + * IPv6-specified addresses in the [0::1] style. (RFC2732)
989 + *
990 + * The conn->host.name is currently host[:port] where host could be a
991 + * hostname, IPv4 address or IPv6 address.
992 + *************************************************************/
993 + if((1 == sscanf(conn->host.name, "[%*39[0-9a-fA-F:.]%c", &endbracket)) &&
994 + (']' == endbracket)) {
995 + /* this is a RFC2732-style specified IP-address */
996 + conn->bits.ipv6_ip = TRUE;
997 +
998 + conn->host.name++; /* pass the starting bracket */
999 + tmp = strchr(conn->host.name, ']');
1000 + *tmp = 0; /* zero terminate */
1001 + tmp++; /* pass the ending bracket */
1002 + if(':' != *tmp)
1003 + tmp = NULL; /* no port number available */
1004 + }
1005 + else
1006 + tmp = strrchr(conn->host.name, ':');
1007 +
1008 + if (tmp) {
1009 + char *rest;
1010 + unsigned long port;
1011 +
1012 + port=strtoul(tmp+1, &rest, 10); /* Port number must be decimal */
1013 +
1014 + if (rest != (tmp+1) && *rest == '\0') {
1015 + /* The colon really did have only digits after it,
1016 + * so it is either a port number or a mistake */
1017 +
1018 + if (port > 0xffff) { /* Single unix standard says port numbers are
1019 + * 16 bits long */
1020 + failf(data, "Port number too large: %lu", port);
1021 + return CURLE_URL_MALFORMAT;
1022 + }
1023 +
1024 + *tmp = '\0'; /* cut off the name there */
1025 + conn->remote_port = (unsigned short)port;
1026 + }
1027 + }
1028 +
1029 + /*************************************************************
1030 * Check the current list of connections to see if we can
1031 * re-use an already existing one or if we have to create a
1032 * new one.
1033 @@ -3471,9 +3479,7 @@
1034 * characters (you get mangled text files, and corrupted binary files when
1035 * you download to stdout and redirect it to a file). */
1037 - if ((data->set.out)->_handle == NULL) {
1038 _fsetmode(stdout, "b");
1039 - }
1040 #endif
1042 return CURLE_OK;
1043 --- misc/curl-7.12.2/ltmain.sh 2004-08-09 13:12:17.000000000 +0200
1044 +++ misc/build/curl-7.12.2/ltmain.sh 2008-07-08 16:11:13.484375000 +0200
1045 @@ -2915,12 +2915,12 @@
1046 # which has an extra 1 added just for fun
1047 #
1048 case $version_type in
1049 - darwin|linux|osf|windows)
1050 + darwin|linux|osf|windows|freebsd-aout|freebsd-elf)
1051 current=`expr $number_major + $number_minor`
1052 age="$number_minor"
1053 revision="$number_revision"
1054 ;;
1055 - freebsd-aout|freebsd-elf|sunos)
1056 + sunos)
1057 current="$number_major"
1058 revision="$number_minor"
1059 age="0"
1060 @@ -2990,16 +2990,6 @@
1061 verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
1062 ;;
1064 - freebsd-aout)
1065 - major=".$current"
1066 - versuffix=".$current.$revision";
1067 - ;;
1068 -
1069 - freebsd-elf)
1070 - major=".$current"
1071 - versuffix=".$current";
1072 - ;;
1073 -
1074 irix | nonstopux)
1075 major=`expr $current - $age + 1`
1077 @@ -3022,7 +3012,7 @@
1078 versuffix="$major.$revision"
1079 ;;
1081 - linux)
1082 + linux|freebsd-aout|freebsd-elf)
1083 major=.`expr $current - $age`
1084 versuffix="$major.$age.$revision"
1085 ;;