diff --git a/debian/changelog b/debian/changelog index aa322e9ec7..a41c60f39d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,16 @@ tor (0.2.1.0-unreleased-1) XXperimental; urgency=low -- Peter Palfrader Wed, 19 Mar 2008 20:09:25 +0100 +tor (0.2.0.27-rc-X) Xxperimental; urgency=low + + * Remove debian/patches/11_tor_as_root_more_helpful.dpatch as + 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 Wed, 11 Jun 2008 12:55:49 +0200 + tor (0.2.0.27-rc-1) experimental; urgency=low * New upstream version. diff --git a/debian/patches/00list b/debian/patches/00list index a6d4270cc8..9260bb7ed5 100644 --- a/debian/patches/00list +++ b/debian/patches/00list @@ -2,4 +2,4 @@ 03_tor_manpage_in_section_8.dpatch 06_add_compile_time_defaults.dpatch 07_log_to_file_by_default.dpatch -11_tor_as_root_more_helpful.dpatch +14_fix_geoip_warning diff --git a/debian/patches/02_add_debian_files_in_manpage.dpatch b/debian/patches/02_add_debian_files_in_manpage.dpatch index 69f8c8a535..ac87f43821 100755 --- a/debian/patches/02_add_debian_files_in_manpage.dpatch +++ b/debian/patches/02_add_debian_files_in_manpage.dpatch @@ -2,7 +2,7 @@ ## 02_add_debian_files_in_manpage.dpatch by ## ## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. +## DP: Change the FILES section of the manpage to properly describe the situation on Debian systems. if [ $# -lt 1 ]; then echo "`basename $0`: script expects -patch|-unpatch as argument" >&2 diff --git a/debian/patches/03_tor_manpage_in_section_8.dpatch b/debian/patches/03_tor_manpage_in_section_8.dpatch index d91f6f365b..a28b463eb4 100755 --- a/debian/patches/03_tor_manpage_in_section_8.dpatch +++ b/debian/patches/03_tor_manpage_in_section_8.dpatch @@ -2,7 +2,7 @@ ## 03_tor_manpage_in_section_8.dpatch by ## ## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. +## DP: Move the Tor manpage from section 1 to section 8. if [ $# -lt 1 ]; then echo "`basename $0`: script expects -patch|-unpatch as argument" >&2 diff --git a/debian/patches/06_add_compile_time_defaults.dpatch b/debian/patches/06_add_compile_time_defaults.dpatch index 578c96055a..26695b7286 100755 --- a/debian/patches/06_add_compile_time_defaults.dpatch +++ b/debian/patches/06_add_compile_time_defaults.dpatch @@ -2,7 +2,7 @@ ## 06_add_compile_time_defaults.dpatch by ## ## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. +## DP: Change a few compile time defaults so that Tor is better integrated on a Debian system if [ $# -lt 1 ]; then echo "`basename $0`: script expects -patch|-unpatch as argument" >&2 diff --git a/debian/patches/07_log_to_file_by_default.dpatch b/debian/patches/07_log_to_file_by_default.dpatch index 809c5ddcf3..225171d0b5 100755 --- a/debian/patches/07_log_to_file_by_default.dpatch +++ b/debian/patches/07_log_to_file_by_default.dpatch @@ -2,7 +2,7 @@ ## 07_log_to_file_by_default.dpatch by ## ## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. +## DP: Change default logging target from stdout to a logfile if [ $# -lt 1 ]; then echo "`basename $0`: script expects -patch|-unpatch as argument" >&2 diff --git a/debian/patches/11_tor_as_root_more_helpful.dpatch b/debian/patches/11_tor_as_root_more_helpful.dpatch deleted file mode 100755 index 96e42d5316..0000000000 --- a/debian/patches/11_tor_as_root_more_helpful.dpatch +++ /dev/null @@ -1,36 +0,0 @@ -#! /bin/sh -e -## 08_no_run_as_root.dpatch by -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. - -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@ ---- tor~/src/or/main.c 2006-07-23 19:31:29.000000000 +0200 -+++ tor/src/or/main.c 2006-07-24 05:34:30.696138870 +0200 -@@ -1483,7 +1483,7 @@ - #ifndef MS_WINDOWS - if (geteuid()==0) - log_warn(LD_GENERAL,"You are running Tor as root. You don't need to, " -- "and you probably shouldn't."); -+ "and you probably shouldn't. Maybe you are looking for the init script? '/etc/init.d/tor start'"); - #endif - - crypto_global_init(get_options()->HardwareAccel); diff --git a/debian/patches/14_fix_geoip_warning.dpatch b/debian/patches/14_fix_geoip_warning.dpatch new file mode 100755 index 0000000000..49adeac6b5 --- /dev/null +++ b/debian/patches/14_fix_geoip_warning.dpatch @@ -0,0 +1,37 @@ +#! /bin/sh -e +## 14_fix_geoip_warning.dpatch by +## +## 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();