From 8eeda9d8760e0afdf1d04377880d84745b84ec4a Mon Sep 17 00:00:00 2001
From: Stefan Kalkowski <stefan.kalkowski@genode-labs.com>
Date: Tue, 29 Aug 2017 15:24:07 +0200
Subject: [PATCH] tor: update to 17.05 release

Ref #74
---
 run/eigentor.run | 36 ++++++++++++++++++------------------
 run/tor_lx.run   | 34 +++++++++++++++++-----------------
 2 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/run/eigentor.run b/run/eigentor.run
index 71c0a3d..1e4e65f 100644
--- a/run/eigentor.run
+++ b/run/eigentor.run
@@ -47,6 +47,7 @@ set config {
 	<default-route>
 		<any-service> <parent/> <any-child/> </any-service>
 	</default-route>
+	<default caps="200"/>
 
 	<start name="timer">
 		<resource name="RAM" quantum="1M"/>
@@ -114,22 +115,21 @@ DataDirectory /tor
 	</start>
 
 	<start name="tor">
-		<resource name="RAM" quantum="20M"/>
+		<resource name="RAM" quantum="30M"/>
 		<config ld_verbose="yes">
+			<vfs>
+				<dir name="dev">
+					<jitterentropy name="random"/>
+					<jitterentropy name="urandom"/>
+					<log/> <rtc/>
+				</dir>
+				<dir name="etc">
+					<dir name="tor"><fs label="conf" /></dir>
+				</dir>
+				<dir name="tor"> <fs label="data"/> </dir>
+			</vfs>
 			<libc stdout="/dev/log" stderr="/dev/log" rtc="/dev/rtc"
-			      ip_addr="10.1.2.2" gateway="10.1.2.1" netmask="255.255.255.0">
-				<vfs>
-					<dir name="dev">
-						<jitterentropy name="random"/>
-						<jitterentropy name="urandom"/>
-						<log/> <rtc/>
-					</dir>
-					<dir name="etc">
-						<dir name="tor"><fs label="conf" /></dir>
-					</dir>
-					<dir name="tor"> <fs label="data"/> </dir>
-				</vfs>
-			</libc>
+			      ip_addr="10.1.2.2" gateway="10.1.2.1" netmask="255.255.255.0"/>
 		</config>
 		<route>
 			<any-service> <child name="nic_router"/> <parent/> <any-child/> </any-service>
@@ -157,12 +157,12 @@ DataDirectory /tor
 		<service name="Nic"/>
 		<service name="Timer"/>
 	</parent-provides>
-	<start name="fetchurl">
+	<start name="fetchurl" caps="500">
 		<resource name="RAM" quantum="8M"/>
-		<config>
+		<config verbose="true">
+			<vfs> <dir name="dev"> <log/> <null/> </dir> </vfs>
 			<libc stdout="/dev/log" stderr="/dev/log"
 			      ip_addr="10.1.3.2" gateway="10.1.3.1" netmask="255.255.255.0">
-				<vfs> <dir name="dev"> <log/> <null/> </dir> </vfs>
 			</libc>
 			<fetch url="https://check.torproject.org/" path="/dev/log"
 			       proxy="socks5h://10.1.3.1:9050"/>
@@ -180,7 +180,7 @@ DataDirectory /tor
 	<start name="web-client">
 		<binary name="init"/>
 		<resource name="RAM" quantum="40M"/>
-		<configfile name="init.config"/>
+		<configfile name="init.config" caps="600"/>
 		<route>
 			<service name="ROM" label="init.config"> <child name="dynamic_rom"/> </service>
 			<service name="Nic"> <child name="nic_router"/> </service>
diff --git a/run/tor_lx.run b/run/tor_lx.run
index 51cceeb..35d9967 100644
--- a/run/tor_lx.run
+++ b/run/tor_lx.run
@@ -61,6 +61,7 @@ set config {
 	<default-route>
 		<any-service> <parent/> <any-child/> </any-service>
 	</default-route>
+	<default caps="200"/>
 
 	<start name="timer">
 		<resource name="RAM" quantum="1M"/>
@@ -74,7 +75,7 @@ set config {
 
 	<start name="config_fs" priority="-1">
 		<binary name="ram_fs"/>
-		<resource name="RAM" quantum="4M"/>
+		<resource name="RAM" quantum="20M"/>
 		<provides> <service name="File_system"/> </provides>
 		<config>
 			<content>
@@ -93,30 +94,29 @@ DataDirectory /tor
 	</start>
 
 	<start name="tor">
-		<resource name="RAM" quantum="20M"/>
+		<resource name="RAM" quantum="30M"/>
 		<config ld_verbose="yes">
 			<libc stdout="/dev/log" stderr="/dev/log" rtc="/dev/rtc"}
-append config " ip_addr=\"$netprefix.2\" netmask=\"255.255.255.0\" gateway=\"$netprefix.1\">"
+append config " ip_addr=\"$netprefix.2\" netmask=\"255.255.255.0\" gateway=\"$netprefix.1\"/>"
 append config {
-				<vfs>
-					<dir name="dev">
-						<jitterentropy name="random"/>
-						<jitterentropy name="urandom"/>
-						<log/> <rtc/>
-					</dir>
-					<dir name="etc">
-						<dir name="tor"><fs label="conf" /></dir>
-					</dir>
-					<dir name="tor"> <fs label="data"/> </dir>
-				</vfs>
-			</libc>
+			<vfs>
+				<dir name="dev">
+					<jitterentropy name="random"/>
+					<jitterentropy name="urandom"/>
+					<log/> <rtc/>
+				</dir>
+				<dir name="etc">
+					<dir name="tor"><fs label="conf" /></dir>
+				</dir>
+				<dir name="tor"> <fs label="data"/> </dir>
+			</vfs>
 		</config>
 	</start>}
 
 append_platform_drv_config
 
 append config {
-	<start name="nic_drv">
+	<start name="linux_nic_drv">
 		<resource name="RAM" quantum="4M"/>
 		<provides><service name="Nic"/></provides>
 	</start>
@@ -135,7 +135,7 @@ set boot_modules {
 	ld.lib.so libc.lib.so libm.lib.so zlib.lib.so posix.lib.so
 	libcrypto.lib.so libevent.lib.so libssl.lib.so pthread.lib.so
 	vfs_jitterentropy.lib.so lwip.lib.so
-	nic_drv ram_fs tor
+	linux_nic_drv ram_fs tor
 }
 
 # platform-specific modules