mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-11-14 07:03:44 +01:00
39 lines
1.2 KiB
Plaintext
Executable File
39 lines
1.2 KiB
Plaintext
Executable File
#! /bin/sh -e
|
|
## 14_fix_geoip_warning.dpatch by <weasel@debian.org>
|
|
##
|
|
## 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
|
|
@@ -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. %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;
|
|
}
|