[tor-commits] [tor-browser-bundle/master] Only apply tor patches to 0.2.4 tor builds.

[mikeperry at torproject.org]

commit 348e4c3216e22dbae3e4863915a877bf65077ff4
Author: Mike Perry <mikeperry-git at torproject.org>
Date:   Thu Feb 20 17:01:16 2014 +0000

    Only apply tor patches to 0.2.4 tor builds.
---
 gitian/descriptors/linux/gitian-tor.yml   |    9 +++++++--
 gitian/descriptors/mac/gitian-tor.yml     |    9 +++++++--
 gitian/descriptors/windows/gitian-tor.yml |    9 +++++++--
 3 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/gitian/descriptors/linux/gitian-tor.yml b/gitian/descriptors/linux/gitian-tor.yml
index ea44fe0..ce9372b 100644
--- a/gitian/descriptors/linux/gitian-tor.yml
+++ b/gitian/descriptors/linux/gitian-tor.yml
@@ -23,12 +23,14 @@ remotes:
 - "url": "https://github.com/libevent/libevent.git"
   "dir": "libevent"
 files:
+- "versions"
 - "bug10297.patch"
 - "bug5018.patch"
 - "dzip.sh"
 - "openssl.tar.gz"
 script: |
   INSTDIR="$HOME/install"
+  source versions
   export LIBRARY_PATH="$INSTDIR/lib"
   export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1
   export FAKETIME=$REFERENCE_DATETIME
@@ -74,8 +76,11 @@ script: |
   export GIT_COMMITTER_NAME="nobody"
   export GIT_COMMITTER_EMAIL="nobody at localhost"
   export GIT_COMMITTER_DATE="$REFERENCE_DATETIME"
-  git am ~/build/bug10297.patch
-  git am ~/build/bug5018.patch
+  if [ ${TOR_TAG:9} == "tor-0.2.4" ];
+  then
+    git am ~/build/bug10297.patch
+    git am ~/build/bug5018.patch
+  fi
   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 3e27ffb..c2c2bf6 100644
--- a/gitian/descriptors/mac/gitian-tor.yml
+++ b/gitian/descriptors/mac/gitian-tor.yml
@@ -23,6 +23,7 @@ remotes:
 - "url": "https://github.com/madler/zlib.git"
   "dir": "zlib"
 files:
+- "versions"
 - "openssl.tar.gz"
 - "bug10297.patch"
 - "bug5018.patch"
@@ -33,6 +34,7 @@ files:
 #- "apple-x86-odcctools_758.159-0flosoft11_i386.deb"
 script: |
   INSTDIR="$HOME/install"
+  source versions
   export LIBRARY_PATH="$INSTDIR/lib"
   export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1
   export FAKETIME=$REFERENCE_DATETIME
@@ -90,8 +92,11 @@ script: |
   export GIT_COMMITTER_NAME="nobody"
   export GIT_COMMITTER_EMAIL="nobody at localhost"
   export GIT_COMMITTER_DATE="$REFERENCE_DATETIME"
-  git am ~/build/bug10297.patch
-  git am ~/build/bug5018.patch
+  if [ ${TOR_TAG:9} == "tor-0.2.4" ];
+  then
+    git am ~/build/bug10297.patch
+    git am ~/build/bug5018.patch
+  fi
   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 df5a798..6900a14 100644
--- a/gitian/descriptors/windows/gitian-tor.yml
+++ b/gitian/descriptors/windows/gitian-tor.yml
@@ -23,6 +23,7 @@ remotes:
 - "url": "https://github.com/madler/zlib.git"
   "dir": "zlib"
 files:
+- "versions"
 - "bug10297.patch"
 - "bug5018.patch"
 - "binutils.tar.bz2"
@@ -30,6 +31,7 @@ files:
 - "openssl.tar.gz"
 script: |
   INSTDIR="$HOME/install"
+  source versions
   export LIBRARY_PATH="$INSTDIR/lib"
   export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1
   export FAKETIME=$REFERENCE_DATETIME
@@ -86,8 +88,11 @@ script: |
   export GIT_COMMITTER_NAME="nobody"
   export GIT_COMMITTER_EMAIL="nobody at localhost"
   export GIT_COMMITTER_DATE="$REFERENCE_DATETIME"
-  git am ~/build/bug10297.patch
-  git am ~/build/bug5018.patch
+  if [ ${TOR_TAG:9} == "tor-0.2.4" ];
+  then
+    git am ~/build/bug10297.patch
+    git am ~/build/bug5018.patch
+  fi
   mkdir -p $OUTDIR/src
   git archive HEAD | tar -x -C $OUTDIR/src
   ./autogen.sh