[or-cvs] Forward port 06_add_compile_time_defaults

[Peter Palfrader]

Update of /home/or/cvsroot/tor/debian/patches
In directory moria.mit.edu:/tmp/cvs-serv16776/patches

Modified Files:
	06_add_compile_time_defaults.dpatch 
Log Message:
Forward port 06_add_compile_time_defaults

Index: 06_add_compile_time_defaults.dpatch
===================================================================
RCS file: /home/or/cvsroot/tor/debian/patches/06_add_compile_time_defaults.dpatch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- 06_add_compile_time_defaults.dpatch	9 Jan 2005 02:30:28 -0000	1.2
+++ 06_add_compile_time_defaults.dpatch	23 Jan 2005 15:24:33 -0000	1.3
@@ -23,10 +23,10 @@
 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 @@
    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"),