summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Lewman <andrew@torproject.org>2007-04-23 00:14:27 +0000
committerAndrew Lewman <andrew@torproject.org>2007-04-23 00:14:27 +0000
commitfb60822f5ce3964f137a550b25b2687a16849ec5 (patch)
tree3e40a538af8df15e2552afe4f809942b5180da1e
parent2290eb92b6ea76c6a2ff6df16a8e521758555035 (diff)
downloadtor-fb60822f5ce3964f137a550b25b2687a16849ec5.tar.gz
tor-fb60822f5ce3964f137a550b25b2687a16849ec5.zip
Disable kqueue on ppc only OSX versions (panther, jaguar, puma,
cheetah). Confirmed in bug #371. svn:r10002
-rwxr-xr-xcontrib/osx/Tor23
1 files changed, 23 insertions, 0 deletions
diff --git a/contrib/osx/Tor b/contrib/osx/Tor
index 88c2973503..667770c267 100755
--- a/contrib/osx/Tor
+++ b/contrib/osx/Tor
@@ -18,6 +18,29 @@ TORGROUP=daemon
TORCMD=$TORDIR/tor
TORLOG=/var/log/tor/tor.log
+## Determine OSX Version
+# map version to name
+if [ -x /usr/bin/sw_vers ]; then
+# This is poor, yet functional. We don't care about the 3rd number in
+# the OS version
+ OSVER=`/usr/bin/sw_vers | grep ProductVersion | cut -f2 | cut -d"." -f1,2`
+ case "$OSVER" in
+ "10.5") OS="leopard" ARCH="universal";;
+ "10.4") OS="tiger" ARCH="universal";;
+ "10.3") OS="panther" ARCH="ppc";;
+ "10.2") OS="jaguar" ARCH="ppc";;
+ "10.1") OS="puma" ARCH="ppc";;
+ "10.0") OS="cheetah" ARCH="ppc";;
+ esac
+else
+ OS="unknown"
+fi
+
+if [ $ARCH != "universal" ]; then
+ export EVENT_NOKQUEUE=1
+fi
+
+
##
# Tor Service
##