diff options
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/README | 2 | ||||
| -rwxr-xr-x | contrib/client-tools/tor-resolve.py | 2 | ||||
| -rw-r--r-- | contrib/dist/rc.subr | 43 | ||||
| -rw-r--r-- | contrib/include.am | 1 | ||||
| -rw-r--r-- | contrib/win32build/tor-mingw.nsi.in | 2 |
5 files changed, 3 insertions, 47 deletions
diff --git a/contrib/README b/contrib/README index 735fcf4c9f..a56065f97d 100644 --- a/contrib/README +++ b/contrib/README @@ -29,7 +29,7 @@ should probably use src/tools/tor-resolve instead. dist/ -- Scripts and files for use when packaging Tor ----------------------------------------------------- -torctl, rc.subr, and tor.sh are init scripts for use with SysV-style init +torctl and tor.sh are init scripts for use with SysV-style init tools. Everybody likes to write init scripts differently, it seems. tor.service is a sample service file for use with systemd. diff --git a/contrib/client-tools/tor-resolve.py b/contrib/client-tools/tor-resolve.py index 3562193715..85e7d2d8b4 100755 --- a/contrib/client-tools/tor-resolve.py +++ b/contrib/client-tools/tor-resolve.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python # Future imports for Python 2.7, mandatory in 3.0 from __future__ import division diff --git a/contrib/dist/rc.subr b/contrib/dist/rc.subr deleted file mode 100644 index d757e89528..0000000000 --- a/contrib/dist/rc.subr +++ /dev/null @@ -1,43 +0,0 @@ -#!/bin/sh -# $FreeBSD: ports/security/tor-devel/files/tor.in,v 1.1 2006/02/17 22:21:25 mnag Exp $ -# -# (rc.subr written by Peter Thoenen for Net/FreeBSD) -# -# REQUIRE: NETWORKING SERVERS USR -# BEFORE: LOGIN -# -# Add the following lines to /etc/rc.conf to enable tor -# -# tor_enable (bool): Set to "NO" by default -# Set it to "YES" to enable tor -# tor_conf (str): Points to your tor conf file -# Default: /usr/local/etc/tor/torrc -# tor_user (str): Tor Daemon user. Default _tor -# - -. /etc/rc.subr - -name="tor" -rcvar=${name}_enable - -load_rc_config ${name} - -: ${tor_enable="NO"} -: ${tor_conf="/usr/local/etc/tor/torrc"} -: ${tor_user="_tor"} -: ${tor_pidfile="/var/run/tor/tor.pid"} -: ${tor_logfile="/var/log/tor"} -: ${tor_datadir="/var/run/tor"} - -required_files=${tor_conf} -required_dirs=${tor_datadir} -command="/usr/local/bin/${name}" -command_args="-f ${tor_conf} --pidfile ${tor_pidfile} --runasdaemon 1 --datadirectory ${tor_datadir} --user ${tor_user}" -extra_commands="log" -log_cmd="${name}_log" - -tor_log() { - cat ${tor_logfile} -} - -run_rc_command "$1" diff --git a/contrib/include.am b/contrib/include.am index 784f5427b8..60783dc439 100644 --- a/contrib/include.am +++ b/contrib/include.am @@ -2,7 +2,6 @@ EXTRA_DIST+= \ contrib/README \ contrib/client-tools/torify \ - contrib/dist/rc.subr \ contrib/dist/tor.service.in \ contrib/operator-tools/tor-exit-notice.html \ contrib/or-tools/exitlist \ diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in index 7f2242c95b..b81ff22c89 100644 --- a/contrib/win32build/tor-mingw.nsi.in +++ b/contrib/win32build/tor-mingw.nsi.in @@ -8,7 +8,7 @@ !include "LogicLib.nsh" !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.4.3.6" +!define VERSION "0.4.4.1-alpha-dev" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "https://www.torproject.org/" !define LICENSE "LICENSE" |