[or-cvs] r14764: include the geoip file in the tarball, and load it by defaul (in tor/trunk: . src/config src/or)

arma at seul.org arma at seul.org
Wed May 28 04:37:35 UTC 2008


Author: arma
Date: 2008-05-28 00:37:34 -0400 (Wed, 28 May 2008)
New Revision: 14764

Modified:
   tor/trunk/LICENSE
   tor/trunk/src/config/Makefile.am
   tor/trunk/src/or/config.c
Log:
include the geoip file in the tarball, and load it by default
when tor starts.
this breaks rpms and maybe other packages.


Modified: tor/trunk/LICENSE
===================================================================
--- tor/trunk/LICENSE	2008-05-28 04:32:59 UTC (rev 14763)
+++ tor/trunk/LICENSE	2008-05-28 04:37:34 UTC (rev 14764)
@@ -77,4 +77,9 @@
  "This product includes software developed by the OpenSSL Project
  for use in the OpenSSL Toolkit (http://www.openssl.org/)"
 ===============================================================================
+"This program uses the IP-to-Country Database provided by
+WebHosting.Info (http://www.webhosting.info), available from
+http://ip-to-country.webhosting.info."
+See the src/config/geoip file in particular.
+===============================================================================
 

Modified: tor/trunk/src/config/Makefile.am
===================================================================
--- tor/trunk/src/config/Makefile.am	2008-05-28 04:32:59 UTC (rev 14763)
+++ tor/trunk/src/config/Makefile.am	2008-05-28 04:37:34 UTC (rev 14764)
@@ -1,11 +1,12 @@
 confdir = $(sysconfdir)/tor
 
-#EXTRA_DIST = fallback-consensus
+EXTRA_DIST = fallback-consensus geoip
 
 conf_DATA = torrc.sample
 
-#data_DATA = fallback-consensus
+data_DATA = fallback-consensus geoip
 
 # If we don't have it, fake it.
 fallback-consensus:
 	touch fallback-consensus
+

Modified: tor/trunk/src/or/config.c
===================================================================
--- tor/trunk/src/or/config.c	2008-05-28 04:32:59 UTC (rev 14763)
+++ tor/trunk/src/or/config.c	2008-05-28 04:37:34 UTC (rev 14764)
@@ -198,7 +198,8 @@
   V(FetchServerDescriptors,      BOOL,     "1"),
   V(FetchHidServDescriptors,     BOOL,     "1"),
   V(FetchUselessDescriptors,     BOOL,     "0"),
-  V(GeoIPFile,                   STRING,   NULL),
+  V(GeoIPFile,                   STRING,
+    SHARE_DATADIR PATH_SEPARATOR "tor" PATH_SEPARATOR "geoip"),
   V(Group,                       STRING,   NULL),
   V(HardwareAccel,               BOOL,     "0"),
   V(HashedControlPassword,       LINELIST, NULL),



More information about the tor-commits mailing list