Forward port 07_log_to_file_by_default.dpatch

svn:r6630

diff --git a/debian/changelog b/debian/changelog
index b049031f888794bc90703eaf39bbaaf81c3c72bb..8248cb306e66375c403ab3be453423b6fc63d642 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -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.

diff --git a/debian/patches/07_log_to_file_by_default.dpatch b/debian/patches/07_log_to_file_by_default.dpatch
index da9aaf4324523cc591d0151c377233e682cae12c..60d12608ea128a339aebbec0d19a892f7069e6ac 100755 (executable)
--- a/debian/patches/07_log_to_file_by_default.dpatch
+++ b/debian/patches/07_log_to_file_by_default.dpatch
@@ -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");