Updated OpenSSL version, added links to docu.

9 files changed, 32 insertions, 28 deletions

diff --git a/docs/INSTALL b/docs/INSTALL
index babd1d171..6005911e0 100644
--- a/docs/INSTALL
+++ b/docs/INSTALL
@@ -211,9 +211,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.3
-     set OPENSSL_PATH=c:\openssl-0.9.8k
-     set LIBSSH2_PATH=c:\libssh2-1.1
+     set ZLIB_PATH=c:\zlib-1.2.5
+     set OPENSSL_PATH=c:\openssl-0.9.8r
+     set LIBSSH2_PATH=c:\libssh2-1.2.7
 
    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!
@@ -232,7 +232,7 @@ Win32
 
    If you want to enable LDAPS support then set LDAPS=1.
 
-   - optional MingW32-built OpenlDAP SDK available from:
+   - optional MingW32-built OpenLDAP SDK available from:
      http://www.gknw.net/mirror/openldap/
    - optional recent Novell CLDAP SDK available from:
      http://developer.novell.com/ndk/cldap.htm
@@ -314,7 +314,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.3
+     set ZLIB_PATH=c:\zlib-1.2.5
 
    Then run 'nmake vc-zlib' in curl's root directory.
 
@@ -328,7 +328,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.8k
+     set OPENSSL_PATH=c:\openssl-0.9.8q
 
    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
@@ -660,7 +660,7 @@ NetWare
    Builds automatically created 8 times a day from current git are here:
    http://www.gknw.net/mirror/curl/autobuilds/
    the status of these builds can be viewed at the autobuild table:
-   http://curl.haxx.se/auto/
+   http://curl.haxx.se/dev/builds.html
 
 
 eCos
@@ -1002,17 +1002,21 @@ PORTS
 Useful URLs
 ===========
 
-c-ares    http://daniel.haxx.se/projects/c-ares/license.html
-GNU GSS   http://www.gnu.org/software/gss/
-GnuTLS    http://www.gnu.org/software/gnutls/
-Heimdal   http://www.pdc.kth.se/heimdal/
-libidn    http://www.gnu.org/software/libidn/
-libssh2   http://www.libssh2.org
-MingW     http://www.mingw.org
+axTLS        http://axtls.sourceforge.net/
+c-ares       http://c-ares.haxx.se/
+GNU GSS      http://www.gnu.org/software/gss/
+GnuTLS       http://www.gnu.org/software/gnutls/
+Heimdal      http://www.pdc.kth.se/heimdal/
+libidn       http://www.gnu.org/software/libidn/
+libssh2      http://www.libssh2.org/
 MIT Kerberos http://web.mit.edu/kerberos/www/dist/
-NSS       http://www.mozilla.org/projects/security/pki/nss/
-OpenLDAP  http://www.openldap.org
-OpenSSL   http://www.openssl.org
-PolarSSL  http://polarssl.org
-yassl     http://www.yassl.com/
-Zlib      http://www.gzip.org/zlib/
+NSS          http://www.mozilla.org/projects/security/pki/nss/
+OpenLDAP     http://www.openldap.org/
+OpenSSL      http://www.openssl.org/
+PolarSSL     http://polarssl.org/
+yassl        http://www.yassl.com/
+Zlib         http://www.zlib.net/
+
+MingW        http://www.mingw.org/
+MinGW-w64    http://mingw-w64.sourceforge.net/
+OpenWatcom   http://www.openwatcom.org/
diff --git a/lib/Makefile.Watcom b/lib/Makefile.Watcom
index 7af368ba6..85aef6a39 100644
--- a/lib/Makefile.Watcom
+++ b/lib/Makefile.Watcom
@@ -94,7 +94,7 @@ LIBRTMP_ROOT = ..$(DS)..$(DS)rtmpdump-2.3
 !ifdef %openssl_root
 OPENSSL_ROOT = $(%openssl_root)
 !else
-OPENSSL_ROOT = ..$(DS)..$(DS)openssl-0.9.8q
+OPENSSL_ROOT = ..$(DS)..$(DS)openssl-0.9.8r
 !endif
 
 !ifdef %ares_root
diff --git a/lib/Makefile.m32 b/lib/Makefile.m32
index 04b6450a5..53aec7789 100644
--- a/lib/Makefile.m32
+++ b/lib/Makefile.m32
@@ -20,7 +20,7 @@ ZLIB_PATH = ../../zlib-1.2.5
 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.8r
 endif
 # Edit the path below to point to the base of your LibSSH2 package.
 ifndef LIBSSH2_PATH
diff --git a/lib/Makefile.netware b/lib/Makefile.netware
index d39f88f52..075d67ef1 100644
--- 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.8q
+OPENSSL_PATH = ../../openssl-0.9.8r
 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 caffedd05..cb4f0fb6f 100644
--- a/lib/Makefile.vc6
+++ b/lib/Makefile.vc6
@@ -63,7 +63,7 @@
 

 

 !IFNDEF OPENSSL_PATH

-OPENSSL_PATH   = ../../openssl-0.9.8q

+OPENSSL_PATH   = ../../openssl-0.9.8r

 !ENDIF

 

 !IFNDEF ZLIB_PATH

diff --git a/src/Makefile.Watcom b/src/Makefile.Watcom
index eb2e766b2..c514ca889 100644
--- 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.8q
+OPENSSL_ROOT = ..$(DS)..$(DS)openssl-0.9.8r
 !endif
 
 !ifdef %ares_root
diff --git a/src/Makefile.m32 b/src/Makefile.m32
index f7d0d92d9..f1438041d 100644
--- a/src/Makefile.m32
+++ b/src/Makefile.m32
@@ -20,7 +20,7 @@ ZLIB_PATH = ../../zlib-1.2.5
 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.8r
 endif
 # Edit the path below to point to the base of your LibSSH2 package.
 ifndef LIBSSH2_PATH
diff --git a/src/Makefile.netware b/src/Makefile.netware
index 7b4d98b1a..98e1ddc14 100644
--- 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.8q
+OPENSSL_PATH = ../../openssl-0.9.8r
 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 898258750..779f70b6c 100644
--- a/src/Makefile.vc6
+++ b/src/Makefile.vc6
@@ -52,7 +52,7 @@ PROGRAM_NAME = curl.exe
 

 

 !IFNDEF OPENSSL_PATH

-OPENSSL_PATH = ../../openssl-0.9.8q

+OPENSSL_PATH = ../../openssl-0.9.8r

 !ENDIF

 

 !IFNDEF ZLIB_PATH