Backport: update documentation to match the new installers.

svn:r13069

1 files changed, 21 insertions, 14 deletions

diff --git a/doc/tor-win32-mingw-creation.txt b/doc/tor-win32-mingw-creation.txt
index b67218b416..00548d459a 100644
--- a/doc/tor-win32-mingw-creation.txt
+++ b/doc/tor-win32-mingw-creation.txt
@@ -5,7 +5,7 @@ Stage One:  Download and Install MinGW.
 ---------------------------------------
 
 Download mingw:
-http://prdownloads.sf.net/mingw/MinGW-5.0.3.exe?download
+http://prdownloads.sf.net/mingw/MinGW-5.1.3.exe?download
 
 Download msys:
 http://prdownloads.sf.net/mingw/MSYS-1.0.10.exe?download
@@ -13,7 +13,13 @@ http://prdownloads.sf.net/mingw/MSYS-1.0.10.exe?download
 Download the mingw developer tool kit:
 http://prdownloads.sf.net/mingw/msysDTK-1.0.1.exe?download
 
-Install mingw, msys and mingw-dtk.
+Download the mingw autoconf-2.59 update:
+http://prdownloads.sf.net/mingw/msys-autoconf-2.59.tar.bz2?download
+
+Install mingw, msys and mingw-dtk.  Extract msys-autoconf-2.59.tar.bz2 into
+your mingw install location.  For example, if you installed mingw into
+/c/mingw/1.0/ you want to extract msys-autoconf-2.59.tar.bz2 into this
+directory.
 
 Create a directory called "tor-mingw".
 
@@ -21,22 +27,22 @@ Stage Two:  Download, extract, compile openssl
 ----------------------------------------------
 
 Download openssl:
-http://www.openssl.org/source/openssl-0.9.8e.tar.gz
+http://www.openssl.org/source/openssl-0.9.8g.tar.gz
 
 Extract openssl:
 Copy the openssl tarball into the "tor-mingw" directory.
 Type "cd tor-mingw/"
-Type "tar zxf openssl-0.9.8e.tar.gz"
+Type "tar zxf openssl-0.9.8g.tar.gz"
 
 Make openssl libraries:
-Type "cd tor-mingw/openssl-0.9.8e/"
-Type "./Configure mingw"
+Type "cd tor-mingw/openssl-0.9.8g/"
+Type "./Configure -no-idea -no-rc5 -no-mdc2 mingw"
 Edit Makefile and remove the "test:" and "tests:" sections.
 Type "rm -rf ./test"
 Type "cd crypto/"
 Type "find ./ -name "*.h" -exec cp {} ../include/openssl/ \;"
 Type "cd ../ssl/"
-Type "find ./ -name "*.h" -exec cp {} ../include/openssl/ \;
+Type "find ./ -name "*.h" -exec cp {} ../include/openssl/ \;"
 Type "cd .."
 Type "cp *.h include/openssl/"
 # The next steps can take up to 30 minutes to complete.
@@ -77,17 +83,16 @@ Type "make -f win32/Makefile.gcc"
 Done.
 
 
-Stage Four: Download, extract, and patch libevent-1.3e.
+Stage Four: Download, extract, and compile libevent-1.3e
 ------------------------------------------------------
 
-Download libevent-1.3e:
+Download the libevent 1.3e release:
 http://www.monkey.org/~provos/libevent/
 
 Copy the libevent tarball into the "tor-mingw" directory.
 Type "cd tor-mingw"
 
-Extract libevent: 
-Type "tar zxf libevent-1.3e.tar.gz"
+Extract libevent.
 
 Type "./configure --enable-static --disable-shared"
 Type "make"
@@ -102,14 +107,15 @@ Extract Tor:
 Type "tar zxf latest-tor-alpha.tar.gz"
 
 cd tor-<version>
-Type "./configure --enable-static --disable-shared"
+Type "./configure"
 Type "make"
 
 You now have a tor.exe in src/or/.  This is Tor.
 You now have a tor-resolve.exe in src/tools/.
 
-Stage Six:  Build installer
----------------------------
+Stage Six:  Build the installer
+-------------------------------
+
 Install the latest NSIS:
 http://nsis.sourceforge.net/Download
 
@@ -118,3 +124,4 @@ From the Tor build directory above, run:
 "./contrib/package_nsis-mingw.sh"
 
 The resulting Tor installer executable is in ./win_tmp/.
+