Updated dependency lib versions.

diff --git a/docs/INSTALL b/docs/INSTALL
index eb56e0d25060cad3fad60638865631cfe6203dcc..43f02f64ed93a9cba71517e1d871bd6bccc78937 100644 (file)
--- a/docs/INSTALL
+++ b/docs/INSTALL
@@ -218,7 +218,7 @@ Win32
    environment variables, for example:
 
      set ZLIB_PATH=c:\zlib-1.2.6
-     set OPENSSL_PATH=c:\openssl-0.9.8u
+     set OPENSSL_PATH=c:\openssl-0.9.8v
      set LIBSSH2_PATH=c:\libssh2-1.4.1
 
    ATTENTION: if you want to build with libssh2 support you have to use latest
@@ -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.8u
+     set OPENSSL_PATH=c:\openssl-0.9.8v
 
    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 3c3d121edebb96838eaf57da3a4a99271b3edfdd..469d7a1cd5115d65da89025f5e911b261ed04bb3 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.5
+## set ZLIB_PATH=c:/zlib-1.2.6
 ## set ZLIB=1
 #
 ###########################################################################
 
 # Edit the path below to point to the base of your Zlib sources.
 ifndef ZLIB_PATH
-ZLIB_PATH = ../../../zlib-1.2.5
+ZLIB_PATH = ../../../zlib-1.2.6
 endif
 # Edit the path below to point to the base of your OpenSSL package.
 ifndef OPENSSL_PATH
-OPENSSL_PATH = ../../../openssl-0.9.8r
+OPENSSL_PATH = ../../../openssl-0.9.8v
 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.3.0
+LIBSSH2_PATH = ../../../libssh2-1.4.1
 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 fdea6b81bf0d1170d57285cd1d0dff89a5ac1d4f..cba66a7a08f6dee28628a34cb4f3c149fc8ab2fd 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.5
+ZLIB_PATH = ../../../zlib-1.2.6
 endif
 
 # Edit the path below to point to the base of your OpenSSL package.
 ifndef OPENSSL_PATH
-OPENSSL_PATH = ../../../openssl-0.9.8r
+OPENSSL_PATH = ../../../openssl-0.9.8v
 endif
 
 # Edit the path below to point to the base of your LibSSH2 package.
 ifndef LIBSSH2_PATH
-LIBSSH2_PATH = ../../../libssh2-1.3.0
+LIBSSH2_PATH = ../../../libssh2-1.4.1
 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 56f994748538c532bc7a815809c1b092831bb626..395fffbd929e3cc7e9caddb7b9b23413d4000765 100644 (file)
--- a/lib/Makefile.Watcom
+++ b/lib/Makefile.Watcom
@@ -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.8u
+OPENSSL_ROOT = ..$(DS)..$(DS)openssl-0.9.8v
 !endif
 
 !ifdef %ares_root

diff --git a/lib/Makefile.b32 b/lib/Makefile.b32
index 487993a95b64744c32b43cc722c6ffc23083e867..37430acf21f316d9366ec0e27d218631765cf629 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.5
+ZLIB_PATH = ..\..\zlib-1.2.6
 !endif
 
 # Edit the path below to point to the base of your OpenSSL package.
 !ifndef OPENSSL_PATH
-OPENSSL_PATH = ..\..\openssl-0.9.8q
+OPENSSL_PATH = ..\..\openssl-0.9.8v
 !endif
 
 # Set libcurl static lib, dll and import lib

diff --git a/lib/Makefile.m32 b/lib/Makefile.m32
index a6270b218834024ef9e3b3ab09f8faf66db5a73a..adb5e5fe433e06f8ae139584472e6126dca3218f 100644 (file)
--- a/lib/Makefile.m32
+++ b/lib/Makefile.m32
@@ -18,7 +18,7 @@ ZLIB_PATH = ../../zlib-1.2.6
 endif
 # Edit the path below to point to the base of your OpenSSL package.
 ifndef OPENSSL_PATH
-OPENSSL_PATH = ../../openssl-0.9.8u
+OPENSSL_PATH = ../../openssl-0.9.8v
 endif
 ifndef OPENSSL_INCLUDE
 OPENSSL_INCLUDE = $(OPENSSL_PATH)/outinc

diff --git a/lib/Makefile.netware b/lib/Makefile.netware
index 94e57c8c5c9ad6511fe36c9a3cf63225f556ed33..32a1a84c31fd334e9b4d47a6e6ccc99e4e5bac1b 100644 (file)
--- a/lib/Makefile.netware
+++ b/lib/Makefile.netware
@@ -19,7 +19,7 @@ endif
 
 # Edit the path below to point to the base of your OpenSSL package.
 ifndef OPENSSL_PATH
-OPENSSL_PATH = ../../openssl-0.9.8u
+OPENSSL_PATH = ../../openssl-0.9.8v
 endif
 
 # Edit the path below to point to the base of your LibSSH2 package.

diff --git a/lib/Makefile.vc6 b/lib/Makefile.vc6
index 63dd0eeb3b19e6a976499ba05e5100d873308d93..e69f31a1501fb6bf4a31726985fb2421d44be0e3 100644 (file)
--- a/lib/Makefile.vc6
+++ b/lib/Makefile.vc6
@@ -65,7 +65,7 @@
 !INCLUDE ..\Makefile.msvc.names\r
 \r
 !IFNDEF OPENSSL_PATH\r
-OPENSSL_PATH   = ../../openssl-0.9.8u\r
+OPENSSL_PATH   = ../../openssl-0.9.8v\r
 !ENDIF\r
 \r
 !IFNDEF LIBSSH2_PATH\r

diff --git a/lib/Makefile.vxworks b/lib/Makefile.vxworks
index 81a36cc0f96eb40db9915c58fdeea45ac7a5f1dc..3d555dd5c39c29d34e6b0afdff90bd10cd89d086 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.8a-vxWorks6.3/include
-OPENSSL_LIB := D:/libraries/openssl/openssl-0.9.8a-vxWorks6.3
-ZLIB_INC    := D:/libraries/zlib/zlib-1.2.3-VxWorks6.3/zlib-1.2.3
-ZLIB_LIB    := D:/libraries/zlib/zlib-1.2.3-VxWorks6.3/binaries/vxworks_3.1_gnu/Debug/lib
+OPENSSL_INC := D:/libraries/openssl/openssl-0.9.8v-vxWorks6.3/include
+OPENSSL_LIB := D:/libraries/openssl/openssl-0.9.8v-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
 ARES_INC    :=
 ARES_LIB    :=
 

diff --git a/src/Makefile.Watcom b/src/Makefile.Watcom
index c88291e2cdca776f7a5b36a5db652e9d0fa2e2aa..77fa91b4d1fab6a3ca3d5a20c715a84231428c59 100644 (file)
--- a/src/Makefile.Watcom
+++ b/src/Makefile.Watcom
@@ -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.8u
+OPENSSL_ROOT = ..$(DS)..$(DS)openssl-0.9.8v
 !endif
 
 !ifdef %ares_root

diff --git a/src/Makefile.b32 b/src/Makefile.b32
index 37981b83c78215b593cc0bcdc557fcc2b98510c5..1a91c1461e8718e143bc42b726b1a244094dfa6d 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.5
+ZLIB_PATH = ..\..\zlib-1.2.6
 !endif
 
 # Edit the path below to point to the base of your OpenSSL package.
 !ifndef OPENSSL_PATH
-OPENSSL_PATH = ..\..\openssl-0.9.8q
+OPENSSL_PATH = ..\..\openssl-0.9.8v
 !endif
 
 # Set program's name

diff --git a/src/Makefile.m32 b/src/Makefile.m32
index 29edc28393ba4077a730447889546678349db983..17c6116c8eb909f3e5fb238ec52c6cc350520944 100644 (file)
--- a/src/Makefile.m32
+++ b/src/Makefile.m32
@@ -18,7 +18,7 @@ ZLIB_PATH = ../../zlib-1.2.6
 endif
 # Edit the path below to point to the base of your OpenSSL package.
 ifndef OPENSSL_PATH
-OPENSSL_PATH = ../../openssl-0.9.8u
+OPENSSL_PATH = ../../openssl-0.9.8v
 endif
 ifndef OPENSSL_LIBPATH
 OPENSSL_LIBPATH = $(OPENSSL_PATH)/out

diff --git a/src/Makefile.netware b/src/Makefile.netware
index 9ea779935e94b4a850e1333add75cc0f6ca2edb0..146d7e8e863b83596ccc859ed9814789dfb62b7f 100644 (file)
--- a/src/Makefile.netware
+++ b/src/Makefile.netware
@@ -19,7 +19,7 @@ endif
 
 # Edit the path below to point to the base of your OpenSSL package.
 ifndef OPENSSL_PATH
-OPENSSL_PATH = ../../openssl-0.9.8u
+OPENSSL_PATH = ../../openssl-0.9.8v
 endif
 
 # Edit the path below to point to the base of your LibSSH2 package.

diff --git a/src/Makefile.vc6 b/src/Makefile.vc6
index 864e9b94df6bc376c1ed593b574ba5b84c26e3a7..4b52b1641beeb952134e1a2f34392fe5a5ce694e 100644 (file)
--- a/src/Makefile.vc6
+++ b/src/Makefile.vc6
@@ -57,7 +57,7 @@ PROGRAM_NAME = curl.exe
 \r
 \r
 !IFNDEF OPENSSL_PATH\r
-OPENSSL_PATH = ../../openssl-0.9.8u\r
+OPENSSL_PATH = ../../openssl-0.9.8v\r
 !ENDIF\r
 \r
 !IFNDEF ZLIB_PATH\r