tor-dev: update to 0.3.5.2-alpha

[Thomas Klausner <tk%giga.or.at@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <tk%giga.or.at@localhost>
Pushed By:	wiz
Date:		Tue Oct 16 18:51:05 2018 +0200
Changeset:	b07f690e8b0c1d47b06983cb94e01a637844f024

Modified Files:
	tor-dev/Makefile
	tor-dev/PLIST
	tor-dev/distinfo
Added Files:
	tor-dev/patches/patch-src_lib_evloop_procmon.c
Removed Files:
	tor-dev/patches/patch-Makefile.in
	tor-dev/patches/patch-src_or_config.c

Log Message:
tor-dev: update to 0.3.5.2-alpha

Latest snapshot.

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

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/PLIST                                  | 10 ++++++----
 tor-dev/distinfo                               | 10 ++++------
 tor-dev/patches/patch-Makefile.in              | 17 ----------------
 tor-dev/patches/patch-src_lib_evloop_procmon.c | 13 +++++++++++++
 tor-dev/patches/patch-src_or_config.c          | 27 --------------------------
 6 files changed, 25 insertions(+), 56 deletions(-)

diffs:
diff --git a/tor-dev/Makefile b/tor-dev/Makefile
index a9d68fd882..5caa835130 100644
--- a/tor-dev/Makefile
+++ b/tor-dev/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD$
 
-DISTNAME=	tor-0.3.4.7-rc
+DISTNAME=	tor-0.3.5.2-alpha
 PKGNAME=	${DISTNAME:S/tor/tordev/:S/-alpha//:S/-rc/rc0/}
 CATEGORIES=	net security
 MASTER_SITES=	http://www.torproject.org/dist/
@@ -44,7 +44,7 @@ OWN_DIRS_PERMS+=	${PKG_HOME.${TOR_USER}} ${USER_GROUP} 0700
 
 CONFIGURE_ARGS+=	--localstatedir=${VARBASE}
 
-CONF_FILES+=		${PREFIX}/share/examples/tordev/torrc.sample	\
+CONF_FILES+=		${PREFIX}/share/examples/tor/torrc.sample	\
 			${PKG_SYSCONFDIR}/torrc
 
 PRINT_PLIST_AWK+=	/^man\/man/ { $$0 = "$${PLIST.doc}" $$0 }
diff --git a/tor-dev/PLIST b/tor-dev/PLIST
index 45782eb57c..448176e2ef 100644
--- a/tor-dev/PLIST
+++ b/tor-dev/PLIST
@@ -1,17 +1,19 @@
 @comment $NetBSD$
 bin/tor-dev
 bin/tor-gencert-dev
+bin/tor-print-ed-signing-cert-dev
 bin/tor-resolve-dev
 bin/torify-dev
 ${PLIST.doc}man/man1/tor-dev.1
 ${PLIST.doc}man/man1/tor-gencert-dev.1
+${PLIST.doc}man/man1/tor-print-ed-signing-cert-dev.1
 ${PLIST.doc}man/man1/tor-resolve-dev.1
 ${PLIST.doc}man/man1/torify-dev.1
 ${PLIST.doc}share/doc/tordev/tor-gencert.html
+${PLIST.doc}share/doc/tordev/tor-print-ed-signing-cert.html
 ${PLIST.doc}share/doc/tordev/tor-resolve.html
 ${PLIST.doc}share/doc/tordev/tor.html
 ${PLIST.doc}share/doc/tordev/torify.html
-share/examples/rc.d/tordev
-share/examples/tordev/torrc.sample
-share/tordev/geoip
-share/tordev/geoip6
+share/examples/tor/torrc.sample
+share/tor/geoip
+share/tor/geoip6
diff --git a/tor-dev/distinfo b/tor-dev/distinfo
index 9d28283d05..3c1f66b735 100644
--- a/tor-dev/distinfo
+++ b/tor-dev/distinfo
@@ -1,8 +1,6 @@
 $NetBSD$
 
-SHA1 (tor-0.3.4.7-rc.tar.gz) = a4dbd5eec7b081c6edabd97ee4e6a76a70360f8c
-RMD160 (tor-0.3.4.7-rc.tar.gz) = 04e50a0176c233cb67070da389a5237bc33d34f1
-SHA512 (tor-0.3.4.7-rc.tar.gz) = 664211ffd6adcdb325cf669fed9fb7c70b1416da3df046c35622b5104a4b63d9a3123eb40744bc070d29ff97472adf31b1aaecea5b91c07059d0cdad79569b58
-Size (tor-0.3.4.7-rc.tar.gz) = 6668322 bytes
-SHA1 (patch-Makefile.in) = cc7a58817fcc0294dc6a301e01a4e5076ce531b2
-SHA1 (patch-src_or_config.c) = 8e4905833ca6722651b52b83c910b1e96d1ca756
+SHA1 (tor-0.3.5.2-alpha.tar.gz) = 67a16c71567c2f4a5b3d3703fa41cd8e9aa18e5e
+RMD160 (tor-0.3.5.2-alpha.tar.gz) = 3752f022fda67ee60a360ada400e1bd48386cc9c
+SHA512 (tor-0.3.5.2-alpha.tar.gz) = 57344a71bbdf6bc0488f8ac5383de3832c411bdb34c620d3effb7146adbcccbb6e6c7a3a794e6b4a9ba5ff191c02f5e411fe96de41f21292385dcd46434903ce
+Size (tor-0.3.5.2-alpha.tar.gz) = 6698132 bytes
diff --git a/tor-dev/patches/patch-Makefile.in b/tor-dev/patches/patch-Makefile.in
deleted file mode 100644
index 2b12d8770d..0000000000
--- a/tor-dev/patches/patch-Makefile.in
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-tor -> tordev.
-
---- Makefile.in.orig	2018-01-25 23:58:59.734631432 +0000
-+++ Makefile.in
-@@ -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
-+tordatadir = $(datadir)/tordev
- conf_DATA = src/config/torrc.sample
- tordata_DATA = src/config/geoip src/config/geoip6
- 
diff --git a/tor-dev/patches/patch-src_lib_evloop_procmon.c b/tor-dev/patches/patch-src_lib_evloop_procmon.c
new file mode 100644
index 0000000000..31d25530b6
--- /dev/null
+++ b/tor-dev/patches/patch-src_lib_evloop_procmon.c
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- src/lib/evloop/procmon.c.orig	2018-09-20 20:13:23.000000000 +0000
++++ src/lib/evloop/procmon.c
+@@ -21,6 +21,8 @@
+ #include <errno.h>
+ #endif
+ 
++#include <time.h>
++
+ #ifdef _WIN32
+ #include <winsock2.h>
+ #include <windows.h>
diff --git a/tor-dev/patches/patch-src_or_config.c b/tor-dev/patches/patch-src_or_config.c
deleted file mode 100644
index 98306c58b7..0000000000
--- a/tor-dev/patches/patch-src_or_config.c
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD$
-
-tor -> tordev.
-
---- src/or/config.c.orig	2018-01-24 17:04:12.000000000 +0000
-+++ src/or/config.c
-@@ -359,9 +359,9 @@ static config_var_t option_vars_[] = {
-   V(GeoIPv6File,                 FILENAME, "<default>"),
- #else
-   V(GeoIPFile,                   FILENAME,
--    SHARE_DATADIR PATH_SEPARATOR "tor" PATH_SEPARATOR "geoip"),
-+    SHARE_DATADIR PATH_SEPARATOR "tordev" PATH_SEPARATOR "geoip"),
-   V(GeoIPv6File,                 FILENAME,
--    SHARE_DATADIR PATH_SEPARATOR "tor" PATH_SEPARATOR "geoip6"),
-+    SHARE_DATADIR PATH_SEPARATOR "tordev" PATH_SEPARATOR "geoip6"),
- #endif /* defined(_WIN32) */
-   OBSOLETE("Group"),
-   V(GuardLifetime,               INTERVAL, "0 minutes"),
-@@ -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;
-   }