Browse Source

update to latest upstream version, use config option User no su anymore required, fix stopping of tor

Waldemar Brodkorb 11 years ago
parent
commit
c49eb50825
4 changed files with 8 additions and 7 deletions
  1. 2 2
      package/tor/Makefile
  2. 4 4
      package/tor/files/tor.init
  3. 1 1
      package/tor/files/tor.postinst
  4. 1 0
      package/tor/files/torrc

+ 2 - 2
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

+ 4 - 4
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

+ 1 - 1
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

+ 1 - 0
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