curl: updated to 7.26.0 to have NTLM auth working with NSS

The update work still needs the review of the windows patches as the
original sources have significantly been changed.

Change-Id: I80e493771f86f0dd87762b63c0c5ee3577fca388

6 files changed, 107 insertions, 136 deletions

diff --git a/curl/curl-7.19.7.patch b/curl/curl-7.19.7.patch
deleted file mode 100644
index 37e8c9a830d0..000000000000
--- a/curl/curl-7.19.7.patch
+++ /dev/null
@@ -1,114 +0,0 @@
---- misc/curl-7.19.7/config.sub	2009-11-04 13:26:13.000000000 +0100
-+++ misc/build/curl-7.19.7/config.sub	2011-09-26 17:29:12.000000000 +0200
-@@ -120,7 +120,7 @@
- # Here we must recognize all the valid KERNEL-OS combinations.
- maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
- case $maybe_os in
--  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
-+  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
-   uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
-   kopensolaris*-gnu* | \
-   storm-chaos* | os2-emx* | rtmk-nova*)
-@@ -1282,7 +1282,7 @@
- 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
- 	      | -chorusos* | -chorusrdb* | -cegcc* \
- 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
--	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
-+	      | -mingw32* | -linux-gnu* | -linux-androideabi* | -linux-newlib* | -linux-uclibc* \
- 	      | -uxpv* | -beos* | -mpeix* | -udk* \
- 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
- 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
---- 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/include/curl/curl.h
-+++ misc/build/curl-7.19.7/include/curl/curl.h
-@@ -74,7 +74,7 @@
-    require it! */
- #if defined(_AIX) || defined(__NOVELL_LIBC__) || defined(__NetBSD__) || \
-     defined(__minix) || defined(__SYMBIAN32__) || defined(__INTEGRITY) || \
--    defined(ANDROID)
-+    defined(__ANDROID__)
- #include <sys/select.h>
- #endif
- 
---- 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.26.0.patch b/curl/curl-7.26.0.patch
new file mode 100644
index 000000000000..6cebdc17bbd7
--- /dev/null
+++ b/curl/curl-7.26.0.patch
@@ -0,0 +1,86 @@
+diff -ur curl-7.26.0/configure misc/build/curl-7.26.0/configure
+--- curl-7.26.0/configure	2012-07-02 13:28:51.327994494 +0200
++++ misc/build/curl-7.26.0/configure	2012-07-02 13:32:38.754006822 +0200
+@@ -2693,8 +2693,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
+ 
+ 
+@@ -3855,8 +3855,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.
+@@ -4506,15 +4506,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
+diff -ur curl-7.26.0/lib/setup.h misc/build/curl-7.26.0/lib/setup.h
+--- curl-7.26.0/lib/setup.h	2012-07-02 13:28:51.322994494 +0200
++++ misc/build/curl-7.26.0/lib/setup.h	2012-07-02 13:41:15.652034841 +0200
+@@ -231,6 +231,7 @@
+ #    include <winsock2.h>
+ #    ifdef HAVE_WS2TCPIP_H
+ #       include <ws2tcpip.h>
++#       include <wspiapi.h>
+ #    endif
+ #  else
+ #    ifdef HAVE_WINSOCK_H
+diff -ur curl-7.26.0/ltmain.sh misc/build/curl-7.26.0/ltmain.sh
+--- curl-7.26.0/ltmain.sh	2012-07-02 13:28:51.298994493 +0200
++++ misc/build/curl-7.26.0/ltmain.sh	2012-07-02 13:42:46.511039769 +0200
+@@ -7334,13 +7334,13 @@
+ 	  #
+ 	  case $version_type in
+ 	  # correct linux to gnu/linux during the next big refactor
+-	  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|qnx|sunos)
++	  qnx|sunos)
+ 	    current="$number_major"
+ 	    revision="$number_minor"
+ 	    age="0"
+@@ -7420,8 +7420,8 @@
+ 	  ;;
+ 
+ 	freebsd-elf)
+-	  major=".$current"
+-	  versuffix=".$current"
++	  major=.`expr $current - $age`
++	  versuffix="$major"
+ 	  ;;
+ 
+ 	irix | nonstopux)
diff --git a/curl/curl-aix.patch b/curl/curl-aix.patch
index 1ee1999c1a46..708411ccf1ef 100644
--- a/curl/curl-aix.patch
+++ b/curl/curl-aix.patch
@@ -1,15 +1,7 @@
---- 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 @@
+diff -ur curl-7.26.0/config.guess misc/build/curl-7.26.0/config.guess
+--- curl-7.26.0/config.guess	2012-07-02 13:46:52.428053096 +0200
++++ misc/build/curl-7.26.0/config.guess	2012-07-02 13:48:13.644057499 +0200
+@@ -565,6 +565,9 @@
  	else
  		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
  	fi
diff --git a/curl/curl-android.patch b/curl/curl-android.patch
index 130c88d0e3e9..40cf12447dbb 100644
--- a/curl/curl-android.patch
+++ b/curl/curl-android.patch
@@ -1,6 +1,7 @@
---- misc/curl-7.19.7/ltmain.sh
-+++ misc/build/curl-7.19.7/ltmain.sh
-@@ -3228,6 +3228,12 @@
+diff -ur curl-7.26.0/ltmain.sh misc/build/curl-7.26.0/ltmain.sh
+--- curl-7.26.0/ltmain.sh	2012-07-02 14:05:04.256112279 +0200
++++ misc/build/curl-7.26.0/ltmain.sh	2012-07-02 14:07:23.775119842 +0200
+@@ -7307,6 +7307,12 @@
  	  func_warning "\`-release' is ignored for convenience libraries"
        else
  
diff --git a/curl/makefile.mk b/curl/makefile.mk
index 97a183566f59..3a0920936ee4 100644
--- a/curl/makefile.mk
+++ b/curl/makefile.mk
@@ -41,10 +41,10 @@ all:
 
 # --- Files --------------------------------------------------------
 
-TARFILE_NAME=curl-7.19.7
-TARFILE_MD5=ecb2e37e45c9933e2a963cabe03670ab
+TARFILE_NAME=curl-7.26.0
+TARFILE_MD5=3fa4d5236f2a36ca5c3af6715e837691
 PATCH_FILES=\
-    curl-7.19.7.patch \
+    curl-7.26.0.patch \
     curl-aix.patch
 
 .IF "$(GUI)"=="WNT"
@@ -87,7 +87,10 @@ CONFIGURE_FLAGS=--disable-shared
 .ELSE
 CONFIGURE_FLAGS=--disable-static
 .ENDIF
-CONFIGURE_FLAGS+= --without-ssl --without-libidn --enable-ftp --enable-ipv6 --enable-http --disable-gopher --disable-file --disable-ldap --disable-telnet --disable-dict --without-libssh2 CPPFLAGS="$(curl_CFLAGS)"  LDFLAGS="$(curl_LDFLAGS)"
+CONFIGURE_FLAGS+= --with-nss --without-ssl --without-libidn --enable-ftp --enable-ipv6 --enable-http --disable-gopher --disable-file --disable-ldap --disable-telnet --disable-dict --without-libssh2 CPPFLAGS="$(curl_CFLAGS)"  LDFLAGS="$(curl_LDFLAGS)"
+.IF "$(debug)" != ""
+CONFIGURE_FLAGS+=--enable-debug
+.ENDIF
 
 .IF "$(OS)" == "MACOSX"
 CONFIGURE_FLAGS += \
@@ -125,7 +128,10 @@ curl_LIBS+=$(MINGW_SHARED_LIBSTDCPP)
 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)"
+CONFIGURE_FLAGS= --with-nss --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)"
+.IF "$(debug)" != ""
+CONFIGURE_FLAGS+=--enable-debug
+.ENDIF
 BUILD_DIR=$(CONFIGURE_DIR)$/lib
 BUILD_ACTION=make
 OUT2BIN=$(BUILD_DIR)$/.libs$/libcurl*.dll
@@ -163,7 +169,7 @@ OUT2INC= \
     include$/curl$/multi.h  		\
     include$/curl$/curl.h  			\
     include$/curl$/curlver.h  		\
-    include$/curl$/types.h  		\
+    include$/curl$/typecheck-gcc.h	\
     include$/curl$/stdcheaders.h  	\
     include$/curl$/mprintf.h	    \
     include$/curl$/curlbuild.h		\
diff --git a/curl/prj/d.lst b/curl/prj/d.lst
index 045c4204cbed..13d6ad291df9 100644
--- a/curl/prj/d.lst
+++ b/curl/prj/d.lst
@@ -5,7 +5,7 @@ mkdir: %_DEST%\inc\external\curl
 ..\%__SRC%\inc\mprintf.h %_DEST%\inc\external\curl\mprintf.h
 ..\%__SRC%\inc\multi.h %_DEST%\inc\external\curl\multi.h
 ..\%__SRC%\inc\stdcheaders.h %_DEST%\inc\external\curl\stdcheaders.h
-..\%__SRC%\inc\types.h %_DEST%\inc\external\curl\types.h
+..\%__SRC%\inc\typecheck-gcc.h %_DEST%\inc\external\curl\typecheck-gcc.h
 ..\%__SRC%\inc\curlbuild.h %_DEST%\inc\external\curl\curlbuild.h
 ..\%__SRC%\inc\curlrules.h %_DEST%\inc\external\curl\curlrules.h