Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/net
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv21928
Modified Files:
tor.info
Added Files:
tor.patch
Log Message:
fix daemonic startup, start tor after install, and include Google Chrome torify
script
--- NEW FILE: tor.patch ---
--- tor-0.2.3.25//src/config/torrc.sample.in 2012-11-19 16:24:38.000000000
-0500
+++ tor-0.2.3.25//src/config/torrc.sample.in 2013-09-03 23:49:54.000000000
-0400
@@ -34,22 +34,22 @@
## may provide sensitive information to an attacker who obtains the logs.
##
## Send all messages of level 'notice' or higher to
@LOCALSTATEDIR@/log/tor/notices.log
-#Log notice file @LOCALSTATEDIR@/log/tor/notices.log
+Log notice file @LOCALSTATEDIR@/log/tor/notices.log
## Send every possible message to @LOCALSTATEDIR@/log/tor/debug.log
#Log debug file @LOCALSTATEDIR@/log/tor/debug.log
## Use the system log instead of Tor's logfiles
-#Log notice syslog
+Log notice syslog
## To send all messages to stderr:
#Log debug stderr
## Uncomment this to start the process in the background... or use
## --runasdaemon 1 on the command line. This is ignored on Windows;
## see the FAQ entry if you want Tor to run as an NT service.
-#RunAsDaemon 1
+RunAsDaemon 1
## The directory for keeping all the keys/etc. By default, we store
## things in $HOME/.tor on Unix, and in Application Data\tor on Windows.
-#DataDirectory @LOCALSTATEDIR@/lib/tor
+DataDirectory @LOCALSTATEDIR@/lib/tor
## The port on which Tor will listen for local connections from Tor
## controller applications, as documented in control-spec.txt.
Index: tor.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/net/tor.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- tor.info 31 Aug 2013 07:28:51 -0000 1.2
+++ tor.info 4 Sep 2013 04:40:27 -0000 1.3
@@ -1,8 +1,10 @@
Package: tor
Version: 0.2.3.25
-Revision: 1
+Revision: 2
Source: http://www.torproject.org/dist/%n-%v.tar.gz
Source-MD5: a1c364189a9a66ed9daa8e6436489daf
+PatchFile: %n.patch
+PatchFile-MD5: b199c3d8cd1f5521eace8cf6993aae02
Depends: libevent2-shlibs (>= 2.0.16), openssl100-shlibs (>= 1.0.1), daemonic
BuildDepends: libevent2 (>= 2.0.16), openssl100-dev (>= 1.0.1)
ConfigureParams: <<
@@ -13,9 +15,23 @@
--with-openssl-dir=%p
<<
InfoTest: TestScript: make check || exit 2
-InstallScript: make install DESTDIR=%d
+InstallScript: <<
+ make install DESTDIR=%d
+ mv %i/etc/%n/torrc.sample %i/etc/%n/torrc
+ install -d -m0700 %i/var/lib/tor
+ install -d -m0750 %i/var/log/tor
+# script to make daemonic start tor as 'daemon'
+ echo '#!/bin/sh' > %b/start-tor-as-daemon
+ echo 'sudo -u daemon %p/bin/tor' >> %b/start-tor-as-daemon
+ install -d %i/sbin
+ install -m0755 %b/start-tor-as-daemon %i/sbin/
+# script to launch Google Chrome in full tor mode
+ echo '#!/bin/sh' > %b/google-chrome-with-tor
+ echo '/Applications/Google\\ Chrome.app/Contents/MacOS/Google\\ Chrome
--proxy-server="socks=127.0.0.1:9050" --incognito check.torproject.org &' >>
%b/google-chrome-with-tor
+ install -m0755 %b/google-chrome-with-tor %i/bin/
+<<
DocFiles: ChangeLog LICENSE README ReleaseNotes
-ConfFiles: %p/etc/tor/tor-tsocks.conf
+ConfFiles: %p/etc/tor/tor-tsocks.conf %p/etc/tor/torrc
Homepage: http://www.torproject.org
License: BSD
Maintainer: Jack Fink <jackf...@users.sourceforge.net>
@@ -32,10 +48,19 @@
<description>Tor Anonymity Service</description>
<message>Anonymizing overlay network for TCP</message>
<daemon name="tor">
- <executable background="yes">%p/bin/tor</executable>
- <!-- the daemon will background itself, but may take a while
- to start up to the point where it does so -->
+ <executable background="no">%p/sbin/start-tor-as-daemon</executable>
<pidfile>%p/var/run/%n.pid</pidfile>
+ <conffile>%p/etc/%n/torrc</conffile>
</daemon>
</service>
<<
+PostInstScript: <<
+ chown daemon %p/var/lib/tor %p/var/log/tor
+ daemonic enable tor
+ /Library/StartupItems/daemonic-tor/daemonic-tor start
+<<
+PreRmScript: <<
+ if [ $1 != "upgrade" ]; then
+ daemonic remove tor
+ fi
+<<
------------------------------------------------------------------------------
Learn the latest--Visual Studio 2012, SharePoint 2013, SQL 2012, more!
Discover the easy way to master current and previous Microsoft technologies
and advance your career. Get an incredible 1,500+ hours of step-by-step
tutorial videos with LearnDevNow. Subscribe today and save!
http://pubads.g.doubleclick.net/gampad/clk?id=58040911&iu=/4140/ostg.clktrk
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
