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

[mikeperry@xxxxxxxxxxxxxx]

commit 93da350916a0292248ead65e0ffa73d82736f91a
Author: David Fifield <david@xxxxxxxxxxxxxxx>
Date:   Fri Dec 13 21:27:42 2013 -0800

    Apply bug10297.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 28a2d5b..b05b3f4 100644
--- a/gitian/descriptors/linux/gitian-tor.yml
+++ b/gitian/descriptors/linux/gitian-tor.yml
@@ -25,6 +25,7 @@ remotes:
 - "url": "https://github.com/nmathewson/openssl.git";
   "dir": "openssl"
 files:
+- "bug10297.patch"
 - "dzip.sh"
 script: |
   INSTDIR="$HOME/install"
@@ -72,6 +73,7 @@ script: |
   export GIT_COMMITTER_NAME="nobody"
   export GIT_COMMITTER_EMAIL="nobody@localhost"
   export GIT_COMMITTER_DATE="$REFERENCE_DATETIME"
+  git am ~/build/bug10297.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 e6e4528..0d90999 100644
--- a/gitian/descriptors/mac/gitian-tor.yml
+++ b/gitian/descriptors/mac/gitian-tor.yml
@@ -25,6 +25,7 @@ remotes:
 - "url": "https://github.com/nmathewson/openssl.git";
   "dir": "openssl"
 files:
+- "bug10297.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"
@@ -88,6 +89,7 @@ script: |
   export GIT_COMMITTER_NAME="nobody"
   export GIT_COMMITTER_EMAIL="nobody@localhost"
   export GIT_COMMITTER_DATE="$REFERENCE_DATETIME"
+  git am ~/build/bug10297.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 cd1838d..bcb0d4f 100644
--- a/gitian/descriptors/windows/gitian-tor.yml
+++ b/gitian/descriptors/windows/gitian-tor.yml
@@ -25,6 +25,7 @@ remotes:
 - "url": "https://github.com/nmathewson/openssl.git";
   "dir": "openssl"
 files:
+- "bug10297.patch"
 - "binutils.tar.bz2"
 - "dzip.sh"
 script: |
@@ -84,6 +85,7 @@ script: |
   export GIT_COMMITTER_NAME="nobody"
   export GIT_COMMITTER_EMAIL="nobody@localhost"
   export GIT_COMMITTER_DATE="$REFERENCE_DATETIME"
+  git am ~/build/bug10297.patch
   mkdir -p $OUTDIR/src
   git archive HEAD | tar -x -C $OUTDIR/src
   ./autogen.sh



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits