Update to tor-0.3.3.1-alpha.

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

Module Name:	pkgsrc-wip
Committed By:	Alexander Nasonov <alnsn%yandex.ru@localhost>
Pushed By:	alnsn
Date:		Thu Jan 25 22:48:27 2018 +0000
Changeset:	1dab304bf74ecc5ccd6ddaf1fc5a84dca425a6b6

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

Log Message:
Update to tor-0.3.3.1-alpha.

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

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

diffstat:
 tor-dev/Makefile                      |  4 ++--
 tor-dev/distinfo                      | 12 ++++++------
 tor-dev/patches/patch-Makefile.in     |  6 +++---
 tor-dev/patches/patch-src_or_config.c | 22 +++++++++++-----------
 4 files changed, 22 insertions(+), 22 deletions(-)

diffs:
diff --git a/tor-dev/Makefile b/tor-dev/Makefile
index 88c4e9134f..27960b7b8b 100644
--- a/tor-dev/Makefile
+++ b/tor-dev/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD$
 
-DISTNAME=	tor-0.3.2.8-rc
-PKGNAME=	${DISTNAME:S/tor/tordev/:S/-rc//}
+DISTNAME=	tor-0.3.3.1-alpha
+PKGNAME=	${DISTNAME:S/tor/tordev/:S/-alpha//}
 CATEGORIES=	net security
 MASTER_SITES=	http://www.torproject.org/dist/
 
diff --git a/tor-dev/distinfo b/tor-dev/distinfo
index 064f33fd5f..2d89d66e9c 100644
--- a/tor-dev/distinfo
+++ b/tor-dev/distinfo
@@ -1,8 +1,8 @@
 $NetBSD$
 
-SHA1 (tor-0.3.2.8-rc.tar.gz) = 14e273a93d6351f9327d4fed3348a2c3742e8214
-RMD160 (tor-0.3.2.8-rc.tar.gz) = 8a8388cfb47020ec82a5211c91fb211a0dc79f0b
-SHA512 (tor-0.3.2.8-rc.tar.gz) = 60913c492f903307d485af26ab3752e0058fb97816d62cd29eb8785446bb7eb6f9bd2aca964a0d8c4de039c4d432590dea68c28c4f34eda2f127b50c752be0d4
-Size (tor-0.3.2.8-rc.tar.gz) = 6345141 bytes
-SHA1 (patch-Makefile.in) = f3e51f568aa7c4338d352689d1ab2f0bb10aa016
-SHA1 (patch-src_or_config.c) = 6cc372ca1809ff8cb7f5cc181f8e7a735d1148cb
+SHA1 (tor-0.3.3.1-alpha.tar.gz) = 78efad1f5dfb6d463156136bcc7a31c4a48804fe
+RMD160 (tor-0.3.3.1-alpha.tar.gz) = 4bd5a6e4664646ee0b63840eb5075e346446ff7e
+SHA512 (tor-0.3.3.1-alpha.tar.gz) = 796deb6c31d78e3424aed72d3c9a0958c77a28fc883da77e724e94bb92376858ae094c73acf166a5415587186667d4ea3e87c0578e42f4a59b8397365d782314
+Size (tor-0.3.3.1-alpha.tar.gz) = 6317585 bytes
+SHA1 (patch-Makefile.in) = cc7a58817fcc0294dc6a301e01a4e5076ce531b2
+SHA1 (patch-src_or_config.c) = 8e4905833ca6722651b52b83c910b1e96d1ca756
diff --git a/tor-dev/patches/patch-Makefile.in b/tor-dev/patches/patch-Makefile.in
index b6063f22e6..2b12d8770d 100644
--- a/tor-dev/patches/patch-Makefile.in
+++ b/tor-dev/patches/patch-Makefile.in
@@ -2,12 +2,12 @@ $NetBSD$
 
 tor -> tordev.
 
---- Makefile.in.orig	2017-11-09 22:35:20.595595671 +0000
+--- Makefile.in.orig	2018-01-25 23:58:59.734631432 +0000
 +++ Makefile.in
-@@ -2954,8 +2954,8 @@ src_tools_tor_gencert_LDADD = src/common
- @COVERAGE_ENABLED_TRUE@    @TOR_LIB_MATH@ @TOR_ZLIB_LIBS@ @TOR_OPENSSL_LIBS@ \
+@@ -3022,8 +3022,8 @@ src_tools_tor_gencert_LDADD = src/common
  @COVERAGE_ENABLED_TRUE@    @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@
  
+ @BUILD_LIBTORRUNNER_TRUE@src_tools_libtorrunner_a_SOURCES = src/tools/tor_runner.c src/or/tor_api.c
 -confdir = $(sysconfdir)/tor
 -tordatadir = $(datadir)/tor
 +confdir = $(sysconfdir)/tordev
diff --git a/tor-dev/patches/patch-src_or_config.c b/tor-dev/patches/patch-src_or_config.c
index 1ff31fd4f6..98306c58b7 100644
--- a/tor-dev/patches/patch-src_or_config.c
+++ b/tor-dev/patches/patch-src_or_config.c
@@ -2,9 +2,9 @@ $NetBSD$
 
 tor -> tordev.
 
---- src/or/config.c.orig	2017-11-05 19:09:21.000000000 +0000
+--- src/or/config.c.orig	2018-01-24 17:04:12.000000000 +0000
 +++ src/or/config.c
-@@ -349,9 +349,9 @@ static config_var_t option_vars_[] = {
+@@ -359,9 +359,9 @@ static config_var_t option_vars_[] = {
    V(GeoIPv6File,                 FILENAME, "<default>"),
  #else
    V(GeoIPFile,                   FILENAME,
@@ -16,12 +16,12 @@ tor -> tordev.
  #endif /* defined(_WIN32) */
    OBSOLETE("Group"),
    V(GuardLifetime,               INTERVAL, "0 minutes"),
-@@ -7646,7 +7646,7 @@ normalize_data_directory(or_options_t *o
-               "\"%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");
-    }
-    tor_free(options->DataDirectory);
-    options->DataDirectory = fn;
+@@ -7769,7 +7769,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;
+   }