aboutsummaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2012-09-29 00:58:15 -0700
committerWladimir J. van der Laan <laanwj@gmail.com>2012-09-29 00:58:15 -0700
commit552af52b459848c364bb4e04f4e0c4e2c3269fa6 (patch)
tree652a159e7aba66120297725265c6681d8795d8eb /doc
parent3b2eb49db949e03e4eab5f0e656bd33ba0806227 (diff)
parent0eaaa83ba521af8453c11ad688bdbb6bd4e33870 (diff)
downloadbitcoin-552af52b459848c364bb4e04f4e0c4e2c3269fa6.tar.xz
Merge pull request #1851 from fanquake/OpenSSL-1.0.1c
Update to use OpenSSL 1.0.1c
Diffstat (limited to 'doc')
-rw-r--r--doc/build-msw.txt12
-rw-r--r--doc/build-unix.txt6
-rw-r--r--doc/release-process.txt4
3 files changed, 11 insertions, 11 deletions
diff --git a/doc/build-msw.txt b/doc/build-msw.txt
index c887a7be8c..3e64813b38 100644
--- a/doc/build-msw.txt
+++ b/doc/build-msw.txt
@@ -24,9 +24,9 @@ Dependencies
Libraries you need to download separately and build:
default path download
-OpenSSL \openssl-1.0.1b-mgw http://www.openssl.org/source/
+OpenSSL \openssl-1.0.1c-mgw http://www.openssl.org/source/
Berkeley DB \db-4.8.30.NC-mgw http://www.oracle.com/technology/software/products/berkeley-db/index.html
-Boost \boost-1.47.0-mgw http://www.boost.org/users/download/
+Boost \boost-1.50.0-mgw http://www.boost.org/users/download/
miniupnpc \miniupnpc-1.6-mgw http://miniupnp.tuxfamily.org/files/
Their licenses:
@@ -36,9 +36,9 @@ Boost MIT-like license
miniupnpc New (3-clause) BSD license
Versions used in this release:
-OpenSSL 1.0.1b
+OpenSSL 1.0.1c
Berkeley DB 4.8.30.NC
-Boost 1.47.0
+Boost 1.50.0
miniupnpc 1.6
@@ -48,7 +48,7 @@ MSYS shell:
un-tar sources with MSYS 'tar xfz' to avoid issue with symlinks (OpenSSL ticket 2377)
change 'MAKE' env. variable from 'C:\MinGW32\bin\mingw32-make.exe' to '/c/MinGW32/bin/mingw32-make.exe'
-cd /c/openssl-1.0.1b-mgw
+cd /c/openssl-1.0.1c-mgw
./config
make
@@ -63,7 +63,7 @@ Boost
-----
DOS prompt:
downloaded boost jam 3.1.18
-cd \boost-1.47.0-mgw
+cd \boost-1.50.0-mgw
bjam toolset=gcc --build-type=complete stage
MiniUPnPc
diff --git a/doc/build-unix.txt b/doc/build-unix.txt
index b02a20a760..2e0b53cf77 100644
--- a/doc/build-unix.txt
+++ b/doc/build-unix.txt
@@ -47,7 +47,7 @@ Licenses of statically linked libraries:
Versions used in this release:
GCC 4.3.3
- OpenSSL 0.9.8g
+ OpenSSL 1.0.1c
Berkeley DB 4.8.30.NC
Boost 1.37
miniupnpc 1.6
@@ -55,7 +55,7 @@ Versions used in this release:
Dependency Build Instructions: Ubuntu & Debian
----------------------------------------------
Build requirements:
- sudo apt-get install build-essential
+ sudo apt-get install build-essential
sudo apt-get install libssl-dev
for Ubuntu 12.04:
@@ -68,7 +68,7 @@ for Ubuntu 12.04:
but using these will break binary wallet compatibility, and is not recommended.
for other Ubuntu & Debian:
- sudo apt-get install libdb4.8-dev
+ sudo apt-get install libdb4.8-dev
sudo apt-get install libdb4.8++-dev
sudo apt-get install libboost1.37-dev
(If using Boost 1.37, append -mt to the boost libraries in the makefile)
diff --git a/doc/release-process.txt b/doc/release-process.txt
index 8443961d27..0cfe684376 100644
--- a/doc/release-process.txt
+++ b/doc/release-process.txt
@@ -24,7 +24,7 @@
* Fetch and build inputs: (first time, or when dependency versions change)
mkdir -p inputs; cd inputs/
wget 'http://miniupnp.free.fr/files/download.php?file=miniupnpc-1.6.tar.gz' -O miniupnpc-1.6.tar.gz
- wget 'http://www.openssl.org/source/openssl-1.0.1b.tar.gz'
+ wget 'http://www.openssl.org/source/openssl-1.0.1c.tar.gz'
wget 'http://download.oracle.com/berkeley-db/db-4.8.30.NC.tar.gz'
wget 'http://zlib.net/zlib-1.2.6.tar.gz'
wget 'ftp://ftp.simplesystems.org/pub/libpng/png/src/libpng-1.5.9.tar.gz'
@@ -37,7 +37,7 @@
./bin/gbuild ../bitcoin/contrib/gitian-descriptors/qt-win32.yml
mv build/out/qt-win32-4.7.4-gitian.zip inputs/
./bin/gbuild ../bitcoin/contrib/gitian-descriptors/deps-win32.yml
- mv build/out/bitcoin-deps-0.0.3.zip inputs/
+ mv build/out/bitcoin-deps-0.0.5.zip inputs/
* Build bitcoind and bitcoin-qt on Linux32, Linux64, and Win32:
./bin/gbuild --commit bitcoin=v${VERSION} ../bitcoin/contrib/gitian-descriptors/gitian.yml