From b87125fbe7e0e84ced95c0f7e72844dd17509c5b Mon Sep 17 00:00:00 2001
From: kayront <46160648+kayront@users.noreply.github.com>
Date: Sat, 31 Aug 2019 14:05:13 +0100
Subject: [PATCH 1/2] net/tor: update to v0.4.1.5 and add SMF support.

---
 net/tor/Makefile               |  6 ++---
 net/tor/distinfo               | 10 ++++----
 net/tor/files/smf/manifest.xml | 42 ++++++++++++++++++++++++++++++++++
 3 files changed, 50 insertions(+), 8 deletions(-)
 create mode 100644 net/tor/files/smf/manifest.xml

diff --git a/net/tor/Makefile b/net/tor/Makefile
index e47191f66c583..a1419ed591b79 100644
--- a/net/tor/Makefile
+++ b/net/tor/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.140 2019/05/03 08:45:51 wiz Exp $
+# $NetBSD: Makefile,v 1.137 2019/02/22 08:47:51 adam Exp $
 
-DISTNAME=	tor-0.4.0.5
+DISTNAME=	tor-0.4.1.5
 CATEGORIES=	net security
 MASTER_SITES=	https://dist.torproject.org/
 
@@ -21,7 +21,7 @@ TEST_TARGET=		check
 
 TOR_USER?=		tor
 TOR_GROUP?=		tor
-PKG_GECOS.${TOR_USER}=	Torifier
+PKG_GECOS.${TOR_USER}=	The Onion Router
 PKG_HOME.${TOR_USER}=	${VARBASE}/chroot/tor
 BUILD_DEFS+=		VARBASE
 PKG_SYSCONFSUBDIR=	tor
diff --git a/net/tor/distinfo b/net/tor/distinfo
index 727c369dc01eb..32ad522b804e5 100644
--- a/net/tor/distinfo
+++ b/net/tor/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.99 2019/05/03 08:45:51 wiz Exp $
+$NetBSD: distinfo,v 1.97 2019/02/22 08:47:51 adam Exp $
 
-SHA1 (tor-0.4.0.5.tar.gz) = be1307f0c78119038dc194c5f1c233b3e658d3bc
-RMD160 (tor-0.4.0.5.tar.gz) = cc0bead52c77d0cb7f65c7c083c48d3810514287
-SHA512 (tor-0.4.0.5.tar.gz) = f6bccc52aaa436a501077b0891ecd3a9779f288b3b15fd76fa2c612e60aba04763b5951f55b2357e6271797b2f924bee9a6d2c1ee20419daa02d9d38ec68510b
-Size (tor-0.4.0.5.tar.gz) = 7203877 bytes
+SHA1 (tor-0.4.1.5.tar.gz) = a65def67cdc70565717aefa5956ec5fdcbbdd959
+RMD160 (tor-0.4.1.5.tar.gz) = 3bb1881407e41725e9013739b71372712571be57
+SHA512 (tor-0.4.1.5.tar.gz) = 33d30f5fd2a92dfcb28d97c76c9d396d3eda27036b01c3a678428e878f046e45a87c2d42de0c1b8ba672568d75b08ba4cbf56d1aa50acd34c0d174180faace6e
+Size (tor-0.4.1.5.tar.gz) = 7378436 bytes
diff --git a/net/tor/files/smf/manifest.xml b/net/tor/files/smf/manifest.xml
new file mode 100644
index 0000000000000..cd6450a350694
--- /dev/null
+++ b/net/tor/files/smf/manifest.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0"?>
+<!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
+<service_bundle type="manifest" name="@SMF_NAME@">
+    <service name="@SMF_PREFIX@/@SMF_NAME@" type="service" version="0.1">
+        <create_default_instance enabled="false"/>
+        <single_instance/>
+
+        <dependency name="network" grouping="require_all" restart_on="error" type="service">
+            <service_fmri value="svc:/milestone/network:default"/>
+        </dependency>
+
+        <dependency name="filesystem" grouping="require_all" restart_on="error" type="service">
+            <service_fmri value="svc:/system/filesystem/local"/>
+        </dependency>
+        
+        <method_context>
+            <method_credential user="@TOR_USER@" group="@TOR_GROUP@"/>
+        </method_context>
+
+        <exec_method type="method" name="start" exec="@PREFIX@/bin/tor --RunAsDaemon 1 --DataDirectory @PKG_HOME@" timeout_seconds="60"/>
+        <exec_method type="method" name="stop" exec=":kill" timeout_seconds="60"/>
+
+        <property_group name="startd" type="framework">
+            <propval name="duration" type="astring" value="contract"/>
+            <propval name="ignore_error" type="astring" value="core,signal"/>
+        </property_group>
+
+        <property_group name="application" type="application">
+            <propval name="config_file" type="astring" value="@PKG_SYSCONFDIR@/torrc"/>
+        </property_group>
+        
+        <stability value="Evolving"/>
+
+        <template>
+            <common_name>
+                <loctext xml:lang="C">
+                    The Onion Router
+                </loctext>
+            </common_name>
+        </template>
+    </service>
+</service_bundle>

From 818d4e509484755f883c96cb38441c2c86c14478 Mon Sep 17 00:00:00 2001
From: kayront <46160648+kayront@users.noreply.github.com>
Date: Sat, 31 Aug 2019 14:26:52 +0100
Subject: [PATCH 2/2] restore first line of Makefile to the correct value

---
 net/tor/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/tor/Makefile b/net/tor/Makefile
index a1419ed591b79..87f33cea939d9 100644
--- a/net/tor/Makefile
+++ b/net/tor/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.137 2019/02/22 08:47:51 adam Exp $
+# $NetBSD: Makefile,v 1.140 2019/05/03 08:45:51 wiz Exp $
 
 DISTNAME=	tor-0.4.1.5
 CATEGORIES=	net security