[tor-commits] [tor/master] Remove contrib/dist/rc.subr

[nickm at torproject.org]

commit 9879eae17e7b64b05622edf02c77a0de05037e7f
Author: rl1987 <rl1987 at sdf.lonestar.org>
Date:   Tue Jan 28 20:32:40 2020 +0800

    Remove contrib/dist/rc.subr
---
 changes/ticket31576  |  3 +++
 contrib/README       |  2 +-
 contrib/dist/rc.subr | 43 -------------------------------------------
 contrib/include.am   |  1 -
 4 files changed, 4 insertions(+), 45 deletions(-)

diff --git a/changes/ticket31576 b/changes/ticket31576
new file mode 100644
index 000000000..ab984cf3d
--- /dev/null
+++ b/changes/ticket31576
@@ -0,0 +1,3 @@
+  o Removed features:
+    - Stop shipping contrib/dist/rc.subr file, as it is not being used on
+      FreeBSD anymore. Closes issue 31576.
diff --git a/contrib/README b/contrib/README
index 735fcf4c9..a56065f97 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/dist/rc.subr b/contrib/dist/rc.subr
deleted file mode 100644
index d757e8952..000000000
--- 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 784f5427b..60783dc43 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			\