From c49eb50825895157e0edd16d7bb542779d57005c Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 18 Jul 2013 12:46:11 +0200 Subject: update to latest upstream version, use config option User no su anymore required, fix stopping of tor --- package/tor/Makefile | 4 ++-- package/tor/files/tor.init | 8 ++++---- package/tor/files/tor.postinst | 2 +- package/tor/files/torrc | 1 + 4 files changed, 8 insertions(+), 7 deletions(-) (limited to 'package/tor') diff --git a/package/tor/Makefile b/package/tor/Makefile index 865ecaa51..26ee59ace 100644 --- a/package/tor/Makefile +++ b/package/tor/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= tor -PKG_VERSION:= 0.2.2.39 +PKG_VERSION:= 0.2.3.25 PKG_RELEASE:= 1 -PKG_MD5SUM:= 9157a1f02fcda9d7d2c5744176373abd +PKG_MD5SUM:= a1c364189a9a66ed9daa8e6436489daf PKG_DESCR:= An anonymous Internet communication system PKG_SECTION:= proxy PKG_DEPENDS:= libevent libopenssl zlib libpthread diff --git a/package/tor/files/tor.init b/package/tor/files/tor.init index 58a8d4759..f75fca49b 100644 --- a/package/tor/files/tor.init +++ b/package/tor/files/tor.init @@ -11,12 +11,12 @@ autostart) ;; start) [ -d /var/run/tor ] || mkdir -p /var/run/tor - [ -d /tmp/.tor ] || mkdir -p /tmp/.tor - chown tor:tor /tmp/.tor /var/run/tor - su - tor -c /usr/bin/tor + [ -d /etc/tor/.tor ] || mkdir -p /etc/tor/.tor + chown tor:tor /etc/tor/.tor /var/run/tor + /usr/bin/tor ;; stop) - kill $(pgrep -f /usr/bin/tor) + kill -15 $(pgrep -f /usr/bin/tor) ;; restart) sh $0 stop diff --git a/package/tor/files/tor.postinst b/package/tor/files/tor.postinst index b3bb981a1..7a374861b 100644 --- a/package/tor/files/tor.postinst +++ b/package/tor/files/tor.postinst @@ -3,4 +3,4 @@ add_rcconf tor tor NO gid=$(get_next_gid) add_group tor $gid -add_user tor $(get_next_uid) $gid /tmp/.tor +add_user tor $(get_next_uid) $gid /etc/tor diff --git a/package/tor/files/torrc b/package/tor/files/torrc index b533ce04c..9d230f1c7 100644 --- a/package/tor/files/torrc +++ b/package/tor/files/torrc @@ -124,3 +124,4 @@ RunAsDaemon 1 #ExitPolicy reject *:* # middleman only -- no exits allowed PidFile /var/run/tor/tor.pid +User tor -- cgit v1.2.3