Sat May 23 08:53:11 2015 UTC ()
Update tor to 0.2.6.8. From Christian Sturm in PR pkg/49917.

Changes in version 0.2.6.8 - 2015-05-21
  Tor 0.2.6.8 fixes a bit of dodgy code in parsing INTRODUCE2 cells, and
  fixes an authority-side bug in assigning the HSDir flag. All directory
  authorities should upgrade.

  o Major bugfixes (hidden services, backport from 0.2.7.1-alpha):
    - Revert commit that made directory authorities assign the HSDir
      flag to relay without a DirPort; this was bad because such relays
      can't handle BEGIN_DIR cells. Fixes bug 15850; bugfix
      on tor-0.2.6.3-alpha.

  o Minor bugfixes (hidden service, backport from 0.2.7.1-alpha):
    - Fix an out-of-bounds read when parsing invalid INTRODUCE2 cells on
      a client authorized hidden service. Fixes bug 15823; bugfix
      on 0.2.1.6-alpha.

  o Minor features (geoip):
    - Update geoip to the April 8 2015 Maxmind GeoLite2 Country database.
    - Update geoip6 to the April 8 2015 Maxmind GeoLite2
      Country database.

Changes in version 0.2.6.7 - 2015-04-06
  Tor 0.2.6.7 fixes two security issues that could be used by an
  attacker to crash hidden services, or crash clients visiting hidden
  services. Hidden services should upgrade as soon as possible; clients
  should upgrade whenever packages become available.

  This release also contains two simple improvements to make hidden
  services a bit less vulnerable to denial-of-service attacks.

  o Major bugfixes (security, hidden service):
    - Fix an issue that would allow a malicious client to trigger an
      assertion failure and halt a hidden service. Fixes bug 15600;
      bugfix on 0.2.1.6-alpha. Reported by "disgleirio".
    - Fix a bug that could cause a client to crash with an assertion
      failure when parsing a malformed hidden service descriptor. Fixes
      bug 15601; bugfix on 0.2.1.5-alpha. Found by "DonnchaC".

  o Minor features (DoS-resistance, hidden service):
    - Introduction points no longer allow multiple INTRODUCE1 cells to
      arrive on the same circuit. This should make it more expensive for
      attackers to overwhelm hidden services with introductions.
      Resolves ticket 15515.
    - Decrease the amount of reattempts that a hidden service performs
      when its rendezvous circuits fail. This reduces the computational
      cost for running a hidden service under heavy load. Resolves
      ticket 11447.


(bsiegert)
diff -r1.102 -r1.103 pkgsrc/net/tor/Makefile
diff -r1.63 -r1.64 pkgsrc/net/tor/distinfo
diff -r1.6 -r1.7 pkgsrc/net/tor/options.mk
cvs diff -r1.102 -r1.103 pkgsrc/net/tor/Makefile (expand / switch to unified diff)

--- pkgsrc/net/tor/Makefile 2015/04/08 05:26:02 1.102
+++ pkgsrc/net/tor/Makefile 2015/05/23 08:53:11 1.103
@@ -1,67 +1,61 @@ @@ -1,67 +1,61 @@
1# $NetBSD: Makefile,v 1.102 2015/04/08 05:26:02 wiz Exp $ 1# $NetBSD: Makefile,v 1.103 2015/05/23 08:53:11 bsiegert Exp $
2 2
3DISTNAME= tor-0.2.5.12 3DISTNAME= tor-0.2.6.8
4CATEGORIES= net security 4CATEGORIES= net security
5MASTER_SITES= http://www.torproject.org/dist/ 5MASTER_SITES= http://www.torproject.org/dist/
6 6
7MAINTAINER= athaba@users.sourceforge.net 7MAINTAINER= athaba@users.sourceforge.net
8HOMEPAGE= http://www.torproject.org/ 8HOMEPAGE= http://www.torproject.org/
9COMMENT= Anonymizing overlay network for TCP 9COMMENT= Anonymizing overlay network for TCP
10LICENSE= modified-bsd 10LICENSE= modified-bsd
11 11
12.include "../../mk/bsd.prefs.mk" 12.include "../../mk/bsd.prefs.mk"
13 13
14USE_LANGUAGES= c99 14USE_LANGUAGES= c99
15USE_PKGLOCALEDIR= yes 15USE_PKGLOCALEDIR= yes
16GNU_CONFIGURE= yes 16GNU_CONFIGURE= yes
17 17
18CONFIGURE_ENV+= CPP=${CPP:Q} 18CONFIGURE_ENV+= CPP=${CPP:Q}
19CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASEDIR} 19CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASEDIR}
20 20
21TEST_TARGET= check 21TEST_TARGET= check
22 22
23TOR_USER?= tor 23TOR_USER?= tor
24TOR_GROUP?= tor 24TOR_GROUP?= tor
25PKG_GECOS.${TOR_USER}?= Torifier 25PKG_GECOS.${TOR_USER}= Torifier
26PKG_HOME.${TOR_USER}?= ${VARBASE}/chroot/tor 26PKG_HOME.${TOR_USER}= ${VARBASE}/chroot/tor
27BUILD_DEFS+= VARBASE 27BUILD_DEFS+= VARBASE
28PKG_SYSCONFSUBDIR= tor 28PKG_SYSCONFSUBDIR= tor
29 29
30PKG_GROUPS_VARS+= TOR_GROUP 30PKG_GROUPS_VARS+= TOR_GROUP
31PKG_USERS_VARS= TOR_USER 31PKG_USERS_VARS= TOR_USER
32 32
33RCD_SCRIPTS= tor 33RCD_SCRIPTS= tor
34RCD_SCRIPT_SRC.tor= ${FILESDIR}/tor.in 34RCD_SCRIPT_SRC.tor= ${FILESDIR}/tor.in
35PKG_GROUPS= ${TOR_GROUP} 35PKG_GROUPS= ${TOR_GROUP}
36PKG_USERS= ${TOR_USER}:${TOR_GROUP} 36PKG_USERS= ${TOR_USER}:${TOR_GROUP}
37USER_GROUP= ${TOR_USER} ${TOR_GROUP} 37USER_GROUP= ${TOR_USER} ${TOR_GROUP}
38 38
39OWN_DIRS_PERMS+= ${PKG_HOME.${TOR_USER}} ${USER_GROUP} 0700 39OWN_DIRS_PERMS+= ${PKG_HOME.${TOR_USER}} ${USER_GROUP} 0700
40 40
41CONFIGURE_ARGS+= --localstatedir=${VARBASE} 41CONFIGURE_ARGS+= --localstatedir=${VARBASE}
42 42
43CONF_FILES+= ${PREFIX}/share/examples/tor/torrc.sample \ 43CONF_FILES+= ${PREFIX}/share/examples/tor/torrc.sample \
44 ${PKG_SYSCONFDIR}/torrc 44 ${PKG_SYSCONFDIR}/torrc
45 45
46FILES_SUBST+= PKG_HOME=${PKG_HOME.${TOR_USER}} 46FILES_SUBST+= PKG_HOME=${PKG_HOME.${TOR_USER}}
47FILES_SUBST+= TOR_USER=${TOR_USER} TOR_GROUP=${TOR_GROUP} 47FILES_SUBST+= TOR_USER=${TOR_USER} TOR_GROUP=${TOR_GROUP}
48 48
49SUBST_CLASSES+= fix-paths 
50SUBST_STAGE.fix-paths= pre-configure 
51SUBST_MESSAGE.fix-paths= Fixing absolute paths. 
52SUBST_FILES.fix-paths= contrib/torify.in 
53SUBST_SED.fix-paths= -e 's,"/etc/tor,"${PKG_SYSCONFDIR},g' 
54 
55INSTALL_MAKE_FLAGS+= sysconfdir=${PREFIX}/share/examples 49INSTALL_MAKE_FLAGS+= sysconfdir=${PREFIX}/share/examples
56 50
57CHECK_PORTABILITY_SKIP+=contrib/* 51CHECK_PORTABILITY_SKIP+=contrib/*
58 52
59.if !empty(PKGSRC_COMPILER:Mmipspro) 53.if !empty(PKGSRC_COMPILER:Mmipspro)
60CFLAGS+= -c99 54CFLAGS+= -c99
61.endif 55.endif
62 56
63BUILDLINK_API_DEPENDS.libevent+= libevent>=1.2 57BUILDLINK_API_DEPENDS.libevent+= libevent>=1.2
64.include "../../devel/libevent/buildlink3.mk" 58.include "../../devel/libevent/buildlink3.mk"
65.include "../../devel/zlib/buildlink3.mk" 59.include "../../devel/zlib/buildlink3.mk"
66.include "../../security/openssl/buildlink3.mk" 60.include "../../security/openssl/buildlink3.mk"
67.include "../../mk/pthread.buildlink3.mk" 61.include "../../mk/pthread.buildlink3.mk"
cvs diff -r1.63 -r1.64 pkgsrc/net/tor/distinfo (expand / switch to unified diff)

--- pkgsrc/net/tor/distinfo 2015/04/08 05:26:02 1.63
+++ pkgsrc/net/tor/distinfo 2015/05/23 08:53:11 1.64
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
1$NetBSD: distinfo,v 1.63 2015/04/08 05:26:02 wiz Exp $ 1$NetBSD: distinfo,v 1.64 2015/05/23 08:53:11 bsiegert Exp $
2 2
3SHA1 (tor-0.2.5.12.tar.gz) = 256e6d77d71420a21a67bba270f43fcf356f8737 3SHA1 (tor-0.2.6.8.tar.gz) = d087dac687d17199feda3a32bbc988333afeb4ef
4RMD160 (tor-0.2.5.12.tar.gz) = 8e6ab8660c0c833849ff0aa8bbf44dcf2097e3eb 4RMD160 (tor-0.2.6.8.tar.gz) = 6427bded6041965af16e67bcc133b273b223b5fd
5Size (tor-0.2.5.12.tar.gz) = 3311423 bytes 5Size (tor-0.2.6.8.tar.gz) = 3580783 bytes
6SHA1 (patch-aa) = ac774cb976e03ff4d38415e78720f2f463c210c8 6SHA1 (patch-aa) = ac774cb976e03ff4d38415e78720f2f463c210c8
cvs diff -r1.6 -r1.7 pkgsrc/net/tor/options.mk (expand / switch to unified diff)

--- pkgsrc/net/tor/options.mk 2014/06/25 13:08:37 1.6
+++ pkgsrc/net/tor/options.mk 2015/05/23 08:53:11 1.7
@@ -1,37 +1,19 @@ @@ -1,37 +1,19 @@
1# $NetBSD: options.mk,v 1.6 2014/06/25 13:08:37 drochner Exp $ 1# $NetBSD: options.mk,v 1.7 2015/05/23 08:53:11 bsiegert Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.tor 3PKG_OPTIONS_VAR= PKG_OPTIONS.tor
4PKG_SUPPORTED_OPTIONS= threads doc 4PKG_SUPPORTED_OPTIONS= doc
5PKG_SUGGESTED_OPTIONS+= doc 5PKG_SUGGESTED_OPTIONS+= doc
6 6
7.if !empty(PTHREAD_TYPE:Mnative) 
8PKG_SUGGESTED_OPTIONS+= threads 
9.endif 
10 
11.include "../../mk/bsd.options.mk" 7.include "../../mk/bsd.options.mk"
12 8
13### 9###
14### This enables the build of manual pages. It requires asciidoc 10### This enables the build of manual pages. It requires asciidoc
15### at build time, which comes with a tail of dependencies and 11### at build time, which comes with a tail of dependencies and
16### may not be wanted under certain circumstances. 12### may not be wanted under certain circumstances.
17### 13###
18.if !empty(PKG_OPTIONS:Mdoc) 14.if !empty(PKG_OPTIONS:Mdoc)
19BUILD_DEPENDS+= asciidoc>=8.3.3:../../textproc/asciidoc 15BUILD_DEPENDS+= asciidoc>=8.3.3:../../textproc/asciidoc
20CONFIGURE_ARGS+= --enable-asciidoc 16CONFIGURE_ARGS+= --enable-asciidoc
21.else 17.else
22CONFIGURE_ARGS+= --disable-asciidoc 18CONFIGURE_ARGS+= --disable-asciidoc
23.endif 19.endif
24 
25 
26### 
27### This enables new code for threaded operation on NetBSD, OpenBSD, etc. 
28### I used {PTHREAD,RESOLV}_AUTO_VARS here for consistency's sake, as 
29### I don't trust configure scripts to do this properly on all platforms. 
30### 
31.if !empty(PKG_OPTIONS:Mthreads) 
32CONFIGURE_ARGS+= --enable-threads 
33PTHREAD_OPTS+= require 
34PTHREAD_AUTO_VARS= yes 
35.else 
36CONFIGURE_ARGS+= --disable-threads 
37.endif