mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-19 09:50:29 +01:00
Code Issues Projects Releases Wiki Activity

Forward port debian/ patches.

Browse Source 
svn:r4767
This commit is contained in:
Peter Palfrader 2005-08-12 15:04:22 +00:00
parent 5cd703bb54
commit ad1ff57705
5 changed files with 33 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
debian/changelog vendored
View File

@ -3,6 +3,7 @@ tor (0.1.1.5-alpha-1) UNRELEASED; urgency=low
* Experimental upstream version.
* Allow test suite to fail, it's broken in this version.
* Update list of files from doc/ that should be installed.
* Forward port debian/ patches.
-- Peter Palfrader <weasel@debian.org> Fri, 12 Aug 2005 17:02:23 +0200

8
debian/patches/02_add_debian_files_in_manpage.dpatch vendored
View File

@ -23,10 +23,10 @@ esac
exit 0
@DPATCH@
diff -urNad tor-0.0.9pre5/doc/tor.1.in /tmp/dpep.E9VjWB/tor-0.0.9pre5/doc/tor.1.in
--- tor-0.0.9pre5/doc/tor.1.in 2004-11-10 02:20:59.000000000 +0100
+++ /tmp/dpep.E9VjWB/tor-0.0.9pre5/doc/tor.1.in 2004-11-10 03:24:17.697639909 +0100
@@ -333,6 +333,12 @@
diff -urNad tor-0.1.1.5/doc/tor.1.in /tmp/dpep.E9VjWB/tor-0.1.1.5/doc/tor.1.in
--- tor-0.1.1.5/doc/tor.1.in
+++ /tmp/dpep.E9VjWB/tor-0.1.1.5/doc/tor.1.in
@@ -627,6 +627,12 @@
.TP
.I @LOCALSTATEDIR@/lib/tor/
The tor process stores keys and other data here.

16
debian/patches/03_tor_manpage_in_section_8.dpatch vendored
View File

@ -23,9 +23,9 @@ esac
exit 0
@DPATCH@
diff -urNad tor-0.0.9pre5/contrib/torify.1 /tmp/dpep.fOA3Mm/tor-0.0.9pre5/contrib/torify.1
--- tor-0.0.9pre5/contrib/torify.1 2004-11-10 03:27:09.608843380 +0100
+++ /tmp/dpep.fOA3Mm/tor-0.0.9pre5/contrib/torify.1 2004-11-10 03:28:29.621248723 +0100
diff -urNad tor-0.1.1.5/contrib/torify.1 /tmp/dpep.fOA3Mm/tor-0.1.1.5/contrib/torify.1
--- tor-0.1.1.5/contrib/torify.1
+++ /tmp/dpep.fOA3Mm/tor-0.1.1.5/contrib/torify.1
@@ -18,6 +18,6 @@
to suid binaries.
@ -34,12 +34,12 @@ diff -urNad tor-0.0.9pre5/contrib/torify.1 /tmp/dpep.fOA3Mm/tor-0.0.9pre5/contri
+.BR tor (8),
.BR tsocks (1),
.BR tsocks.conf (5).
diff -urNad tor-0.0.9pre5/doc/tor.1.in /tmp/dpep.fOA3Mm/tor-0.0.9pre5/doc/tor.1.in
--- tor-0.0.9pre5/doc/tor.1.in 2004-11-10 03:28:29.263327434 +0100
+++ /tmp/dpep.fOA3Mm/tor-0.0.9pre5/doc/tor.1.in 2004-11-10 03:28:29.622248503 +0100
diff -urNad tor-0.1.1.5/doc/tor.1.in /tmp/dpep.fOA3Mm/tor-0.1.1.5/doc/tor.1.in
--- tor-0.1.1.5/doc/tor.1.in
+++ /tmp/dpep.fOA3Mm/tor-0.1.1.5/doc/tor.1.in
@@ -1,4 +1,4 @@
-.TH TOR 1 "May 2005" "TOR"
+.TH TOR 8 "May 2005" "TOR"
-.TH TOR 1 "June 2005" "TOR"
+.TH TOR 8 "June 2005" "TOR"
.SH NAME
tor \- The second-generation onion router
.SH SYNOPSIS

27
debian/patches/06_add_compile_time_defaults.dpatch vendored
View File

@ -23,30 +23,33 @@ esac
exit 0
@DPATCH@
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 @@
diff -urNad tor-0.1.1.5/src/or/config.c /tmp/dpep.Xv4cHn/tor-0.1.1.5/src/or/config.c
--- tor-0.1.1.5/src/or/config.c 2005-01-12 16:32:45.000000000 +0100
+++ /tmp/dpep.Xv4cHn/tor-0.1.1.5/src/or/config.c 2005-01-13 03:50:33.815693540 +0100
@@ -108,7 +108,7 @@
VAR("ContactInfo", STRING, ContactInfo, NULL),
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("DebugLogFile", STRING, DebugLogFile, NULL),
VAR("DirAllowPrivateAddresses",BOOL, DirAllowPrivateAddresses, NULL),
VAR("DirPort", UINT, DirPort, "0"),
VAR("DirBindAddress", LINELIST, DirBindAddress, NULL),
@@ -149,12 +149,12 @@
@@ -159,7 +159,7 @@
VAR("ORPort", UINT, ORPort, "0"),
VAR("ORBindAddress", LINELIST, ORBindAddress, NULL),
VAR("OutboundBindAddress", STRING, OutboundBindAddress, NULL),
VAR("PathlenCoinWeight", DOUBLE, PathlenCoinWeight, "0.3"),
- 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("RecommendedVersions", LINELIST, RecommendedVersions, NULL),
VAR("RedirectExit", LINELIST, RedirectExit, NULL),
VAR("RendExcludeNodes", STRING, RendExcludeNodes, NULL),
@@ -167,7 +167,7 @@
VAR("RendPostPeriod", INTERVAL, RendPostPeriod, "20 minutes"),
VAR("RephistTrackTime", INTERVAL, RephistTrackTime, "24 hours"),
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),
VAR("SafeLogging", BOOL, SafeLogging, "1"),
VAR("ShutdownWaitLength", INTERVAL, ShutdownWaitLength, "30 seconds"),

10
debian/patches/07_log_to_file_by_default.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.YwfNhI/tor-0.1.0.0-alpha-cvs/src/or/config.c
--- tor-0.1.0.0-alpha-cvs/src/or/config.c 2005-01-07 02:00:10.761573594 +0100
+++ /tmp/dpep.YwfNhI/tor-0.1.0.0-alpha-cvs/src/or/config.c 2005-01-07 02:01:02.819978258 +0100
@@ -1192,7 +1192,7 @@
diff -urNad tor-0.1.1.5/src/or/config.c /tmp/dpep.YwfNhI/tor-0.1.1.5/src/or/config.c
--- tor-0.1.1.5/src/or/config.c
+++ /tmp/dpep.YwfNhI/tor-0.1.1.5/src/or/config.c
@@ -1548,7 +1548,7 @@
/* Special case if no options are given. */
if (!options->Logs) {
@ -34,4 +34,4 @@ diff -urNad tor-0.1.0.0-alpha-cvs/src/or/config.c /tmp/dpep.YwfNhI/tor-0.1.0.0-a
+ config_line_append(&options->Logs, "Log", "notice file /var/log/tor/log");
}
if (config_init_logs(options, 1)<0) /* Validate the log(s) */
if (options_init_logs(options, 1)<0) /* Validate the log(s) */