diff --git a/net/tor/Makefile b/net/tor/Makefile index a7979bfcf4b..484ea032520 100644 --- a/net/tor/Makefile +++ b/net/tor/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.34 2008/01/19 16:03:21 rui Exp $ +# $OpenBSD: Makefile,v 1.35 2008/09/19 21:50:59 rui Exp $ COMMENT= anonymity service using onion routing -DISTNAME= tor-0.1.2.19 +DISTNAME= tor-0.2.0.31 CATEGORIES= net -HOMEPAGE= http://tor.eff.org/ +HOMEPAGE= http://www.torproject.org/ MAINTAINER= Rui Reis @@ -13,12 +13,10 @@ PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -WANTLIB= c crypto event ssl z +WANTLIB= c crypto event pthread ssl z MASTER_SITES= ${HOMEPAGE}dist/ -AUTOCONF_VERSION=2.59 - CONFIGURE_STYLE=gnu CONFIGURE_ARGS= --with-ssl-dir=/usr diff --git a/net/tor/distinfo b/net/tor/distinfo index b2daa190ebb..90fde0ea10e 100644 --- a/net/tor/distinfo +++ b/net/tor/distinfo @@ -1,5 +1,5 @@ -MD5 (tor-0.1.2.19.tar.gz) = Sz+ZY7hDAQr1qjvWJm0R4A== -RMD160 (tor-0.1.2.19.tar.gz) = TxtUdKS7rS48gu8Pzi3YOJB+SNU= -SHA1 (tor-0.1.2.19.tar.gz) = UCLasN4kmeLGY44aLp7ubHn7cHw= -SHA256 (tor-0.1.2.19.tar.gz) = flcZighY9bqGUddSJSSMhbYZ6QXw/027Rf/6LQOhqmE= -SIZE (tor-0.1.2.19.tar.gz) = 1264275 +MD5 (tor-0.2.0.31.tar.gz) = 86t9mC7SleeyWYHDkQ1cLA== +RMD160 (tor-0.2.0.31.tar.gz) = WEy72fKVqPZ3vJWl8F3Hj2GEuXo= +SHA1 (tor-0.2.0.31.tar.gz) = pYbMAXp5GsSB/eg2w8+ONmf7XPw= +SHA256 (tor-0.2.0.31.tar.gz) = BYlPXPy3jrqyNPbnM1BDDlf0yL7EpMPmCkHh6fsTxmw= +SIZE (tor-0.2.0.31.tar.gz) = 2156305 diff --git a/net/tor/patches/patch-configure b/net/tor/patches/patch-configure index d1aa2cf8cf1..9f68195890a 100644 --- a/net/tor/patches/patch-configure +++ b/net/tor/patches/patch-configure @@ -1,10 +1,10 @@ -$OpenBSD: patch-configure,v 1.7 2007/11/04 08:39:20 rui Exp $ ---- configure.orig Sun Oct 28 11:18:29 2007 -+++ configure Thu Nov 1 13:44:09 2007 -@@ -17576,7 +17576,7 @@ _ACEOF +$OpenBSD: patch-configure,v 1.8 2008/09/19 21:51:00 rui Exp $ +--- configure.orig Tue Aug 5 10:42:21 2008 ++++ configure Tue Aug 5 10:42:57 2008 +@@ -19341,7 +19341,7 @@ LOCALSTATEDIR=`eval echo $localstatedir` # Set CFLAGS _after_ all the above checks, since our warnings are stricter # than autoconf's macros like. - if test $ac_cv_c_compiler_gnu = yes; then + if test "$ac_cv_c_compiler_gnu" = yes; then - CFLAGS="$CFLAGS -Wall -g -O2" + CFLAGS="$CFLAGS -Wall" else diff --git a/net/tor/patches/patch-src_config_torrc_sample_in b/net/tor/patches/patch-src_config_torrc_sample_in index 52ed4cbdae3..1f323e94b26 100644 --- a/net/tor/patches/patch-src_config_torrc_sample_in +++ b/net/tor/patches/patch-src_config_torrc_sample_in @@ -1,7 +1,7 @@ -$OpenBSD: patch-src_config_torrc_sample_in,v 1.6 2007/11/04 08:39:20 rui Exp $ ---- src/config/torrc.sample.in.orig Fri May 25 01:51:41 2007 -+++ src/config/torrc.sample.in Thu Nov 1 13:44:09 2007 -@@ -43,18 +43,18 @@ SocksListenAddress 127.0.0.1 # accept connections only +$OpenBSD: patch-src_config_torrc_sample_in,v 1.7 2008/09/19 21:51:00 rui Exp $ +--- src/config/torrc.sample.in.orig Tue Feb 26 19:56:28 2008 ++++ src/config/torrc.sample.in Tue Aug 5 10:41:00 2008 +@@ -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 ## Use the system log instead of Tor's logfiles @@ -23,10 +23,13 @@ $OpenBSD: patch-src_config_torrc_sample_in,v 1.6 2007/11/04 08:39:20 rui Exp $ ## The port on which Tor will listen for local connections from Tor ## controller applications, as documented in control-spec.txt. -@@ -142,3 +142,6 @@ SocksListenAddress 127.0.0.1 # accept connections only +@@ -134,6 +134,9 @@ SocksListenAddress 127.0.0.1 # accept connections only #ExitPolicy accept *:119 # accept nntp as well as default exit policy #ExitPolicy reject *:* # no exits allowed - + # +## Revoke privileges +User _tor +Group _tor + ################ This section is just for bridge relays ############## + # + ## Bridge relays (or "bridges" ) are Tor relays that aren't listed in the diff --git a/net/tor/pkg/PLIST b/net/tor/pkg/PLIST index 58ad946be43..b09d1ea3f33 100644 --- a/net/tor/pkg/PLIST +++ b/net/tor/pkg/PLIST @@ -1,12 +1,14 @@ -@comment $OpenBSD: PLIST,v 1.4 2006/09/20 22:06:36 ray Exp $ +@comment $OpenBSD: PLIST,v 1.5 2008/09/19 21:51:00 rui Exp $ @newgroup _tor:566 @newuser _tor:566:566:daemon:tor:/nonexistent:/sbin/nologin -bin/tor -bin/tor-resolve -bin/torify +@bin bin/tor +@bin bin/tor-gencert +@bin bin/tor-resolve +@comment bin/torify +@man man/man1/tor-gencert.1 @man man/man1/tor-resolve.1 @man man/man1/tor.1 -@man man/man1/torify.1 +@comment @man man/man1/torify.1 share/examples/tor/ @sample ${SYSCONFDIR}/tor/ share/examples/tor/tor-tsocks.conf @@ -17,3 +19,8 @@ share/examples/tor/torrc.sample @owner _tor @group _tor @sample ${DB_DIR}/ +@mode +@owner +@group +share/tor/ +share/tor/geoip