From 0a44dcf6b67974dae96bc961236f448251fce386 Mon Sep 17 00:00:00 2001
From: Steven Murdoch <stevenm@cronto.com>
Date: Sun, 10 Oct 2010 23:30:24 +0100
Subject: [PATCH 1/2] Update build instructions for OpenSSL 1.0.0a and zlib 1.2.5

---
 build-scripts/INSTALL |   63 +++++++++---------------------------------------
 1 files changed, 12 insertions(+), 51 deletions(-)

diff --git a/build-scripts/INSTALL b/build-scripts/INSTALL
index a73bfa8..5b337b0 100644
--- a/build-scripts/INSTALL
+++ b/build-scripts/INSTALL
@@ -296,7 +296,7 @@ Building zlib
 Now we'll download zlib and install it.
 
 Download the zlib source:
-        http://www.zlib.net/zlib-1.2.3.tar.gz
+        http://www.zlib.net/zlib-1.2.5.tar.gz
 
 Currently, zlib doesn't have package signatures. We emailed the zlib team and are awaiting a reply.
 
@@ -306,70 +306,31 @@ Extract zlib:
         $ cd zlib-1.2.3/
 
 Build it (we'll need this because we want zlib.a):
-        ./configure
-        make
-        make install
+        make -f win32/Makefile.gcc
+        INCLUDE_PATH=/usr/local/include \
+	 LIBRARY_PATH=/usr/local/lib make install -fwin32/Makefile.gcc
 
 Building OpenSSL
 ================
 
 Download openssl:
 
-    http://www.openssl.org/source/openssl-0.9.8l.tar.gz
+    http://www.openssl.org/source/openssl-1.0.0a.tar.gz
 
 Unpack it:
 
     cd /c/build/
-    tar -C /c/build/ -xvzf /c/Documents\ and\ Settings/Administrator/Desktop/openssl-0.9.8l.tar.gz
-
-You should see errors not unlike:
-
-    tar: openssl-0.9.8l/include/openssl/bn.h: Cannot create symlink to `../../crypto/bn/bn.h': No such file or directory
-    tar: openssl-0.9.8l/include/openssl/blowfish.h: Cannot create symlink to `../../crypto/bf/blowfish.h': No such file or directory
-    tar: openssl-0.9.8l/include/openssl/bio.h: Cannot create symlink to `../../crypto/bio/bio.h': No such file or directory
-    tar: openssl-0.9.8l/include/openssl/asn1t.h: Cannot create symlink to `../../crypto/asn1/asn1t.h': No such file or directory
-    tar: openssl-0.9.8l/include/openssl/asn1_mac.h: Cannot create symlink to `../../crypto/asn1/asn1_mac.h': No such file or directory
-    tar: openssl-0.9.8l/include/openssl/asn1.h: Cannot create symlink to `../../crypto/asn1/asn1.h': No such file or directory
-    tar: openssl-0.9.8l/include/openssl/aes.h: Cannot create symlink to `../../crypto/aes/aes.h': No such file or directory
-    tar: openssl-0.9.8l/apps/md4.c: Cannot create symlink to `../crypto/md4/md4.c': No such file or directory
-    tar: Error exit delayed from previous errors
-
-Uncompressing OpenSSL shows a number of errors concerning symlinks. These do
-not appear to have caused a problem.
+    tar -C /c/build/ -xvzf /c/Documents\ and\ Settings/Administrator/Desktop/openssl-1.0.0a.tar.gz
 
 Now configure the source package:
 
-    cd openssl-0.9.8l/
-    ./config -no-idea -no-rc5 -no-mdc2
-
-Edit '/c/build/openssl-0.9.8l/Makefile' and remove the "test:" and "tests:" sections that follow:
-
-    test:   tests
-
-    tests: rehash
-            @(cd test && echo "testing..." && \
-            $(CLEARENV) && $(MAKE) -e $(BUILDENV) TOP=.. TESTS='${TESTS}' OPENSSL_DE
-    BUG_MEMORY=on tests );
-            util/opensslwrap.sh version -a
+    cd openssl-1.0.0a/
+    ./config -no-idea -no-rc5 -no-mdc2 -DOPENSSL_NO_CAPIENG
 
-Now remove things we don't need that interfere with the build process:
-
-        rm -rf ./test
-
-Now copy files we do need:
-
-        cd crypto/
-        find ./ -name "*.h" -exec cp {} ../include/openssl/ \;
-        cd ../ssl/
-        find ./ -name "*.h" -exec cp {} ../include/openssl/ \;
-        cd ..
-        cp *.h include/openssl/
-        cp fips/fips.h include/openssl/
-
-And finally, build it - this can take a long time and depends on the speed of your computer:
-
-        make
-        make install
+Finally build it:
+    make depend
+    make
+    make install
 
 Building libevent
 =================
-- 
1.7.3.1.msysgit.0