4 files changed, 78 insertions, 1 deletions
diff --git a/debian/patches/00list b/debian/patches/00list
index 13c7d1b391..57694fe518 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1,3 +1,5 @@
 01_uncomment_datadirectory.dpatch
 02_add_debian_files_in_manpage.dpatch
 03_tor_manpage_in_section_8.dpatch
+04_run_as_daemon.dpatch
+05_log_to_file.dpatch
diff --git a/debian/patches/03_tor_manpage_in_section_8.dpatch b/debian/patches/03_tor_manpage_in_section_8.dpatch
index 1d8be4cc51..98301805e6 100755
--- a/debian/patches/03_tor_manpage_in_section_8.dpatch
+++ b/debian/patches/03_tor_manpage_in_section_8.dpatch
@@ -1,5 +1,5 @@
 #! /bin/sh -e
-## 02_tor_manpage_in_section_8.dpatch by  <weasel@debian.org>
+## 03_tor_manpage_in_section_8.dpatch by  <weasel@debian.org>
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
 ## DP: No description.
diff --git a/debian/patches/04_run_as_daemon.dpatch b/debian/patches/04_run_as_daemon.dpatch
new file mode 100755
index 0000000000..ed71341a9f
--- /dev/null
+++ b/debian/patches/04_run_as_daemon.dpatch
@@ -0,0 +1,38 @@
+#! /bin/sh -e
+## 04_run_as_daemon.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@
+diff -urNad cvs/src/config/torrc.sample.in /tmp/dpep.ICyOZe/cvs/src/config/torrc.sample.in
+--- cvs/src/config/torrc.sample.in	2004-11-10 03:09:14.931082420 +0100
++++ /tmp/dpep.ICyOZe/cvs/src/config/torrc.sample.in	2004-11-10 04:32:54.737527368 +0100
+@@ -32,7 +32,8 @@
+ 
+ # Uncomment this to start the process in the background... or use
+ # --runasdaemon 1 on the command line.
+-#RunAsDaemon 1
++RunAsDaemon 1
++PIDfile /var/run/tor/tor.pid
+ 
+ # Tor only trusts directories signed with one of these keys, and
+ # uses the given addresses to connect to the trusted directory
diff --git a/debian/patches/05_log_to_file.dpatch b/debian/patches/05_log_to_file.dpatch
new file mode 100755
index 0000000000..076bc14fe8
--- /dev/null
+++ b/debian/patches/05_log_to_file.dpatch
@@ -0,0 +1,37 @@
+#! /bin/sh -e
+## 05_log_to_file.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@
+diff -urNad cvs/src/config/torrc.sample.in /tmp/dpep.5IEZdW/cvs/src/config/torrc.sample.in
+--- cvs/src/config/torrc.sample.in	2004-11-10 03:09:14.931082420 +0100
++++ /tmp/dpep.5IEZdW/cvs/src/config/torrc.sample.in	2004-11-10 04:34:35.090758448 +0100
+@@ -19,6 +19,8 @@
+ 
+ # Logs go to stdout unless redirected by something else, like one of
+ # the below lines, or --logfile on the command line.
++### Send all messages of level 'notice' or higher to @LOCALSTATEDIR@/log/tor/log
++Log warn file @LOCALSTATEDIR@/log/tor/log
+ ### Send all messages of level 'warn' or higher to @LOCALSTATEDIR@/log/tor/warnings
+ #Log warn file @LOCALSTATEDIR@/log/tor/warnings
+ ### Send all debug and info messages to @LOCALSTATEDIR@/log/tor/debug