[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[or-cvs] Do not patch the default torrc to include settings we reall...
Update of /home/or/cvsroot/debian/patches
In directory moria.mit.edu:/tmp/cvs-serv30154/patches
Modified Files:
00list
Added Files:
06_add_compile_time_defaults.dpatch
07_log_to_file_by_default.dpatch
Removed Files:
01_uncomment_datadirectory.dpatch 04_run_as_daemon.dpatch
05_log_to_file.dpatch
Log Message:
Do not patch the default torrc to include settings we really want. Instead modify the compiled in default options.
Index: 00list
===================================================================
RCS file: /home/or/cvsroot/debian/patches/00list,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- 00list 10 Nov 2004 03:42:06 -0000 1.6
+++ 00list 12 Nov 2004 17:17:58 -0000 1.7
@@ -1,5 +1,4 @@
-01_uncomment_datadirectory.dpatch
02_add_debian_files_in_manpage.dpatch
03_tor_manpage_in_section_8.dpatch
-04_run_as_daemon.dpatch
-05_log_to_file.dpatch
+06_add_compile_time_defaults.dpatch
+07_log_to_file_by_default.dpatch
--- 01_uncomment_datadirectory.dpatch DELETED ---
--- 04_run_as_daemon.dpatch DELETED ---
--- 05_log_to_file.dpatch DELETED ---
--- NEW FILE: 06_add_compile_time_defaults.dpatch ---
#! /bin/sh -e
## 06_add_compile_time_defaults.dpatch by <weasel@debian.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: No description.
if [ $# -lt 1 ]; then
echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
exit 1
fi
[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
case "$1" in
-patch) patch -p1 ${patch_opts} < $0;;
-unpatch) patch -R -p1 ${patch_opts} < $0;;
*)
echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
exit 1;;
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 @@
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("DirPort", UINT, DirPort, "0"),
VAR("DirBindAddress", LINELIST, DirBindAddress, NULL),
VAR("DirFetchPostPeriod", UINT, DirFetchPostPeriod, "600"),
@@ -135,11 +135,11 @@
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("PathlenCoinWeight", DOUBLE, PathlenCoinWeight, "0.3"),
VAR("RedirectExit", LINELIST, RedirectExit, NULL),
OBSOLETE("RouterFile"),
- VAR("RunAsDaemon", BOOL, RunAsDaemon, "0"),
+ VAR("RunAsDaemon", BOOL, RunAsDaemon, "1"),
VAR("RunTesting", BOOL, RunTesting, "0"),
VAR("RecommendedVersions", LINELIST, RecommendedVersions, NULL),
VAR("RendNodes", STRING, RendNodes, NULL),
--- NEW FILE: 07_log_to_file_by_default.dpatch ---
#! /bin/sh -e
## 07_log_to_file_by_default.dpatch by <weasel@debian.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: No description.
if [ $# -lt 1 ]; then
echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
exit 1
fi
[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
case "$1" in
-patch) patch -p1 ${patch_opts} < $0;;
-unpatch) patch -R -p1 ${patch_opts} < $0;;
*)
echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
exit 1;;
esac
exit 0
@DPATCH@
diff -urNad cvs/src/or/config.c /tmp/dpep.fbjWEM/cvs/src/or/config.c
--- cvs/src/or/config.c 2004-11-12 18:10:35.333768630 +0100
+++ /tmp/dpep.fbjWEM/cvs/src/or/config.c 2004-11-12 18:10:53.432747222 +0100
@@ -1026,7 +1026,7 @@
/* Special case if no options are given. */
if (!options->Logs) {
- options->Logs = config_line_prepend(NULL, "Log", "notice-err stdout");
+ options->Logs = config_line_prepend(NULL, "Log", "notice file /var/log/tor/log");
}
if (config_init_logs(options, 1)<0) /* Validate the log(s) */