commit 174db93d1c62bf7542757e3096150e46b1956615 Author: Georg Koppen gk@torproject.org Date: Thu Sep 18 10:49:58 2014 +0000

No patch for bug 11200 when using tor 0.2.5.7-rc.

tor 0.2.5.7-rc already includes the fix for bug 11200 which breaks our build as we try to apply it, too. Thus, we remove it if building bundles with a tor 0.2.5.x from now on. --- 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 deletions(-)

diff --git a/gitian/descriptors/linux/gitian-tor.yml b/gitian/descriptors/linux/gitian-tor.yml index 3678913..2dccff6 100644 --- a/gitian/descriptors/linux/gitian-tor.yml +++ b/gitian/descriptors/linux/gitian-tor.yml @@ -30,7 +30,6 @@ files: - "bug9665.patch" - "bug8402.patch" - "bug8402-master.patch" -- "bug11200-hang-0.2.5.patch" - "dzip.sh" - "openssl-linux32-utils.zip" - "openssl-linux64-utils.zip" @@ -86,7 +85,6 @@ script: | elif [ ${TOR_TAG::9} == "tor-0.2.5" ]; then git am ~/build/bug8402-master.patch - git am ~/build/bug11200-hang-0.2.5.patch fi fi mkdir -p $OUTDIR/src diff --git a/gitian/descriptors/mac/gitian-tor.yml b/gitian/descriptors/mac/gitian-tor.yml index 88fb40f..ee8a556 100644 --- a/gitian/descriptors/mac/gitian-tor.yml +++ b/gitian/descriptors/mac/gitian-tor.yml @@ -27,7 +27,6 @@ files: - "bug9665.patch" - "bug8402.patch" - "bug8402-master.patch" -- "bug11200-hang-0.2.5.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" @@ -81,7 +80,6 @@ script: | elif [ ${TOR_TAG::9} == "tor-0.2.5" ]; then git am ~/build/bug8402-master.patch - git am ~/build/bug11200-hang-0.2.5.patch fi fi mkdir -p $OUTDIR/src diff --git a/gitian/descriptors/windows/gitian-tor.yml b/gitian/descriptors/windows/gitian-tor.yml index ad218f5..c326157 100644 --- a/gitian/descriptors/windows/gitian-tor.yml +++ b/gitian/descriptors/windows/gitian-tor.yml @@ -27,7 +27,6 @@ files: - "bug9665.patch" - "bug8402.patch" - "bug8402-master.patch" -- "bug11200-hang-0.2.5.patch" - "binutils.tar.bz2" - "dzip.sh" - "mingw-w64-win32-utils.zip" @@ -81,7 +80,6 @@ script: | elif [ ${TOR_TAG::9} == "tor-0.2.5" ]; then git am ~/build/bug8402-master.patch - git am ~/build/bug11200-hang-0.2.5.patch fi fi mkdir -p $OUTDIR/src