From c009c57c7840c64d5a228af9b5a0b80fa7d1ee7f Mon Sep 17 00:00:00 2001
From: David Marcin <djmarcin@gmail.com>
Date: Tue, 7 Jul 2015 17:48:28 -0700
Subject: Remove absolute path from stunnel rcfile.

---
 config/stunnel/stunnel.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/stunnel/stunnel.xml b/config/stunnel/stunnel.xml
index 21e023a9..95dea0c1 100644
--- a/config/stunnel/stunnel.xml
+++ b/config/stunnel/stunnel.xml
@@ -158,7 +158,7 @@
 	</fields>
 	<service>
 	  <name>stunnel</name>
-	  <rcfile>/usr/local/etc/rc.d/stunnel.sh</rcfile>
+	  <rcfile>stunnel.sh</rcfile>
 	  <executable>stunnel</executable>
 	</service>
 	<include_file>/usr/local/pkg/stunnel.inc</include_file>
-- 
cgit v1.2.3


From b997f8957f8ccf90c13fecbf8a3a7625495525f3 Mon Sep 17 00:00:00 2001
From: David Marcin <djmarcin@gmail.com>
Date: Tue, 7 Jul 2015 17:48:42 -0700
Subject: Add ability to specify client mode tunnels.

---
 config/stunnel/stunnel.inc | 1 +
 config/stunnel/stunnel.xml | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/config/stunnel/stunnel.inc b/config/stunnel/stunnel.inc
index fdc72bf2..552603b6 100644
--- a/config/stunnel/stunnel.inc
+++ b/config/stunnel/stunnel.inc
@@ -123,6 +123,7 @@ function stunnel_save($config) {
 	if(!is_array($config['installedpackages']['stunnel']['config'])) { $config['installedpackages']['stunnel']['config']=Array(); }
 	foreach($config['installedpackages']['stunnel']['config'] as $pkgconfig) {
 		fwrite($fout, "\n[" . $pkgconfig['description'] . "]\n");
+		if($pkgconfig['client']) fwrite($fout, "client = yes" . "\n");
 		if($pkgconfig['certificate']) {
 			if(file_exists('/usr/local/etc/stunnel/'.$pkgconfig['certificate'].'.key') and
 			   file_exists('/usr/local/etc/stunnel/'.$pkgconfig['certificate'].'.chain')) {
diff --git a/config/stunnel/stunnel.xml b/config/stunnel/stunnel.xml
index 95dea0c1..11334000 100644
--- a/config/stunnel/stunnel.xml
+++ b/config/stunnel/stunnel.xml
@@ -115,6 +115,12 @@
 			<description>Enter a description for this redirection.</description>
 			<type>input</type>
 		</field>
+		<field>
+			<fielddescr>Client Mode?</fielddescr>
+			<fieldname>client</fieldname>
+			<description>Use client mode for this tunnel (i.e. connect to an SSL server, do not act as an SSL server)</description>
+			<type>checkbox</type>
+		</field>
 		<field>
 			<fielddescr>Listen on IP</fielddescr>
 			<fieldname>localip</fieldname>
-- 
cgit v1.2.3


From dc9c42db566fa60030393b4433c94467d390721e Mon Sep 17 00:00:00 2001
From: David Marcin <djmarcin@gmail.com>
Date: Wed, 15 Jul 2015 22:45:34 -0700
Subject: Bump stunnel version number for config changes.

---
 pkg_config.10.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg_config.10.xml b/pkg_config.10.xml
index 59ccb704..afaf2d02 100644
--- a/pkg_config.10.xml
+++ b/pkg_config.10.xml
@@ -930,7 +930,7 @@
 		<descr>An SSL encryption wrapper between remote client and local or remote servers. </descr>
 		<category>Network Management</category>
 		<depends_on_package_pbi>stunnel-5.07-##ARCH##.pbi</depends_on_package_pbi>
-		<version>5.07</version>
+		<version>5.07.1</version>
 		<status>Stable</status>
 		<pkginfolink>https://doc.pfsense.org/index.php/Stunnel_package</pkginfolink>
 		<required_version>2.2</required_version>
-- 
cgit v1.2.3