[tor-commits] [tor-browser-bundle/master] Apply bug5018.patch.

[mikeperry at torproject.org]

commit e8378009e21c9f71eadfec3ea42bf31f1db006a8
Author: David Fifield <david at bamsoftware.com>
Date:   Fri Dec 13 22:04:55 2013 +0000

    Apply bug5018.patch.
---
 gitian/descriptors/linux/gitian-tor.yml   |    2 ++
 gitian/descriptors/mac/gitian-tor.yml     |    2 ++
 gitian/descriptors/windows/gitian-tor.yml |    2 ++
 3 files changed, 6 insertions(+)

diff --git a/gitian/descriptors/linux/gitian-tor.yml b/gitian/descriptors/linux/gitian-tor.yml
index b05b3f4..6925663 100644
--- a/gitian/descriptors/linux/gitian-tor.yml
+++ b/gitian/descriptors/linux/gitian-tor.yml
@@ -26,6 +26,7 @@ remotes:
   "dir": "openssl"
 files:
 - "bug10297.patch"
+- "bug5018.patch"
 - "dzip.sh"
 script: |
   INSTDIR="$HOME/install"
@@ -74,6 +75,7 @@ script: |
   export GIT_COMMITTER_EMAIL="nobody at localhost"
   export GIT_COMMITTER_DATE="$REFERENCE_DATETIME"
   git am ~/build/bug10297.patch
+  git am ~/build/bug5018.patch
   mkdir -p $OUTDIR/src
   #git archive HEAD | tar -x -C $OUTDIR/src
   ./autogen.sh
diff --git a/gitian/descriptors/mac/gitian-tor.yml b/gitian/descriptors/mac/gitian-tor.yml
index 0d90999..c9dba1f 100644
--- a/gitian/descriptors/mac/gitian-tor.yml
+++ b/gitian/descriptors/mac/gitian-tor.yml
@@ -26,6 +26,7 @@ remotes:
   "dir": "openssl"
 files:
 - "bug10297.patch"
+- "bug5018.patch"
 - "apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb"
 - "multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz"
 - "dzip.sh"
@@ -90,6 +91,7 @@ script: |
   export GIT_COMMITTER_EMAIL="nobody at localhost"
   export GIT_COMMITTER_DATE="$REFERENCE_DATETIME"
   git am ~/build/bug10297.patch
+  git am ~/build/bug5018.patch
   mkdir -p $OUTDIR/src
   git archive HEAD | tar -x -C $OUTDIR/src
   ./autogen.sh
diff --git a/gitian/descriptors/windows/gitian-tor.yml b/gitian/descriptors/windows/gitian-tor.yml
index bcb0d4f..db7951b 100644
--- a/gitian/descriptors/windows/gitian-tor.yml
+++ b/gitian/descriptors/windows/gitian-tor.yml
@@ -26,6 +26,7 @@ remotes:
   "dir": "openssl"
 files:
 - "bug10297.patch"
+- "bug5018.patch"
 - "binutils.tar.bz2"
 - "dzip.sh"
 script: |
@@ -86,6 +87,7 @@ script: |
   export GIT_COMMITTER_EMAIL="nobody at localhost"
   export GIT_COMMITTER_DATE="$REFERENCE_DATETIME"
   git am ~/build/bug10297.patch
+  git am ~/build/bug5018.patch
   mkdir -p $OUTDIR/src
   git archive HEAD | tar -x -C $OUTDIR/src
   ./autogen.sh