[or-cvs] No longer use --pidfile, --logfile, and --runasdaemon comma...

[Peter Palfrader]

Update of /home/or/cvsroot/debian/patches
In directory moria.mit.edu:/tmp/cvs-serv14501/debian/patches

Modified Files:
	00list 03_tor_manpage_in_section_8.dpatch 
Added Files:
	04_run_as_daemon.dpatch 05_log_to_file.dpatch 
Log Message:
No longer use --pidfile, --logfile, and --runasdaemon command line options.  Set them in the configfile instead.


Index: 00list
===================================================================
RCS file: /home/or/cvsroot/debian/patches/00list,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- 00list	10 Nov 2004 03:27:52 -0000	1.5
+++ 00list	10 Nov 2004 03:42:06 -0000	1.6
@@ -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

Index: 03_tor_manpage_in_section_8.dpatch
===================================================================
RCS file: /home/or/cvsroot/debian/patches/03_tor_manpage_in_section_8.dpatch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- 03_tor_manpage_in_section_8.dpatch	10 Nov 2004 03:30:51 -0000	1.2
+++ 03_tor_manpage_in_section_8.dpatch	10 Nov 2004 03:42:06 -0000	1.3
@@ -1,5 +1,5 @@
 #! /bin/sh -e
-## 02_tor_manpage_in_section_8.dpatch by  <weasel at debian.org>
+## 03_tor_manpage_in_section_8.dpatch by  <weasel at debian.org>
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
 ## DP: No description.

--- NEW FILE: 04_run_as_daemon.dpatch ---
#! /bin/sh -e
## 04_run_as_daemon.dpatch by  <weasel at 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

--- NEW FILE: 05_log_to_file.dpatch ---
#! /bin/sh -e
## 05_log_to_file.dpatch by  <weasel at 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