nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-27 22:03:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Forward port 14_fix_geoip_warning.dpatch

Browse Source 
svn:r17016
This commit is contained in:
Peter Palfrader 2008-09-30 13:11:36 +00:00
parent dde2dbde1e
commit ce5d2bc5fb
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
debian/changelog vendored
View File

@ -1,6 +1,7 @@
tor (0.2.1.6-alpha-1) experimental; urgency=low
* New alpha release.
* Forward port 14_fix_geoip_warning.dpatch.
-- Peter Palfrader <weasel@debian.org> Tue, 30 Sep 2008 14:37:26 +0200

11
debian/patches/14_fix_geoip_warning.dpatch vendored
View File

@ -26,12 +26,13 @@ exit 0
diff -urNad git-stable~/src/or/geoip.c git-stable/src/or/geoip.c
--- git-stable~/src/or/geoip.c 2008-06-06 01:00:41.000000000 +0200
+++ git-stable/src/or/geoip.c 2008-06-11 12:54:17.605150644 +0200
@@ -147,7 +147,7 @@
int severity = should_record_bridge_info(options) ? LOG_WARN : LOG_INFO;
@@ -182,7 +182,8 @@
int severity = options_need_geoip_info(options, &msg) ? LOG_WARN : LOG_INFO;
clear_geoip_db();
if (!(f = fopen(filename, "r"))) {
- log_fn(severity, LD_GENERAL, "Failed to open GEOIP file %s.", filename);
+ log_fn(severity, LD_GENERAL, "Failed to open GEOIP file %s. Do you have the tor-geoipdb package installed?", filename);
- log_fn(severity, LD_GENERAL, "Failed to open GEOIP file %s. %s",
+ log_fn(severity, LD_GENERAL, "Failed to open GEOIP file %s. %s"
+ " Do you have the tor-geoipdb package installed?",
filename, msg);
return -1;
}
geoip_countries = smartlist_create();