summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xaccounts1
-rwxr-xr-xgroups1
-rw-r--r--net/tor/28988BF5.gpgbin1158 -> 0 bytes
-rwxr-xr-xnet/tor/BUILD2
-rwxr-xr-xnet/tor/CONFIGURE10
-rwxr-xr-xnet/tor/DEPENDS3
-rw-r--r--net/tor/HISTORY4
-rwxr-xr-xnet/tor/PRE_BUILD3
8 files changed, 23 insertions, 1 deletions
diff --git a/accounts b/accounts
index af5dc852b6..c159501c22 100755
--- a/accounts
+++ b/accounts
@@ -15,6 +15,7 @@ dnslog:89:88
dnscache:90:88
axfrdns:91:88
mediatomb:95:95
+tor:96:96
bind:101:101
gnats:102:102
postgres:103:103
diff --git a/groups b/groups
index 0e53ffdfb1..96ac10d01f 100755
--- a/groups
+++ b/groups
@@ -25,6 +25,7 @@ crontab:66:
firebird:84:
djbdns:88:
mediatomb:95:
+tor:96:
bind:101:
gnats:102:
postgres:103:
diff --git a/net/tor/28988BF5.gpg b/net/tor/28988BF5.gpg
deleted file mode 100644
index d7c2a54f73..0000000000
--- a/net/tor/28988BF5.gpg
+++ /dev/null
Binary files differ
diff --git a/net/tor/BUILD b/net/tor/BUILD
new file mode 100755
index 0000000000..4bccc91452
--- /dev/null
+++ b/net/tor/BUILD
@@ -0,0 +1,2 @@
+OPTS="$OPTS $TOR_OPTS" &&
+default_build
diff --git a/net/tor/CONFIGURE b/net/tor/CONFIGURE
new file mode 100755
index 0000000000..270fe96ea9
--- /dev/null
+++ b/net/tor/CONFIGURE
@@ -0,0 +1,10 @@
+config_query_option TOR_OPTS 'Enable code for directories to collect per-country statistics?' n \
+ '--enable-geoip-stats' \
+ '--disable-geoip-stats' &&
+
+config_query_option TOR_OPTS 'Enable iPhone support?' n \
+ '--enable-iphone' \
+ '--disable-iphone' &&
+config_query_string TOR_USERGROUP 'Which user/group to use for tor?' 'tor' &&
+
+TOR_OPTS="$TOR_OPTS --with-tor-user=$TOR_USERGROUP --with-tor-group=$TOR_USERGROUP"
diff --git a/net/tor/DEPENDS b/net/tor/DEPENDS
index dca2b2c34a..da251f65ac 100755
--- a/net/tor/DEPENDS
+++ b/net/tor/DEPENDS
@@ -1,4 +1,5 @@
depends openssl &&
depends libevent &&
suggest_depends socat '' '' 'more secure tunnel' &&
-suggest_depends tsocks "" "" "to enable use of torify"
+suggest_depends tsocks "" "" "to enable use of torify" &&
+suggest_depends SYSTEM-LOGGER '' '' 'to enable logging to syslog'
diff --git a/net/tor/HISTORY b/net/tor/HISTORY
index b3f36e60e2..005d9b4aa2 100644
--- a/net/tor/HISTORY
+++ b/net/tor/HISTORY
@@ -1,3 +1,7 @@
+2009-09-15 Arjan Bouter <abouter@sourcemage.org>
+ * BUILD, CONFIGURE, PRE_BUILD: made tor user/group, iphone support and geo-ip
+ stats optional.
+
2009-09-03 Arjan Bouter <abouter@sourcemage.org>
* DETAILS: stable 0.2.1.19 and devel 0.2.2.1-alpha
diff --git a/net/tor/PRE_BUILD b/net/tor/PRE_BUILD
new file mode 100755
index 0000000000..5085296dbe
--- /dev/null
+++ b/net/tor/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&
+create_account tor