From rik@spoon.pkl.net  Fri Jul 29 08:13:23 2005
Return-Path: <rik@spoon.pkl.net>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 3870016A41F
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 29 Jul 2005 08:13:23 +0000 (GMT)
	(envelope-from rik@spoon.pkl.net)
Received: from spoon.pkl.net (spoon.pkl.net [209.69.98.10])
	by mx1.FreeBSD.org (Postfix) with ESMTP id B702843D48
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 29 Jul 2005 08:13:22 +0000 (GMT)
	(envelope-from rik@spoon.pkl.net)
Received: from spoon.pkl.net (rik@localhost [127.0.0.1])
	by spoon.pkl.net (8.12.11/8.12.11) with ESMTP id j6T8DONs024204
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 29 Jul 2005 04:13:24 -0400 (EDT)
	(envelope-from rik@spoon.pkl.net)
Received: (from rik@localhost)
	by spoon.pkl.net (8.12.11/8.12.11/Submit) id j6T8DOJn024203;
	Fri, 29 Jul 2005 04:13:24 -0400 (EDT)
	(envelope-from rik)
Message-Id: <200507290813.j6T8DOJn024203@spoon.pkl.net>
Date: Fri, 29 Jul 2005 04:13:24 -0400 (EDT)
From: rik <freebsd-ports@rikrose.net>
Reply-To:
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: maintainer-update security/tor 0.1.0.11 -> 0.1.0.12
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         84281
>Category:       ports
>Synopsis:       maintainer-update security/tor 0.1.0.11 -> 0.1.0.12
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    garga
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Jul 29 08:20:19 GMT 2005
>Closed-Date:    Fri Jul 29 11:05:46 GMT 2005
>Last-Modified:  Fri Jul 29 11:05:46 GMT 2005
>Originator:     rik
>Release:        FreeBSD 4.9-STABLE i386
>Organization:
N/A
>Environment:
System: FreeBSD spoon.pkl.net 4.9-STABLE FreeBSD 4.9-STABLE #0: Thu Mar 4 22:27:24 EST 2004 root@spoon.pkl.net:/usr/src/sys/compile/SPOON i386


>Description:
maintainer-update security/tor 0.1.0.11 -> 0.1.0.12
fixes an assert bug that was taking down some clients and servers in rare
cases.
>How-To-Repeat:
>Fix:

diff -ruN tor/Makefile tor.old/Makefile
--- tor/Makefile	Fri Jul 29 09:07:51 2005
+++ tor.old/Makefile	Fri Jul 29 09:07:27 2005
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	tor
-PORTVERSION=	0.1.0.12
+PORTVERSION=	0.1.0.11
 CATEGORIES=	security net
 MASTER_SITES=	http://tor.eff.org/dist/
 
diff -ruN tor/Makefile.orig tor.old/Makefile.orig
--- tor/Makefile.orig	Thu Jan  1 01:00:00 1970
+++ tor.old/Makefile.orig	Fri Jul 29 09:07:27 2005
@@ -0,0 +1,40 @@
+# ports collection makefile for: 		tor
+# Date created: 				2004.05.28
+# Whom:						freebsd-ports@rikrose.net
+#
+# $FreeBSD: ports/security/tor/Makefile,v 1.9 2005/01/08 20:18:49 lioux Exp $
+#
+
+PORTNAME=	tor
+PORTVERSION=	0.0.9.2
+CATEGORIES=	security net
+MASTER_SITES=	http://tor.eff.org/dist/
+
+MAINTAINER=	freebsd-ports@rikrose.net
+COMMENT=	An anonymizing overlay network for TCP
+
+RUN_DEPENDS=	tsocks:${PORTSDIR}/net/tsocks
+
+GNU_CONFIGURE=	yes
+CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+USE_OPENSSL=	yes
+USE_REINPLACE=	yes
+
+MANCOMPRESSED=	no
+MAN1=		tor.1 tor-resolve.1 torify.1
+
+post-patch:
+	@${MV} ${WRKSRC}/contrib/tor-tsocks.conf \
+		${WRKSRC}/contrib/tor-tsocks.conf.sample
+	@${REINPLACE_CMD} -e "s|tor-tsocks.conf|tor-tsocks.conf.sample|g" \
+		${WRKSRC}/contrib/Makefile.in
+# uphold CFLAGS
+	@${FIND} ${WRKSRC} -type f | ${XARGS} \
+		-n 10 ${REINPLACE_CMD} -E \
+		-e 's!-g -O2!!' \
+		-e 's!-O2!!'
+
+post-install:
+	@${CP} ${WRKSRC}/contrib/tor.sh ${LOCALBASE}/etc/rc.d/tor.sh.sample
+
+.include <bsd.port.mk>
diff -ruN tor/distinfo tor.old/distinfo
--- tor/distinfo	Fri Jul 29 09:08:07 2005
+++ tor.old/distinfo	Fri Jul 29 09:07:27 2005
@@ -1,2 +1,2 @@
-MD5 (tor-0.1.0.12.tar.gz) = 8f4fea2631f5f8c973cff6700960b937
-SIZE (tor-0.1.0.12.tar.gz) = 630549
+MD5 (tor-0.1.0.11.tar.gz) = c9d2b313a4c0637b9b75e382d2e0e88c
+SIZE (tor-0.1.0.11.tar.gz) = 630033
diff -ruN tor/distinfo.orig tor.old/distinfo.orig
--- tor/distinfo.orig	Thu Jan  1 01:00:00 1970
+++ tor.old/distinfo.orig	Fri Jul 29 09:07:27 2005
@@ -0,0 +1,2 @@
+MD5 (tor-0.0.9.2.tar.gz) = 65fe27324904c350be555e4eb0ae9fcd
+SIZE (tor-0.0.9.2.tar.gz) = 539296
diff -ruN tor/pkg-plist.orig tor.old/pkg-plist.orig
--- tor/pkg-plist.orig	Thu Jan  1 01:00:00 1970
+++ tor.old/pkg-plist.orig	Fri Jul 29 09:07:27 2005
@@ -0,0 +1,7 @@
+bin/tor
+bin/tor-resolve
+bin/torify
+etc/rc.d/tor.sh.sample
+etc/tor/torrc.sample
+etc/tor/tor-tsocks.conf.sample
+@dirrm etc/tor
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->garga 
Responsible-Changed-By: garga 
Responsible-Changed-When: Fri Jul 29 10:18:31 GMT 2005 
Responsible-Changed-Why:  
Grabbed. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=84281 
State-Changed-From-To: open->closed 
State-Changed-By: garga 
State-Changed-When: Fri Jul 29 11:05:38 GMT 2005 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=84281 
>Unformatted:
