Bug 93314

        Update to current release.  Yes I know I really should create a
FBSD rc.script instead of patching the hell out of tor.sh and torctl. 
Hopefully I do for the 1.14 release.  Want to get this in before the
freeze as it fixes some significant bugs 1.12 had.

--0-1192121909-1139876598=:82245
Content-Type: text/plain; name="tor-devel.diff.txt"
Content-Description: 3310809015-tor-devel.diff.txt
Content-Disposition: inline; filename="tor-devel.diff.txt"

diff -ruN tor-devel.orig/Makefile tor-devel/Makefile
--- tor-devel.orig/Makefile	Sat Feb 11 11:09:25 2006
+++ tor-devel/Makefile	Tue Feb 14 03:03:02 2006
@@ -1,18 +1,18 @@
 # ports collection makefile for:	tor-devel
 # Date created:				2005.10.20
-# Whom:					eol1@yahoo.com
+# Whom:					peter.thoenen@yahoo.com
 #
 # $FreeBSD: ports/security/tor-devel/Makefile,v 1.22 2006/01/16 00:13:31 pav Exp $
 #
 
 PORTNAME=	tor
-PORTVERSION=	0.1.1.12
+PORTVERSION=	0.1.1.13
 CATEGORIES=	security net
 MASTER_SITES=	http://tor.eff.org/dist/
 PKGNAMESUFFIX=	-devel
 DISTNAME=	${PORTNAME}-${PORTVERSION}-alpha
 
-MAINTAINER=	eol1@yahoo.com
+MAINTAINER=	peter.thoenen@yahoo.com
 COMMENT=	An anonymizing overlay network for TCP
 
 RUN_DEPENDS=	tsocks:${PORTSDIR}/net/tsocks
@@ -20,8 +20,6 @@
 
 GNU_CONFIGURE=	yes
 USE_OPENSSL=	yes
-USE_REINPLACE=	yes
-USE_RC_SUBR=	yes
 
 CONFLICTS=	tor-[0-9]*
 
diff -ruN tor-devel.orig/distinfo tor-devel/distinfo
--- tor-devel.orig/distinfo	Sat Feb 11 11:09:25 2006
+++ tor-devel/distinfo	Sat Feb 11 11:10:26 2006
@@ -1,3 +1,3 @@
-MD5 (tor-0.1.1.12-alpha.tar.gz) = 64439b11f18462bc0a9599940899240e
-SHA256 (tor-0.1.1.12-alpha.tar.gz) = 125bfd5b3f6979ee02dca0fa8372f80bbf6e4907a569e890105fe3405dc03a95
-SIZE (tor-0.1.1.12-alpha.tar.gz) = 751711
+MD5 (tor-0.1.1.13-alpha.tar.gz) = 5cdf6c5ed20efd7048ee1257cbcc1b4e
+SHA256 (tor-0.1.1.13-alpha.tar.gz) = cb15a83ed8ad87d67c0685b20a41096c32211f20ae321f39ed110d7ace38e29f
+SIZE (tor-0.1.1.13-alpha.tar.gz) = 756583
diff -ruN tor-devel.orig/files/patch-contrib-tor.sh.in tor-devel/files/patch-contrib-tor.sh.in
--- tor-devel.orig/files/patch-contrib-tor.sh.in	Sat Feb 11 11:09:25 2006
+++ tor-devel/files/patch-contrib-tor.sh.in	Tue Feb 14 02:58:51 2006
@@ -1,24 +1,21 @@
---- contrib/tor.sh.in.orig	Mon Dec 26 04:28:12 2005
-+++ contrib/tor.sh.in	Thu Jan 12 06:25:02 2006
-@@ -9,26 +9,26 @@
+--- contrib/tor.sh.in.orig	Tue Feb 14 01:15:56 2006
++++ contrib/tor.sh.in	Tue Feb 14 01:22:58 2006
+@@ -9,29 +9,24 @@
  # This particular script is written for Red Hat/Fedora Linux, and may
  # also work on Mandrake, but not SuSE.
  #
 -# These next couple of lines "declare" tor for the "chkconfig" program,
 -# originally from SGI, used on Red Hat/Fedora and probably elsewhere.
--#
--# chkconfig: 2345 90 10
- # description: Onion Router - A low-latency anonymous proxy
- #
-+#
 +# Add some of the following variables to /etc/rc.conf to configure stunnel:
 +# tor_enable (bool):        Default "NO"
 +#                               Set it to "YES" to enable stunnel.
 +# tor_user (str):         Default "_tor"
 +#                               Set it to the tor user
 +# tor_group (str):        Default "_tor"
-+#                               Set it to the tor group
-+#
+ #
+-# chkconfig: 2345 90 10
+ # description: Onion Router - A low-latency anonymous proxy
+ #
  
 -# Library functions
 -if [ -f /etc/rc.d/init.d/functions ]; then
@@ -26,10 +23,13 @@
 -elif [ -f /etc/init.d/functions ]; then
 -   . /etc/init.d/functions
 -fi
+-
+-# Increase open file descriptors a reasonable amount
+-ulimit -n 8192
 +tor_enable=${tor_enable-"NO"}
  
 -TORCTL=@BINDIR@/torctl
-+TORCTL=%%PREFIX%%/bin/torctl
++TORCTL=/usr/local/bin/torctl
  
  # torctl will use these environment variables
 -TORUSER=@TORUSER@
@@ -40,46 +40,39 @@
  export TORGROUP
  
  if [ -x /bin/su ] ; then
-@@ -46,28 +46,32 @@
+@@ -49,23 +44,27 @@
  case "$1" in
  
      start)
 -    action $"Starting tor:" $TORCTL start
 -    RETVAL=$?
-+      echo "Starting tor:"
-+        $TORCTL start
-+      RETVAL=$?
++          echo "Starting tor:"
++          $TORCTL start
++          RETVAL=$?
      ;;
  
      stop)
 -    action $"Stopping tor:" $TORCTL stop
 -    RETVAL=$?
-+      echo "Stopping tor:" 
-+        $TORCTL stop
-+      RETVAL=$?
++          echo "Stopping tor:"
++          $TORCTL stop
++          RETVAL=$? 
      ;;
  
      restart)
 -    action $"Restarting tor:" $TORCTL restart
 -    RETVAL=$?
-+      echo "Restarting tor:"
-+        $TORCTL restart
-+      RETVAL=$?
++         echo "Restarting tor:"
++         $TORCTL restart
++         RETVAL=$? 
      ;;
  
      reload)
 -    action $"Reloading tor:" $TORCTL reload
 -    RETVAL=$?
-+      echo "Reloading tor:"
-+        $TORCTL reload
-+      RETVAL=$?
++         echo "Reloading tor:"
++         $TORCTL reload
++         RETVAL=$?
      ;;
  
      status)
--    $TORCTL status
--    RETVAL=$?
-+      $TORCTL status
-+      RETVAL=$?
-     ;;
- 
-     *)

--0-1192121909-1139876598=:82245--