diff options
| -rw-r--r-- | security/tor-devel/Makefile | 4 | ||||
| -rw-r--r-- | security/tor-devel/distinfo | 4 | ||||
| -rw-r--r-- | security/tor-devel/files/patch-contrib-tor.sh.in | 29 | ||||
| -rw-r--r-- | security/tor/Makefile | 4 | ||||
| -rw-r--r-- | security/tor/distinfo | 4 | ||||
| -rw-r--r-- | security/tor/files/patch-contrib-tor.sh.in | 29 |
6 files changed, 8 insertions, 66 deletions
diff --git a/security/tor-devel/Makefile b/security/tor-devel/Makefile index dc79814d0fd6..d908ef37b192 100644 --- a/security/tor-devel/Makefile +++ b/security/tor-devel/Makefile @@ -6,8 +6,8 @@ # PORTNAME= tor -PORTVERSION= 0.0.9.2 -PORTREVISION= 1 +PORTVERSION= 0.0.9.9 +# PORTREVISION= 1 CATEGORIES= security net MASTER_SITES= http://tor.eff.org/dist/ diff --git a/security/tor-devel/distinfo b/security/tor-devel/distinfo index c0c036fa75b8..2d9efda42e8e 100644 --- a/security/tor-devel/distinfo +++ b/security/tor-devel/distinfo @@ -1,2 +1,2 @@ -MD5 (tor-0.0.9.2.tar.gz) = 65fe27324904c350be555e4eb0ae9fcd -SIZE (tor-0.0.9.2.tar.gz) = 539296 +MD5 (tor-0.0.9.9.tar.gz) = a9979fc4d20d7e3734d7b8a51e60a7d5 +SIZE (tor-0.0.9.9.tar.gz) = 574809 diff --git a/security/tor-devel/files/patch-contrib-tor.sh.in b/security/tor-devel/files/patch-contrib-tor.sh.in deleted file mode 100644 index 74fa8978a719..000000000000 --- a/security/tor-devel/files/patch-contrib-tor.sh.in +++ /dev/null @@ -1,29 +0,0 @@ ---- contrib/tor.sh.in.orig Sat Jan 29 20:41:19 2005 -+++ contrib/tor.sh.in Sat Jan 29 20:46:14 2005 -@@ -5,12 +5,12 @@ - # chkconfig: 2345 90 10 - # description: Onion Router - --TORUSER= --TORGROUP= -+TORUSER=_tor -+TORGROUP=_tor - TORBIN=@BINDIR@/tor --TORPID=@LOCALSTATEDIR@/run/tor/tor.pid --TORLOG=@LOCALSTATEDIR@/log/tor/tor.log --TORDATA=@LOCALSTATEDIR@/lib/tor -+TORPID=/var/run/tor.pid -+TORLOG=/var/log/tor.log -+TORDATA=/var/db/tor/data - - TORCONF=@CONFDIR@/torrc - # Strictly speaking, we don't need to su if we have --user and --group. -@@ -36,7 +36,7 @@ - if [ "x$TORUSER" = "x" ]; then - $TORBIN -f $TORCONF $TORARGS - else -- /bin/su -c "$TORBIN -f $TORCONF $TORARGS" $TORUSER -+ /usr/bin/su $TORUSER -c "$TORBIN -f $TORCONF $TORARGS" - fi - RETVAL=$? - if [ $RETVAL -eq 0 ]; then diff --git a/security/tor/Makefile b/security/tor/Makefile index dc79814d0fd6..d908ef37b192 100644 --- a/security/tor/Makefile +++ b/security/tor/Makefile @@ -6,8 +6,8 @@ # PORTNAME= tor -PORTVERSION= 0.0.9.2 -PORTREVISION= 1 +PORTVERSION= 0.0.9.9 +# PORTREVISION= 1 CATEGORIES= security net MASTER_SITES= http://tor.eff.org/dist/ diff --git a/security/tor/distinfo b/security/tor/distinfo index c0c036fa75b8..2d9efda42e8e 100644 --- a/security/tor/distinfo +++ b/security/tor/distinfo @@ -1,2 +1,2 @@ -MD5 (tor-0.0.9.2.tar.gz) = 65fe27324904c350be555e4eb0ae9fcd -SIZE (tor-0.0.9.2.tar.gz) = 539296 +MD5 (tor-0.0.9.9.tar.gz) = a9979fc4d20d7e3734d7b8a51e60a7d5 +SIZE (tor-0.0.9.9.tar.gz) = 574809 diff --git a/security/tor/files/patch-contrib-tor.sh.in b/security/tor/files/patch-contrib-tor.sh.in deleted file mode 100644 index 74fa8978a719..000000000000 --- a/security/tor/files/patch-contrib-tor.sh.in +++ /dev/null @@ -1,29 +0,0 @@ ---- contrib/tor.sh.in.orig Sat Jan 29 20:41:19 2005 -+++ contrib/tor.sh.in Sat Jan 29 20:46:14 2005 -@@ -5,12 +5,12 @@ - # chkconfig: 2345 90 10 - # description: Onion Router - --TORUSER= --TORGROUP= -+TORUSER=_tor -+TORGROUP=_tor - TORBIN=@BINDIR@/tor --TORPID=@LOCALSTATEDIR@/run/tor/tor.pid --TORLOG=@LOCALSTATEDIR@/log/tor/tor.log --TORDATA=@LOCALSTATEDIR@/lib/tor -+TORPID=/var/run/tor.pid -+TORLOG=/var/log/tor.log -+TORDATA=/var/db/tor/data - - TORCONF=@CONFDIR@/torrc - # Strictly speaking, we don't need to su if we have --user and --group. -@@ -36,7 +36,7 @@ - if [ "x$TORUSER" = "x" ]; then - $TORBIN -f $TORCONF $TORARGS - else -- /bin/su -c "$TORBIN -f $TORCONF $TORARGS" $TORUSER -+ /usr/bin/su $TORUSER -c "$TORBIN -f $TORCONF $TORARGS" - fi - RETVAL=$? - if [ $RETVAL -eq 0 ]; then |