Commit b4020346 authored by Peter Palfrader's avatar Peter Palfrader
Browse files

Update and fix a minor whitespace issue in debian/patches/14_fix_geoip_warning.

parent 4336be23

debian/changelog

+3 −1
Original line number Diff line number Diff line
@@ -2,8 +2,10 @@ tor (0.2.4.2-alpha-X) XXperimental; urgency=low 


  * Remove debian/patches/02_add_debian_files_in_manpage which hasn't been

    enabled for over five years now.

  * Update and fix a minor whitespace issue in

    debian/patches/14_fix_geoip_warning.



 -- Peter Palfrader <weasel@debian.org>  Wed, 19 Sep 2012 10:31:04 +0200

 -- Peter Palfrader <weasel@debian.org>  Wed, 19 Sep 2012 10:32:58 +0200



tor (0.2.4.2-alpha-1) experimental; urgency=low

debian/patches/14_fix_geoip_warning.dpatch

+6 −6
Original line number Diff line number Diff line
@@ -23,11 +23,11 @@ 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

@@ -182,7 +182,8 @@

   int severity = options_need_geoip_info(options, &msg) ? LOG_WARN : LOG_INFO;

diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' tor~/src/or/geoip.c tor/src/or/geoip.c

--- tor~/src/or/geoip.c	2012-09-13 23:13:52.000000000 +0200

+++ tor/src/or/geoip.c	2012-09-19 10:32:40.869252859 +0200

@@ -207,7 +207,8 @@

   crypto_digest_t *geoip_digest_env = NULL;

   clear_geoip_db();

   if (!(f = tor_fopen_cloexec(filename, "r"))) {

-    log_fn(severity, LD_GENERAL, "Failed to open GEOIP file %s.  %s",