nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-09-20 21:16:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

Forward port patches

Browse Source 
svn:r3329
This commit is contained in:
Peter Palfrader 2005-01-09 02:30:28 +00:00
parent 904b321fa7
commit eab35efa67
3 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
debian/changelog vendored
View File

@ -1,8 +1,9 @@
tor (0.0.9.2-X) UNRELEASED; urgency=low
* Add a watch file.
* Forward port patches (so they apply to current cvs).
-- Peter Palfrader <weasel@debian.org> Sun, 9 Jan 2005 03:29:36 +0100
-- Peter Palfrader <weasel@debian.org> Sun, 9 Jan 2005 03:30:06 +0100
tor (0.0.9.2-1) unstable; urgency=low

12
debian/patches/06_add_compile_time_defaults.dpatch vendored
View File

@ -23,19 +23,19 @@ esac
exit 0
@DPATCH@
diff -urNad cvs/src/or/config.c /tmp/dpep.XUCqlY/cvs/src/or/config.c
--- cvs/src/or/config.c 2004-11-12 17:40:22.906576139 +0100
+++ /tmp/dpep.XUCqlY/cvs/src/or/config.c 2004-11-12 17:58:01.603511522 +0100
@@ -95,7 +95,7 @@
diff -urNad tor-0.1.0.0-alpha-cvs/src/or/config.c /tmp/dpep.w3oD6B/tor-0.1.0.0-alpha-cvs/src/or/config.c
--- tor-0.1.0.0-alpha-cvs/src/or/config.c 2005-01-06 22:03:27.000000000 +0100
+++ /tmp/dpep.w3oD6B/tor-0.1.0.0-alpha-cvs/src/or/config.c 2005-01-07 01:57:43.801310097 +0100
@@ -102,7 +102,7 @@
VAR("ControlPort", UINT, ControlPort, "0"),
VAR("CookieAuthentication",BOOL, CookieAuthentication, "0"),
VAR("DebugLogFile", STRING, DebugLogFile, NULL),
- VAR("DataDirectory", STRING, DataDirectory, NULL),
+ VAR("DataDirectory", STRING, DataDirectory, "/var/lib/tor"),
VAR("DirAllowPrivateAddresses",BOOL, DirAllowPrivateAddresses, NULL),
VAR("DirPort", UINT, DirPort, "0"),
VAR("DirBindAddress", LINELIST, DirBindAddress, NULL),
VAR("DirFetchPostPeriod", UINT, DirFetchPostPeriod, "600"),
@@ -135,11 +135,11 @@
@@ -148,11 +148,11 @@
VAR("ORPort", UINT, ORPort, "0"),
VAR("ORBindAddress", LINELIST, ORBindAddress, NULL),
VAR("OutboundBindAddress", STRING, OutboundBindAddress, NULL),

12
debian/patches/07_log_to_file_by_default.dpatch vendored
View File

@ -23,15 +23,15 @@ esac
exit 0
@DPATCH@
diff -urNad tor-0.0.9rc7/src/or/config.c /tmp/dpep.BdF2iw/tor-0.0.9rc7/src/or/config.c
--- tor-0.0.9rc7/src/or/config.c 2004-12-08 13:20:28.111199142 +0100
+++ /tmp/dpep.BdF2iw/tor-0.0.9rc7/src/or/config.c 2004-12-08 13:22:08.294210420 +0100
@@ -1179,7 +1179,7 @@
diff -urNad tor-0.1.0.0-alpha-cvs/src/or/config.c /tmp/dpep.YwfNhI/tor-0.1.0.0-alpha-cvs/src/or/config.c
--- tor-0.1.0.0-alpha-cvs/src/or/config.c 2005-01-07 02:00:10.761573594 +0100
+++ /tmp/dpep.YwfNhI/tor-0.1.0.0-alpha-cvs/src/or/config.c 2005-01-07 02:01:02.819978258 +0100
@@ -1192,7 +1192,7 @@
/* Special case if no options are given. */
if (!options->Logs) {
- options->Logs = config_line_prepend(NULL, "Log", "notice stdout");
+ options->Logs = config_line_prepend(NULL, "Log", "notice file /var/log/tor/log");
- config_line_append(&options->Logs, "Log", "notice stdout");
+ config_line_append(&options->Logs, "Log", "notice file /var/log/tor/log");
}
if (config_init_logs(options, 1)<0) /* Validate the log(s) */