Sun Oct 30 17:49:18 2011 UTC ()
update to 0.2.2.34
fixes a critical anonymity vulnerability where an attacker
can deanonymize Tor users (CVE-2011-2768)


(drochner)
diff -r1.83 -r1.84 pkgsrc/net/tor/Makefile
diff -r1.50 -r1.51 pkgsrc/net/tor/distinfo
cvs diff -r1.83 -r1.84 pkgsrc/net/tor/Makefile (switch to unified diff)

--- pkgsrc/net/tor/Makefile 2011/10/06 18:06:15 1.83
+++ pkgsrc/net/tor/Makefile 2011/10/30 17:49:18 1.84
@@ -1,78 +1,78 @@ @@ -1,78 +1,78 @@
1# $NetBSD: Makefile,v 1.83 2011/10/06 18:06:15 drochner Exp $ 1# $NetBSD: Makefile,v 1.84 2011/10/30 17:49:18 drochner Exp $
2# 2#
3 3
4DISTNAME= tor-0.2.2.33 4DISTNAME= tor-0.2.2.34
5CATEGORIES= net security 5CATEGORIES= net security
6MASTER_SITES= http://www.torproject.org/dist/ 6MASTER_SITES= http://www.torproject.org/dist/
7# MASTER_SITES redirects to https, and ftp(1) cannot handle that. 7# MASTER_SITES redirects to https, and ftp(1) cannot handle that.
8FETCH_USING= curl 8FETCH_USING= curl
9 9
10MAINTAINER= athaba@users.sourceforge.net 10MAINTAINER= athaba@users.sourceforge.net
11HOMEPAGE= http://www.torproject.org/ 11HOMEPAGE= http://www.torproject.org/
12COMMENT= Anonymizing overlay network for TCP 12COMMENT= Anonymizing overlay network for TCP
13LICENSE= modified-bsd 13LICENSE= modified-bsd
14 14
15PKG_DESTDIR_SUPPORT= user-destdir 15PKG_DESTDIR_SUPPORT= user-destdir
16 16
17.include "../../mk/bsd.prefs.mk" 17.include "../../mk/bsd.prefs.mk"
18 18
19USE_LANGUAGES= c99 19USE_LANGUAGES= c99
20# tor is not documented to require GNU make, but it fails to build on 20# tor is not documented to require GNU make, but it fails to build on
21# NetBSD 5.1 with (system) BSD make. Reported to 21# NetBSD 5.1 with (system) BSD make. Reported to
22# tor-talk@lists.torproject.org on 20110907. 22# tor-talk@lists.torproject.org on 20110907.
23USE_TOOLS+= gmake 23USE_TOOLS+= gmake
24USE_PKGLOCALEDIR= yes 24USE_PKGLOCALEDIR= yes
25GNU_CONFIGURE= yes 25GNU_CONFIGURE= yes
26 26
27CONFIGURE_ENV+= CPP=${CPP:Q} 27CONFIGURE_ENV+= CPP=${CPP:Q}
28CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASEDIR} 28CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASEDIR}
29 29
30TEST_TARGET= check 30TEST_TARGET= check
31 31
32TOR_USER?= tor 32TOR_USER?= tor
33TOR_GROUP?= tor 33TOR_GROUP?= tor
34PKG_HOME?= ${VARBASE}/chroot/tor 34PKG_HOME?= ${VARBASE}/chroot/tor
35BUILD_DEFS+= VARBASE 35BUILD_DEFS+= VARBASE
36PKG_SYSCONFSUBDIR= tor 36PKG_SYSCONFSUBDIR= tor
37 37
38PKG_GROUPS_VARS+= TOR_GROUP 38PKG_GROUPS_VARS+= TOR_GROUP
39PKG_USERS_VARS= TOR_USER 39PKG_USERS_VARS= TOR_USER
40 40
41RCD_SCRIPTS= tor 41RCD_SCRIPTS= tor
42RCD_SCRIPT_SRC.tor= ${FILESDIR}/tor.in 42RCD_SCRIPT_SRC.tor= ${FILESDIR}/tor.in
43PKG_GROUPS= ${TOR_GROUP} 43PKG_GROUPS= ${TOR_GROUP}
44PKG_USERS= ${TOR_USER}:${TOR_GROUP}::Torifier:${PKG_HOME} 44PKG_USERS= ${TOR_USER}:${TOR_GROUP}::Torifier:${PKG_HOME}
45USER_GROUP= ${TOR_USER} ${TOR_GROUP} 45USER_GROUP= ${TOR_USER} ${TOR_GROUP}
46 46
47OWN_DIRS_PERMS+= ${PKG_HOME} ${USER_GROUP} 0700 47OWN_DIRS_PERMS+= ${PKG_HOME} ${USER_GROUP} 0700
48 48
49CONFIGURE_ARGS+= --localstatedir=${VARBASE} 49CONFIGURE_ARGS+= --localstatedir=${VARBASE}
50 50
51CONF_FILES+= ${PREFIX}/share/examples/tor/tor-tsocks.conf \ 51CONF_FILES+= ${PREFIX}/share/examples/tor/tor-tsocks.conf \
52 ${PKG_SYSCONFDIR}/tor-tsocks.conf 52 ${PKG_SYSCONFDIR}/tor-tsocks.conf
53CONF_FILES+= ${PREFIX}/share/examples/tor/torrc.sample \ 53CONF_FILES+= ${PREFIX}/share/examples/tor/torrc.sample \
54 ${PKG_SYSCONFDIR}/torrc 54 ${PKG_SYSCONFDIR}/torrc
55 55
56FILES_SUBST+= PKG_HOME=${PKG_HOME} 56FILES_SUBST+= PKG_HOME=${PKG_HOME}
57FILES_SUBST+= TOR_USER=${TOR_USER} TOR_GROUP=${TOR_GROUP} 57FILES_SUBST+= TOR_USER=${TOR_USER} TOR_GROUP=${TOR_GROUP}
58 58
59INSTALL_MAKE_FLAGS+= sysconfdir=${PREFIX}/share/examples 59INSTALL_MAKE_FLAGS+= sysconfdir=${PREFIX}/share/examples
60 60
61CHECK_PORTABILITY_SKIP+=contrib/* 61CHECK_PORTABILITY_SKIP+=contrib/*
62 62
63.if !empty(PKGSRC_COMPILER:Mmipspro) 63.if !empty(PKGSRC_COMPILER:Mmipspro)
64CFLAGS+= -c99 64CFLAGS+= -c99
65.endif 65.endif
66 66
67BUILD_DEPENDS+= asciidoc-[0-9]*:../../textproc/asciidoc 67BUILD_DEPENDS+= asciidoc-[0-9]*:../../textproc/asciidoc
68BUILDLINK_API_DEPENDS.libevent+= libevent>=1.2 68BUILDLINK_API_DEPENDS.libevent+= libevent>=1.2
69.include "../../devel/libevent/buildlink3.mk" 69.include "../../devel/libevent/buildlink3.mk"
70.include "../../devel/zlib/buildlink3.mk" 70.include "../../devel/zlib/buildlink3.mk"
71.include "../../security/openssl/buildlink3.mk" 71.include "../../security/openssl/buildlink3.mk"
72.include "../../mk/pthread.buildlink3.mk" 72.include "../../mk/pthread.buildlink3.mk"
73 73
74## We include this after other b3.mk files since we use PTHREAD_TYPE. 74## We include this after other b3.mk files since we use PTHREAD_TYPE.
75## 75##
76.include "options.mk" 76.include "options.mk"
77 77
78.include "../../mk/bsd.pkg.mk" 78.include "../../mk/bsd.pkg.mk"
cvs diff -r1.50 -r1.51 pkgsrc/net/tor/distinfo (switch to unified diff)

--- pkgsrc/net/tor/distinfo 2011/10/06 18:06:15 1.50
+++ pkgsrc/net/tor/distinfo 2011/10/30 17:49:18 1.51
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
1$NetBSD: distinfo,v 1.50 2011/10/06 18:06:15 drochner Exp $ 1$NetBSD: distinfo,v 1.51 2011/10/30 17:49:18 drochner Exp $
2 2
3SHA1 (tor-0.2.2.33.tar.gz) = 2bbeb73cf866cc2701c0d28d3438e8626c1e8cca 3SHA1 (tor-0.2.2.34.tar.gz) = 81d777d07d01513da483bcd27dc92bc36112e771
4RMD160 (tor-0.2.2.33.tar.gz) = 7b47c08a4ecfa0864f28d5beb3ab26b5292f3170 4RMD160 (tor-0.2.2.34.tar.gz) = 3cbf6f00ab88010ed2f916526c4acef9a8514c37
5Size (tor-0.2.2.33.tar.gz) = 2719888 bytes 5Size (tor-0.2.2.34.tar.gz) = 2752710 bytes
6SHA1 (patch-aa) = 5b89228dc37c459c48f24616933a5673a5a0a0d1 6SHA1 (patch-aa) = 5b89228dc37c459c48f24616933a5673a5a0a0d1