From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Feb 14 00:30:15 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8480B16A420 for ; Tue, 14 Feb 2006 00:30:15 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1E99543D5E for ; Tue, 14 Feb 2006 00:30:11 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k1E0UAjH028833 for ; Tue, 14 Feb 2006 00:30:10 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k1E0UAPR028832; Tue, 14 Feb 2006 00:30:10 GMT (envelope-from gnats) Resent-Date: Tue, 14 Feb 2006 00:30:10 GMT Resent-Message-Id: <200602140030.k1E0UAPR028832@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, eol1@yahoo.com Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E72F216A420 for ; Tue, 14 Feb 2006 00:23:19 +0000 (GMT) (envelope-from eol1@yahoo.com) Received: from web51912.mail.yahoo.com (web51912.mail.yahoo.com [206.190.48.75]) by mx1.FreeBSD.org (Postfix) with SMTP id 7095143D48 for ; Tue, 14 Feb 2006 00:23:19 +0000 (GMT) (envelope-from eol1@yahoo.com) Received: (qmail 96853 invoked by uid 60001); 14 Feb 2006 00:23:19 -0000 Received: from [62.68.76.227] by web51912.mail.yahoo.com via HTTP; Mon, 13 Feb 2006 16:23:18 PST Message-Id: <20060214002318.96851.qmail@web51912.mail.yahoo.com> Date: Mon, 13 Feb 2006 16:23:18 -0800 (PST) From: Peter Thoenen To: FreeBSD-gnats-submit@FreeBSD.org Cc: Subject: ports/93314: Update: security/tor-devel X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: eol1@yahoo.com List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Feb 2006 00:30:15 -0000 >Number: 93314 >Category: ports >Synopsis: security/tor-devel >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Tue Feb 14 00:30:10 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Peter Thoenen >Release: FreeBSD 6.0-RELEASE i386 >Organization: >Environment: >Description: 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-- >How-To-Repeat: >Fix: >Release-Note: >Audit-Trail: >Unformatted: --0-1192121909-1139876598=:82245 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: 8bit Content-Id: Content-Disposition: inline