7 files changed, 331 insertions, 0 deletions
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_mingw.patch b/curl/curl-7.19.7_mingw.patch
new file mode 100644
index 000000000000..b0fa6736d901
--- /dev/null
+++ b/curl/curl-7.19.7_mingw.patch
@@ -0,0 +1,24 @@
+--- misc/curl-7.19.7/lib/setup.h	2009-10-29 05:21:58.000000000 +0900
++++ misc/build/curl-7.19.7/lib/setup.h	2010-03-02 06:03:10.009500000 +0900
+@@ -40,6 +40,21 @@
+ 
+ #include "curl_config.h"
+ 
++#ifdef __MINGW32__
++#undef HAVE_DLFCN_H
++#define HAVE_GETHOSTBYADDR 1
++#define HAVE_GETHOSTBYNAME 1
++#undef HAVE_LIBZ
++#undef HAVE_NETDB_H
++#undef HAVE_POLL_H
++#undef HAVE_SYS_IOCTL_H
++#undef HAVE_SYS_POLL_H
++#undef HAVE_SYS_UIO_H
++#undef HAVE_TERMIOS_H
++#undef HAVE_TERMIO_H
++#undef HAVE_ZLIB_H
++#endif
++
+ #else /* HAVE_CONFIG_H */
+ 
+ #ifdef _WIN32_WCE
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/curl-aix.patch b/curl/curl-aix.patch
new file mode 100644
index 000000000000..1ee1999c1a46
--- /dev/null
+++ b/curl/curl-aix.patch
@@ -0,0 +1,21 @@
+--- misc/curl-7.19.7/config.guess	2010-09-15 14:29:17.000000000 -0500
++++ misc/build/curl-7.19.7/config.guess	2010-09-15 14:32:41.000000000 -0500
+@@ -548,7 +548,7 @@
+ 		echo rs6000-ibm-aix3.2
+ 	fi
+ 	exit ;;
+-    *:AIX:*:[456])
++    *:AIX:*:[4567])
+ 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
+ 	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
+ 		IBM_ARCH=rs6000
+@@ -560,6 +560,9 @@
+ 	else
+ 		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
+ 	fi
++	if [ "$IBM_REV" == "V7BETA" ]; then
++		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
++	fi
+ 	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
+ 	exit ;;
+     *:AIX:*:*)
diff --git a/curl/makefile.mk b/curl/makefile.mk
new file mode 100644
index 000000000000..dfcb77fa1ce4
--- /dev/null
+++ b/curl/makefile.mk
@@ -0,0 +1,166 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# 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.
+#
+#*************************************************************************
+PRJ=.
+
+PRJNAME=so_curl
+TARGET=so_curl
+
+# --- Settings -----------------------------------------------------
+
+.INCLUDE :	settings.mk
+
+.IF "$(SYSTEM_CURL)" == "YES"
+all:
+    @echo "An already available installation of curl should exist on your system."
+    @echo "Therefore the version provided here does not need to be built in addition."
+.ENDIF
+
+# --- Files --------------------------------------------------------
+
+TARFILE_NAME=curl-7.19.7
+TARFILE_MD5=ecb2e37e45c9933e2a963cabe03670ab
+PATCH_FILES=\
+    curl-7.19.7.patch \
+    curl-aix.patch
+
+.IF "$(GUI)"=="WNT"
+    PATCH_FILES+=curl-7.19.7_win.patch
+    .IF "$(COM)"=="GCC"
+        PATCH_FILES+=curl-7.19.7_mingw.patch
+    .ENDIF
+.ENDIF
+
+
+#CONVERTFILES= \
+    lib$/Makefile.vc6
+
+#ADDITIONAL_FILES= lib$/config-os2.h lib$/Makefile.os2
+
+.IF "$(GUI)"=="UNX"
+
+.IF "$(SYSBASE)"!=""
+curl_CFLAGS+=-I$(SYSBASE)$/usr$/include
+curl_LDFLAGS+=-L$(SYSBASE)$/usr$/lib
+.ENDIF			# "$(SYSBASE)"!=""
+
+.IF "$(OS)$(CPU)"=="SOLARISU"
+curl_CFLAGS+:=$(ARCH_FLAGS)
+curl_LDFLAGS+:=$(ARCH_FLAGS)
+.ENDIF
+
+.IF "$(OS)"=="AIX"
+curl_LDFLAGS+:=$(LINKFLAGS) $(LINKFLAGSRUNPATH_OOO)
+.ENDIF
+
+CONFIGURE_DIR=.$/
+#relative to CONFIGURE_DIR
+CONFIGURE_ACTION=.$/configure
+CONFIGURE_FLAGS= --without-ssl --without-libidn --enable-ftp --enable-ipv6 --enable-http --disable-gopher --disable-file --disable-ldap --disable-telnet --disable-dict --disable-static CPPFLAGS="$(curl_CFLAGS)"  LDFLAGS="$(curl_LDFLAGS)"
+
+BUILD_DIR=$(CONFIGURE_DIR)$/lib
+BUILD_ACTION=$(GNUMAKE)
+BUILD_FLAGS+= -j$(EXTMAXPROCESS)
+
+OUT2LIB=$(BUILD_DIR)$/.libs$/libcurl$(DLLPOST).4
+.ENDIF			# "$(GUI)"=="UNX"
+
+
+.IF "$(GUI)"=="WNT"
+.IF "$(COM)"=="GCC"
+curl_CC=$(CC) -mthreads
+.IF "$(MINGW_SHARED_GCCLIB)"=="YES"
+curl_CC+=-shared-libgcc
+.ENDIF
+curl_LIBS=-lws2_32 -lwinmm
+.IF "$(MINGW_SHARED_GXXLIB)"=="YES"
+curl_LIBS+=$(MINGW_SHARED_LIBSTDCPP)
+.ENDIF
+CONFIGURE_DIR=.$/
+#relative to CONFIGURE_DIR
+CONFIGURE_ACTION=.$/configure
+CONFIGURE_FLAGS= --without-ssl --enable-ftp --enable-ipv6 --disable-http --disable-gopher --disable-file --disable-ldap --disable-telnet --disable-dict --build=i586-pc-mingw32 --host=i586-pc-mingw32 CC="$(curl_CC)" CPPFLAGS="$(INCLUDE)" OBJDUMP="objdump" LDFLAGS="-L$(ILIB:s/;/ -L/)" LIBS="$(curl_LIBS)"
+BUILD_DIR=$(CONFIGURE_DIR)$/lib
+BUILD_ACTION=make
+OUT2BIN=$(BUILD_DIR)$/.libs$/libcurl*.dll
+OUT2LIB=$(BUILD_DIR)$/.libs$/libcurl*.a
+.ELSE
+
+.IF "$(CCNUMVER)" > "001399999999"
+EXCFLAGS="/EHa /Zc:wchar_t- /D "_CRT_SECURE_NO_DEPRECATE""
+.ELSE
+EXCFLAGS="/EHsc /YX"
+.ENDIF
+
+BUILD_DIR=.$/lib
+
+.IF "$(CPU)" == "I"
+MACHINE=X86
+.ELSE
+MACHINE=X64
+.ENDIF
+
+.IF "$(debug)"==""
+BUILD_ACTION=nmake -f Makefile.vc9 cfg=release-dll EXCFLAGS=$(EXCFLAGS) MACHINE=$(MACHINE)
+.ELSE
+BUILD_ACTION=nmake -f Makefile.vc9 cfg=debug-dll EXCFLAGS=$(EXCFLAGS) MACHINE=$(MACHINE)
+.ENDIF
+
+OUT2BIN=$(BUILD_DIR)$/libcurl.dll
+OUT2LIB=$(BUILD_DIR)$/libcurl.lib
+
+.ENDIF
+.ENDIF			# "$(GUI)"=="WNT"
+
+.IF "$(GUI)"=="OS2"
+BUILD_DIR=.$/lib
+.IF "$(debug)"==""
+BUILD_ACTION=make -f Makefile.os2
+.ELSE
+BUILD_ACTION=make -f Makefile.os2
+.ENDIF
+
+OUT2BIN=$(BUILD_DIR)$/libcurl.dll
+OUT2LIB=$(BUILD_DIR)$/libcurl.lib
+
+.ENDIF			# "$(GUI)"=="OS2"
+
+OUT2INC= \
+    include$/curl$/easy.h  			\
+    include$/curl$/multi.h  		\
+    include$/curl$/curl.h  			\
+    include$/curl$/curlver.h  		\
+    include$/curl$/types.h  		\
+    include$/curl$/stdcheaders.h  	\
+    include$/curl$/mprintf.h	    \
+    include$/curl$/curlbuild.h		\
+    include$/curl$/curlrules.h
+
+# --- Targets ------------------------------------------------------
+
+.INCLUDE : set_ext.mk
+.INCLUDE : target.mk
+.INCLUDE : tg_ext.mk
diff --git a/curl/prj/build.lst b/curl/prj/build.lst
new file mode 100644
index 000000000000..d3aab4781144
--- /dev/null
+++ b/curl/prj/build.lst
@@ -0,0 +1,3 @@
+xc	curl	:	stlport external NULL
+xc	curl	usr1	-	all	xc_mkout NULL
+xc	curl	nmake	-	all	xc_curl NULL
diff --git a/curl/prj/d.lst b/curl/prj/d.lst
new file mode 100644
index 000000000000..fe97f2044f23
--- /dev/null
+++ b/curl/prj/d.lst
@@ -0,0 +1,15 @@
+mkdir: %_DEST%\inc%_EXT%\external\curl
+..\%__SRC%\inc\easy.h %_DEST%\inc%_EXT%\external\curl\easy.h
+..\%__SRC%\inc\curlver.h %_DEST%\inc%_EXT%\external\curl\curlver.h
+..\%__SRC%\inc\curl.h %_DEST%\inc%_EXT%\external\curl\curl.h
+..\%__SRC%\inc\mprintf.h %_DEST%\inc%_EXT%\external\curl\mprintf.h
+..\%__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.*
+
+linklib: libcurl.*.*
+\ No newline at end of file