[tor-commits] [tor-browser-bundle/master] Include GeoIP file in bundles.

[mikeperry at torproject.org]

commit 313346c958be18de5e8f77d38ea45d5b4b93657c
Author: Mike Perry <mikeperry-git at torproject.org>
Date:   Mon Jun 24 03:07:59 2013 -0700

    Include GeoIP file in bundles.
    
    Fixes some EntryNode issues people ran into.
---
 gitian/descriptors/linux/gitian-tor.yml   |    4 +++-
 gitian/descriptors/mac/gitian-tor.yml     |    2 ++
 gitian/descriptors/windows/gitian-tor.yml |    4 +++-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/gitian/descriptors/linux/gitian-tor.yml b/gitian/descriptors/linux/gitian-tor.yml
index 2901274..2ab9b20 100644
--- a/gitian/descriptors/linux/gitian-tor.yml
+++ b/gitian/descriptors/linux/gitian-tor.yml
@@ -41,6 +41,7 @@ script: |
   export DEB_BUILD_HARDENING_PIE=1
   #
   mkdir -p $INSTDIR/App
+  mkdir -p $INSTDIR/Data/Tor/
   mkdir -p $INSTDIR/Lib/libz/
   #
   cd zlib
@@ -80,7 +81,8 @@ script: |
   make install
   cd ..
   install -s $INSTDIR/bin/tor $INSTDIR/App/
+  cp $INSTDIR/share/tor/geoip $INSTDIR/Data/Tor/
   #
   cd $INSTDIR
-  ~/build/dzip.sh tor-linux$GBUILD_BITS-gbuilt.zip App/ Lib/
+  ~/build/dzip.sh tor-linux$GBUILD_BITS-gbuilt.zip Data/ App/ Lib/
   cp tor-linux$GBUILD_BITS-gbuilt.zip $OUTDIR/
diff --git a/gitian/descriptors/mac/gitian-tor.yml b/gitian/descriptors/mac/gitian-tor.yml
index 537202f..d2ccd90 100644
--- a/gitian/descriptors/mac/gitian-tor.yml
+++ b/gitian/descriptors/mac/gitian-tor.yml
@@ -45,6 +45,7 @@ script: |
   #
   mkdir -p $INSTDIR/bin/
   mkdir -p $INSTDIR/TorBrowserBundle.app/Contents/MacOS/
+  mkdir -p $INSTDIR/TorBrowserBundle.app/Contents/Resources/Data/Tor/
   mkdir -p $OUTDIR/
   #
   sudo dpkg -i *.deb
@@ -90,6 +91,7 @@ script: |
   make install
   cd ..
   cp $INSTDIR/bin/tor $INSTDIR/TorBrowserBundle.app/Contents/MacOS/
+  cp $INSTDIR/share/tor/geoip $INSTDIR/TorBrowserBundle.app/Contents/Resources/Data/Tor/
   cd $INSTDIR/TorBrowserBundle.app/Contents/MacOS/
   i686-apple-darwin11-install_name_tool -change /home/ubuntu/install/libevent/lib/$LIBEVENT_FILE @executable_path/$LIBEVENT_FILE tor
   # XXX: Geoip files..
diff --git a/gitian/descriptors/windows/gitian-tor.yml b/gitian/descriptors/windows/gitian-tor.yml
index 5fb0ef5..aec8c30 100644
--- a/gitian/descriptors/windows/gitian-tor.yml
+++ b/gitian/descriptors/windows/gitian-tor.yml
@@ -39,6 +39,7 @@ script: |
   # 
   mkdir -p $INSTDIR/bin/
   mkdir -p $INSTDIR/App/
+  mkdir -p $INSTDIR/Data/Tor/
   mkdir -p $OUTDIR/
   #
   cd zlib
@@ -76,11 +77,12 @@ script: |
   make install
   cd ..
   install -s $INSTDIR/bin/tor.exe $INSTDIR/App/
+  cp $INSTDIR/share/tor/geoip $INSTDIR/Data/Tor/
   # XXX: Geoip files..
   #
   cp -a /usr/lib/gcc/i686-w64-mingw32/4.6/libgcc_s_sjlj-1.dll $INSTDIR/App/
   cp -a /usr/lib/gcc/i686-w64-mingw32/4.6/libssp*.dll $INSTDIR/App/
   #
   cd $INSTDIR
-  ~/build/dzip.sh tor-win32-gbuilt.zip App/
+  ~/build/dzip.sh tor-win32-gbuilt.zip App/ Data/
   cp tor-win32-gbuilt.zip $OUTDIR/