Updated dependency libary versions.

diff --git a/docs/INSTALL b/docs/INSTALL
index 137b64c4293f7da7b21e72ed2a96e84172b08b0b..cb228091a6424fe4bcda83b8fad159e206a7c817 100644 (file)
--- a/docs/INSTALL
+++ b/docs/INSTALL
@@ -217,9 +217,9 @@ Win32
    adjust as necessary. It is also possible to override these paths with
    environment variables, for example:
 
-     set ZLIB_PATH=c:\zlib-1.2.6
-     set OPENSSL_PATH=c:\openssl-0.9.8w
-     set LIBSSH2_PATH=c:\libssh2-1.4.1
+     set ZLIB_PATH=c:\zlib-1.2.7
+     set OPENSSL_PATH=c:\openssl-0.9.8x
+     set LIBSSH2_PATH=c:\libssh2-1.4.2
 
    ATTENTION: if you want to build with libssh2 support you have to use latest
    version 0.17 - previous versions will NOT work with 7.17.0 and later!
@@ -320,7 +320,7 @@ Win32
    documentation on how to compile zlib. Define the ZLIB_PATH environment
    variable to the location of zlib.h and zlib.lib, for example:
 
-     set ZLIB_PATH=c:\zlib-1.2.6
+     set ZLIB_PATH=c:\zlib-1.2.7
 
    Then run 'nmake vc-zlib' in curl's root directory.
 
@@ -334,7 +334,7 @@ Win32
    Before running nmake define the OPENSSL_PATH environment variable with
    the root/base directory of OpenSSL, for example:
 
-     set OPENSSL_PATH=c:\openssl-0.9.8w
+     set OPENSSL_PATH=c:\openssl-0.9.8x
 
    Then run 'nmake vc-ssl' or 'nmake vc-ssl-dll' in curl's root
    directory.  'nmake vc-ssl' will create a libcurl static and dynamic

diff --git a/docs/examples/Makefile.m32 b/docs/examples/Makefile.m32
index 930d0017cfa18fca2dd4e84aef224ddd4d05bc4a..4327a64f817e50d352f98e2cee4460f19cf7326f 100644 (file)
--- a/docs/examples/Makefile.m32
+++ b/docs/examples/Makefile.m32
@@ -27,18 +27,18 @@
 ## Example: mingw32-make -f Makefile.m32 CFG=-zlib-ssl-spi-winidn
 ##
 ## Hint: you can also set environment vars to control the build, f.e.:
-## set ZLIB_PATH=c:/zlib-1.2.6
+## set ZLIB_PATH=c:/zlib-1.2.7
 ## set ZLIB=1
 #
 ###########################################################################
 
 # Edit the path below to point to the base of your Zlib sources.
 ifndef ZLIB_PATH
-ZLIB_PATH = ../../../zlib-1.2.6
+ZLIB_PATH = ../../../zlib-1.2.7
 endif
 # Edit the path below to point to the base of your OpenSSL package.
 ifndef OPENSSL_PATH
-OPENSSL_PATH = ../../../openssl-0.9.8w
+OPENSSL_PATH = ../../../openssl-0.9.8x
 endif
 ifndef OPENSSL_LIBPATH
 OPENSSL_LIBPATH = $(OPENSSL_PATH)/out
@@ -48,7 +48,7 @@ OPENSSL_LIBS = -leay32 -lssl32
 endif
 # Edit the path below to point to the base of your LibSSH2 package.
 ifndef LIBSSH2_PATH
-LIBSSH2_PATH = ../../../libssh2-1.4.1
+LIBSSH2_PATH = ../../../libssh2-1.4.2
 endif
 # Edit the path below to point to the base of your librtmp package.
 ifndef LIBRTMP_PATH

diff --git a/docs/examples/Makefile.netware b/docs/examples/Makefile.netware
index b2fc329a96f712bbdb7e5b986ad5ae540e9fddec..934f17aeff15779b7dcbe79417d8707a55541c77 100644 (file)
--- a/docs/examples/Makefile.netware
+++ b/docs/examples/Makefile.netware
@@ -14,17 +14,17 @@ endif
 
 # Edit the path below to point to the base of your Zlib sources.
 ifndef ZLIB_PATH
-ZLIB_PATH = ../../../zlib-1.2.6
+ZLIB_PATH = ../../../zlib-1.2.7
 endif
 
 # Edit the path below to point to the base of your OpenSSL package.
 ifndef OPENSSL_PATH
-OPENSSL_PATH = ../../../openssl-0.9.8w
+OPENSSL_PATH = ../../../openssl-0.9.8x
 endif
 
 # Edit the path below to point to the base of your LibSSH2 package.
 ifndef LIBSSH2_PATH
-LIBSSH2_PATH = ../../../libssh2-1.4.1
+LIBSSH2_PATH = ../../../libssh2-1.4.2
 endif
 
 # Edit the path below to point to the base of your axTLS package.

diff --git a/lib/Makefile.Watcom b/lib/Makefile.Watcom
index 9de52a8b143007d3ee91acfe613240413f71d1f1..decb0a11c57b939b922660caa41041de0a536417 100644 (file)
--- a/lib/Makefile.Watcom
+++ b/lib/Makefile.Watcom
@@ -83,13 +83,13 @@ CFLAGS += -dWANT_IDN_PROTOTYPES
 !ifdef %zlib_root
 ZLIB_ROOT = $(%zlib_root)
 !else
-ZLIB_ROOT = ..$(DS)..$(DS)zlib-1.2.6
+ZLIB_ROOT = ..$(DS)..$(DS)zlib-1.2.7
 !endif
 
 !ifdef %libssh2_root
 LIBSSH2_ROOT = $(%libssh2_root)
 !else
-LIBSSH2_ROOT = ..$(DS)..$(DS)libssh2-1.4.1
+LIBSSH2_ROOT = ..$(DS)..$(DS)libssh2-1.4.2
 !endif
 
 !ifdef %librtmp_root
@@ -101,7 +101,7 @@ LIBRTMP_ROOT = ..$(DS)..$(DS)rtmpdump-2.3
 !ifdef %openssl_root
 OPENSSL_ROOT = $(%openssl_root)
 !else
-OPENSSL_ROOT = ..$(DS)..$(DS)openssl-0.9.8w
+OPENSSL_ROOT = ..$(DS)..$(DS)openssl-0.9.8x
 !endif
 
 !ifdef %ares_root

diff --git a/lib/Makefile.b32 b/lib/Makefile.b32
index 4c45e910c2db59520388aa219a7c9e7b1e352459..c71f651b50f6c4afc8ecaca6e647b612a3fc4aaf 100644 (file)
--- a/lib/Makefile.b32
+++ b/lib/Makefile.b32
@@ -22,12 +22,12 @@ BCCDIR = $(MAKEDIR)\..
 
 # Edit the path below to point to the base of your Zlib sources.
 !ifndef ZLIB_PATH
-ZLIB_PATH = ..\..\zlib-1.2.6
+ZLIB_PATH = ..\..\zlib-1.2.7
 !endif
 
 # Edit the path below to point to the base of your OpenSSL package.
 !ifndef OPENSSL_PATH
-OPENSSL_PATH = ..\..\openssl-0.9.8w
+OPENSSL_PATH = ..\..\openssl-0.9.8x
 !endif
 
 # Set libcurl static lib, dll and import lib

diff --git a/lib/Makefile.m32 b/lib/Makefile.m32
index 0b04c19ef19de2d7bcdb69c181629228aa19040c..a94eeb8b09d2fd8b324bdf0327f5d56b8f423d30 100644 (file)
--- a/lib/Makefile.m32
+++ b/lib/Makefile.m32
@@ -7,18 +7,18 @@
 ## Example: mingw32-make -f Makefile.m32 CFG=-zlib-ssl-sspi-winidn
 ##
 ## Hint: you can also set environment vars to control the build, f.e.:
-## set ZLIB_PATH=c:/zlib-1.2.6
+## set ZLIB_PATH=c:/zlib-1.2.7
 ## set ZLIB=1
 #
 ###########################################################################
 
 # Edit the path below to point to the base of your Zlib sources.
 ifndef ZLIB_PATH
-ZLIB_PATH = ../../zlib-1.2.6
+ZLIB_PATH = ../../zlib-1.2.7
 endif
 # Edit the path below to point to the base of your OpenSSL package.
 ifndef OPENSSL_PATH
-OPENSSL_PATH = ../../openssl-0.9.8w
+OPENSSL_PATH = ../../openssl-0.9.8x
 endif
 ifndef OPENSSL_INCLUDE
 OPENSSL_INCLUDE = $(OPENSSL_PATH)/outinc
@@ -31,7 +31,7 @@ OPENSSL_LIBS = -leay32 -lssl32
 endif
 # Edit the path below to point to the base of your LibSSH2 package.
 ifndef LIBSSH2_PATH
-LIBSSH2_PATH = ../../libssh2-1.4.1
+LIBSSH2_PATH = ../../libssh2-1.4.2
 endif
 # Edit the path below to point to the base of your librtmp package.
 ifndef LIBRTMP_PATH

diff --git a/lib/Makefile.netware b/lib/Makefile.netware
index c7d9bc655f999fa189cde2d74367ead9205982b6..0c339ceedb1ba5586c18922853855f137eec5ab0 100644 (file)
--- a/lib/Makefile.netware
+++ b/lib/Makefile.netware
@@ -14,17 +14,17 @@ endif
 
 # Edit the path below to point to the base of your Zlib sources.
 ifndef ZLIB_PATH
-ZLIB_PATH = ../../zlib-1.2.6
+ZLIB_PATH = ../../zlib-1.2.7
 endif
 
 # Edit the path below to point to the base of your OpenSSL package.
 ifndef OPENSSL_PATH
-OPENSSL_PATH = ../../openssl-0.9.8w
+OPENSSL_PATH = ../../openssl-0.9.8x
 endif
 
 # Edit the path below to point to the base of your LibSSH2 package.
 ifndef LIBSSH2_PATH
-LIBSSH2_PATH = ../../libssh2-1.4.1
+LIBSSH2_PATH = ../../libssh2-1.4.2
 endif
 
 # Edit the path below to point to the base of your axTLS package.

diff --git a/lib/Makefile.vc6 b/lib/Makefile.vc6
index cf89c1644ab28397a665f75c208f63f17059bd5a..e70b5f81484fff3aa7995a2cd144cf165e7ce4bd 100644 (file)
--- a/lib/Makefile.vc6
+++ b/lib/Makefile.vc6
@@ -65,15 +65,15 @@
 !INCLUDE ..\Makefile.msvc.names\r
 \r
 !IFNDEF OPENSSL_PATH\r
-OPENSSL_PATH   = ../../openssl-0.9.8w\r
+OPENSSL_PATH   = ../../openssl-0.9.8x\r
 !ENDIF\r
 \r
 !IFNDEF LIBSSH2_PATH\r
-LIBSSH2_PATH   = ../../libssh2-1.4.1\r
+LIBSSH2_PATH   = ../../libssh2-1.4.2\r
 !ENDIF\r
 \r
 !IFNDEF ZLIB_PATH\r
-ZLIB_PATH  = ../../zlib-1.2.6\r
+ZLIB_PATH  = ../../zlib-1.2.7\r
 !ENDIF\r
 \r
 !IFNDEF MACHINE\r

diff --git a/lib/Makefile.vxworks b/lib/Makefile.vxworks
index 7e692ef76f3b38db7084bcbd2f4d12680b537a0f..4d2aaa0b819b477dc080d4c4a835061f7e78c444 100644 (file)
--- a/lib/Makefile.vxworks
+++ b/lib/Makefile.vxworks
@@ -33,10 +33,10 @@ BUILD_TYPE := debug
 USER_CFLAGS:=
 
 # directories where to seek for includes and libraries
-OPENSSL_INC := D:/libraries/openssl/openssl-0.9.8w-vxWorks6.3/include
-OPENSSL_LIB := D:/libraries/openssl/openssl-0.9.8w-vxWorks6.3
-ZLIB_INC    := D:/libraries/zlib/zlib-1.2.6-VxWorks6.3/zlib-1.2.6
-ZLIB_LIB    := D:/libraries/zlib/zlib-1.2.6-VxWorks6.3/binaries/vxworks_3.1_gnu/Debug/lib
+OPENSSL_INC := D:/libraries/openssl/openssl-0.9.8x-vxWorks6.3/include
+OPENSSL_LIB := D:/libraries/openssl/openssl-0.9.8x-vxWorks6.3
+ZLIB_INC    := D:/libraries/zlib/zlib-1.2.7-VxWorks6.3/zlib-1.2.7
+ZLIB_LIB    := D:/libraries/zlib/zlib-1.2.7-VxWorks6.3/binaries/vxworks_3.1_gnu/Debug/lib
 ARES_INC    :=
 ARES_LIB    :=
 

diff --git a/src/Makefile.Watcom b/src/Makefile.Watcom
index b09ec6b0bdcc193149bced893ceba3923497cd79..6f7e8b261091a2b9b27b88658daea6af808e9e48 100644 (file)
--- a/src/Makefile.Watcom
+++ b/src/Makefile.Watcom
@@ -72,13 +72,13 @@ CFLAGS += -d_WIN32_WINNT=0x0501 -dENABLE_IPV6
 !ifdef %zlib_root
 ZLIB_ROOT = $(%zlib_root)
 !else
-ZLIB_ROOT = ..$(DS)..$(DS)zlib-1.2.6
+ZLIB_ROOT = ..$(DS)..$(DS)zlib-1.2.7
 !endif
 
 !ifdef %libssh2_root
 LIBSSH2_ROOT = $(%libssh2_root)
 !else
-LIBSSH2_ROOT = ..$(DS)..$(DS)libssh2-1.4.1
+LIBSSH2_ROOT = ..$(DS)..$(DS)libssh2-1.4.2
 !endif
 
 !ifdef %librtmp_root
@@ -90,7 +90,7 @@ LIBRTMP_ROOT = ..$(DS)..$(DS)rtmpdump-2.3
 !ifdef %openssl_root
 OPENSSL_ROOT = $(%openssl_root)
 !else
-OPENSSL_ROOT = ..$(DS)..$(DS)openssl-0.9.8w
+OPENSSL_ROOT = ..$(DS)..$(DS)openssl-0.9.8x
 !endif
 
 !ifdef %ares_root

diff --git a/src/Makefile.b32 b/src/Makefile.b32
index ce1b766aad47a475eeeff3dab7a3172735e52a6c..29d30dfebfafc32938775d53599ace8c7d9013e2 100644 (file)
--- a/src/Makefile.b32
+++ b/src/Makefile.b32
@@ -22,12 +22,12 @@ BCCDIR = $(MAKEDIR)\..
 
 # Edit the path below to point to the base of your Zlib sources.
 !ifndef ZLIB_PATH
-ZLIB_PATH = ..\..\zlib-1.2.6
+ZLIB_PATH = ..\..\zlib-1.2.7
 !endif
 
 # Edit the path below to point to the base of your OpenSSL package.
 !ifndef OPENSSL_PATH
-OPENSSL_PATH = ..\..\openssl-0.9.8w
+OPENSSL_PATH = ..\..\openssl-0.9.8x
 !endif
 
 # Set program's name

diff --git a/src/Makefile.m32 b/src/Makefile.m32
index c07aa3e049fb6e8272adc75af6b25ef386e35a32..cd3611f537095097b4eca9adc64d4d87ccd4fc90 100644 (file)
--- a/src/Makefile.m32
+++ b/src/Makefile.m32
@@ -7,18 +7,18 @@
 ## Example: mingw32-make -f Makefile.m32 CFG=-zlib-ssl-spi-winidn
 ##
 ## Hint: you can also set environment vars to control the build, f.e.:
-## set ZLIB_PATH=c:/zlib-1.2.6
+## set ZLIB_PATH=c:/zlib-1.2.7
 ## set ZLIB=1
 #
 ###########################################################################
 
 # Edit the path below to point to the base of your Zlib sources.
 ifndef ZLIB_PATH
-ZLIB_PATH = ../../zlib-1.2.6
+ZLIB_PATH = ../../zlib-1.2.7
 endif
 # Edit the path below to point to the base of your OpenSSL package.
 ifndef OPENSSL_PATH
-OPENSSL_PATH = ../../openssl-0.9.8w
+OPENSSL_PATH = ../../openssl-0.9.8x
 endif
 ifndef OPENSSL_LIBPATH
 OPENSSL_LIBPATH = $(OPENSSL_PATH)/out
@@ -28,7 +28,7 @@ OPENSSL_LIBS = -leay32 -lssl32
 endif
 # Edit the path below to point to the base of your LibSSH2 package.
 ifndef LIBSSH2_PATH
-LIBSSH2_PATH = ../../libssh2-1.4.1
+LIBSSH2_PATH = ../../libssh2-1.4.2
 endif
 # Edit the path below to point to the base of your librtmp package.
 ifndef LIBRTMP_PATH

diff --git a/src/Makefile.netware b/src/Makefile.netware
index 504a68a5678420b3673c4b0cbfd0964af546fa01..09044f64c3c6d65d26b71881da13af7fcc9a879f 100644 (file)
--- a/src/Makefile.netware
+++ b/src/Makefile.netware
@@ -14,17 +14,17 @@ endif
 
 # Edit the path below to point to the base of your Zlib sources.
 ifndef ZLIB_PATH
-ZLIB_PATH = ../../zlib-1.2.6
+ZLIB_PATH = ../../zlib-1.2.7
 endif
 
 # Edit the path below to point to the base of your OpenSSL package.
 ifndef OPENSSL_PATH
-OPENSSL_PATH = ../../openssl-0.9.8w
+OPENSSL_PATH = ../../openssl-0.9.8x
 endif
 
 # Edit the path below to point to the base of your LibSSH2 package.
 ifndef LIBSSH2_PATH
-LIBSSH2_PATH = ../../libssh2-1.4.1
+LIBSSH2_PATH = ../../libssh2-1.4.2
 endif
 
 # Edit the path below to point to the base of your axTLS package.

diff --git a/src/Makefile.vc6 b/src/Makefile.vc6
index 036e9e3b8cfd296ab16399ba91d6528cdaabd951..650246fe69cc82cb3a59f9ca5258311a0de3ce65 100644 (file)
--- a/src/Makefile.vc6
+++ b/src/Makefile.vc6
@@ -57,11 +57,11 @@ PROGRAM_NAME = curl.exe
 \r
 \r
 !IFNDEF OPENSSL_PATH\r
-OPENSSL_PATH = ../../openssl-0.9.8w\r
+OPENSSL_PATH = ../../openssl-0.9.8x\r
 !ENDIF\r
 \r
 !IFNDEF ZLIB_PATH\r
-ZLIB_PATH = ../../zlib-1.2.6\r
+ZLIB_PATH = ../../zlib-1.2.7\r
 !ENDIF\r
 \r
 !IFNDEF MACHINE\r