From peter.thoenen@yahoo.com  Mon May  7 14:40:37 2007
Return-Path: <peter.thoenen@yahoo.com>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id B706D16A400
	for <FreeBSD-gnats-submit@freebsd.org>; Mon,  7 May 2007 14:40:37 +0000 (UTC)
	(envelope-from peter.thoenen@yahoo.com)
Received: from web51905.mail.re2.yahoo.com (web51905.mail.re2.yahoo.com [206.190.48.68])
	by mx1.freebsd.org (Postfix) with SMTP id 7CB5113C45A
	for <FreeBSD-gnats-submit@freebsd.org>; Mon,  7 May 2007 14:40:37 +0000 (UTC)
	(envelope-from peter.thoenen@yahoo.com)
Received: (qmail 6863 invoked by uid 60001); 7 May 2007 14:33:01 -0000
Received: from [65.106.146.230] by web51905.mail.re2.yahoo.com via HTTP; Mon, 07 May 2007 07:33:01 PDT
Message-Id: <248216.6579.qm@web51905.mail.re2.yahoo.com>
Date: Mon, 7 May 2007 07:33:01 -0700 (PDT)
From: Peter Thoenen <peter.thoenen@yahoo.com>
Reply-To: eol1@yahoo.com
To: FreeBSD-gnats-submit@freebsd.org
Subject: [UPDATE] security/tor

>Number:         112492
>Category:       ports
>Synopsis:       security/tor
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    miwi
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Mon May 07 14:50:04 GMT 2007
>Closed-Date:    Tue Jun 05 09:05:05 GMT 2007
>Last-Modified:  Tue Jun 05 09:05:05 GMT 2007
>Originator:     Peter Thoenen
>Release:        FreeBSD 7.0-CURRENT i386
>Organization:
>Environment:
>Description:
        Update to latest release and sync with tor-devel.  Also drop
maintainership as I no longer use tor-stable and its a PITA having a
separate build box just for testing and building stable.  I will
continue to maintain tor-devel though.  Hopefully somebody picks this
up, if not I will submit stable updates on a ad-hoc basis to keep it
from being depreciated.
--0-717455062-1178548381=:6579
Content-Type: text/plain; name="tor.diff.txt"
Content-Description: 3935507696-tor.diff.txt
Content-Disposition: inline; filename="tor.diff.txt"

diff -ruN tor.orig/Makefile tor/Makefile
--- tor.orig/Makefile	Mon May  7 10:22:26 2007
+++ tor/Makefile	Mon May  7 10:31:03 2007
@@ -2,17 +2,16 @@
 # Date created:				2005.10.20
 # Whom:					peter.thoenen@yahoo.com
 #
-# $FreeBSD: ports/security/tor/Makefile,v 1.28 2007/04/06 18:28:46 mnag Exp $
+# $FreeBSD$
 #
 
 PORTNAME=	tor
-PORTVERSION=	0.1.1.26
-PORTREVISION=	1
+PORTVERSION=	0.1.2.13
 CATEGORIES=	security net
 MASTER_SITES=	http://tor.eff.org/dist/ \
 		http://mirror.onionland.org/dist/
 
-MAINTAINER=	peter.thoenen@yahoo.com
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	An anonymizing overlay network for TCP
 
 RUN_DEPENDS=	tsocks:${PORTSDIR}/net/tsocks
@@ -21,18 +20,28 @@
 GNU_CONFIGURE=	yes
 USE_OPENSSL=	yes
 
+OPTIONS=	VIDALIA	"Vidalia graphical Tor controller" off
+
 USE_RC_SUBR=	tor
 SUB_FILES=	pkg-message
 
+CONFLICTS=	tor-1.3.[0-9]*
+
 MANCOMPRESSED=	no
 MAN1=		tor.1 tor-resolve.1 torify.1
 
+.include <bsd.port.pre.mk>
+
+.ifdef(WITH_VIDALIA)
+RUN_DEPENDS+=	vidalia:${PORTSDIR}/net-mgmt/vidalia
+.endif
+
 post-patch:
-	@${MV} ${WRKSRC}/contrib/tor-tsocks.conf \
+	${MV} ${WRKSRC}/contrib/tor-tsocks.conf \
 		${WRKSRC}/contrib/tor-tsocks.conf.sample
-	@${REINPLACE_CMD} -e "s|tor-tsocks.conf|tor-tsocks.conf.sample|g" \
+	${REINPLACE_CMD} -e "s|tor-tsocks.conf|tor-tsocks.conf.sample|g" \
 		${WRKSRC}/contrib/Makefile.in
-	@${FIND} ${WRKSRC} -type f | ${XARGS} \
+	${FIND} ${WRKSRC} -type f | ${XARGS} \
 		-n 10 ${REINPLACE_CMD} -E \
 		-e 's!-g -O2!!' \
 		-e 's!-O2!!'
@@ -42,11 +51,11 @@
 		${PKGINSTALL} ${PKGNAME} PRE-INSTALL
 
 post-install:
-	@${TOUCH} /var/log/tor
-	@${CHOWN} _tor:_tor /var/log/tor
-	@${MKDIR} /var/db/tor
-	@${MKDIR} /var/db/tor/data
-	@${CHOWN} _tor:_tor /var/db/tor
-	@${CAT} ${PKGMESSAGE}
+	${TOUCH} /var/log/tor
+	${CHOWN} _tor:_tor /var/log/tor
+	${MKDIR} /var/db/tor
+	${MKDIR} /var/db/tor/data
+	${CHOWN} _tor:_tor /var/db/tor
+	${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff -ruN tor.orig/distinfo tor/distinfo
--- tor.orig/distinfo	Mon May  7 10:22:26 2007
+++ tor/distinfo	Mon May  7 10:30:15 2007
@@ -1,3 +1,3 @@
-MD5 (tor-0.1.1.26.tar.gz) = 0667df7a1f670bee5163b607aea172ba
-SHA256 (tor-0.1.1.26.tar.gz) = 3be8c89be5b927e73b77a82ca3d83f0f162fceea2d6a14ce1c0cf5333b36cd1c
-SIZE (tor-0.1.1.26.tar.gz) = 893367
+MD5 (tor-0.1.2.13.tar.gz) = db54abdddf7eb5859b6e1bdf5f7ece00
+SHA256 (tor-0.1.2.13.tar.gz) = c8a33521b32e04b00ce97c4ab980a4232b4029284cd2944f496609a9797ba21b
+SIZE (tor-0.1.2.13.tar.gz) = 1181719

--0-717455062-1178548381=:6579--
>How-To-Repeat:
>Fix:
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->miwi 
Responsible-Changed-By: miwi 
Responsible-Changed-When: Mon May 7 15:02:56 UTC 2007 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=112492 
State-Changed-From-To: open->closed 
State-Changed-By: miwi 
State-Changed-When: Tue Jun 5 09:05:02 UTC 2007 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=112492 
>Unformatted:
 --0-717455062-1178548381=:6579
 Content-Type: text/plain; charset=iso-8859-1
 Content-Transfer-Encoding: 8bit
 Content-Id: 
 Content-Disposition: inline
 
