[or-cvs] r15128: Add patches/14_fix_geoip_warning: Change geoipdb open failed (in tor/branches/tor-0_2_0-patches/debian: . patches)

[weasel@xxxxxxxx]

Author: weasel
Date: 2008-06-11 06:59:16 -0400 (Wed, 11 Jun 2008)
New Revision: 15128

Added:
   tor/branches/tor-0_2_0-patches/debian/patches/14_fix_geoip_warning.dpatch
Modified:
   tor/branches/tor-0_2_0-patches/debian/changelog
   tor/branches/tor-0_2_0-patches/debian/patches/00list
Log:
Add patches/14_fix_geoip_warning: Change geoipdb open failed message.


Modified: tor/branches/tor-0_2_0-patches/debian/changelog
===================================================================
--- tor/branches/tor-0_2_0-patches/debian/changelog	2008-06-11 10:48:24 UTC (rev 15127)
+++ tor/branches/tor-0_2_0-patches/debian/changelog	2008-06-11 10:59:16 UTC (rev 15128)
@@ -4,8 +4,9 @@
     it is no longer needed:  We now setuid() to the Tor user
     when run as root and it all just works.
   * Add comments to the dpatch headers so lintian shuts up.
+  * Add patches/14_fix_geoip_warning: Change geoipdb open failed message.
 
- -- Peter Palfrader <weasel@xxxxxxxxxx>  Wed, 11 Jun 2008 11:32:27 +0200
+ -- Peter Palfrader <weasel@xxxxxxxxxx>  Wed, 11 Jun 2008 12:55:49 +0200
 
 tor (0.2.0.27-rc-1) experimental; urgency=low
 

Modified: tor/branches/tor-0_2_0-patches/debian/patches/00list
===================================================================
--- tor/branches/tor-0_2_0-patches/debian/patches/00list	2008-06-11 10:48:24 UTC (rev 15127)
+++ tor/branches/tor-0_2_0-patches/debian/patches/00list	2008-06-11 10:59:16 UTC (rev 15128)
@@ -2,3 +2,4 @@
 03_tor_manpage_in_section_8.dpatch
 06_add_compile_time_defaults.dpatch
 07_log_to_file_by_default.dpatch
+14_fix_geoip_warning

Added: tor/branches/tor-0_2_0-patches/debian/patches/14_fix_geoip_warning.dpatch
===================================================================
--- tor/branches/tor-0_2_0-patches/debian/patches/14_fix_geoip_warning.dpatch	                        (rev 0)
+++ tor/branches/tor-0_2_0-patches/debian/patches/14_fix_geoip_warning.dpatch	2008-06-11 10:59:16 UTC (rev 15128)
@@ -0,0 +1,37 @@
+#! /bin/sh -e
+## 14_fix_geoip_warning.dpatch by  <weasel@xxxxxxxxxx>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Change geoipdb open failed message
+
+if [ $# -lt 1 ]; then
+    echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+    exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
+
+case "$1" in
+    -patch) patch -p1 ${patch_opts} < $0;;
+    -unpatch) patch -R -p1 ${patch_opts} < $0;;
+    *)
+        echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+        exit 1;;
+esac
+
+exit 0
+
+@DPATCH@
+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;
+   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);
+     return -1;
+   }
+   geoip_countries = smartlist_create();


Property changes on: tor/branches/tor-0_2_0-patches/debian/patches/14_fix_geoip_warning.dpatch
___________________________________________________________________
Name: svn:executable
   + *