diff options
38 files changed, 373 insertions, 1399 deletions
diff --git a/berkeleydb/makefile.mk b/berkeleydb/makefile.mk index c6b50c6001cf..fe1208e554ab 100644 --- a/berkeleydb/makefile.mk +++ b/berkeleydb/makefile.mk @@ -1,15 +1,11 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2008 by Sun Microsystems, Inc. +# +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: makefile.mk,v $ -# -# $Revision: 1.48 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/bitstream_vera_fonts/fonts/ttf_dejavu/makefile.mk b/bitstream_vera_fonts/fonts/ttf_dejavu/makefile.mk index a59850514022..87fd5a859306 100644 --- a/bitstream_vera_fonts/fonts/ttf_dejavu/makefile.mk +++ b/bitstream_vera_fonts/fonts/ttf_dejavu/makefile.mk @@ -2,7 +2,7 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # diff --git a/bitstream_vera_fonts/fonts/ttf_gentium/makefile.mk b/bitstream_vera_fonts/fonts/ttf_gentium/makefile.mk index 0bdbba04695d..2105e2f01cb5 100644 --- a/bitstream_vera_fonts/fonts/ttf_gentium/makefile.mk +++ b/bitstream_vera_fonts/fonts/ttf_gentium/makefile.mk @@ -2,7 +2,7 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # diff --git a/bitstream_vera_fonts/fonts/ttf_liberation/makefile.mk b/bitstream_vera_fonts/fonts/ttf_liberation/makefile.mk index 6d8eb96d1e17..4d0093ec9a71 100644 --- a/bitstream_vera_fonts/fonts/ttf_liberation/makefile.mk +++ b/bitstream_vera_fonts/fonts/ttf_liberation/makefile.mk @@ -2,7 +2,7 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # diff --git a/boost/makefile.mk b/boost/makefile.mk index e58e8939a09e..8601c4d12801 100644 --- a/boost/makefile.mk +++ b/boost/makefile.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: makefile.mk,v $ -# -# $Revision: 1.12 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/cairo/cairo/makefile.mk b/cairo/cairo/makefile.mk index dd2300eaa8d1..2cf9de19ec0a 100644 --- a/cairo/cairo/makefile.mk +++ b/cairo/cairo/makefile.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: makefile.mk,v $ -# -# $Revision: 1.1.2.4 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/cairo/pixman/makefile.mk b/cairo/pixman/makefile.mk index c48f80c2da49..c32cf906a1dd 100644 --- a/cairo/pixman/makefile.mk +++ b/cairo/pixman/makefile.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: makefile.mk,v $ -# -# $Revision: 1.1.2.2 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/cairo/prj/build.lst b/cairo/prj/build.lst index 6f45aedc4047..c531e6c0ffb9 100644 --- a/cairo/prj/build.lst +++ b/cairo/prj/build.lst @@ -1,4 +1,4 @@ -lcairo cairo : zlib soltools NULL +lcairo cairo : ZLIB:zlib soltools NULL lcairo cairo usr1 - all lcairo_mkout NULL lcairo cairo\pixman nmake - all lcairo_pixman NULL lcairo cairo\cairo nmake - all lcairo_cairo lcairo_pixman NULL diff --git a/curl/curl-7.12.2.patch b/curl/curl-7.12.2.patch deleted file mode 100644 index 5aff45800b77..000000000000 --- a/curl/curl-7.12.2.patch +++ /dev/null @@ -1,1070 +0,0 @@ ---- misc/curl-7.12.2/configure 2004-10-18 00:22:10.000000000 +0200 -+++ misc/build/curl-7.12.2/configure 2008-07-08 16:11:12.796875000 +0200 -@@ -1538,8 +1538,8 @@ - - ac_ext=c - ac_cpp='$CPP $CPPFLAGS' --ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' --ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -+ac_compile='$CC -c $ADDCFLAGS $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -+ac_link='$CC -o conftest$ac_exeext $ADDCFLAGS $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' - ac_compiler_gnu=$ac_cv_c_compiler_gnu - - -@@ -2314,8 +2314,8 @@ - - ac_ext=c - ac_cpp='$CPP $CPPFLAGS' --ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' --ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -+ac_compile='$CC -c $ADDCFLAGS $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -+ac_link='$CC -o conftest$ac_exeext $ADDCFLAGS $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' - ac_compiler_gnu=$ac_cv_c_compiler_gnu - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. -@@ -2967,15 +2967,15 @@ - CFLAGS=$ac_save_CFLAGS - elif test $ac_cv_prog_cc_g = yes; then - if test "$GCC" = yes; then -- CFLAGS="-g -O2" -+ CFLAGS="$ADDCFLAGS -g -O2" - else -- CFLAGS="-g" -+ CFLAGS="$ADDCFLAGS -g" - fi - else - if test "$GCC" = yes; then -- CFLAGS="-O2" -+ CFLAGS="$ADDCFLAGS -O2" - else -- CFLAGS= -+ CFLAGS="$ADDCFLAGS" - fi - fi - echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5 -@@ -9456,7 +9456,7 @@ - ;; - - freebsd*) -- objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` -+ objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` - version_type=freebsd-$objformat - case $version_type in - freebsd-elf*) -@@ -13154,7 +13154,7 @@ - ;; - - freebsd*) -- objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` -+ objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` - version_type=freebsd-$objformat - case $version_type in - freebsd-elf*) -@@ -16303,7 +16303,7 @@ - ;; - - freebsd*) -- objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` -+ objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` - version_type=freebsd-$objformat - case $version_type in - freebsd-elf*) -@@ -18650,7 +18650,7 @@ - ;; - - freebsd*) -- objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` -+ objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` - version_type=freebsd-$objformat - case $version_type in - freebsd-elf*) ---- misc/curl-7.12.2/lib/Makefile.os2 2008-07-09 07:45:49.093750000 +0200 -+++ misc/build/curl-7.12.2/lib/Makefile.os2 2008-07-08 16:11:13.109375000 +0200 -@@ -1 +1,79 @@ --dummy -+############################################################# -+# $Id$ -+# -+## Makefile for building libcurl.a with MingW32 (GCC-3.2) and -+## optionally OpenSSL (0.9.7) -+## -+## Use: make -f Makefile.m32 -+## -+## Comments to: Troy Engel <tengel@sonic.net> or -+## Joern Hartroth <hartroth@acm.org> -+ -+ifndef OPENSSL_PATH -+OPENSSL_PATH = ../../openssl-0.9.7d -+endif -+ifndef ZLIB_PATH -+ZLIB_PATH = ../../zlib-1.2.1 -+endif -+ -+CC = gcc -+AR = emxomfar -+RM = rm -f -+RANLIB = echo -+STRIP = echo -+ -+######################################################## -+## Nothing more to do below this line! -+ -+INCLUDES = -I. -I.. -I../include -I../src -+CFLAGS = -s -Zomf -O2 -DOS2 -+ifdef SSL -+ INCLUDES += -I"$(OPENSSL_PATH)/outinc" -I"$(OPENSSL_PATH)/outinc/openssl" -+ CFLAGS += -DUSE_SSLEAY -DHAVE_OPENSSL_ENGINE_H -+ DLL_LIBS = -L$(OPENSSL_PATH)/out -leay32 -lssl32 -+endif -+ifdef ZLIB -+ INCLUDES += -I"$(ZLIB_PATH)" -+ CFLAGS += -DHAVE_LIBZ -DHAVE_ZLIB_H -+ DLL_LIBS += -L$(ZLIB_PATH) -lz -+endif -+COMPILE = $(CC) $(INCLUDES) $(CFLAGS) -+ -+# Makefile.inc provides the CSOURCES and HHEADERS defines -+include Makefile.inc -+ -+libcurl_a_OBJECTS := $(patsubst %.c,%.o,$(strip $(CSOURCES))) -+ -+libcurl_a_LIBRARIES = libcurl.a -+libcurl_a_DEPENDENCIES = $(strip $(CSOURCES) $(HHEADERS)) -+ -+all: libcurl.a libcurl.dll -+ -+libcurl.a: $(libcurl_a_OBJECTS) $(libcurl_a_DEPENDENCIES) -+ $(RM) libcurl.a -+ $(AR) cru libcurl.a $(libcurl_a_OBJECTS) -+ $(STRIP) $@ -+ -+# remove the last line above to keep debug info -+ -+libcurl.dll: libcurl.a -+ $(RM) $@ -+ dllar -omf -libflags "INITINSTANCE TERMINSTANCE" -libdata "MULTIPLE" libcurl.a -lz -lgcc_eh -Zmap -Zno-fork -Zhigh-mem -Zbin-files -+ -+# remove the last line above to keep debug info -+ -+.c.o: -+ $(COMPILE) -c $< -+ -+.s.o: -+ $(COMPILE) -c $< -+ -+.S.o: -+ $(COMPILE) -c $< -+ -+clean: -+ $(RM) $(libcurl_a_OBJECTS) $(RESOURCE) -+ -+distrib: clean -+ $(RM) $(libcurl_a_LIBRARIES) -+ ---- misc/curl-7.12.2/lib/Makefile.vc6 2004-09-16 13:13:37.000000000 +0200 -+++ misc/build/curl-7.12.2/lib/Makefile.vc6 2008-07-08 16:11:16.765625000 +0200 -@@ -23,7 +23,7 @@ - ############################################################## - - LIB_NAME = libcurl --LIB_NAME_DEBUG = libcurld -+LIB_NAME_DEBUG = libcurl - !IFNDEF OPENSSL_PATH - OPENSSL_PATH = ../../openssl-0.9.7d - !ENDIF -@@ -34,7 +34,7 @@ - - # Use the high resolution time by default. Comment this out to use low - # resolution time and not require winmm.lib --USEMM_LIBS = YES -+#USEMM_LIBS = YES - - ############################################################# - ## Nothing more to do below this line! -@@ -43,7 +43,7 @@ - CCDEBUG = cl.exe /MDd /Od /Gm /Zi /D "_DEBUG" /GZ - CFLAGSSSL = /D "USE_SSLEAY" /I "$(OPENSSL_PATH)/inc32" /I "$(OPENSSL_PATH)/inc32/openssl" - CFLAGSZLIB = /D "HAVE_ZLIB_H" /D "HAVE_ZLIB" /D "HAVE_LIBZ" /I "$(ZLIB_PATH)" --CFLAGS = /I "." /I "../include" /nologo /W3 /GX /D "WIN32" /D "VC6" /D "_MBCS" /D "_LIB" /YX /FD /c /D "MSDOS" -+CFLAGS = /I "." /I "../include" /nologo /W3 $(EXCFLAGS) /D "WIN32" /D "VC6" /D "_MBCS" /D "_LIB" /FD /c /D "MSDOS" - LNKDLL = link.exe /DLL /def:libcurl.def - LNKLIB = link.exe /lib - LFLAGS = /nologo -@@ -51,7 +51,11 @@ - !IFDEF USEMM_LIBS - WINLIBS = wsock32.lib winmm.lib - !ELSE -+!IFDEF WINDOWS_VISTA_PSDK -+WINLIBS = wsock32.lib ws2_32.lib -+!ELSE - WINLIBS = wsock32.lib -+!ENDIF - CFLAGS = $(CFLAGS) /D "WITHOUT_MM_LIB" - !ENDIF - # RSAglue.lib was formerly needed in the SSLLIBS ---- misc/curl-7.12.2/lib/config-os2.h 2008-07-09 07:45:48.484375000 +0200 -+++ misc/build/curl-7.12.2/lib/config-os2.h 2008-07-08 16:11:12.859375000 +0200 -@@ -1 +1,531 @@ --dummy -+/* lib/config.h. Generated by configure. */ -+/* lib/config.h.in. Generated from configure.ac by autoheader. */ -+ -+/* to disable DICT */ -+#define CURL_DISABLE_DICT 1 -+ -+/* to disable FILE */ -+#define CURL_DISABLE_FILE 1 -+ -+/* to disable FTP */ -+/* #undef CURL_DISABLE_FTP */ -+ -+/* to disable GOPHER */ -+#define CURL_DISABLE_GOPHER 1 -+ -+/* to disable HTTP */ -+#define CURL_DISABLE_HTTP 1 -+ -+/* to disable LDAP */ -+#define CURL_DISABLE_LDAP 1 -+ -+/* to disable TELNET */ -+#define CURL_DISABLE_TELNET 1 -+ -+/* Set to explicitly specify we don't want to use thread-safe functions */ -+/* #undef DISABLED_THREADSAFE */ -+ -+/* your Entropy Gathering Daemon socket pathname */ -+/* #undef EGD_SOCKET */ -+ -+/* Define if you want to enable IPv6 support */ -+/* #undef ENABLE_IPV6 */ -+ -+/* Define to 1 if you have the <alloca.h> header file. */ -+#define HAVE_ALLOCA_H 1 -+ -+/* Define to 1 if you have the <arpa/inet.h> header file. */ -+#define HAVE_ARPA_INET_H 1 -+ -+/* Define to 1 if you have the <assert.h> header file. */ -+#define HAVE_ASSERT_H 1 -+ -+/* Define to 1 if you have the `basename' function. */ -+#define HAVE_BASENAME 1 -+ -+/* Define to 1 if you have the `closesocket' function. */ -+/* #undef HAVE_CLOSESOCKET */ -+ -+/* Define to 1 if you have the `CRYPTO_cleanup_all_ex_data' function. */ -+/* #undef HAVE_CRYPTO_CLEANUP_ALL_EX_DATA */ -+ -+/* Define to 1 if you have the <crypto.h> header file. */ -+/* #undef HAVE_CRYPTO_H */ -+ -+/* Define to 1 if you have the <des.h> header file. */ -+/* #undef HAVE_DES_H */ -+ -+/* disabled non-blocking sockets */ -+/* #undef HAVE_DISABLED_NONBLOCKING */ -+ -+/* Define to 1 if you have the <dlfcn.h> header file. */ -+#define HAVE_DLFCN_H 1 -+ -+/* Define to 1 if you have the `dlopen' function. */ -+#define HAVE_DLOPEN 1 -+ -+/* Define to 1 if you have the <err.h> header file. */ -+/* #undef HAVE_ERR_H */ -+ -+/* Define to 1 if you have the <fcntl.h> header file. */ -+#define HAVE_FCNTL_H 1 -+ -+/* use FIONBIO for non-blocking sockets */ -+/* #undef HAVE_FIONBIO */ -+ -+/* Define if getaddrinfo exists and works */ -+/* #undef HAVE_GETADDRINFO */ -+ -+/* Define to 1 if you have the `geteuid' function. */ -+#define HAVE_GETEUID 1 -+ -+/* Define to 1 if you have the `gethostbyaddr' function. */ -+#define HAVE_GETHOSTBYADDR 1 -+ -+/* If you have gethostbyname */ -+#define HAVE_GETHOSTBYNAME 1 -+ -+/* Define to 1 if you have the `gethostbyname_r' function. */ -+/* #undef HAVE_GETHOSTBYNAME_R */ -+ -+/* gethostbyname_r() takes 3 args */ -+/* #undef HAVE_GETHOSTBYNAME_R_3 */ -+ -+/* gethostbyname_r() takes 5 args */ -+/* #undef HAVE_GETHOSTBYNAME_R_5 */ -+ -+/* gethostbyname_r() takes 6 args */ -+/* #undef HAVE_GETHOSTBYNAME_R_6 */ -+ -+/* Define to 1 if you have the `getpass_r' function. */ -+/* #undef HAVE_GETPASS_R */ -+ -+/* Define to 1 if you have the `getpwuid' function. */ -+#define HAVE_GETPWUID 1 -+ -+/* Define to 1 if you have the `gettimeofday' function. */ -+#define HAVE_GETTIMEOFDAY 1 -+ -+/* we have a glibc-style strerror_r() */ -+/* #undef HAVE_GLIBC_STRERROR_R */ -+ -+/* Define to 1 if you have the `gmtime_r' function. */ -+#define HAVE_GMTIME_R 1 -+ -+/* if you have the gssapi libraries */ -+/* #undef HAVE_GSSAPI */ -+ -+/* if you have the Heimdal gssapi libraries */ -+/* #undef HAVE_GSSHEIMDAL */ -+ -+/* if you have the MIT gssapi libraries */ -+/* #undef HAVE_GSSMIT */ -+ -+/* Define to 1 if you have the `idna_strerror' function. */ -+/* #undef HAVE_IDNA_STRERROR */ -+ -+/* Define to 1 if you have the `idn_free' function. */ -+/* #undef HAVE_IDN_FREE */ -+ -+/* Define to 1 if you have the <idn-free.h> header file. */ -+/* #undef HAVE_IDN_FREE_H */ -+ -+/* Define to 1 if you have the `inet_addr' function. */ -+#define HAVE_INET_ADDR 1 -+ -+/* Define to 1 if you have the `inet_ntoa' function. */ -+#define HAVE_INET_NTOA 1 -+ -+/* Define to 1 if you have the `inet_ntoa_r' function. */ -+/* #undef HAVE_INET_NTOA_R */ -+ -+/* inet_ntoa_r() is declared */ -+/* #undef HAVE_INET_NTOA_R_DECL */ -+ -+/* Define to 1 if you have the `inet_pton' function. */ -+#define HAVE_INET_PTON 1 -+ -+/* Define to 1 if you have the <inttypes.h> header file. */ -+#define HAVE_INTTYPES_H 1 -+ -+/* use ioctlsocket() for non-blocking sockets */ -+/* #undef HAVE_IOCTLSOCKET */ -+ -+/* use Ioctlsocket() for non-blocking sockets */ -+/* #undef HAVE_IOCTLSOCKET_CASE */ -+ -+/* Define to 1 if you have the <io.h> header file. */ -+#define HAVE_IO_H 1 -+ -+/* if you have the Kerberos4 libraries (including -ldes) */ -+/* #undef HAVE_KRB4 */ -+ -+/* Define to 1 if you have the `krb_get_our_ip_for_realm' function. */ -+/* #undef HAVE_KRB_GET_OUR_IP_FOR_REALM */ -+ -+/* Define to 1 if you have the <krb.h> header file. */ -+/* #undef HAVE_KRB_H */ -+ -+/* Define to 1 if you have the `crypto' library (-lcrypto). */ -+/* #undef HAVE_LIBCRYPTO */ -+ -+/* Define to 1 if you have the `dl' library (-ldl). */ -+/* #undef HAVE_LIBDL */ -+ -+/* Define to 1 if you have the <libgen.h> header file. */ -+#define HAVE_LIBGEN_H 1 -+ -+/* Define to 1 if you have the `idn' library (-lidn). */ -+/* #undef HAVE_LIBIDN */ -+ -+/* Define to 1 if you have the `resolv' library (-lresolv). */ -+/* #undef HAVE_LIBRESOLV */ -+ -+/* Define to 1 if you have the `resolve' library (-lresolve). */ -+/* #undef HAVE_LIBRESOLVE */ -+ -+/* Define to 1 if you have the `socket' library (-lsocket). */ -+/* #undef HAVE_LIBSOCKET */ -+ -+/* Define to 1 if you have the `ssl' library (-lssl). */ -+/* #undef HAVE_LIBSSL */ -+ -+/* if zlib is available */ -+#define HAVE_LIBZ 1 -+ -+/* Define to 1 if you have the <limits.h> header file. */ -+#define HAVE_LIMITS_H 1 -+ -+/* if your compiler supports LL */ -+#define HAVE_LL 1 -+ -+/* Define to 1 if you have the `localtime_r' function. */ -+#define HAVE_LOCALTIME_R 1 -+ -+/* if your compiler supports long long */ -+#define HAVE_LONGLONG 1 -+ -+/* Define to 1 if you have the <malloc.h> header file. */ -+#define HAVE_MALLOC_H 1 -+ -+/* Define to 1 if you have the <memory.h> header file. */ -+#define HAVE_MEMORY_H 1 -+ -+/* Define to 1 if you have the <netdb.h> header file. */ -+#define HAVE_NETDB_H 1 -+ -+/* Define to 1 if you have the <netinet/in.h> header file. */ -+#define HAVE_NETINET_IN_H 1 -+ -+/* Define to 1 if you have the <netinet/tcp.h> header file. */ -+#define HAVE_NETINET_TCP_H 1 -+ -+/* Define to 1 if you have the <net/if.h> header file. */ -+#define HAVE_NET_IF_H 1 -+ -+/* Define if NI_WITHSCOPEID exists and works */ -+/* #undef HAVE_NI_WITHSCOPEID */ -+ -+/* we have no strerror_r() proto */ -+/* #undef HAVE_NO_STRERROR_R_DECL */ -+ -+/* Define to 1 if you have the <openssl/crypto.h> header file. */ -+/* #undef HAVE_OPENSSL_CRYPTO_H */ -+ -+/* Define to 1 if you have the <openssl/engine.h> header file. */ -+/* #undef HAVE_OPENSSL_ENGINE_H */ -+ -+/* Define to 1 if you have the <openssl/err.h> header file. */ -+/* #undef HAVE_OPENSSL_ERR_H */ -+ -+/* Define to 1 if you have the <openssl/pem.h> header file. */ -+/* #undef HAVE_OPENSSL_PEM_H */ -+ -+/* Define to 1 if you have the <openssl/rsa.h> header file. */ -+/* #undef HAVE_OPENSSL_RSA_H */ -+ -+/* Define to 1 if you have the <openssl/ssl.h> header file. */ -+/* #undef HAVE_OPENSSL_SSL_H */ -+ -+/* Define to 1 if you have the <openssl/x509.h> header file. */ -+/* #undef HAVE_OPENSSL_X509_H */ -+ -+/* use O_NONBLOCK for non-blocking sockets */ -+#define HAVE_O_NONBLOCK 1 -+ -+/* Define to 1 if you have the <pem.h> header file. */ -+/* #undef HAVE_PEM_H */ -+ -+/* Define to 1 if you have the `perror' function. */ -+#define HAVE_PERROR 1 -+ -+/* Define to 1 if you have the `poll' function. */ -+/* #undef HAVE_POLL */ -+ -+/* If you have a fine poll */ -+/* #undef HAVE_POLL_FINE */ -+ -+/* we have a POSIX-style strerror_r() */ -+#define HAVE_POSIX_STRERROR_R 1 -+ -+/* Define to 1 if you have the <pwd.h> header file. */ -+#define HAVE_PWD_H 1 -+ -+/* Define to 1 if you have the `RAND_egd' function. */ -+/* #undef HAVE_RAND_EGD */ -+ -+/* Define to 1 if you have the `RAND_screen' function. */ -+/* #undef HAVE_RAND_SCREEN */ -+ -+/* Define to 1 if you have the `RAND_status' function. */ -+/* #undef HAVE_RAND_STATUS */ -+ -+/* Define to 1 if you have the <rsa.h> header file. */ -+/* #undef HAVE_RSA_H */ -+ -+/* Define to 1 if you have the `select' function. */ -+#define HAVE_SELECT 1 -+ -+/* Define to 1 if you have the <setjmp.h> header file. */ -+#define HAVE_SETJMP_H 1 -+ -+/* Define to 1 if you have the <sgtty.h> header file. */ -+#define HAVE_SGTTY_H 1 -+ -+/* Define to 1 if you have the `sigaction' function. */ -+#define HAVE_SIGACTION 1 -+ -+/* Define to 1 if you have the `siginterrupt' function. */ -+#define HAVE_SIGINTERRUPT 1 -+ -+/* Define to 1 if you have the `signal' function. */ -+#define HAVE_SIGNAL 1 -+ -+/* If you have sigsetjmp */ -+#define HAVE_SIGSETJMP 1 -+ -+/* Define to 1 if you have the `socket' function. */ -+#define HAVE_SOCKET 1 -+ -+/* use SO_NONBLOCK for non-blocking sockets */ -+/* #undef HAVE_SO_NONBLOCK */ -+ -+/* Define this if you have the SPNEGO library fbopenssl */ -+/* #undef HAVE_SPNEGO */ -+ -+/* Define to 1 if you have the <ssl.h> header file. */ -+/* #undef HAVE_SSL_H */ -+ -+/* Define to 1 if you have the <stdint.h> header file. */ -+#define HAVE_STDINT_H 1 -+ -+/* Define to 1 if you have the <stdlib.h> header file. */ -+#define HAVE_STDLIB_H 1 -+ -+/* Define to 1 if you have the `strcasecmp' function. */ -+#define HAVE_STRCASECMP 1 -+ -+/* Define to 1 if you have the `strcmpi' function. */ -+/* #undef HAVE_STRCMPI */ -+ -+/* Define to 1 if you have the `strdup' function. */ -+#define HAVE_STRDUP 1 -+ -+/* Define to 1 if you have the `strerror_r' function. */ -+#define HAVE_STRERROR_R 1 -+ -+/* Define to 1 if you have the `strftime' function. */ -+#define HAVE_STRFTIME 1 -+ -+/* Define to 1 if you have the `stricmp' function. */ -+#define HAVE_STRICMP 1 -+ -+/* Define to 1 if you have the <strings.h> header file. */ -+#define HAVE_STRINGS_H 1 -+ -+/* Define to 1 if you have the <string.h> header file. */ -+#define HAVE_STRING_H 1 -+ -+/* Define to 1 if you have the `strlcat' function. */ -+#define HAVE_STRLCAT 1 -+ -+/* Define to 1 if you have the `strlcpy' function. */ -+/* #undef HAVE_STRLCPY */ -+ -+/* Define to 1 if you have the `strstr' function. */ -+#define HAVE_STRSTR 1 -+ -+/* Define to 1 if you have the `strtok_r' function. */ -+#define HAVE_STRTOK_R 1 -+ -+/* Define to 1 if you have the `strtoll' function. */ -+#define HAVE_STRTOLL 1 -+ -+/* Define to 1 if you have the <sys/ioctl.h> header file. */ -+#define HAVE_SYS_IOCTL_H 1 -+ -+/* Define to 1 if you have the <sys/param.h> header file. */ -+#define HAVE_SYS_PARAM_H 1 -+ -+/* Define to 1 if you have the <sys/poll.h> header file. */ -+/* #undef HAVE_SYS_POLL_H */ -+ -+/* Define to 1 if you have the <sys/select.h> header file. */ -+#define HAVE_SYS_SELECT_H 1 -+ -+/* Define to 1 if you have the <sys/socket.h> header file. */ -+#define HAVE_SYS_SOCKET_H 1 -+ -+/* Define to 1 if you have the <sys/sockio.h> header file. */ -+#define HAVE_SYS_SOCKIO_H 1 -+ -+/* Define to 1 if you have the <sys/stat.h> header file. */ -+#define HAVE_SYS_STAT_H 1 -+ -+/* Define to 1 if you have the <sys/time.h> header file. */ -+#define HAVE_SYS_TIME_H 1 -+ -+/* Define to 1 if you have the <sys/types.h> header file. */ -+#define HAVE_SYS_TYPES_H 1 -+ -+/* Define to 1 if you have the <sys/utime.h> header file. */ -+#define HAVE_SYS_UTIME_H 1 -+ -+/* Define to 1 if you have the `tcgetattr' function. */ -+#define HAVE_TCGETATTR 1 -+ -+/* Define to 1 if you have the `tcsetattr' function. */ -+#define HAVE_TCSETATTR 1 -+ -+/* Define to 1 if you have the <termios.h> header file. */ -+#define HAVE_TERMIOS_H 1 -+ -+/* Define to 1 if you have the <termio.h> header file. */ -+#define HAVE_TERMIO_H 1 -+ -+/* Define to 1 if you have the <time.h> header file. */ -+#define HAVE_TIME_H 1 -+ -+/* Define to 1 if you have the `tld_strerror' function. */ -+/* #undef HAVE_TLD_STRERROR */ -+ -+/* Define to 1 if you have the `uname' function. */ -+#define HAVE_UNAME 1 -+ -+/* Define to 1 if you have the <unistd.h> header file. */ -+#define HAVE_UNISTD_H 1 -+ -+/* Define to 1 if you have the `utime' function. */ -+#define HAVE_UTIME 1 -+ -+/* Define to 1 if you have the <utime.h> header file. */ -+#define HAVE_UTIME_H 1 -+ -+/* Define to 1 if you have the <winsock.h> header file. */ -+/* #undef HAVE_WINSOCK_H */ -+ -+/* Define this symbol if your OS supports changing the contents of argv */ -+#define HAVE_WRITABLE_ARGV 1 -+ -+/* Define to 1 if you have the <x509.h> header file. */ -+/* #undef HAVE_X509_H */ -+ -+/* if you have the zlib.h header file */ -+#define HAVE_ZLIB_H 1 -+ -+/* If you lack a fine basename() prototype */ -+/* #undef NEED_BASENAME_PROTO */ -+ -+/* need REENTRANT defined */ -+/* #undef NEED_REENTRANT */ -+ -+/* cpu-machine-OS */ -+#define OS "i386-pc-os2-emx" -+ -+/* Name of package */ -+#define PACKAGE "curl" -+ -+/* Define to the address where bug reports for this package should be sent. */ -+#define PACKAGE_BUGREPORT "a suitable curl mailing list => http://curl.haxx.se/mail/" -+ -+/* Define to the full name of this package. */ -+#define PACKAGE_NAME "curl" -+ -+/* Define to the full name and version of this package. */ -+#define PACKAGE_STRING "curl -" -+ -+/* Define to the one symbol short name of this package. */ -+#define PACKAGE_TARNAME "curl" -+ -+/* Define to the version of this package. */ -+#define PACKAGE_VERSION "-" -+ -+/* a suitable file to read random data from */ -+/* #undef RANDOM_FILE */ -+ -+/* Define as the return type of signal handlers (`int' or `void'). */ -+#define RETSIGTYPE void -+ -+/* Define to the type of arg 1 for `select'. */ -+#define SELECT_TYPE_ARG1 int -+ -+/* Define to the type of args 2, 3 and 4 for `select'. */ -+#define SELECT_TYPE_ARG234 (fd_set *) -+ -+/* Define to the type of arg 5 for `select'. */ -+#define SELECT_TYPE_ARG5 (struct timeval *) -+ -+/* The size of a `curl_off_t', as computed by sizeof. */ -+#define SIZEOF_CURL_OFF_T 8 -+ -+/* The size of a `long', as computed by sizeof. */ -+#define SIZEOF_LONG 4 -+ -+/* The size of a `size_t', as computed by sizeof. */ -+#define SIZEOF_SIZE_T 4 -+ -+/* Define to 1 if you have the ANSI C header files. */ -+#define STDC_HEADERS 1 -+ -+/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */ -+#define TIME_WITH_SYS_TIME 1 -+ -+/* Define if you want to enable ares support */ -+/* #undef USE_ARES */ -+ -+/* If you want to build curl with the built-in manual */ -+/* #undef USE_MANUAL */ -+ -+/* Version number of package */ -+#define VERSION "7.12.2" -+ -+/* Define to 1 if on AIX 3. -+ System headers sometimes define this. -+ We just want to avoid a redefinition error message. */ -+#ifndef _ALL_SOURCE -+/* # undef _ALL_SOURCE */ -+#endif -+ -+/* Number of bits in a file offset, on hosts where this is settable. */ -+/* #undef _FILE_OFFSET_BITS */ -+ -+/* Define for large files, on AIX-style hosts. */ -+/* #undef _LARGE_FILES */ -+ -+/* define this if you need it to compile thread-safe code */ -+/* #undef _THREAD_SAFE */ -+ -+/* Define to empty if `const' does not conform to ANSI C. */ -+/* #undef const */ -+ -+/* type to use in place of in_addr_t if not defined */ -+/* #undef in_addr_t */ -+ -+/* Define to `unsigned' if <sys/types.h> does not define. */ -+/* #undef size_t */ -+ -+/* type to use in place of socklen_t if not defined */ -+#define socklen_t int -+ -+/* the signed version of size_t */ -+/* #undef ssize_t */ ---- misc/curl-7.12.2/lib/config-win32.h 2004-07-29 15:09:58.000000000 +0200 -+++ misc/build/curl-7.12.2/lib/config-win32.h 2008-07-08 16:11:12.984375000 +0200 -@@ -29,6 +29,24 @@ - /* Define this to 'int' if ssize_t is not an available typedefed type */ - #define ssize_t int - -+/* Define to disable DICT */ -+#define CURL_DISABLE_DICT 1 -+ -+/* Define to disable FILE */ -+#define CURL_DISABLE_FILE 1 -+ -+/* Define to disable GOPHER */ -+#define CURL_DISABLE_GOPHER 1 -+ -+/* Define to disable LDAP */ -+#define CURL_DISABLE_LDAP 1 -+ -+/* Define to disable TELNET */ -+#define CURL_DISABLE_TELNET 1 -+ -+/* Define if you want to enable IPv6 support */ -+#define ENABLE_IPV6 1 -+ - /* Define this to 'int' if socklen_t is not an available typedefed type */ - #if !defined(ENABLE_IPV6) && ((_MSC_VER < 1300) || !defined(USE_SSLEAY)) - #define socklen_t int ---- misc/curl-7.12.2/lib/http_ntlm.c 2004-07-29 15:09:58.000000000 +0200 -+++ misc/build/curl-7.12.2/lib/http_ntlm.c 2008-07-08 16:11:13.062500000 +0200 -@@ -528,6 +528,13 @@ - size=64; - ntlmbuf[62]=ntlmbuf[63]=0; - -+ /* Make sure that the user and domain strings fit in the target buffer -+ before we copy them there. */ -+ if(size + userlen + domlen >= sizeof(ntlmbuf)) { -+ failf(conn->data, "user + domain name too big"); -+ return CURLE_OUT_OF_MEMORY; -+ } -+ - memcpy(&ntlmbuf[size], domain, domlen); - size += domlen; - ---- misc/curl-7.12.2/lib/setup.h 2004-10-08 10:06:16.000000000 +0200 -+++ misc/build/curl-7.12.2/lib/setup.h 2008-07-08 16:23:32.328125000 +0200 -@@ -44,6 +44,10 @@ - /* hand-modified win32 config.h! */ - #include "config-win32.h" - #endif -+#ifdef OS2 -+/* hand-modified os2 config.h! */ -+#include "config-os2.h" -+#endif - #endif - - #ifdef macintosh -@@ -161,21 +165,11 @@ - #define WIN32_LEAN_AND_MEAN /* Prevent including <winsock*.h> in <windows.h> */ - #endif - --#if (defined(ENABLE_IPV6) || defined(CURLDEBUG)) && defined(_MSC_VER) && \ -- (!defined(_WIN32_WINNT) || _WIN32_WINNT < 0x0500) --/* -- * Needed to pull in the real getaddrinfo() and not the inline version -- * in <wspiAPI.H> which doesn't support IPv6 (IPv4 only). <wspiAPI.H> is -- * included from <ws2tcpip.h> for <= 0x0500 SDKs. -- */ --#undef _WIN32_WINNT --#define _WIN32_WINNT 0x0501 --#endif -- - #include <winsock2.h> /* required by telnet.c */ - - #if defined(ENABLE_IPV6) || defined(USE_SSLEAY) - #include <ws2tcpip.h> -+#include <wspiapi.h> - #endif - - #if !defined(__GNUC__) || defined(__MINGW32__) ---- misc/curl-7.12.2/lib/url.c 2004-10-18 00:21:02.000000000 +0200 -+++ misc/build/curl-7.12.2/lib/url.c 2008-07-08 16:11:13.375000000 +0200 -@@ -814,27 +814,6 @@ - and this just changes the actual request keyword */ - break; - -- case CURLOPT_PROXY: -- /* -- * Set proxy server:port to use as HTTP proxy. -- * -- * If the proxy is set to "" we explicitly say that we don't want to use a -- * proxy (even though there might be environment variables saying so). -- * -- * Setting it to NULL, means no proxy but allows the environment variables -- * to decide for us. -- */ -- if(data->change.proxy_alloc) { -- /* -- * The already set string is allocated, free that first -- */ -- data->change.proxy_alloc=FALSE;; -- free(data->change.proxy); -- } -- data->set.set_proxy = va_arg(param, char *); -- data->change.proxy = data->set.set_proxy; -- break; -- - case CURLOPT_PROXYPORT: - /* - * Explicitly set HTTP proxy port number. -@@ -883,6 +862,27 @@ - break; - #endif /* CURL_DISABLE_HTTP */ - -+ case CURLOPT_PROXY: -+ /* -+ * Set proxy server:port to use as HTTP proxy. -+ * -+ * If the proxy is set to "" we explicitly say that we don't want to use a -+ * proxy (even though there might be environment variables saying so). -+ * -+ * Setting it to NULL, means no proxy but allows the environment variables -+ * to decide for us. -+ */ -+ if(data->change.proxy_alloc) { -+ /* -+ * The already set string is allocated, free that first -+ */ -+ data->change.proxy_alloc=FALSE;; -+ free(data->change.proxy); -+ } -+ data->set.set_proxy = va_arg(param, char *); -+ data->change.proxy = data->set.set_proxy; -+ break; -+ - case CURLOPT_WRITEHEADER: - /* - * Custom pointer to pass the header write callback function -@@ -1428,7 +1428,7 @@ - result = CURLE_FAILED_INIT; /* correct this */ - break; - } -- -+ - return result; - } - -@@ -2278,12 +2278,18 @@ - if(urllen < LEAST_PATH_ALLOC) - urllen=LEAST_PATH_ALLOC; - -- conn->pathbuffer=(char *)malloc(urllen); -+ /* -+ * We malloc() the buffers below urllen+2 to make room for to possibilities: -+ * 1 - an extra terminating zero -+ * 2 - an extra slash (in case a syntax like "www.host.com?moo" is used) -+ */ -+ -+ conn->pathbuffer=(char *)malloc(urllen+2); - if(NULL == conn->pathbuffer) - return CURLE_OUT_OF_MEMORY; /* really bad error */ - conn->path = conn->pathbuffer; - -- conn->host.rawalloc=(char *)malloc(urllen); -+ conn->host.rawalloc=(char *)malloc(urllen+2); - if(NULL == conn->host.rawalloc) - return CURLE_OUT_OF_MEMORY; - conn->host.name = conn->host.rawalloc; -@@ -2461,6 +2467,7 @@ - return CURLE_OUT_OF_MEMORY; - } - -+#ifndef CURL_DISABLE_HTTP - /************************************************************* - * Detect what (if any) proxy to use - *************************************************************/ -@@ -2625,6 +2632,7 @@ - if(no_proxy) - free(no_proxy); - } /* if not using proxy */ -+#endif /* CURL_DISABLE_HTTP */ - - /************************************************************* - * No protocol part in URL was used, add it! -@@ -2880,54 +2888,6 @@ - return CURLE_UNSUPPORTED_PROTOCOL; - } - -- /************************************************************* -- * Figure out the remote port number -- * -- * No matter if we use a proxy or not, we have to figure out the remote -- * port number of various reasons. -- * -- * To be able to detect port number flawlessly, we must not confuse them -- * IPv6-specified addresses in the [0::1] style. (RFC2732) -- * -- * The conn->host.name is currently [user:passwd@]host[:port] where host -- * could be a hostname, IPv4 address or IPv6 address. -- *************************************************************/ -- if((1 == sscanf(conn->host.name, "[%*39[0-9a-fA-F:.]%c", &endbracket)) && -- (']' == endbracket)) { -- /* this is a RFC2732-style specified IP-address */ -- conn->bits.ipv6_ip = TRUE; -- -- conn->host.name++; /* pass the starting bracket */ -- tmp = strchr(conn->host.name, ']'); -- *tmp = 0; /* zero terminate */ -- tmp++; /* pass the ending bracket */ -- if(':' != *tmp) -- tmp = NULL; /* no port number available */ -- } -- else -- tmp = strrchr(conn->host.name, ':'); -- -- if (tmp) { -- char *rest; -- unsigned long port; -- -- port=strtoul(tmp+1, &rest, 10); /* Port number must be decimal */ -- -- if (rest != (tmp+1) && *rest == '\0') { -- /* The colon really did have only digits after it, -- * so it is either a port number or a mistake */ -- -- if (port > 0xffff) { /* Single unix standard says port numbers are -- * 16 bits long */ -- failf(data, "Port number too large: %lu", port); -- return CURLE_URL_MALFORMAT; -- } -- -- *tmp = '\0'; /* cut off the name there */ -- conn->remote_port = (unsigned short)port; -- } -- } -- - if(data->change.proxy && *data->change.proxy) { - /* If this is supposed to use a proxy, we need to figure out the proxy - host name name, so that we can re-use an existing connection -@@ -3119,6 +3079,54 @@ - return CURLE_OUT_OF_MEMORY; - - /************************************************************* -+ * Figure out the remote port number -+ * -+ * No matter if we use a proxy or not, we have to figure out the remote -+ * port number of various reasons. -+ * -+ * To be able to detect port number flawlessly, we must not confuse them -+ * IPv6-specified addresses in the [0::1] style. (RFC2732) -+ * -+ * The conn->host.name is currently host[:port] where host could be a -+ * hostname, IPv4 address or IPv6 address. -+ *************************************************************/ -+ if((1 == sscanf(conn->host.name, "[%*39[0-9a-fA-F:.]%c", &endbracket)) && -+ (']' == endbracket)) { -+ /* this is a RFC2732-style specified IP-address */ -+ conn->bits.ipv6_ip = TRUE; -+ -+ conn->host.name++; /* pass the starting bracket */ -+ tmp = strchr(conn->host.name, ']'); -+ *tmp = 0; /* zero terminate */ -+ tmp++; /* pass the ending bracket */ -+ if(':' != *tmp) -+ tmp = NULL; /* no port number available */ -+ } -+ else -+ tmp = strrchr(conn->host.name, ':'); -+ -+ if (tmp) { -+ char *rest; -+ unsigned long port; -+ -+ port=strtoul(tmp+1, &rest, 10); /* Port number must be decimal */ -+ -+ if (rest != (tmp+1) && *rest == '\0') { -+ /* The colon really did have only digits after it, -+ * so it is either a port number or a mistake */ -+ -+ if (port > 0xffff) { /* Single unix standard says port numbers are -+ * 16 bits long */ -+ failf(data, "Port number too large: %lu", port); -+ return CURLE_URL_MALFORMAT; -+ } -+ -+ *tmp = '\0'; /* cut off the name there */ -+ conn->remote_port = (unsigned short)port; -+ } -+ } -+ -+ /************************************************************* - * Check the current list of connections to see if we can - * re-use an already existing one or if we have to create a - * new one. -@@ -3471,9 +3479,7 @@ - * characters (you get mangled text files, and corrupted binary files when - * you download to stdout and redirect it to a file). */ - -- if ((data->set.out)->_handle == NULL) { - _fsetmode(stdout, "b"); -- } - #endif - - return CURLE_OK; ---- misc/curl-7.12.2/ltmain.sh 2004-08-09 13:12:17.000000000 +0200 -+++ misc/build/curl-7.12.2/ltmain.sh 2008-07-08 16:11:13.484375000 +0200 -@@ -2915,12 +2915,12 @@ - # which has an extra 1 added just for fun - # - case $version_type in -- darwin|linux|osf|windows) -+ darwin|linux|osf|windows|freebsd-aout|freebsd-elf) - current=`expr $number_major + $number_minor` - age="$number_minor" - revision="$number_revision" - ;; -- freebsd-aout|freebsd-elf|sunos) -+ sunos) - current="$number_major" - revision="$number_minor" - age="0" -@@ -2996,8 +2996,8 @@ - ;; - - freebsd-elf) -- major=".$current" -- versuffix=".$current"; -+ major=.`expr $current - $age` -+ versuffix="$major" - ;; - - irix | nonstopux) diff --git a/curl/curl-7.19.7.patch b/curl/curl-7.19.7.patch new file mode 100644 index 000000000000..0e39cb700a35 --- /dev/null +++ b/curl/curl-7.19.7.patch @@ -0,0 +1,83 @@ +--- misc/curl-7.19.7/configure 2009-11-04 13:26:02.000000000 +0100 ++++ misc/build/curl-7.19.7/configure 2009-11-18 14:17:25.453125000 +0100 +@@ -2735,8 +2735,8 @@ + + ac_ext=c + ac_cpp='$CPP $CPPFLAGS' +-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ++ac_compile='$CC -c $ADDCFLAGS $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ++ac_link='$CC -o conftest$ac_exeext $ADDCFLAGS $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_c_compiler_gnu + + +@@ -3783,8 +3783,8 @@ + ac_save_CPPFLAGS="$CPPFLAGS" + ac_ext=c + ac_cpp='$CPP $CPPFLAGS' +-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ++ac_compile='$CC -c $ADDCFLAGS $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ++ac_link='$CC -o conftest$ac_exeext $ADDCFLAGS $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_c_compiler_gnu + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. +@@ -4434,15 +4434,15 @@ + CFLAGS=$ac_save_CFLAGS + elif test $ac_cv_prog_cc_g = yes; then + if test "$GCC" = yes; then +- CFLAGS="-g -O2" ++ CFLAGS="$ADDCFLAGS -g -O2" + else +- CFLAGS="-g" ++ CFLAGS="$ADDCFLAGS -g" + fi + else + if test "$GCC" = yes; then +- CFLAGS="-O2" ++ CFLAGS="$ADDCFLAGS -O2" + else +- CFLAGS= ++ CFLAGS="$ADDCFLAGS" + fi + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 +--- misc/curl-7.19.7/lib/setup.h 2009-10-28 21:21:58.000000000 +0100 ++++ misc/build/curl-7.19.7/lib/setup.h 2009-11-18 13:30:42.375000000 +0100 +@@ -193,6 +193,7 @@ + # include <winsock2.h> + # ifdef HAVE_WS2TCPIP_H + # include <ws2tcpip.h> ++# include <wspiapi.h> + # endif + # else + # ifdef HAVE_WINSOCK_H +--- misc/curl-7.19.7/ltmain.sh 2009-11-04 13:25:51.000000000 +0100 ++++ misc/build/curl-7.19.7/ltmain.sh 2009-11-18 14:37:08.046875000 +0100 +@@ -6188,13 +6188,13 @@ + # which has an extra 1 added just for fun + # + case $version_type in +- darwin|linux|osf|windows|none) ++ darwin|linux|osf|windows|freebsd-aout|freebsd-elf|none) + func_arith $number_major + $number_minor + current=$func_arith_result + age="$number_minor" + revision="$number_revision" + ;; +- freebsd-aout|freebsd-elf|sunos) ++ sunos) + current="$number_major" + revision="$number_minor" + age="0" +@@ -6271,8 +6271,8 @@ + ;; + + freebsd-elf) +- major=".$current" +- versuffix=".$current" ++ major=.`expr $current - $age` ++ versuffix="$major" + ;; + + irix | nonstopux) diff --git a/curl/curl-7.19.7_win.patch b/curl/curl-7.19.7_win.patch new file mode 100644 index 000000000000..bc59433b5ef1 --- /dev/null +++ b/curl/curl-7.19.7_win.patch @@ -0,0 +1,19 @@ +--- misc/curl-7.19.7/lib/Makefile.vc9 2009-11-04 13:35:39.000000000 +0100 ++++ misc/build/curl-7.19.7/lib/Makefile.vc9 2009-11-18 12:32:57.234375000 +0100 +@@ -46,13 +46,13 @@ + # Stem for static libs and DLLs + # + LIB_NAME = libcurl +-LIB_NAME_DEBUG = libcurld ++LIB_NAME_DEBUG = libcurl + + # + # Stem for DLL import libs + # +-IMPLIB_NAME = libcurl_imp +-IMPLIB_NAME_DEBUG = libcurld_imp ++IMPLIB_NAME = libcurl ++IMPLIB_NAME_DEBUG = libcurl + + !IFNDEF OPENSSL_PATH + OPENSSL_PATH = ../../openssl-0.9.8g diff --git a/curl/makefile.mk b/curl/makefile.mk index 2d26a876a556..d129b7be2411 100644 --- a/curl/makefile.mk +++ b/curl/makefile.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: makefile.mk,v $ -# -# $Revision: 1.25 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify @@ -45,12 +41,18 @@ all: # --- Files -------------------------------------------------------- -TARFILE_NAME=curl-7.12.2 -PATCH_FILES=curl-7.12.2.patch -CONVERTFILES= \ +TARFILE_NAME=curl-7.19.7 +PATCH_FILES=curl-7.19.7.patch + +.IF "$(GUI)"=="WNT" + PATCH_FILES+=curl-7.19.7_win.patch +.ENDIF + + +#CONVERTFILES= \ lib$/Makefile.vc6 -ADDITIONAL_FILES= lib$/config-os2.h lib$/Makefile.os2 +#ADDITIONAL_FILES= lib$/config-os2.h lib$/Makefile.os2 .IF "$(GUI)"=="UNX" @@ -77,7 +79,7 @@ BUILD_DIR=$(CONFIGURE_DIR)$/lib BUILD_ACTION=$(GNUMAKE) BUILD_FLAGS+= -j$(EXTMAXPROCESS) -OUT2LIB=$(BUILD_DIR)$/.libs$/libcurl$(DLLPOST).3 +OUT2LIB=$(BUILD_DIR)$/.libs$/libcurl$(DLLPOST).4 .ENDIF # "$(GUI)"=="UNX" @@ -111,9 +113,9 @@ EXCFLAGS="/EHsc /YX" BUILD_DIR=.$/lib .IF "$(debug)"=="" -BUILD_ACTION=nmake -f Makefile.vc6 cfg=release-dll EXCFLAGS=$(EXCFLAGS) +BUILD_ACTION=nmake -f Makefile.vc9 cfg=release-dll EXCFLAGS=$(EXCFLAGS) .ELSE -BUILD_ACTION=nmake -f Makefile.vc6 cfg=debug-dll EXCFLAGS=$(EXCFLAGS) +BUILD_ACTION=nmake -f Makefile.vc9 cfg=debug-dll EXCFLAGS=$(EXCFLAGS) .ENDIF OUT2BIN=$(BUILD_DIR)$/libcurl.dll @@ -145,7 +147,9 @@ OUT2INC= \ include$/curl$/curlver.h \ include$/curl$/types.h \ include$/curl$/stdcheaders.h \ - include$/curl$/mprintf.h + include$/curl$/mprintf.h \ + include$/curl$/curlbuild.h \ + include$/curl$/curlrules.h # --- Targets ------------------------------------------------------ diff --git a/curl/prj/d.lst b/curl/prj/d.lst index a83ff5c06360..fe97f2044f23 100644 --- a/curl/prj/d.lst +++ b/curl/prj/d.lst @@ -6,6 +6,8 @@ mkdir: %_DEST%\inc%_EXT%\external\curl ..\%__SRC%\inc\multi.h %_DEST%\inc%_EXT%\external\curl\multi.h ..\%__SRC%\inc\stdcheaders.h %_DEST%\inc%_EXT%\external\curl\stdcheaders.h ..\%__SRC%\inc\types.h %_DEST%\inc%_EXT%\external\curl\types.h +..\%__SRC%\inc\curlbuild.h %_DEST%\inc%_EXT%\external\curl\curlbuild.h +..\%__SRC%\inc\curlrules.h %_DEST%\inc%_EXT%\external\curl\curlrules.h ..\%__SRC%\bin\libcurl*.dll %_DEST%\bin%_EXT%\*.dll ..\%__SRC%\lib\libcurl.* %_DEST%\lib%_EXT%\libcurl.* diff --git a/expat/expat-2.0.1.patch b/expat/expat-2.0.1.patch index 9ed7413d40de..bea3d01e0c4f 100644 --- a/expat/expat-2.0.1.patch +++ b/expat/expat-2.0.1.patch @@ -1,19 +1,15 @@ --- misc/expat-2.0.1/lib/makefile.mk Wed Aug 20 14:33:55 2008 +++ misc/build/expat-2.0.1/lib/makefile.mk Wed Aug 20 14:26:42 2008 -@@ -1 +1,93 @@ +@@ -1 +1,89 @@ -dummy +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# -+# Copyright 2008 by Sun Microsystems, Inc. ++# Copyright 2000, 2010 Oracle and/or its affiliates. +# +# OpenOffice.org - a multi-platform office productivity suite +# -+# $RCSfile: header.hxx,v $ -+# -+# $Revision: 1.1 $ -+# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/expat/makefile.mk b/expat/makefile.mk index a7e9a6fe5d68..1c2ca1a9e0f7 100644 --- a/expat/makefile.mk +++ b/expat/makefile.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: makefile.mk,v $ -# -# $Revision: 1.5 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/graphite/makefile.mk b/graphite/makefile.mk index 5faa9054f98a..1f3d71748a4b 100644 --- a/graphite/makefile.mk +++ b/graphite/makefile.mk @@ -1,58 +1,27 @@ #************************************************************************* # -# $RCSfile: graphite-makefile-mk.diff,v $ -# -# The Contents of this file are made available subject to the terms of -# either of the following licenses -# -# - GNU Lesser General Public License Version 2.1 -# - Sun Industry Standards Source License Version 1.1 -# -# Sun Microsystems Inc., October, 2000 -# -# GNU Lesser General Public License Version 2.1 -# ============================================= -# Copyright 2000 by Sun Microsystems, Inc. -# 901 San Antonio Road, Palo Alto, CA 94303, USA -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License version 2.1, as published by the Free Software Foundation. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# -# -# Sun Industry Standards Source License Version 1.1 -# ================================================= -# The contents of this file are subject to the Sun Industry Standards -# Source License Version 1.1 (the "License"); You may not use this file -# except in compliance with the License. You may obtain a copy of the -# License at http://www.openoffice.org/license.html. -# -# Software provided under this License is provided on an "AS IS" basis, -# WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, -# WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS, -# MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING. -# See the License for the specific provisions governing your rights and -# obligations concerning the Software. -# -# The Initial Developer of the Original Code is: Sun Microsystems, Inc. +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2010 Oracle and/or its affiliates. # -# Copyright: 2000 by Sun Microsystems, Inc. +# OpenOffice.org - a multi-platform office productivity suite # -# All Rights Reserved. +# This file is part of OpenOffice.org. # -# Contributor(s): _______________________________________ +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. # +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). # +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# <http://www.openoffice.org/license.html> +# for a copy of the LGPLv3 License. # #************************************************************************* @@ -68,6 +37,12 @@ TARGET=so_graphite .INCLUDE : settings.mk +.IF "$(SYSTEM_GRAPHITE)" == "YES" +all: + @echo "An already available installation of silgraphite should exist on your system." + @echo "Therefore the version provided here does not need to be built in addition." +.ENDIF + # --- Files -------------------------------------------------------- .IF "$(ENABLE_GRAPHITE)"=="TRUE" TARFILE_NAME=silgraphite-2.3.1 diff --git a/hunspell/makefile.mk b/hunspell/makefile.mk index f7e17c9dad0c..b20e8d135887 100644 --- a/hunspell/makefile.mk +++ b/hunspell/makefile.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: makefile.mk,v $ -# -# $Revision: 1.6.4.1 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/icu/createmak.pl b/icu/createmak.pl index 5558c9415bfb..891c5e33a778 100644 --- a/icu/createmak.pl +++ b/icu/createmak.pl @@ -3,36 +3,28 @@ eval 'exec perl -wS $0 ${1+"$@"}' if 0; #************************************************************************* # -# OpenOffice.org - a multi-platform office productivity suite +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# $RCSfile: checksize.pl,v $ +# Copyright 2000, 2010 Oracle and/or its affiliates. # -# $Revision: 1.3 $ +# OpenOffice.org - a multi-platform office productivity suite # -# last change: $Author: rt $ $Date: 2006/04/21 10:48:45 $ +# This file is part of OpenOffice.org. # -# The Contents of this file are made available subject to -# the terms of GNU Lesser General Public License Version 2.1. +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. # +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). # -# GNU Lesser General Public License Version 2.1 -# ============================================= -# Copyright 2005 by Sun Microsystems, Inc. -# 901 San Antonio Road, Palo Alto, CA 94303, USA -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License version 2.1, as published by the Free Software Foundation. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# <http://www.openoffice.org/license.html> +# for a copy of the LGPLv3 License. # #************************************************************************* # diff --git a/icu/icuversion.mk b/icu/icuversion.mk index e0b599f94c4a..eedf6276e598 100755 --- a/icu/icuversion.mk +++ b/icu/icuversion.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: icuversion.mk,v $ -# -# $Revision: 1.5 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/icu/makefile.mk b/icu/makefile.mk index c452443c889d..8776ada87979 100644 --- a/icu/makefile.mk +++ b/icu/makefile.mk @@ -1,15 +1,11 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2008 by Sun Microsystems, Inc. +# +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: makefile.mk,v $ -# -# $Revision: 1.40 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/jpeg/jpeg-6b.patch b/jpeg/jpeg-6b.patch index c7c96a3eb736..c1a0f8010669 100644 --- a/jpeg/jpeg-6b.patch +++ b/jpeg/jpeg-6b.patch @@ -150,16 +150,10 @@ --- misc/jpeg-6b/makefile.mk 2009-03-19 11:30:46.000000000 +0100 +++ misc/build/jpeg-6b/makefile.mk 2009-03-19 11:30:30.000000000 +0100 -@@ -1 +1,82 @@ +@@ -1 +1,76 @@ -dummy +#************************************************************************* +# -+# $RCSfile: makefile.mk,v $ -+# -+# $Revision: 1.5 $ -+# -+# last change: $Author: thb $ $Date: 2001/08/14 12:53:46 $ -+# +# Copyright according the GNU Public License. +# +#************************************************************************* diff --git a/jpeg/makefile.mk b/jpeg/makefile.mk index b02480b118d6..0f5f5e0aba64 100644 --- a/jpeg/makefile.mk +++ b/jpeg/makefile.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: makefile.mk,v $ -# -# $Revision: 1.5 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/libxml2/makefile.mk b/libxml2/makefile.mk index 1e7842932e4a..490c9c2bd289 100644 --- a/libxml2/makefile.mk +++ b/libxml2/makefile.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: makefile.mk,v $ -# -# $Revision: 1.24 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/libxslt/libxsltversion.mk b/libxslt/libxsltversion.mk index 66e2888c6193..c80c0e9535b0 100644 --- a/libxslt/libxsltversion.mk +++ b/libxslt/libxsltversion.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: libxsltversion.mk,v $ -# -# $Revision: 1.2 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/libxslt/makefile.mk b/libxslt/makefile.mk index 33de5e231d2b..afb3225bc847 100644 --- a/libxslt/makefile.mk +++ b/libxslt/makefile.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: makefile.mk,v $ -# -# $Revision: 1.16 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/moz/extractfiles.mk b/moz/extractfiles.mk index 81e04ab80ad6..c8d88c015411 100644 --- a/moz/extractfiles.mk +++ b/moz/extractfiles.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: extractfiles.mk,v $ -# -# $Revision: 1.13 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/moz/makefile.mk b/moz/makefile.mk index 0aabda002e2e..c1649d2f8b85 100644 --- a/moz/makefile.mk +++ b/moz/makefile.mk @@ -1,15 +1,11 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2008 by Sun Microsystems, Inc. +# +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: makefile.mk,v $ -# -# $Revision: 1.15 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/moz/zipped/makefile.mk b/moz/zipped/makefile.mk index c8497d36acf9..0ea80c02dc3e 100644 --- a/moz/zipped/makefile.mk +++ b/moz/zipped/makefile.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: makefile.mk,v $ -# -# $Revision: 1.17 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/neon/makefile.mk b/neon/makefile.mk index dd0022822752..f7dc137015c4 100644 --- a/neon/makefile.mk +++ b/neon/makefile.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: makefile.mk,v $ -# -# $Revision: 1.11 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify @@ -62,8 +58,8 @@ PATCH_FILES=neon.patch .ENDIF ADDITIONAL_FILES=src$/makefile.mk src$/config.h src$/ne_ntlm.h src$/ne_ntlm.c - BUILD_DIR=src + BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS) OUT2INC= \ @@ -71,6 +67,7 @@ OUT2INC= \ $(BUILD_DIR)$/ne_alloc.h \ $(BUILD_DIR)$/ne_auth.h \ $(BUILD_DIR)$/ne_basic.h \ + $(BUILD_DIR)$/ne_compress.h \ $(BUILD_DIR)$/ne_defs.h \ $(BUILD_DIR)$/ne_locks.h \ $(BUILD_DIR)$/ne_props.h \ diff --git a/neon/neon.patch b/neon/neon.patch index 23a6bba02ebe..09233266b292 100644 --- a/neon/neon.patch +++ b/neon/neon.patch @@ -1,6 +1,6 @@ ---- misc/neon-0.28.2/src/config.h 2009-09-29 10:28:26.750000000 +0200 -+++ misc/build/neon-0.28.2/src/config.h 2009-09-29 10:22:51.890625000 +0200 -@@ -1 +1,484 @@ +--- misc/neon-0.28.2/src/config.h 2010-01-08 11:51:21.000000000 +0100 ++++ misc/build/neon-0.28.2/src/config.h 2010-01-08 11:53:42.000000000 +0100 +@@ -1 +1,488 @@ -dummy + +/* Define to specific EGD socket path */ @@ -22,7 +22,7 @@ + +/* Define to 1 if you have the declaration of `h_errno', and to 0 if you + don't. */ -+#ifdef WIN32 ++#ifdef WIN32 +#define HAVE_DECL_H_ERRNO 1 +#endif + @@ -132,14 +132,14 @@ +#endif + +/* Define if OpenSSL support is enabled */ -+/* #undef HAVE_OPENSSL */ -+#define HAVE_OPENSSL ++#define HAVE_OPENSSL 1 ++ +/* Define to 1 if you have the <openssl/opensslv.h> header file. */ -+/* #undef HAVE_OPENSSL_OPENSSLV_H */ +#define HAVE_OPENSSL_OPENSSLV_H 1 ++ +/* Define to 1 if you have the <openssl/ssl.h> header file. */ -+/* #undef HAVE_OPENSSL_SSL_H */ +#define HAVE_OPENSSL_SSL_H 1 ++ +/* Define to 1 if you have the `pipe' function. */ +#define HAVE_PIPE 1 + @@ -340,13 +340,13 @@ +/* #undef NE_HAVE_SOCKS */ + +/* Defined if SSL is supported */ -+/* #undef NE_HAVE_SSL */ +#define NE_HAVE_SSL ++ +/* Defined if TS_SSL is supported */ +/* #undef NE_HAVE_TS_SSL */ + +/* Defined if ZLIB is supported */ -+/* #undef NE_HAVE_ZLIB */ ++#define NE_HAVE_ZLIB 1 + +/* Define to be filename of an SSL CA root bundle */ +/* #undef NE_SSL_CA_BUNDLE */ @@ -455,6 +455,10 @@ +/* Define to `unsigned' if <sys/types.h> does not define. */ +/* #undef size_t */ + ++/* MS IIS does not send Lock-Token response header after creation of a */ ++/* new lock. This violates RFC, but... if we want to talk with this */ ++/* beast we need a workaround */ ++#define IIS_LOCK_BUG_WORKAROUND 1 + +/* Enable leak-tracking versions of ne_*alloc when NEON_MEMLEAK is enabled */ +#ifdef NEON_MEMLEAK @@ -471,13 +475,13 @@ + +#define HAVE_MEMCPY 1 + -+#define strncasecmp strnicmp ++#define strncasecmp strnicmp +#define inline __inline +#define WIN32_LEAN_AND_MEAN +#define NOUSER +#define NOGDI +#define NONLS -+#define NOCRYPT ++#define NOCRYPT + +#endif + @@ -486,9 +490,9 @@ +#else +#define HAVE_NTLM 1 +#endif ---- misc/neon-0.28.2/src/makefile.mk 2009-09-29 10:28:26.687500000 +0200 -+++ misc/build/neon-0.28.2/src/makefile.mk 2009-09-17 13:04:18.031250000 +0200 -@@ -1 +1,92 @@ +--- misc/neon-0.28.2/src/makefile.mk 2010-01-08 11:51:21.000000000 +0100 ++++ misc/build/neon-0.28.2/src/makefile.mk 2010-01-08 11:53:27.000000000 +0100 +@@ -1 +1,100 @@ -dummy +PRJ=..$/..$/..$/..$/.. + @@ -497,7 +501,7 @@ +LIBTARGET=NO +USE_DEFFILE=TRUE +EXTERNAL_WARNINGS_NOT_ERRORS := TRUE -+ UWINAPILIB= ++UWINAPILIB= + +# --- Settings ----------------------------------------------------- + @@ -508,7 +512,7 @@ +CDEFS+=-DHAVE_CONFIG_H + +.IF "$(SYSTEM_LIBXML)" == "YES" -+CFLAGS+= -DSYSTEM_LIBXML $(LIBXML_CFLAGS) ++CFLAGS+=-DSYSTEM_LIBXML $(LIBXML_CFLAGS) +.ELSE +LIBXMLINCDIR=external$/libxml +CFLAGS+= -I$(SOLARINCDIR)$/$(LIBXMLINCDIR) @@ -518,6 +522,13 @@ +CFLAGS+= $(OPENSSL_CFLAGS) +.ENDIF + ++.IF "$(SYSTEM_ZLIB)" == "YES" ++CFLAGS+=-DSYSTEM_ZLIB ++.ELSE ++ZLIBINCDIR=external$/zlib ++CFLAGS+=-I$(SOLARINCDIR)$/$(ZLIBINCDIR) ++.ENDIF ++ +SLOFILES= \ + $(SLO)$/ne_207.obj \ + $(SLO)$/ne_acl.obj \ @@ -548,14 +559,15 @@ +.ENDIF + +# $(SLO)$/ne_gnutls.obj \ -+# $(SLO)$/ne_stubssl.obj ++# $(SLO)$/ne_stubssl.obj + +SHL1OBJS=$(SLOFILES) +SHL1TARGET=$(TARGET) +SHL1VERSIONMAP=exports.map +SHL1IMPLIB=i$(TARGET) + -+SHL1STDLIBS+= $(LIBXML2LIB) ++SHL1STDLIBS+= $(LIBXML2LIB) \ ++ $(ZLIB3RDLIB) + +.IF "$(GUI)"=="WNT" + SHL1STDLIBS+= $(WSOCK32LIB) @@ -580,10 +592,10 @@ +SHL1DEF=$(MISC)$/$(SHL1TARGET).def + +# --- Targets ------------------------------------------------------ -+DEF1NAME=$(SHL1TARGET) ++DEF1NAME=$(SHL1TARGET) +.INCLUDE : target.mk --- misc/neon-0.28.2/src/ne_auth.c 2008-02-29 17:30:12.000000000 +0100 -+++ misc/build/neon-0.28.2/src/ne_auth.c 2009-09-29 10:22:51.906250000 +0200 ++++ misc/build/neon-0.28.2/src/ne_auth.c 2010-01-08 11:30:06.000000000 +0100 @@ -77,6 +77,10 @@ #include "ne_sspi.h" #endif @@ -627,25 +639,22 @@ chall->handler->attempt++, sess->username, pwbuf) == 0) { return 0; } else { -@@ -598,9 +611,10 @@ +@@ -598,7 +611,8 @@ int ntlm = ne_strcasecmp(parms->protocol->name, "NTLM") == 0; int status; char *response = NULL; - -+ char password[NE_ABUFSIZ]; -+ ++ char password[NE_ABUFSIZ]; ++ NE_DEBUG(NE_DBG_HTTPAUTH, "auth: SSPI challenge.\n"); -- -+ + if (!sess->sspi_context) { - ne_uri uri = {0}; - @@ -614,8 +628,17 @@ return status; } } + -+ /* Authentification needs more than one http request. ++ /* Authentification needs more than one http request. + * As long as authentification in progress use the existing credentials. + * Otherwise get new credentials.*/ + if (!parms->opaque) @@ -665,7 +674,7 @@ +#ifdef HAVE_NTLM + -+static char *request_ntlm(auth_session *sess, struct auth_request *request) ++static char *request_ntlm(auth_session *sess, struct auth_request *request) +{ + char *token = ne_ntlm_getRequestToken(sess->ntlm_context); + if (token) { @@ -679,13 +688,13 @@ + +static int ntlm_challenge(auth_session *sess, int attempt, + struct auth_challenge *parms, -+ ne_buffer **errmsg) ++ ne_buffer **errmsg) +{ + int status; -+ ++ + NE_DEBUG(NE_DBG_HTTPAUTH, "auth: NTLM challenge.\n"); -+ -+ if (!parms->opaque) { ++ ++ if (!parms->opaque && (!sess->ntlm_context || (attempt > 1))) { + char password[NE_ABUFSIZ]; + + if (get_credentials(sess, errmsg, attempt, parms, password)) { @@ -702,7 +711,7 @@ + } + + status = ne_ntlm_create_context(&sess->ntlm_context, -+ sess->username, ++ sess->username, + password); + if (status) { + return status; @@ -717,7 +726,7 @@ + return 0; +} +#endif /* HAVE_NTLM */ -+ ++ + /* Examine a digest challenge: return 0 if it is a valid Digest challenge, * else non-zero. */ @@ -747,7 +756,7 @@ return ret; } --- misc/neon-0.28.2/src/ne_auth.h 2007-12-05 17:39:58.000000000 +0100 -+++ misc/build/neon-0.28.2/src/ne_auth.h 2009-09-29 10:22:51.921875000 +0200 ++++ misc/build/neon-0.28.2/src/ne_auth.h 2010-01-08 11:30:07.000000000 +0100 @@ -47,8 +47,8 @@ * Hint: if you just wish to attempt authentication just once (even if * the user gets the username/password wrong), have the callback @@ -760,7 +769,7 @@ /* Set callbacks to provide credentials for server and proxy * authentication, using the default set of authentication protocols. --- misc/neon-0.28.2/src/ne_defs.h 2006-10-24 21:40:09.000000000 +0200 -+++ misc/build/neon-0.28.2/src/ne_defs.h 2009-09-29 10:22:51.921875000 +0200 ++++ misc/build/neon-0.28.2/src/ne_defs.h 2010-01-08 11:30:07.000000000 +0100 @@ -41,7 +41,7 @@ #endif @@ -770,8 +779,76 @@ #define ssize_t int #endif +--- misc/neon-0.28.2/src/ne_locks.c 2007-02-05 11:09:27.000000000 +0100 ++++ misc/build/neon-0.28.2/src/ne_locks.c 2010-01-08 11:30:06.000000000 +0100 +@@ -579,6 +579,23 @@ + const char *token = ne_get_response_header(ctx->req, "Lock-Token"); + /* at the root element; retrieve the Lock-Token header, + * and bail if it wasn't given. */ ++#ifdef IIS_LOCK_BUG_WORKAROUND ++ /* MS IIS violates RFC 2518/4918. It does not send a Lock-Token response ++ header upon successful creation of a new lock. As a workaround, we ++ will try to pick the lock token from the response body (although ++ this is not 100% safe in case of multiple activelocks). */ ++ if (token == NULL) ++ NE_DEBUG(NE_DBG_LOCKS, ++ "Ignoring missing LOCK response Lock-Token header\n"); ++ ++ if (token != NULL) { ++ if (token[0] == '<') token++; ++ ctx->token = ne_strdup(token); ++ ne_shave(ctx->token, ">"); ++ NE_DEBUG(NE_DBG_LOCKS, "lk_startelm: Finding token %s\n", ++ ctx->token); ++ } ++#else + if (token == NULL) { + ne_xml_set_error(ctx->parser, + _("LOCK response missing Lock-Token header")); +@@ -590,12 +607,28 @@ + ne_shave(ctx->token, ">"); + NE_DEBUG(NE_DBG_LOCKS, "lk_startelm: Finding token %s\n", + ctx->token); ++#endif + } + + /* TODO: only accept 'prop' as root for LOCK response */ + if (!can_accept(parent, id)) + return NE_XML_DECLINE; + ++#ifdef IIS_LOCK_BUG_WORKAROUND ++ if (id == ELM_activelock && ctx->found) { ++ /* Found another activelock... */ ++ const char *token = ne_get_response_header(ctx->req, "Lock-Token"); ++ if (token == NULL) { ++ /* Response contains more than one activelock and no Lock-Token ++ * response header. We are doomed. No safe workaround for IIS ++ * lock bug possible. */ ++ ne_xml_set_error(ctx->parser, ++ _("LOCK response missing Lock-Token header and more than one activelock")); ++ return NE_XML_ABORT; ++ } ++ } ++#endif ++ + if (id == ELM_activelock && !ctx->found) { + /* a new activelock */ + ne_lock_free(&ctx->active); +@@ -621,7 +654,12 @@ + return -1; + + if (state == ELM_activelock) { ++#ifdef IIS_LOCK_BUG_WORKAROUND ++ if (ctx->active.token) { ++ ctx->token = ne_strdup(ctx->active.token); ++#else + if (ctx->active.token && strcmp(ctx->active.token, ctx->token) == 0) { ++#endif + ctx->found = 1; + } + } --- misc/neon-0.28.2/src/ne_locks.h 2006-01-02 12:43:19.000000000 +0100 -+++ misc/build/neon-0.28.2/src/ne_locks.h 2009-09-29 10:22:51.921875000 +0200 ++++ misc/build/neon-0.28.2/src/ne_locks.h 2010-01-08 11:30:07.000000000 +0100 @@ -22,6 +22,10 @@ #ifndef NE_LOCKS_H #define NE_LOCKS_H @@ -783,11 +860,11 @@ #include "ne_request.h" /* for ne_session + ne_request */ #include "ne_uri.h" /* for ne_uri */ ---- misc/neon-0.28.2/src/ne_ntlm.c 2009-09-29 10:28:26.875000000 +0200 -+++ misc/build/neon-0.28.2/src/ne_ntlm.c 2009-09-29 10:22:51.937500000 +0200 -@@ -1 +1,700 @@ +--- misc/neon-0.28.2/src/ne_ntlm.c 2010-01-08 11:51:21.000000000 +0100 ++++ misc/build/neon-0.28.2/src/ne_ntlm.c 2010-01-08 11:53:52.000000000 +0100 +@@ -1 +1,703 @@ -dummy -+/* ++/* + Handling of NTLM Authentication + Copyright (C) 2003, Daniel Stenberg <daniel@haxx.se> + Copyright (C) 2009, Kai Sommerfeld <kso@openoffice.org> @@ -796,7 +873,7 @@ + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. -+ ++ + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -810,7 +887,7 @@ +*/ + +/* NTLM details: -+ ++ + http://davenport.sourceforge.net/ntlm.html + http://www.innovation.ch/java/ntlm.html + @@ -1018,8 +1095,8 @@ + memcpy(ctx->nonce, &buffer[24], 8); + + /* at index decimal 20, there's a 32bit NTLM flag field */ -+ -+ if (buffer) ne_free(buffer); ++ ++ if (buffer) ne_free(buffer); + } + else { + if(ctx->state >= NTLMSTATE_TYPE1) @@ -1105,7 +1182,7 @@ + + if (len > 14) + len = 14; -+ ++ + for (i=0; i<len; i++) + pw[i] = toupper(password[i]); + @@ -1119,7 +1196,7 @@ + setup_des_key(pw, DESKEY(ks)); + DES_ecb_encrypt((DES_cblock *)magic, (DES_cblock *)lmbuffer, + DESKEY(ks), DES_ENCRYPT); -+ ++ + setup_des_key(pw+7, DESKEY(ks)); + DES_ecb_encrypt((DES_cblock *)magic, (DES_cblock *)(lmbuffer+8), + DESKEY(ks), DES_ENCRYPT); @@ -1173,13 +1250,13 @@ + if(!ctx->user || !ctx->passwd) + /* no user, no auth */ + return 0; /* OK */ -+ ++ + switch(ctx->state) { + case NTLMSTATE_TYPE1: + default: /* for the weird cases we (re)start here */ + hostoff = 32; + domoff = hostoff + hostlen; -+ ++ + /* Create and send a type-1 message: + + Index Description Content @@ -1232,7 +1309,7 @@ + ctx->requestToken = ne_base64(ntlmbuf, size); + + break; -+ ++ + case NTLMSTATE_TYPE2: + /* We received the type-2 already, create a type-3 message: + @@ -1250,7 +1327,7 @@ + 52 (64) start of data block + + */ -+ ++ + { + int lmrespoff; + int ntrespoff; @@ -1300,25 +1377,25 @@ + "%c%c" /* NT-response allocated space */ + "%c%c" /* NT-response offset */ + "%c%c" /* 2 zeroes */ -+ ++ + "%c%c" /* domain length */ + "%c%c" /* domain allocated space */ + "%c%c" /* domain name offset */ + "%c%c" /* 2 zeroes */ -+ ++ + "%c%c" /* user length */ + "%c%c" /* user allocated space */ + "%c%c" /* user offset */ + "%c%c" /* 2 zeroes */ -+ ++ + "%c%c" /* host length */ + "%c%c" /* host allocated space */ + "%c%c" /* host offset */ + "%c%c%c%c%c%c" /* 6 zeroes */ -+ ++ + "\xff\xff" /* message length */ + "%c%c" /* 2 zeroes */ -+ ++ + "\x01\x82" /* flags */ + "%c%c" /* 2 zeroes */ + @@ -1335,7 +1412,7 @@ + SHORTPAIR(0x18), + SHORTPAIR(lmrespoff), + 0x0, 0x0, -+ ++ +#ifdef USE_NTRESPONSES + SHORTPAIR(0x18), /* NT-response length, twice */ + SHORTPAIR(0x18), @@ -1355,12 +1432,12 @@ + SHORTPAIR(userlen), + SHORTPAIR(useroff), + 0x0, 0x0, -+ ++ + SHORTPAIR(hostlen), + SHORTPAIR(hostlen), + SHORTPAIR(hostoff), + 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, -+ ++ + 0x0, 0x0, + + 0x0, 0x0); @@ -1388,7 +1465,7 @@ + } + +#ifdef USE_NTRESPONSES -+ if(size < ((int)sizeof(ntlmbuf) - 0x18)) { ++ if(size < ((int)sizeof(ntlmbuf) - 0x18)) { + memcpy(&ntlmbuf[size], ntresp, 0x18); + size += 0x18; + } @@ -1458,10 +1535,13 @@ + if (context == NULL) { + return -1; + } else { ++ if (!responseToken && (context->state == NTLMSTATE_TYPE3)) ++ context->state = NTLMSTATE_NONE; ++ + if (context->state <= NTLMSTATE_TYPE3) { + ntlm ntlmstatus = ne_input_ntlm(context, responseToken); + -+ if (ntlmstatus != NTLM_FINE) { ++ if (ntlmstatus != NTLM_FINE) { + return -1; + } + } @@ -1487,11 +1567,11 @@ + +#endif /* HAVE_OPENSSL */ +#endif /* HAVE_NTLM */ ---- misc/neon-0.28.2/src/ne_ntlm.h 2009-09-29 10:28:26.812500000 +0200 -+++ misc/build/neon-0.28.2/src/ne_ntlm.h 2009-09-29 10:22:51.937500000 +0200 +--- misc/neon-0.28.2/src/ne_ntlm.h 2010-01-08 11:51:21.000000000 +0100 ++++ misc/build/neon-0.28.2/src/ne_ntlm.h 2010-01-08 11:53:52.000000000 +0100 @@ -1 +1,44 @@ -dummy -+/* ++/* + Handling of NTLM Authentication + Copyright (C) 2009, Kai Sommerfeld <kso@openoffice.org> + @@ -1499,7 +1579,7 @@ + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. -+ ++ + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -1536,7 +1616,7 @@ + +#endif /* NE_NTLM_H */ --- misc/neon-0.28.2/src/ne_socket.c 2008-02-28 14:19:19.000000000 +0100 -+++ misc/build/neon-0.28.2/src/ne_socket.c 2009-09-29 10:22:51.953125000 +0200 ++++ misc/build/neon-0.28.2/src/ne_socket.c 2010-01-08 11:30:06.000000000 +0100 @@ -60,6 +60,7 @@ #include <stddef.h> #ifdef USE_GETADDRINFO @@ -1546,17 +1626,13 @@ #endif --- misc/neon-0.28.2/src/ne_sspi.c 2007-08-10 17:26:08.000000000 +0200 -+++ misc/build/neon-0.28.2/src/ne_sspi.c 2009-09-29 10:22:51.953125000 +0200 -@@ -202,9 +202,48 @@ - return -1; - } ++++ misc/build/neon-0.28.2/src/ne_sspi.c 2010-01-08 11:30:07.000000000 +0100 +@@ -206,6 +206,45 @@ + } -+ return 0; -+} -+ -+/* + /* + * Simplification wrapper arround AcquireCredentialsHandle as most of -+ * the parameters do not change. ++ * the parameters do not change. + */ +static int acquireCredentialsHandleForUsername(CredHandle * credentials, char *package, const char *username, const char *password) +{ @@ -1589,13 +1665,14 @@ + return -1; + } + - return 0; - } - ++ return 0; ++} + - /* ++ ++/* * Wrapper arround initializeSecurityContext. Supplies several * default parameters as well as logging in case of errors. + */ @@ -483,7 +522,7 @@ * Processes received authentication tokens as well as supplies the * response token. @@ -1605,11 +1682,17 @@ { SecBufferDesc outBufferDesc; SecBuffer outBuffer; -@@ -560,14 +599,23 @@ - +@@ -561,13 +600,22 @@ /* Reset any existing context since we are starting over */ resetContext(sspiContext); -+ + +- if (acquireCredentialsHandle +- (&sspiContext->credentials, sspiContext->mechanism) != SEC_E_OK) { +- freeBuffer(&outBufferDesc); +- NE_DEBUG(NE_DBG_HTTPAUTH, +- "sspi: acquireCredentialsHandle failed.\n"); +- return -1; +- } + if (strlen(username) != 0) { + if (acquireCredentialsHandleForUsername + (&sspiContext->credentials, sspiContext->mechanism, username, password) != SEC_E_OK) { @@ -1625,19 +1708,12 @@ + return -1; + } + } - -- if (acquireCredentialsHandle -- (&sspiContext->credentials, sspiContext->mechanism) != SEC_E_OK) { -- freeBuffer(&outBufferDesc); -- NE_DEBUG(NE_DBG_HTTPAUTH, -- "sspi: acquireCredentialsHandle failed.\n"); -- return -1; -- } ++ securityStatus = initializeSecurityContext(&sspiContext->credentials, NULL, --- misc/neon-0.28.2/src/ne_sspi.h 2006-02-12 13:05:14.000000000 +0100 -+++ misc/build/neon-0.28.2/src/ne_sspi.h 2009-09-29 10:22:51.968750000 +0200 ++++ misc/build/neon-0.28.2/src/ne_sspi.h 2010-01-08 11:30:06.000000000 +0100 @@ -41,7 +41,7 @@ int ne_sspi_clear_context(void *context); @@ -1648,7 +1724,7 @@ #endif /* HAVE_SSPI */ --- misc/neon-0.28.2/src/ne_uri.c 2007-12-05 12:04:47.000000000 +0100 -+++ misc/build/neon-0.28.2/src/ne_uri.c 2009-09-29 10:22:51.968750000 +0200 ++++ misc/build/neon-0.28.2/src/ne_uri.c 2010-01-08 11:30:06.000000000 +0100 @@ -42,7 +42,7 @@ #include "ne_alloc.h" #include "ne_uri.h" @@ -1695,7 +1771,7 @@ /* 4x */ AT, AL, AL, AL, AL, AL, AL, AL, AL, AL, AL, AL, AL, AL, AL, AL, /* 5x */ AL, AL, AL, AL, AL, AL, AL, AL, AL, AL, AL, GD, OT, GD, OT, US, --- misc/neon-0.28.2/src/ne_utils.c 2006-03-07 10:36:43.000000000 +0100 -+++ misc/build/neon-0.28.2/src/ne_utils.c 2009-09-29 10:22:51.984375000 +0200 ++++ misc/build/neon-0.28.2/src/ne_utils.c 2010-01-08 11:30:06.000000000 +0100 @@ -118,6 +118,9 @@ #ifdef HAVE_GNUTLS ", GNU TLS " LIBGNUTLS_VERSION @@ -1726,7 +1802,7 @@ #endif /* NE_HAVE_* */ default: --- misc/neon-0.28.2/src/ne_utils.h 2007-07-16 08:54:57.000000000 +0200 -+++ misc/build/neon-0.28.2/src/ne_utils.h 2009-09-29 10:22:51.984375000 +0200 ++++ misc/build/neon-0.28.2/src/ne_utils.h 2010-01-08 11:30:07.000000000 +0100 @@ -54,6 +54,7 @@ #define NE_FEATURE_SOCKS (5) /* SOCKSv5 support */ #define NE_FEATURE_TS_SSL (6) /* Thread-safe SSL/TLS support */ diff --git a/neon/version.mk b/neon/version.mk index c5c6d6cc47f5..86716c5746f3 100644 --- a/neon/version.mk +++ b/neon/version.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: version.mk,v $ -# -# $Revision: 1.4 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/nss/makefile.mk b/nss/makefile.mk index 94d6e60c5817..55b3e7d118f2 100644 --- a/nss/makefile.mk +++ b/nss/makefile.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: makefile.mk,v $ -# -# $Revision: 1.48 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/python/makefile.mk b/python/makefile.mk index 06e3ffe87a79..93fdaa448a75 100644 --- a/python/makefile.mk +++ b/python/makefile.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: makefile.mk,v $ -# -# $Revision: 1.39 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/saxon/makefile.mk b/saxon/makefile.mk index 03c873fc9e5e..e1f887f1263a 100644 --- a/saxon/makefile.mk +++ b/saxon/makefile.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: makefile.mk,v $ -# -# $Revision: 1.1.2.1 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/stax/makefile.mk b/stax/makefile.mk index 41d2a2ba0885..76f2456d3b96 100644 --- a/stax/makefile.mk +++ b/stax/makefile.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: makefile.mk,v $ -# -# $Revision: 1.4.2.1 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/zlib/make_patched_header.pl b/zlib/make_patched_header.pl index f0ff00f4baad..41dbdc5fbb96 100755 --- a/zlib/make_patched_header.pl +++ b/zlib/make_patched_header.pl @@ -5,14 +5,10 @@ eval 'exec perl -S $0 ${1+"$@"}' # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: make_patched_header.pl,v $ -# -# $Revision: 1.3 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/zlib/makefile.mk b/zlib/makefile.mk index c7e1ae8a7b50..e9c9a8c5c83e 100644 --- a/zlib/makefile.mk +++ b/zlib/makefile.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: makefile.mk,v $ -# -# $Revision: 1.8 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/zlib/zlib-1.1.4.patch b/zlib/zlib-1.1.4.patch index 6b76c9114e6e..19d1cd5904ea 100644 --- a/zlib/zlib-1.1.4.patch +++ b/zlib/zlib-1.1.4.patch @@ -1,15 +1,9 @@ --- misc/zlib-1.1.4/makefile.mk Fri Mar 14 10:17:06 2008 +++ misc/build/zlib-1.1.4/makefile.mk Fri Mar 14 10:16:56 2008 -@@ -1 +1,79 @@ +@@ -1 +1,73 @@ -dummy +#************************************************************************* +# -+# $RCSfile: makefile.mk,v $ -+# -+# $Revision: 1.8 $ -+# -+# last change: $Author: mtg $ $Date: 2000/11/09 10:19:32 $ -+# +# Copyright according the GNU Public License. +# +#************************************************************************* @@ -192,7 +186,7 @@ + also may be found at: ftp://ftp.info-zip.org/pub/infozip/license.html +*/ +/* -+ crypt.c (full version) by Info-ZIP. Last revised: [see crypt.h] ++ crypt.c (full version) by Info-ZIP. Last revised: [see info_zip_crypt.h] + + The encryption/decryption parts of this source code (as opposed to the + non-echoing password parts) were originally written in Europe. The @@ -334,7 +328,7 @@ +#ifndef NOUNCRYPT -+#include "crypt.h" ++#include "info_zip_crypt.h" +#endif + /* =========================================================================== @@ -2855,10 +2849,10 @@ #ifdef __cplusplus } #endif - --- misc/zlib-1.1.4/contrib/minizip/crypt.h 2009-07-17 11:13:37.281250000 +0200 -+++ misc/build/zlib-1.1.4/contrib/minizip/crypt.h 2009-07-17 10:58:41.843750000 +0200 +--- misc/zlib-1.1.4/contrib/minizip/info_zip_crypt.h 2009-07-17 11:13:37.281250000 +0200 ++++ misc/build/zlib-1.1.4/contrib/minizip/info_zip_crypt.h 2009-07-17 10:58:41.843750000 +0200 @@ -0,0 +1,132 @@ -+/* crypt.h -- base code for crypt/uncrypt ZIPfile ++/* info_zip_crypt.h -- base code for crypt/uncrypt ZIPfile + + + Version 1.01e, February 12th, 2005 |