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.


svn:r15126
This commit is contained in:
Peter Palfrader
2008-06-11 10:48:21 +00:00
parent 6260054d96
commit fccc74c062
3 changed files with 8 additions and 37 deletions
+8
View File
@@ -1,3 +1,11 @@
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.
-- Peter Palfrader <weasel@debian.org> Wed, 11 Jun 2008 11:30:30 +0200
tor (0.2.0.27-rc-1) experimental; urgency=low
* New upstream version.
-1
View File
@@ -2,4 +2,3 @@
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
-36
View File
@@ -1,36 +0,0 @@
#! /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);