diff options
| author | Peter Palfrader <peter@palfrader.org> | 2005-09-09 21:22:52 +0000 |
|---|---|---|
| committer | Peter Palfrader <peter@palfrader.org> | 2005-09-09 21:22:52 +0000 |
| commit | 1ea5d312e5b34d408e26d8348279e5a6de1133a9 (patch) | |
| tree | 513152a70f68b9a29e9bcec106be2be8f310be7b | |
| parent | 23008f292a3ef97342515224d91aab3b369def2f (diff) | |
| download | tor-1ea5d312e5b34d408e26d8348279e5a6de1133a9.tar.gz tor-1ea5d312e5b34d408e26d8348279e5a6de1133a9.zip | |
Forward port 06_add_compile_time_defaults.dpatch
svn:r4970
| -rw-r--r-- | debian/changelog | 3 | ||||
| -rwxr-xr-x | debian/patches/06_add_compile_time_defaults.dpatch | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog index 8d60e64abb..29c7e43c63 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,8 +3,9 @@ tor (0.1.1.5-alpha-cvs-1) UNRELEASED; urgency=low * Even more experimental cvs snapshot. * Testsuite is mandatory again. * Forward port 03_tor_manpage_in_section_8.dpatch + * Forward port 06_add_compile_time_defaults.dpatch - -- Peter Palfrader <weasel@debian.org> Fri, 9 Sep 2005 23:16:53 +0200 + -- Peter Palfrader <weasel@debian.org> Fri, 9 Sep 2005 23:22:38 +0200 tor (0.1.1.5-alpha-1) UNRELEASED; urgency=low diff --git a/debian/patches/06_add_compile_time_defaults.dpatch b/debian/patches/06_add_compile_time_defaults.dpatch index 84da66fa88..3ced95c7d0 100755 --- a/debian/patches/06_add_compile_time_defaults.dpatch +++ b/debian/patches/06_add_compile_time_defaults.dpatch @@ -41,9 +41,9 @@ diff -urNad tor-0.1.1.5/src/or/config.c /tmp/dpep.Xv4cHn/tor-0.1.1.5/src/or/conf VAR("PathlenCoinWeight", DOUBLE, PathlenCoinWeight, "0.3"), - VAR("PidFile", STRING, PidFile, NULL), + VAR("PidFile", STRING, PidFile, "/var/run/tor/tor.pid"), + VAR("ReachableAddresses", LINELIST, ReachableAddresses, NULL), VAR("RecommendedVersions", LINELIST, RecommendedVersions, NULL), - VAR("RedirectExit", LINELIST, RedirectExit, NULL), - VAR("RendExcludeNodes", STRING, RendExcludeNodes, NULL), + VAR("RecommendedClientVersions", LINELIST, RecommendedClientVersions, NULL), @@ -167,7 +167,7 @@ VAR("RendPostPeriod", INTERVAL, RendPostPeriod, "20 minutes"), VAR("RephistTrackTime", INTERVAL, RephistTrackTime, "24 hours"), |