diff options
Diffstat (limited to 'debian/patches')
| -rw-r--r-- | debian/patches/00list | 1 | ||||
| -rwxr-xr-x | debian/patches/11_tor_as_root_more_helpful.dpatch | 36 |
2 files changed, 37 insertions, 0 deletions
diff --git a/debian/patches/00list b/debian/patches/00list index cd17cd1dca..0c2be8424f 100644 --- a/debian/patches/00list +++ b/debian/patches/00list @@ -2,3 +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 diff --git a/debian/patches/11_tor_as_root_more_helpful.dpatch b/debian/patches/11_tor_as_root_more_helpful.dpatch new file mode 100755 index 0000000000..96e42d5316 --- /dev/null +++ b/debian/patches/11_tor_as_root_more_helpful.dpatch @@ -0,0 +1,36 @@ +#! /bin/sh -e +## 08_no_run_as_root.dpatch by <weasel@debian.org> +## +## 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); |