CVS commit: pkgsrc/net/tor

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Thu Nov 12 22:56:00 UTC 2020

Modified Files:
        pkgsrc/net/tor: Makefile distinfo options.mk

Log Message:
tor: update to 0.4.4.6.

Disable rust option since it currently doesn't work.

Changes in version 0.4.4.6 - 2020-11-12
  Tor 0.4.4.6 is the second stable release in the 0.4.4.x series. It
  backports fixes from later releases, including a fix for TROVE-2020-
  005, a security issue that could be used, under certain cases, by an
  adversary to observe traffic patterns on a limited number of circuits
  intended for a different relay.

  o Major bugfixes (security, backport from 0.4.5.1-alpha):
    - When completing a channel, relays now check more thoroughly to
      make sure that it matches any pending circuits before attaching
      those circuits. Previously, address correctness and Ed25519
      identities were not checked in this case, but only when extending
      circuits on an existing channel. Fixes bug 40080; bugfix on
      0.2.7.2-alpha. Resolves TROVE-2020-005.

  o Minor features (directory authorities, backport from 0.4.5.1-alpha):
    - Authorities now list a different set of protocols as required and
      recommended. These lists have been chosen so that only truly
      recommended and/or required protocols are included, and so that
      clients using 0.2.9 or later will continue to work (even though
      they are not supported), whereas only relays running 0.3.5 or
      later will meet the requirements. Closes ticket 40162.
    - Make it possible to specify multiple ConsensusParams torrc lines.
      Now directory authority operators can for example put the main
      ConsensusParams config in one torrc file and then add to it from a
      different torrc file. Closes ticket 40164.

  o Minor features (subprotocol versions, backport from 0.4.5.1-alpha):
    - Tor no longer allows subprotocol versions larger than 63.
      Previously version numbers up to UINT32_MAX were allowed, which
      significantly complicated our code. Implements proposal 318;
      closes ticket 40133.

  o Minor features (tests, v2 onion services, backport from 0.4.5.1-alpha):
    - Fix a rendezvous cache unit test that was triggering an underflow
      on the global rend cache allocation. Fixes bug 40125; bugfix
      on 0.2.8.1-alpha.
    - Fix another rendezvous cache unit test that was triggering an
      underflow on the global rend cache allocation. Fixes bug 40126;
      bugfix on 0.2.8.1-alpha.

  o Minor bugfixes (compilation, backport from 0.4.5.1-alpha):
    - Fix compiler warnings that would occur when building with
      "--enable-all-bugs-are-fatal" and "--disable-module-relay" at the
      same time. Fixes bug 40129; bugfix on 0.4.4.1-alpha.
    - Resolve a compilation warning that could occur in
      test_connection.c. Fixes bug 40113; bugfix on 0.2.9.3-alpha.

  o Minor bugfixes (logging, backport from 0.4.5.1-alpha):
    - Remove a debug logging statement that uselessly spammed the logs.
      Fixes bug 40135; bugfix on 0.3.5.0-alpha.

  o Minor bugfixes (relay configuration, crash, backport from 0.4.5.1-alpha):
    - Avoid a fatal assert() when failing to create a listener
      connection for an address that was in use. Fixes bug 40073; bugfix
      on 0.3.5.1-alpha.

  o Minor bugfixes (v2 onion services, backport from 0.4.5.1-alpha):
    - For HSFETCH commands on v2 onion services addresses, check the
      length of bytes decoded, not the base32 length. Fixes bug 34400;
      bugfix on 0.4.1.1-alpha. Patch by Neel Chauhan.


To generate a diff of this commit:
cvs rdiff -u -r1.157 -r1.158 pkgsrc/net/tor/Makefile
cvs rdiff -u -r1.109 -r1.110 pkgsrc/net/tor/distinfo
cvs rdiff -u -r1.12 -r1.13 pkgsrc/net/tor/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/tor/Makefile
diff -u pkgsrc/net/tor/Makefile:1.157 pkgsrc/net/tor/Makefile:1.158
--- pkgsrc/net/tor/Makefile:1.157       Sat Sep 19 18:22:01 2020
+++ pkgsrc/net/tor/Makefile     Thu Nov 12 22:56:00 2020
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.157 2020/09/19 18:22:01 leot Exp $
+# $NetBSD: Makefile,v 1.158 2020/11/12 22:56:00 wiz Exp $
 
-DISTNAME=      tor-0.4.4.5
-PKGREVISION=   1
+DISTNAME=      tor-0.4.4.6
 CATEGORIES=    net security
 MASTER_SITES=  https://dist.torproject.org/
 

Index: pkgsrc/net/tor/distinfo
diff -u pkgsrc/net/tor/distinfo:1.109 pkgsrc/net/tor/distinfo:1.110
--- pkgsrc/net/tor/distinfo:1.109       Tue Sep 15 19:12:55 2020
+++ pkgsrc/net/tor/distinfo     Thu Nov 12 22:56:00 2020
@@ -1,6 +1,30 @@
-$NetBSD: distinfo,v 1.109 2020/09/15 19:12:55 wiz Exp $
+$NetBSD: distinfo,v 1.110 2020/11/12 22:56:00 wiz Exp $
 
-SHA1 (tor-0.4.4.5.tar.gz) = f5a4ef9d51c9f9b7a9666a8c667162cc4ff562ec
-RMD160 (tor-0.4.4.5.tar.gz) = a39f09ed99df8572f19adf12df41fcf94f90d7e3
-SHA512 (tor-0.4.4.5.tar.gz) = 8b7bedf998c66b33cb7b248ef33eb551dd75cca7eabf2133f716948d5bc83408d0be2ec1968e1c860b1067746b5645ea6e8f23478458b5eb2f5573ea7ecaecb7
-Size (tor-0.4.4.5.tar.gz) = 7808696 bytes
+SHA1 (digest-0.7.2.crate) = 5b9c88bbbd10db277eb81489d4fd98222c81f654
+RMD160 (digest-0.7.2.crate) = e1754858a8cc3376e4b1faaa2ab950f5c5a9ff26
+SHA512 (digest-0.7.2.crate) = 8232be4fbc7a77d437933d18423ed6c113abbc84084ceb998fac26413b374266975fd3c00e90131985c800dd0b83ff006dd9e77629d2e6ee19638bd67295ff85
+Size (digest-0.7.2.crate) = 8386 bytes
+SHA1 (generic-array-0.9.0.crate) = 1cd2878b30397e19cd189367dd8a4ea71a14e2ec
+RMD160 (generic-array-0.9.0.crate) = 45975a0df06c24fe628f007f7cd77fc1c8ceb1d9
+SHA512 (generic-array-0.9.0.crate) = e2a00d8856a4231a5c29bae592b2a84b98c70737058104fd67570af1220259994d11cb4506f1a1412f3c8a04576fe2617ef015600f677ecfccc8ff7a07425400
+Size (generic-array-0.9.0.crate) = 10702 bytes
+SHA1 (libc-0.2.39.crate) = 426579d6ce98e82c0531ebff2464582d0aea0567
+RMD160 (libc-0.2.39.crate) = 19f01e69a28f2d606d09eb8a8661e8ddceed782f
+SHA512 (libc-0.2.39.crate) = 4b399306da2f4d85e84db5a0a2212bc784b6ab1fb0d4731b58256e47684b5a244dcad8a12088035985e933ca2880dca5ada7dc822443d1cf474f4e73bbe59aa1
+Size (libc-0.2.39.crate) = 325829 bytes
+SHA1 (rand-0.5.0-pre.2.crate) = e55aa9ab4bb44ac92d40da0d99a64efdb2e33464
+RMD160 (rand-0.5.0-pre.2.crate) = 74a094353fee28574d1ec86b9587ca30701685a0
+SHA512 (rand-0.5.0-pre.2.crate) = 7f7f9c77367c2f6c310ad8f15074b85af615c8c0777a1bcbdd2e56410ea057e932fe20263e747d78e1b940abe02d6ada9e4d66ec743b169eb78895b220f5aa7b
+Size (rand-0.5.0-pre.2.crate) = 132485 bytes
+SHA1 (rand_core-0.2.0-pre.0.crate) = 21ea25e01766a26dbbd71997c5c3f358f3454980
+RMD160 (rand_core-0.2.0-pre.0.crate) = cbd3dc9ad06727ca36c296f4d33ec695e25b7bb9
+SHA512 (rand_core-0.2.0-pre.0.crate) = b14f88e529fe99b7b9774fc8e1233b44192e253a8a27bfc4da1a7ae99104b6b697068bd19faab85df3427e557a5182892f81f481dd89e8eb6921ec390ca752e9
+Size (rand_core-0.2.0-pre.0.crate) = 19211 bytes
+SHA1 (tor-0.4.4.6.tar.gz) = e5bf072a0e3dbc34c346ff721f830c46e9c774b3
+RMD160 (tor-0.4.4.6.tar.gz) = 2806d9a607399fd8162f92d4cee4753c8ad36c3d
+SHA512 (tor-0.4.4.6.tar.gz) = 84f981bed6d8c89d3de437e35dd2ad2ca3ee5efd7ce6b78e3e00bf40f644f495b960a7a741be5dd7ba096d73d5f941974722a44e9d3ef4fbcd02b20274d565fb
+Size (tor-0.4.4.6.tar.gz) = 7806477 bytes
+SHA1 (typenum-1.9.0.crate) = 76b18bc10204c28798cd32d10fd0df349d4cb5e4
+RMD160 (typenum-1.9.0.crate) = 6468f8efe8e91edac71dfd4e28c46581a2f0d457
+SHA512 (typenum-1.9.0.crate) = 8b72af1e370cf9d9308287baf4fc7c6096c4923d1c52fe0313c23c84077d74196aa4d997ecf195842d8242c871b0fd0da111f7914664be1841c97315e3ba6abb
+Size (typenum-1.9.0.crate) = 57747 bytes

Index: pkgsrc/net/tor/options.mk
diff -u pkgsrc/net/tor/options.mk:1.12 pkgsrc/net/tor/options.mk:1.13
--- pkgsrc/net/tor/options.mk:1.12      Sun Jun 14 15:33:28 2020
+++ pkgsrc/net/tor/options.mk   Thu Nov 12 22:56:00 2020
@@ -1,7 +1,7 @@
-# $NetBSD: options.mk,v 1.12 2020/06/14 15:33:28 nia Exp $
+# $NetBSD: options.mk,v 1.13 2020/11/12 22:56:00 wiz Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.tor
-PKG_SUPPORTED_OPTIONS= doc rust
+PKG_SUPPORTED_OPTIONS= doc # rust
 PKG_SUGGESTED_OPTIONS+=        doc
 
 .include "../../mk/bsd.options.mk"
@@ -23,6 +23,8 @@ CONFIGURE_ARGS+=      --disable-asciidoc
 
 ### This enables building tor with rust as per
 ### https://trac.torproject.org/projects/tor/wiki/RustInTor
+### XXX:
+### As of 0.4.4.6 I am not sure how this is supposed to work.
 .if !empty(PKG_OPTIONS:Mrust)
 CONFIGURE_ENV+=                TOR_RUST_DEPENDENCIES=${WRKDIR}/vendor
 CONFIGURE_ARGS+=       --enable-rust