From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Jun 2 21:00:30 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 AA8AC16A465 for ; Fri, 2 Jun 2006 21:00:30 +0000 (UTC) (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 22C0743D58 for ; Fri, 2 Jun 2006 21:00:28 +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 k52L0Rhq063496 for ; Fri, 2 Jun 2006 21:00:27 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k52L0RGi063495; Fri, 2 Jun 2006 21:00:27 GMT (envelope-from gnats) Resent-Date: Fri, 2 Jun 2006 21:00:27 GMT Resent-Message-Id: <200606022100.k52L0RGi063495@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, Nils Vogels Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2DCE216A481 for ; Fri, 2 Jun 2006 20:51:30 +0000 (UTC) (envelope-from nivo@imhotep.yuckfou.org) Received: from ssdd.xs4all.nl (ssdd.xs4all.nl [195.64.89.117]) by mx1.FreeBSD.org (Postfix) with ESMTP id E90F643D48 for ; Fri, 2 Jun 2006 20:51:28 +0000 (GMT) (envelope-from nivo@imhotep.yuckfou.org) Received: from localhost (localhost [127.0.0.1]) by imhotep.yuckfou.org (Postfix) with ESMTP id 926D7C0; Fri, 2 Jun 2006 22:53:31 +0200 (CEST) Received: from ssdd.xs4all.nl ([127.0.0.1]) by localhost (imhotep.is-root.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id x4hCjO1jmqv7; Fri, 2 Jun 2006 22:53:24 +0200 (CEST) Received: by imhotep.yuckfou.org (Postfix, from userid 1000) id DAF72AC; Fri, 2 Jun 2006 22:53:24 +0200 (CEST) Message-Id: <20060602205324.DAF72AC@imhotep.yuckfou.org> Date: Fri, 2 Jun 2006 22:53:24 +0200 (CEST) From: Nils Vogels To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: freebsd-ports@rikrose.net Subject: ports/98401: [PATCH] security/tor: update to 0.1.1.20 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 02 Jun 2006 21:00:30 -0000 >Number: 98401 >Category: ports >Synopsis: [PATCH] security/tor: update to 0.1.1.20 >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: Fri Jun 02 21:00:27 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Nils Vogels >Release: FreeBSD 5.4-RELEASE-p6 i386 >Organization: IS-Root >Environment: System: FreeBSD imhotep.yuckfou.org 5.4-RELEASE-p6 FreeBSD 5.4-RELEASE-p6 #0: Fri Aug 5 19:36:46 CEST >Description: - Update to 0.1.1.20 - Added patchfiles from tor-devel port to tor port Added file(s): - files/pkg-message.in - files/tor.in Removed file(s): - files/patch-contrib-tor.sh.in Port maintainer (freebsd-ports@rikrose.net) is cc'd. Generated with FreeBSD Port Tools 0.77 >How-To-Repeat: >Fix: --- tor-0.1.1.20.patch begins here --- diff -ruN --exclude=CVS /usr/ports/security/tor/Makefile /disk/3/home/nivo/ports/tor/Makefile --- /usr/ports/security/tor/Makefile Thu Mar 16 15:43:56 2006 +++ /disk/3/home/nivo/ports/tor/Makefile Fri Jun 2 22:42:16 2006 @@ -6,7 +6,7 @@ # PORTNAME= tor -PORTVERSION= 0.1.0.17 +PORTVERSION= 0.1.1.20 CATEGORIES= security net MASTER_SITES= http://tor.eff.org/dist/ \ http://mirror.onionland.org/dist/ diff -ruN --exclude=CVS /usr/ports/security/tor/distinfo /disk/3/home/nivo/ports/tor/distinfo --- /usr/ports/security/tor/distinfo Thu Mar 16 15:43:56 2006 +++ /disk/3/home/nivo/ports/tor/distinfo Fri Jun 2 22:42:28 2006 @@ -1,3 +1,3 @@ -MD5 (tor-0.1.0.17.tar.gz) = 83c4afe29fa82473afcb2ec7e17771b9 -SHA256 (tor-0.1.0.17.tar.gz) = 33dc70a8d8f4ad20a9c9b8d476d431c713d8d94f1859b3efbaf1e178b36c2ca3 -SIZE (tor-0.1.0.17.tar.gz) = 634144 +MD5 (tor-0.1.1.20.tar.gz) = 51aac1749ff2549e8f3e1a172dc66992 +SHA256 (tor-0.1.1.20.tar.gz) = b251fd9079a40345beb5b67bcdf30c3292ee9220d2d062d583b89f3526015138 +SIZE (tor-0.1.1.20.tar.gz) = 828833 diff -ruN --exclude=CVS /usr/ports/security/tor/files/patch-contrib-tor.sh.in /disk/3/home/nivo/ports/tor/files/patch-contrib-tor.sh.in --- /usr/ports/security/tor/files/patch-contrib-tor.sh.in Fri Sep 2 17:08:37 2005 +++ /disk/3/home/nivo/ports/tor/files/patch-contrib-tor.sh.in Thu Jan 1 01:00:00 1970 @@ -1,28 +0,0 @@ ---- contrib/tor.sh.in.orig Sun Jun 5 15:44:43 2005 -+++ contrib/tor.sh.in Fri Sep 2 13:25:51 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 -+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. -@@ -48,7 +48,7 @@ - if [ "x$TORUSER" = "x" ]; then - $TORBIN -f $TORCONF $TORARGS - else -- $SUPROG -c "$TORBIN -f $TORCONF $TORARGS" $TORUSER -+ $SUPROG $TORUSER -c "$TORBIN -f $TORCONF $TORARGS" - fi - RETVAL=$? - if [ $RETVAL -eq 0 ]; then diff -ruN --exclude=CVS /usr/ports/security/tor/files/pkg-message.in /disk/3/home/nivo/ports/tor/files/pkg-message.in --- /usr/ports/security/tor/files/pkg-message.in Thu Jan 1 01:00:00 1970 +++ /disk/3/home/nivo/ports/tor/files/pkg-message.in Fri Jun 2 22:50:33 2006 @@ -0,0 +1,5 @@ +================================================================================ +To enable the tor server, set tor_enable="YES" in your /etc/rc.conf +and edit %%PREFIX%%/etc/tor/torrc. Also note that the rc.subr script overrides +many torrc options and is tunable. See %%PREFIX%%/etc/rc.d/tor.sh for details +================================================================================ diff -ruN --exclude=CVS /usr/ports/security/tor/files/tor.in /disk/3/home/nivo/ports/tor/files/tor.in --- /usr/ports/security/tor/files/tor.in Thu Jan 1 01:00:00 1970 +++ /disk/3/home/nivo/ports/tor/files/tor.in Fri Jun 2 22:50:33 2006 @@ -0,0 +1,48 @@ +#!/bin/sh +# +# $FreeBSD: ports/security/tor-devel/files/tor.in,v 1.2 2006/04/13 13:43:02 johans Exp $ +# +# REQUIRE: NETWORKING SERVERS USR +# BEFORE: LOGIN +# +# Add the following lines to /etc/rc.conf to enable tor +# +# tor_enable (bool): Set to "NO" by default +# Set it to "YES" to enable tor +# tor_conf (str): Points to your tor conf file +# Default: %%PREFIX%%/etc/tor/torrc +# tor_user (str): Tor Daemon user. Default _tor +# tor_group (str): Tor Daemon group. Default _tor +# tor_datadir (str): Tor DataDir. Defaults /var/db/tor +# This will overide your torrc as it is +# a command line option. +# + +. %%RC_SUBR%% + +name="tor" +rcvar=${name}_enable + +load_rc_config ${name} + +: ${tor_enable="NO"} +: ${tor_conf="%%PREFIX%%/etc/tor/torrc"} +: ${tor_user="_tor"} +: ${tor_group="_tor"} +: ${tor_pidfile="/var/run/tor/tor.pid"} +: ${tor_logfile="/var/log/tor"} +: ${tor_datadir="/var/db/tor"} + +required_files=${tor_conf} +required_dirs=${tor_datadir} +command="%%PREFIX%%/bin/${name}" +command_args="-f ${tor_conf} --pidfile ${tor_pidfile} --runasdaemon 1 --datadirectory ${tor_datadir} --user ${tor_user} --group ${tor_group}" +extra_commands="log" +log_cmd="${name}_log" + +tor_log() { + cat ${tor_logfile} +} + +run_rc_command "$1" + --- tor-0.1.1.20.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: