CWS-TOOLING: integrate CWS tkr32

curl/curl-7.19.7.patch

+--- 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)

curl/curl-7.19.7_win.patch

+--- 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

curl/makefile.mk

@@ -45,12 +45,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 +83,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 +117,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 +151,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 ------------------------------------------------------
 

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.*

zlib/zlib-1.1.4.patch

@@ -192,7 +192,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 +334,7 @@
  
  
 +#ifndef NOUNCRYPT
-+#include "crypt.h"
++#include "info_zip_crypt.h"
 +#endif
 +
  /* ===========================================================================
@@ -2855,10 +2855,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