pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/net/tor Update to current stable version, tor-0.2.0.30...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/5cbe7dc0af54
branches:  trunk
changeset: 545389:5cbe7dc0af54
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Fri Aug 01 17:23:21 2008 +0000

description:
Update to current stable version, tor-0.2.0.30, based on wip/tor.
Thanks to athaba, netcap, and tvierling.

Changes in version 0.2.0.30 - 2008-07-15
  This new stable release switches to a more efficient directory
  distribution design, adds features to make connections to the Tor
  network harder to block, allows Tor to act as a DNS proxy, adds separate
  rate limiting for relayed traffic to make it easier for clients to
  become relays, fix a variety of potential anonymity problems, and
  includes the usual huge pile of other features and bug fixes.

diffstat:

 net/tor/MESSAGE          |   9 ++-------
 net/tor/Makefile         |  22 +++++++++++-----------
 net/tor/PLIST            |   6 +++++-
 net/tor/distinfo         |  13 ++++++-------
 net/tor/options.mk       |   4 ++--
 net/tor/patches/patch-aa |  13 +++++++++++++
 net/tor/patches/patch-ab |  13 +++++++++++++
 net/tor/patches/patch-ac |  13 -------------
 net/tor/patches/patch-ad |  13 -------------
 net/tor/patches/patch-ae |  21 ---------------------
 10 files changed, 52 insertions(+), 75 deletions(-)

diffs (235 lines):

diff -r 9814528dd5d1 -r 5cbe7dc0af54 net/tor/MESSAGE
--- a/net/tor/MESSAGE   Fri Aug 01 13:09:04 2008 +0000
+++ b/net/tor/MESSAGE   Fri Aug 01 17:23:21 2008 +0000
@@ -1,15 +1,10 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.5 2008/01/06 19:56:54 jschauma Exp $
+$NetBSD: MESSAGE,v 1.6 2008/08/01 17:23:21 wiz Exp $
 
 You probably want to install www/privoxy to torify your browsers.  Please
-see https://wiki.torproject.org/noreply/TheOnionRouter/TorifyHOWTO/WebBrowsers
-for details.
+see https://wiki.torproject.org/wiki/TheOnionRouter/TorifyHOWTO for details.
 
 Other applications can be torified with the help of libtsocks (net/tsocks).
 A tsocks configuration file for this is installed as
 ${PREFIX}/share/examples/tor/tor-tsocks.conf.
-
-If you wish to chroot tor, you may find the following URLs helpful:
-  http://pestilenz.org/~bauerm/tor-openbsd-howto.html
-  http://wiki.noreply.org/wiki/TheOnionRouter/TorInChroot
 ===========================================================================
diff -r 9814528dd5d1 -r 5cbe7dc0af54 net/tor/Makefile
--- a/net/tor/Makefile  Fri Aug 01 13:09:04 2008 +0000
+++ b/net/tor/Makefile  Fri Aug 01 17:23:21 2008 +0000
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.53 2008/04/22 18:06:09 tnn Exp $
+# $NetBSD: Makefile,v 1.54 2008/08/01 17:23:21 wiz Exp $
 #
 
-DISTNAME=              tor-0.1.2.19
-PKGREVISION=           1
+DISTNAME=              tor-0.2.0.30
 CATEGORIES=            net security
 MASTER_SITES=          http://www.torproject.org/dist/
 
-MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
+MAINTAINER=            athaba%inode.at@localhost
 HOMEPAGE=              http://www.torproject.org/
 COMMENT=               Anonymizing overlay network for TCP
 
@@ -33,15 +32,12 @@
 RCD_SCRIPTS=           tor
 RCD_SCRIPT_SRC.tor=    ${FILESDIR}/tor.in
 PKG_GROUPS=            ${TOR_GROUP}
-PKG_USERS=             ${TOR_USER}:${TOR_GROUP}
-PKG_GECOS.${TOR_USER}= Torifier
-PKG_HOME.${TOR_USER}=  ${PKG_HOME}
+PKG_USERS=             ${TOR_USER}:${TOR_GROUP}::Torifier:${PKG_HOME}
 USER_GROUP=            ${TOR_USER} ${TOR_GROUP}
 
 OWN_DIRS_PERMS+=       ${PKG_HOME} ${USER_GROUP} 0700
 
 CONFIGURE_ARGS+=       --localstatedir=${VARBASE:Q}
-CONFIGURE_ARGS+=       --with-libevent-dir=${BUILDLINK_PREFIX.libevent:Q}
 
 CONF_FILES+=           ${PREFIX}/share/examples/tor/tor-tsocks.conf    \
                                ${PKG_SYSCONFDIR}/tor-tsocks.conf
@@ -53,19 +49,23 @@
 
 CHECK_PORTABILITY_SKIP+=contrib/*
 
+.if !empty(PKGSRC_COMPILER:Mmipspro)
+CFLAGS+=               -c99
+.endif
+
 post-install:
        ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/tor
        ${INSTALL_DATA} ${WRKSRC}/src/config/torrc.sample               \
                ${PREFIX}/share/examples/tor/torrc.sample
        ${INSTALL_DATA} ${WRKSRC}/contrib/tor-tsocks.conf               \
                ${PREFIX}/share/examples/tor/tor-tsocks.conf
+       -${RMDIR} ${PREFIX}/etc/tor/tor
 
-BUILDLINK_API_DEPENDS.libevent+= libevent>=1.1a
-
+BUILDLINK_API_DEPENDS.libevent+= libevent>=1.2
 .include "../../devel/libevent/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
-.include "../../security/openssl/buildlink3.mk"
 
 ## We include this after other b3.mk files since we use PTHREAD_TYPE.
 ##
diff -r 9814528dd5d1 -r 5cbe7dc0af54 net/tor/PLIST
--- a/net/tor/PLIST     Fri Aug 01 13:09:04 2008 +0000
+++ b/net/tor/PLIST     Fri Aug 01 17:23:21 2008 +0000
@@ -1,11 +1,15 @@
-@comment $NetBSD: PLIST,v 1.6 2006/05/26 02:21:41 jschauma Exp $
+@comment $NetBSD: PLIST,v 1.7 2008/08/01 17:23:21 wiz Exp $
 bin/tor
+bin/tor-gencert
 bin/tor-resolve
 bin/torify
+man/man1/tor-gencert.1
 man/man1/tor-resolve.1
 man/man1/tor.1
 man/man1/torify.1
 share/examples/rc.d/tor
 share/examples/tor/tor-tsocks.conf
 share/examples/tor/torrc.sample
+share/tor/geoip
+@dirrm share/tor
 @dirrm share/examples/tor
diff -r 9814528dd5d1 -r 5cbe7dc0af54 net/tor/distinfo
--- a/net/tor/distinfo  Fri Aug 01 13:09:04 2008 +0000
+++ b/net/tor/distinfo  Fri Aug 01 17:23:21 2008 +0000
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.28 2008/02/19 13:48:12 obache Exp $
+$NetBSD: distinfo,v 1.29 2008/08/01 17:23:21 wiz Exp $
 
-SHA1 (tor-0.1.2.19.tar.gz) = 5022dab0de2499e2c6638e1a2e9eee6c79fb707c
-RMD160 (tor-0.1.2.19.tar.gz) = 4f1b5474a4bbad2e3c82ef0fce2dd838907e48d5
-Size (tor-0.1.2.19.tar.gz) = 1264275 bytes
-SHA1 (patch-ac) = adcc070e4d522143c4d882bd13436cd2b71f289b
-SHA1 (patch-ad) = 72a68cbd00a5febdff82ba9268bdad2b47ea8159
-SHA1 (patch-ae) = ca9bb6a0a4c4d9ce260add9f0b14a16fb4a455e1
+SHA1 (tor-0.2.0.30.tar.gz) = c6fbb3bf0141f4b34cc90845373b3dfa8b47ddc4
+RMD160 (tor-0.2.0.30.tar.gz) = e51a38aa1531076bc9722e1584403f917d207dd0
+Size (tor-0.2.0.30.tar.gz) = 2155463 bytes
+SHA1 (patch-aa) = 630e1e0a9591c136987b504e73c64ff9f53b54e9
+SHA1 (patch-ab) = 3363efdcf8b9918c1249add1046077f2323a11ff
diff -r 9814528dd5d1 -r 5cbe7dc0af54 net/tor/options.mk
--- a/net/tor/options.mk        Fri Aug 01 13:09:04 2008 +0000
+++ b/net/tor/options.mk        Fri Aug 01 17:23:21 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2007/12/16 21:51:54 rillig Exp $
+# $NetBSD: options.mk,v 1.3 2008/08/01 17:23:21 wiz Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.tor
 PKG_SUPPORTED_OPTIONS= threads
@@ -6,9 +6,9 @@
 .if !empty(PTHREAD_TYPE:Mnative)
 PKG_SUGGESTED_OPTIONS+=        threads
 .endif
+
 .include "../../mk/bsd.options.mk"
 
-
 ###
 ### This enables new code for threaded operation on NetBSD, OpenBSD, etc.
 ### I used {PTHREAD,RESOLV}_AUTO_VARS here for consistency's sake, as
diff -r 9814528dd5d1 -r 5cbe7dc0af54 net/tor/patches/patch-aa
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/tor/patches/patch-aa  Fri Aug 01 17:23:21 2008 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.3 2008/08/01 17:23:21 wiz Exp $
+
+--- contrib/Makefile.in.orig   2008-06-03 21:41:27.000000000 +0200
++++ contrib/Makefile.in
+@@ -185,7 +185,7 @@ SUBDIRS = osx suse
+ DIST_SUBDIRS = osx suse
+ confdir = $(sysconfdir)/tor
+ EXTRA_DIST = exitlist tor-tsocks.conf torify.1 tor.nsi.in tor.sh torctl rc.subr cross.sh tor-mingw.nsi.in package_nsis-mingw.sh tor.ico tor-ctrl.sh linux-tor-prio.sh tor-exit-notice.html
+-conf_DATA = tor-tsocks.conf
++#conf_DATA = tor-tsocks.conf
+ bin_SCRIPTS = torify
+ man_MANS = torify.1
+ all: all-recursive
diff -r 9814528dd5d1 -r 5cbe7dc0af54 net/tor/patches/patch-ab
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/tor/patches/patch-ab  Fri Aug 01 17:23:21 2008 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.3 2008/08/01 17:23:21 wiz Exp $
+
+--- src/config/Makefile.in.orig        2008-06-03 21:41:28.000000000 +0200
++++ src/config/Makefile.in
+@@ -166,7 +166,7 @@ top_srcdir = @top_srcdir@
+ confdir = $(sysconfdir)/tor
+ tordatadir = $(datadir)/tor
+ EXTRA_DIST = geoip
+-conf_DATA = torrc.sample
++#conf_DATA = torrc.sample
+ tordata_DATA = geoip
+ all: all-am
+ 
diff -r 9814528dd5d1 -r 5cbe7dc0af54 net/tor/patches/patch-ac
--- a/net/tor/patches/patch-ac  Fri Aug 01 13:09:04 2008 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.4 2007/08/09 19:33:58 drochner Exp $
-
---- contrib/Makefile.in.orig   2007-05-25 02:52:01.000000000 +0200
-+++ contrib/Makefile.in
-@@ -176,7 +176,7 @@ SUBDIRS = osx suse
- DIST_SUBDIRS = osx suse
- confdir = $(sysconfdir)/tor
- EXTRA_DIST = exitlist tor-tsocks.conf torify.1 TorControl.py tor.nsi.in tor.sh torctl rc.subr ExerciseServer.py PathDemo.py cross.sh tor-mingw.nsi.in package_nsis-mingw.sh tor.ico
--conf_DATA = tor-tsocks.conf
-+#conf_DATA = tor-tsocks.conf
- bin_SCRIPTS = torify
- man_MANS = torify.1
- all: all-recursive
diff -r 9814528dd5d1 -r 5cbe7dc0af54 net/tor/patches/patch-ad
--- a/net/tor/patches/patch-ad  Fri Aug 01 13:09:04 2008 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.3 2007/08/09 19:33:58 drochner Exp $
-
---- src/config/Makefile.in.orig        2007-05-25 02:52:01.000000000 +0200
-+++ src/config/Makefile.in
-@@ -155,7 +155,7 @@ top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- confdir = $(sysconfdir)/tor
- EXTRA_DIST = 
--conf_DATA = torrc.sample
-+#conf_DATA = torrc.sample
- all: all-am
- 
- .SUFFIXES:
diff -r 9814528dd5d1 -r 5cbe7dc0af54 net/tor/patches/patch-ae
--- a/net/tor/patches/patch-ae  Fri Aug 01 13:09:04 2008 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-$NetBSD: patch-ae,v 1.6 2008/02/19 13:48:12 obache Exp $
-
---- configure.orig     2008-01-17 19:49:56.000000000 +0000
-+++ configure
-@@ -5497,6 +5497,8 @@ fi
- 
- done
- 
-+# these checks don't work, assume types are present
-+if false; then
- 
- { echo "$as_me:$LINENO: checking for u_int64_t" >&5
- echo $ECHO_N "checking for u_int64_t... $ECHO_C" >&6; }
-@@ -5750,6 +5752,7 @@ _ACEOF
- 
- fi
- 
-+fi
- 
- { echo "$as_me:$LINENO: checking for libevent directory" >&5
- echo $ECHO_N "checking for libevent directory... $ECHO_C" >&6; }



Home | Main Index | Thread Index | Old Index