Update wip/tor-dev to version 0.4.1.4-rc.

[Alexander Nasonov <alnsn%yandex.ru@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Alexander Nasonov <alnsn%yandex.ru@localhost>
Pushed By:	alnsn
Date:		Sun Aug 18 18:58:30 2019 +0100
Changeset:	ab077fc4a54f02d4a911acf9f45c819ac3dbaf20

Modified Files:
	tor-dev/Makefile
	tor-dev/distinfo
	tor-dev/patches/patch-src_app_config_config.c

Log Message:
Update wip/tor-dev to version 0.4.1.4-rc.

Changes in version 0.4.1.4-rc - 2019-07-25
  Tor 0.4.1.4-rc fixes a few bugs from previous versions of Tor, and
  updates to a new list of fallback directories. If no new bugs are
  found, the next release in the 0.4.1.x serious should be stable.

  o Major bugfixes (circuit build, guard):
    - When considering upgrading circuits from "waiting for guard" to
      "open", always ignore circuits that are marked for close. Otherwise,
      we can end up in the situation where a subsystem is notified that
      a closing circuit has just opened, leading to undesirable
      behavior. Fixes bug 30871; bugfix on 0.3.0.1-alpha.

  o Minor features (continuous integration):
    - Our Travis configuration now uses Chutney to run some network
      integration tests automatically. Closes ticket 29280.

  o Minor features (fallback directory list):
    - Replace the 157 fallbacks originally introduced in Tor 0.3.5.6-rc
      in December 2018 (of which ~122 were still functional), with a
      list of 148 fallbacks (70 new, 78 existing, 79 removed) generated
      in June 2019. Closes ticket 28795.

  o Minor bugfixes (circuit padding):
    - On relays, properly check that a padding machine is absent before
      logging a warning about it being absent. Fixes bug 30649; bugfix
      on 0.4.1.1-alpha.
    - Add two NULL checks in unreachable places to silence Coverity (CID
      144729 and 1447291) and better future-proof ourselves. Fixes bug
      31024; bugfix on 0.4.1.1-alpha.

  o Minor bugfixes (crash on exit):
    - Avoid a set of possible code paths that could try to use freed
      memory in routerlist_free() while Tor was exiting. Fixes bug
      31003; bugfix on 0.1.2.2-alpha.

  o Minor bugfixes (logging):
    - Fix a conflict between the flag used for messaging-domain log
      messages, and the LD_NO_MOCK testing flag. Fixes bug 31080; bugfix
      on 0.4.1.1-alpha.

  o Minor bugfixes (memory leaks):
    - Fix a trivial memory leak when parsing an invalid value from a
      download schedule in the configuration. Fixes bug 30894; bugfix
      on 0.3.4.1-alpha.

  o Code simplification and refactoring:
    - Remove some dead code from circpad_machine_remove_token() to fix
      some Coverity warnings (CID 1447298). Fixes bug 31027; bugfix
      on 0.4.1.1-alpha.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=ab077fc4a54f02d4a911acf9f45c819ac3dbaf20

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

diffstat:
 tor-dev/Makefile                              |  2 +-
 tor-dev/distinfo                              | 10 +++++-----
 tor-dev/patches/patch-src_app_config_config.c | 13 +++++++++++--
 3 files changed, 17 insertions(+), 8 deletions(-)

diffs:
diff --git a/tor-dev/Makefile b/tor-dev/Makefile
index c7e1a54039..8082fd0013 100644
--- a/tor-dev/Makefile
+++ b/tor-dev/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD$
 
-DISTNAME=	tor-0.4.1.2-alpha
+DISTNAME=	tor-0.4.1.4-rc
 PKGNAME=	${DISTNAME:S/tor/tordev/:S/-alpha//:S/-rc/rc0/}
 CATEGORIES=	net security
 MASTER_SITES=	https://dist.torproject.org/
diff --git a/tor-dev/distinfo b/tor-dev/distinfo
index 2d2037711d..f1c945c1a4 100644
--- a/tor-dev/distinfo
+++ b/tor-dev/distinfo
@@ -1,8 +1,8 @@
 $NetBSD$
 
-SHA1 (tor-0.4.1.2-alpha.tar.gz) = 4872246841f8ecab84f61c6556d458d3fc68e005
-RMD160 (tor-0.4.1.2-alpha.tar.gz) = 20d1a6443e53c881f3c8cad1bf795df4a56dc125
-SHA512 (tor-0.4.1.2-alpha.tar.gz) = e138f836bc40f16a405e08024168176ed3eafdc26eca06f2a5e31b856e299e1ea04d84fea71a48bd9d79572fad060462d3bd2d4151c6009d04b14848d99102f6
-Size (tor-0.4.1.2-alpha.tar.gz) = 7355589 bytes
+SHA1 (tor-0.4.1.4-rc.tar.gz) = 8d8c92a3ae4d5d29c86353f917f2e471cd4aba3e
+RMD160 (tor-0.4.1.4-rc.tar.gz) = 5a75e8bee985aa637d76de7cf6db838358346f6f
+SHA512 (tor-0.4.1.4-rc.tar.gz) = 851809c5ff80beea8bf4432d702bcb6ce9ffe0b3d137c3c11386f1e4c771140d218d4ed2dc5c3c4994091c13a2e28f85ce125c1b68fe606d16e4e1f5a259937b
+Size (tor-0.4.1.4-rc.tar.gz) = 7369948 bytes
 SHA1 (patch-Makefile.in) = c190295f4702bd1e69531cab1ac61dbab451e48b
-SHA1 (patch-src_app_config_config.c) = bac106e382207cdf22c84a52b45c791de2bdf0f8
+SHA1 (patch-src_app_config_config.c) = f14298e5a33faf25f385cfc91d74bff2862a14c6
diff --git a/tor-dev/patches/patch-src_app_config_config.c b/tor-dev/patches/patch-src_app_config_config.c
index e96b01efd3..187b32857b 100644
--- a/tor-dev/patches/patch-src_app_config_config.c
+++ b/tor-dev/patches/patch-src_app_config_config.c
@@ -2,9 +2,9 @@ $NetBSD$
 
 tor -> tordev.
 
---- src/app/config/config.c.orig	2018-09-21 11:51:54.000000000 +0000
+--- src/app/config/config.c.orig	2019-06-11 11:29:32.000000000 +0000
 +++ src/app/config/config.c
-@@ -437,9 +437,9 @@ static config_var_t option_vars_[] = {
+@@ -460,9 +460,9 @@ static config_var_t option_vars_[] = {
    V(GeoIPv6File,                 FILENAME, "<default>"),
  #else
    V(GeoIPFile,                   FILENAME,
@@ -16,3 +16,12 @@ tor -> tordev.
  #endif /* defined(_WIN32) */
    OBSOLETE("Group"),
    V(GuardLifetime,               INTERVAL, "0 minutes"),
+@@ -7850,7 +7850,7 @@ get_data_directory(const char *val)
+                "\"%s\", which is probably not what you want.  Using "
+                "\"%s"PATH_SEPARATOR"tor\" instead", fn, LOCALSTATEDIR);
+       tor_free(fn);
+-      fn = tor_strdup(LOCALSTATEDIR PATH_SEPARATOR "tor");
++      fn = tor_strdup(LOCALSTATEDIR PATH_SEPARATOR "tordev");
+     }
+     return fn;
+   }