diff options
| author | Peter Palfrader <peter@palfrader.org> | 2006-06-15 23:20:50 +0000 |
|---|---|---|
| committer | Peter Palfrader <peter@palfrader.org> | 2006-06-15 23:20:50 +0000 |
| commit | 068876eb36c763cf5d05852e25dac3c01f42c71e (patch) | |
| tree | fe08c1bcccf1c864ec72f1b097d3b9e15090e745 /debian | |
| parent | 2ff24dbc2638fc3604e7c5ed3c107fb57d2610a4 (diff) | |
| download | tor-068876eb36c763cf5d05852e25dac3c01f42c71e.tar tor-068876eb36c763cf5d05852e25dac3c01f42c71e.tar.gz | |
Forward port 07_log_to_file_by_default.dpatch
svn:r6630
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rwxr-xr-x | debian/patches/07_log_to_file_by_default.dpatch | 8 |
2 files changed, 11 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog index b049031f8..8248cb306 100644 --- 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 da9aaf432..60d12608e 100755 --- 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"); |