Forward port 14_fix_geoip_warning.dpatch

svn:r17016

diff --git a/debian/changelog b/debian/changelog
index b4466c2df04893e907cd912ee4cf2821d0bf9df9..835f555972c411abbaf2b8b472a94a7468d5cbee 100644 (file)
--- 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 49adeac6b5d9b366a4a7ef89efb34c2db10a6254..09737d7a615b39ca95c0e254a1c8c620f7044605 100755 (executable)
--- 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();