mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2025-02-22 06:21:55 +01:00
Code Issues Projects Releases Wiki Activity

Forward port 06_add_compile_time_defaults

Browse source 
svn:r3423
This commit is contained in:
Peter Palfrader 2005-01-23 15:24:33 +00:00
parent c3f66177a3
commit 6bdd3da630
2 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
debian/changelog vendored
View file

@ -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

11
debian/patches/06_add_compile_time_defaults.dpatch vendored
View file

@ -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"),