Forward port 07_log_to_file_by_default.dpatch

svn:r6630
This commit is contained in:
Peter Palfrader 2006-06-15 23:20:50 +00:00
parent 2ff24dbc26
commit 068876eb36
2 changed files with 11 additions and 4 deletions

7
debian/changelog vendored
View File

@ -1,3 +1,10 @@
tor (0.1.2.0-alpha-cvs-1) unstable; urgency=low
* CVS snapshot.
* Forward port 07_log_to_file_by_default.dpatch.
-- Peter Palfrader <weasel@debian.org> Fri, 16 Jun 2006 01:14:04 +0200
tor (0.1.1.21-1) unstable; urgency=low
* New upstream version.

View File

@ -23,13 +23,13 @@ esac
exit 0
@DPATCH@
diff -urNad tor-0.1.1.17/src/or/config.c /tmp/dpep.YwfNhI/tor-0.1.1.17/src/or/config.c
--- tor-0.1.1.17/src/or/config.c
+++ /tmp/dpep.YwfNhI/tor-0.1.1.17/src/or/config.c
diff -urNad tor-0.1.2.0-alpha-cvs/src/or/config.c /tmp/dpep.YwfNhI/tor-0.1.2.0-alpha-cvs/src/or/config.c
--- tor-0.1.2.0-alpha-cvs/src/or/config.c
+++ /tmp/dpep.YwfNhI/tor-0.1.2.0-alpha-cvs/src/or/config.c
@@ -2079,7 +2079,7 @@
/* Special case on first boot if no Log options are given. */
if (!options->Logs && !from_setconf)
if (!options->Logs && !options->RunAsDaemon && !from_setconf)
- config_line_append(&options->Logs, "Log", "notice stdout");
+ config_line_append(&options->Logs, "Log", "notice file /var/log/tor/log");