diff options
| author | Peter Palfrader <peter@palfrader.org> | 2005-01-23 15:24:33 +0000 |
|---|---|---|
| committer | Peter Palfrader <peter@palfrader.org> | 2005-01-23 15:24:33 +0000 |
| commit | 7547852a202b77d7895198d3de45e430afe072cf (patch) | |
| tree | 5177166b59d41bcf42b2c40137d708fc9c473ac0 | |
| parent | f7c2309930c046a75ec129f44b476cc89eb63193 (diff) | |
| download | tor-7547852a202b77d7895198d3de45e430afe072cf.tar.gz tor-7547852a202b77d7895198d3de45e430afe072cf.zip | |
Forward port 06_add_compile_time_defaults
svn:r3423
| -rw-r--r-- | changelog | 6 | ||||
| -rwxr-xr-x | patches/06_add_compile_time_defaults.dpatch | 11 |
2 files changed, 9 insertions, 8 deletions
@@ -1,10 +1,10 @@ -tor (0.0.9.2-X) UNRELEASED; urgency=low +tor (0.1.0.0-alpha-cvs-1) UNRELEASED; urgency=low * Add a watch file. - * Forward port patches (so they apply to current cvs). + * Forward port 06_add_compile_time_defaults. * Add libevent-dev to build-depends. - -- Peter Palfrader <weasel@debian.org> Wed, 12 Jan 2005 16:43:10 +0100 + -- Peter Palfrader <weasel@debian.org> Sun, 23 Jan 2005 16:19:29 +0100 tor (0.0.9.3-1) unstable; urgency=low diff --git a/patches/06_add_compile_time_defaults.dpatch b/patches/06_add_compile_time_defaults.dpatch index 29ffcbfe6b..6fd89ce033 100755 --- a/patches/06_add_compile_time_defaults.dpatch +++ b/patches/06_add_compile_time_defaults.dpatch @@ -23,10 +23,10 @@ esac exit 0 @DPATCH@ -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 @@ +diff -urNad tor-0.1.0.0-alpha-cvs/src/or/config.c /tmp/dpep.Xv4cHn/tor-0.1.0.0-alpha-cvs/src/or/config.c +--- tor-0.1.0.0-alpha-cvs/src/or/config.c 2005-01-12 16:32:45.000000000 +0100 ++++ /tmp/dpep.Xv4cHn/tor-0.1.0.0-alpha-cvs/src/or/config.c 2005-01-13 03:50:33.815693540 +0100 +@@ -103,7 +103,7 @@ VAR("ControlPort", UINT, ControlPort, "0"), VAR("CookieAuthentication",BOOL, CookieAuthentication, "0"), VAR("DebugLogFile", STRING, DebugLogFile, NULL), @@ -35,12 +35,13 @@ diff -urNad tor-0.1.0.0-alpha-cvs/src/or/config.c /tmp/dpep.w3oD6B/tor-0.1.0.0-a VAR("DirAllowPrivateAddresses",BOOL, DirAllowPrivateAddresses, NULL), VAR("DirPort", UINT, DirPort, "0"), VAR("DirBindAddress", LINELIST, DirBindAddress, NULL), -@@ -148,11 +148,11 @@ +@@ -149,12 +149,12 @@ VAR("ORPort", UINT, ORPort, "0"), VAR("ORBindAddress", LINELIST, ORBindAddress, NULL), VAR("OutboundBindAddress", STRING, OutboundBindAddress, NULL), - VAR("PidFile", STRING, PidFile, NULL), + VAR("PidFile", STRING, PidFile, "/var/run/tor/tor.pid"), + VAR("LongLivedPorts", CSV, LongLivedPorts, "21,22,706,1863,5050,5190,5222,5223,6667,8300,8888"), VAR("PathlenCoinWeight", DOUBLE, PathlenCoinWeight, "0.3"), VAR("RedirectExit", LINELIST, RedirectExit, NULL), OBSOLETE("RouterFile"), |