Attachment 176703 Details for Bug 207129 – Patch improving instance messages and error codes, implementing single instance operations

[patch] Patch improving instance messages and error codes, implementing single instance operations

tor.patch (text/plain), 2.66 KB, created by Yuri Victorovich on 2016-11-06 21:55:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yuri Victorovich

Created: 2016-11-06 21:55:42 UTC

Size: 2.66 KB

patch

obsolete

>Index: security/tor/Makefile
>===================================================================
>--- security/tor/Makefile	(revision 425446)
>+++ security/tor/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	tor
> PORTVERSION=	0.2.8.9
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	security net ipv6
> MASTER_SITES=	TOR
> 
>Index: security/tor/files/tor.in
>===================================================================
>--- security/tor/files/tor.in	(revision 425446)
>+++ security/tor/files/tor.in	(working copy)
>@@ -30,6 +30,7 @@
> 
> name="tor"
> rcvar=tor_enable
>+exit_code=0
> 
> load_rc_config ${name}
> 
>@@ -42,13 +43,14 @@
> : ${tor_datadir="/var/db/tor"}
> : ${tor_disable_default_instance="NO"}
> 
>-instance=${2}
>+instance=${slave_instance}
> if [ -n "${instance}" ]; then
>-  # extended instance: parameters are set explicitly
>   inst_def=${instance}
>   inst_name=${inst_def%%:*}
>+  [ "${inst_name}" != "main" ] || err 1 "${name} instance can't be named 'main'"
>   inst_def=${inst_def#$inst_name}
>   if [ -n "$inst_def" ]; then
>+    # extended instance: parameters are set explicitly
>     inst_def=${inst_def#:}
>     tor_conf=${inst_def%%:*}
>     inst_def=${inst_def#$tor_conf:}
>@@ -59,7 +61,7 @@
>     tor_pidfile=${inst_def%%:*}
>     tor_datadir=${inst_def#$tor_pidfile:}
>     if [ -z "${tor_conf}" -o -z "${tor_user}" -o -z "${tor_group}" -o -z "${tor_pidfile}" -o -z "${tor_datadir}" ]; then
>-      warn "invalid tor instance ${inst_name} settings"
>+      warn "invalid tor instance ${inst_name} settings: ${instance}"
>       exit 1
>     fi
>   else
>@@ -82,10 +84,25 @@
> fi
> 
> if [ -z "${instance}" -a -n "${tor_instances}" ]; then
>+  inst_only="$2"
>+  inst_done=0
>   for i in ${tor_instances}; do
>-    %%PREFIX%%/etc/rc.d/tor $1 ${i} || warn "$1 failed for the tor instance $i"
>+    inst_name=${i%%:*}
>+    if [ -z "${inst_only}" -o "${inst_name}" = "${inst_only}" ]; then
>+      echo -n "${name} instance ${inst_name}: "
>+      if ! slave_instance=${i} /usr/local/etc/rc.d/tor "$1"; then
>+        exit_code=1
>+      fi
>+      inst_done=$((inst_done+1))
>+    fi
>   done
>-  checkyesno tor_disable_default_instance && return 0
>+  if [ -z "${inst_only}" -o "${inst_only}" = "main" ]; then
>+    checkyesno tor_disable_default_instance && return $exit_code
>+    echo -n "${name} main instance: "
>+  elif [ -n "${inst_only}" ]; then
>+    [ $inst_done -gt 0 ] || err 1 "${name} instance '$inst_only' isn't defined"
>+    return  $exit_code
>+  fi
> fi
> 
> required_files=${tor_conf}
>@@ -95,5 +112,8 @@
> command_args="-f ${tor_conf} --PidFile ${tor_pidfile} --RunAsDaemon 1 --DataDirectory ${tor_datadir}"
> extra_commands="reload"
> 
>-run_rc_command "$1"
>+if ! run_rc_command "$1"; then
>+  exit_code=1
>+fi
> 
>+return $exit_code

Flags:

yuri: maintainer-approval+

Actions: View | Diff

Attachments on bug 207129: 176091 | 176094 | 176109 | 176120 | 176123 | 176124 | 176150 | 176669 | 176703