From 1cbbeb6a270d974b89c68d01e6a8544136a3c562 Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Wed, 15 Jan 2014 20:39:49 +0100
Subject: [PATCH] gitian: Add openssl to linux deps

Build OpenSSL instead of using distribution-provided
library.
---
 contrib/gitian-descriptors/deps-linux.yml   | 13 ++++++++++++-
 contrib/gitian-descriptors/gitian-linux.yml |  7 +++----
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/contrib/gitian-descriptors/deps-linux.yml b/contrib/gitian-descriptors/deps-linux.yml
index 4ebf5c53a3..41d8d65fb7 100644
--- a/contrib/gitian-descriptors/deps-linux.yml
+++ b/contrib/gitian-descriptors/deps-linux.yml
@@ -15,6 +15,7 @@ packages:
 reference_datetime: "2013-06-01 00:00:00"
 remotes: []
 files:
+- "openssl-1.0.1e.tar.gz"
 - "miniupnpc-1.8.tar.gz"
 - "qrencode-3.4.3.tar.bz2"
 - "protobuf-2.5.0.tar.bz2"
@@ -24,11 +25,21 @@ script: |
   OPTFLAGS='-O2'
   export LIBRARY_PATH="$STAGING/lib"
   # Integrity Check
+  echo "f74f15e8c8ff11aa3d5bb5f276d202ec18d7246e95f961db76054199c69c1ae3  openssl-1.0.1e.tar.gz"  | sha256sum -c
   echo "bc5f73c7b0056252c1888a80e6075787a1e1e9112b808f863a245483ff79859c  miniupnpc-1.8.tar.gz"   | sha256sum -c
   echo "dfd71487513c871bad485806bfd1fdb304dedc84d2b01a8fb8e0940b50597a98  qrencode-3.4.3.tar.bz2" | sha256sum -c
   echo "13bfc5ae543cf3aa180ac2485c0bc89495e3ae711fc6fab4f8ffe90dfb4bb677  protobuf-2.5.0.tar.bz2" | sha256sum -c
   echo "12edc0df75bf9abd7f82f821795bcee50f42cb2e5f76a6a281b85732798364ef  db-4.8.30.NC.tar.gz"    | sha256sum -c
 
+  #
+  tar xzf openssl-1.0.1e.tar.gz
+  cd openssl-1.0.1e
+  #   need -fPIC to avoid relocation error in 64 bit builds
+  ./config no-shared no-zlib no-dso no-krb5 --openssldir=$STAGING -fPIC
+  make
+  make install_sw
+  cd ..
+  #
   tar xzfm miniupnpc-1.8.tar.gz
   cd miniupnpc-1.8
   #   miniupnpc is always built with -fPIC
@@ -60,4 +71,4 @@ script: |
   cd ../..
   #
   cd $STAGING
-  zip -r $OUTDIR/bitcoin-deps-linux${GBUILD_BITS}-gitian-r1.zip include lib bin host
+  zip -r $OUTDIR/bitcoin-deps-linux${GBUILD_BITS}-gitian-r2.zip include lib bin host
diff --git a/contrib/gitian-descriptors/gitian-linux.yml b/contrib/gitian-descriptors/gitian-linux.yml
index d0bdf144a5..417f31e270 100644
--- a/contrib/gitian-descriptors/gitian-linux.yml
+++ b/contrib/gitian-descriptors/gitian-linux.yml
@@ -7,7 +7,6 @@ architectures:
 - "amd64"
 packages: 
 - "libqt4-dev"
-- "libssl-dev"
 - "git-core"
 - "unzip"
 - "pkg-config"
@@ -21,8 +20,8 @@ remotes:
 - "url": "https://github.com/bitcoin/bitcoin.git"
   "dir": "bitcoin"
 files:
-- "bitcoin-deps-linux32-gitian-r1.zip"
-- "bitcoin-deps-linux64-gitian-r1.zip"
+- "bitcoin-deps-linux32-gitian-r2.zip"
+- "bitcoin-deps-linux64-gitian-r2.zip"
 - "boost-linux32-1.55.0-gitian-r1.zip"
 - "boost-linux64-1.55.0-gitian-r1.zip"
 script: |
@@ -34,7 +33,7 @@ script: |
   #
   mkdir -p $STAGING
   cd $STAGING
-  unzip ../build/bitcoin-deps-linux${GBUILD_BITS}-gitian-r1.zip
+  unzip ../build/bitcoin-deps-linux${GBUILD_BITS}-gitian-r2.zip
   unzip ../build/boost-linux${GBUILD_BITS}-1.55.0-gitian-r1.zip
   cd ../build
   #