[tor-commits] [torbrowser/master] add geoip6 files to alpha bundles

[mikeperry at torproject.org]

commit b6b517e34ef295983b10fefe77e834be1e2e1c8c
Author: Erinn Clark <erinn at torproject.org>
Date:   Tue Mar 19 15:50:39 2013 -0400

    add geoip6 files to alpha bundles
---
 build-scripts/config/alpha/torrc       |    1 +
 build-scripts/config/alpha/torrc-linux |    2 +-
 build-scripts/config/alpha/torrc-osx   |    1 +
 build-scripts/linux-alpha.mk           |    1 +
 build-scripts/osx-alpha.mk             |    1 +
 build-scripts/windows-alpha.mk         |    1 +
 6 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/build-scripts/config/alpha/torrc b/build-scripts/config/alpha/torrc
index 16f9486..1c79def 100644
--- a/build-scripts/config/alpha/torrc
+++ b/build-scripts/config/alpha/torrc
@@ -3,6 +3,7 @@ AvoidDiskWrites 1
 # Store working data, state, keys, and caches here.
 DataDirectory .\Data\Tor
 GeoIPFile .\Data\Tor\geoip
+GeoIPv6File .\Data\Tor\geoip6
 # Where to send logging messages.  Format is minSeverity[-maxSeverity]
 # (stderr|stdout|syslog|file FILENAME).
 Log notice stdout
diff --git a/build-scripts/config/alpha/torrc-linux b/build-scripts/config/alpha/torrc-linux
index 7d11921..aea57fd 100644
--- a/build-scripts/config/alpha/torrc-linux
+++ b/build-scripts/config/alpha/torrc-linux
@@ -2,7 +2,7 @@
 AvoidDiskWrites 1
 # Store working data, state, keys, and caches here.
 DataDirectory ./Data/Tor
-GeoIPFile ./Data/Tor/geoip
+GeoIPv6File ./Data/Tor/geoip6
 # Where to send logging messages.  Format is minSeverity[-maxSeverity]
 # (stderr|stdout|syslog|file FILENAME).
 Log notice stdout
diff --git a/build-scripts/config/alpha/torrc-osx b/build-scripts/config/alpha/torrc-osx
index f9c71d5..877c70b 100644
--- a/build-scripts/config/alpha/torrc-osx
+++ b/build-scripts/config/alpha/torrc-osx
@@ -3,6 +3,7 @@ AvoidDiskWrites 1
 # Store working data, state, keys, and caches here.
 DataDirectory ../../Contents/Resources/Data/Tor
 GeoIPFile ../../Contents/Resources/Data/Tor/geoip
+GeoIPv6File ../../Contents/Resources/Data/Tor/geoip6
 # Where to send logging messages.  Format is minSeverity[-maxSeverity]
 # (stderr|stdout|syslog|file FILENAME).
 Log notice stdout
diff --git a/build-scripts/linux-alpha.mk b/build-scripts/linux-alpha.mk
index b8e1c7a..7121474 100644
--- a/build-scripts/linux-alpha.mk
+++ b/build-scripts/linux-alpha.mk
@@ -362,6 +362,7 @@ else
 	cp config/alpha/torrc-linux $(DEST)/Data/Tor/torrc
 endif
 	cp $(TOR_DIR)/src/config/geoip $(DEST)/Data/Tor/geoip
+	cp $(TOR_DIR)/src/config/geoip6 $(DEST)/Data/Tor/geoip6
 	chmod 700 $(DEST)/Data/Tor
 
 # We've replaced the custom C program with a shell script for now...
diff --git a/build-scripts/osx-alpha.mk b/build-scripts/osx-alpha.mk
index 7edbc40..7ad744d 100644
--- a/build-scripts/osx-alpha.mk
+++ b/build-scripts/osx-alpha.mk
@@ -369,6 +369,7 @@ else
 	cp config/alpha/torrc-osx $(DEST)/Library/Vidalia/torrc
 endif
 	cp $(TOR_DIR)/src/config/geoip $(DEST)/Contents/Resources/Data/Tor/geoip
+	cp $(TOR_DIR)/src/config/geoip6 $(DEST)/Contents/Resources/Data/Tor/geoip6
 	chmod 700 $(DATADIR)/Tor
 
 # We've replaced the custom C program with a shell script for now...
diff --git a/build-scripts/windows-alpha.mk b/build-scripts/windows-alpha.mk
index 02424ec..56233c4 100644
--- a/build-scripts/windows-alpha.mk
+++ b/build-scripts/windows-alpha.mk
@@ -374,6 +374,7 @@ else
 	cp config/alpha/torrc $(DEST)/Data/Tor/torrc
 endif
 	cp $(TOR)/src/config/geoip $(DEST)/Data/Tor
+	cp $(TOR)/src/config/geoip6 $(DEST)/Data/Tor
 
 launcher:
 	cd ../src/RelativeLink/ && $(MAKE)