From 4ee0250bed849ecaf23cbf0a141a59dc68d5b706 Mon Sep 17 00:00:00 2001 From: jasper Date: Wed, 7 Sep 2011 07:55:41 +0000 Subject: [PATCH] - update to 0.2.2.32 from new maintainer pascal stumpf (rui@ timed-out too many times) additional testing from roberth ok sthen@ --- net/tor/Makefile | 9 ++++----- net/tor/distinfo | 10 +++++----- net/tor/patches/patch-src_config_torrc_sample_in | 8 ++++---- net/tor/pkg/PLIST | 7 ++++++- 4 files changed, 19 insertions(+), 15 deletions(-) diff --git a/net/tor/Makefile b/net/tor/Makefile index 784bbcac947..7650ff75878 100644 --- a/net/tor/Makefile +++ b/net/tor/Makefile @@ -1,20 +1,19 @@ -# $OpenBSD: Makefile,v 1.51 2011/03/26 10:01:08 sthen Exp $ +# $OpenBSD: Makefile,v 1.52 2011/09/07 07:55:41 jasper Exp $ COMMENT= anonymity service using onion routing -DISTNAME= tor-0.2.1.30 -REVISION= 0 +DISTNAME= tor-0.2.2.32 CATEGORIES= net HOMEPAGE= http://www.torproject.org/ -MAINTAINER= Rui Reis +MAINTAINER= Pascal Stumpf # BSD PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -WANTLIB= c crypto event pthread ssl z +WANTLIB= c crypto event m pthread ssl z MASTER_SITES= ${HOMEPAGE}dist/ diff --git a/net/tor/distinfo b/net/tor/distinfo index 7b1fd040810..fa9e5f09447 100644 --- a/net/tor/distinfo +++ b/net/tor/distinfo @@ -1,5 +1,5 @@ -MD5 (tor-0.2.1.30.tar.gz) = bG1h4FOvWWmiRdAlxM/OnQ== -RMD160 (tor-0.2.1.30.tar.gz) = BeShRDpUlJgu943GGgiNomoJ6c8= -SHA1 (tor-0.2.1.30.tar.gz) = 8luJ2MZ3yD7gVZA21bE9SbJys7A= -SHA256 (tor-0.2.1.30.tar.gz) = 81KhqP+kaa4lEyT4k4YHQHS8/+8afGpyyqfkwtEs4Qk= -SIZE (tor-0.2.1.30.tar.gz) = 2447447 +MD5 (tor-0.2.2.32.tar.gz) = bXDbjalRNFPVIBaOAXonLA== +RMD160 (tor-0.2.2.32.tar.gz) = ZJwh9+yJ40d0x522VEthLwiVu2E= +SHA1 (tor-0.2.2.32.tar.gz) = S63cg2kxs+kVl0wmHkBeERY2txY= +SHA256 (tor-0.2.2.32.tar.gz) = h0QyjBC1SVDgjuQEp1oOdoZb4GFcrW9//Ix1r3FR700= +SIZE (tor-0.2.2.32.tar.gz) = 2701371 diff --git a/net/tor/patches/patch-src_config_torrc_sample_in b/net/tor/patches/patch-src_config_torrc_sample_in index ec21fb2167f..d120d06d712 100644 --- a/net/tor/patches/patch-src_config_torrc_sample_in +++ b/net/tor/patches/patch-src_config_torrc_sample_in @@ -1,6 +1,6 @@ -$OpenBSD: patch-src_config_torrc_sample_in,v 1.10 2011/03/11 06:49:55 ajacoutot Exp $ ---- src/config/torrc.sample.in.orig Wed Feb 23 09:25:40 2011 -+++ src/config/torrc.sample.in Mon Mar 7 16:21:17 2011 +$OpenBSD: patch-src_config_torrc_sample_in,v 1.11 2011/09/07 07:55:41 jasper Exp $ +--- src/config/torrc.sample.in.orig Sat Aug 27 01:10:59 2011 ++++ src/config/torrc.sample.in Wed Sep 7 09:52:35 2011 @@ -37,18 +37,18 @@ SocksListenAddress 127.0.0.1 # accept connections only ## Send every possible message to @LOCALSTATEDIR@/log/tor/debug.log #Log debug file @LOCALSTATEDIR@/log/tor/debug.log @@ -23,7 +23,7 @@ $OpenBSD: patch-src_config_torrc_sample_in,v 1.10 2011/03/11 06:49:55 ajacoutot ## The port on which Tor will listen for local connections from Tor ## controller applications, as documented in control-spec.txt. -@@ -154,3 +154,5 @@ SocksListenAddress 127.0.0.1 # accept connections only +@@ -168,3 +168,5 @@ SocksListenAddress 127.0.0.1 # accept connections only #BridgeRelay 1 #ExitPolicy reject *:* diff --git a/net/tor/pkg/PLIST b/net/tor/pkg/PLIST index 23d5a6b4bee..112fa66e13c 100644 --- a/net/tor/pkg/PLIST +++ b/net/tor/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.6 2011/03/11 06:49:55 ajacoutot Exp $ +@comment $OpenBSD: PLIST,v 1.7 2011/09/07 07:55:41 jasper Exp $ @newgroup _tor:566 @newuser _tor:566:566:daemon:tor:/nonexistent:/sbin/nologin @bin bin/tor @@ -9,6 +9,11 @@ @man man/man1/tor-resolve.1 @man man/man1/tor.1 @comment @man man/man1/torify.1 +share/doc/tor/ +share/doc/tor/tor-gencert.html +share/doc/tor/tor-resolve.html +share/doc/tor/tor.html +@comment share/doc/tor/torify.html share/examples/tor/ @sample ${SYSCONFDIR}/tor/ share/examples/tor/tor-tsocks.conf