diff options
| author | Peter Palfrader <peter@palfrader.org> | 2008-09-30 13:11:36 +0000 |
|---|---|---|
| committer | Peter Palfrader <peter@palfrader.org> | 2008-09-30 13:11:36 +0000 |
| commit | ce5d2bc5fb32bf822103b584d5934e57d8527cec (patch) | |
| tree | 0d31727b504eb97ed8482f7ec81600a6469d2267 /debian | |
| parent | dde2dbde1ee832d6a360a53d1338813dbe9c448b (diff) | |
| download | tor-ce5d2bc5fb32bf822103b584d5934e57d8527cec.tar.gz tor-ce5d2bc5fb32bf822103b584d5934e57d8527cec.zip | |
Forward port 14_fix_geoip_warning.dpatch
svn:r17016
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rwxr-xr-x | debian/patches/14_fix_geoip_warning.dpatch | 11 |
2 files changed, 7 insertions, 5 deletions
diff --git a/debian/changelog b/debian/changelog index b4466c2df0..835f555972 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 diff --git a/debian/patches/14_fix_geoip_warning.dpatch b/debian/patches/14_fix_geoip_warning.dpatch index 49adeac6b5..09737d7a61 100755 --- a/debian/patches/14_fix_geoip_warning.dpatch +++ b/debian/patches/14_fix_geoip_warning.dpatch @@ -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(); |