e-smith-imap/sme8/e-smith-imap-2.2.0-stunnel.patch

diff -ruN e-smith-imap-2.2.0.orig/root/etc/e-smith/templates/etc/hosts.allow/imaps e-smith-imap-2.2.0/root/etc/e-smith/templates/etc/hosts.allow/imaps
--- e-smith-imap-2.2.0.orig/root/etc/e-smith/templates/etc/hosts.allow/imaps    1969-12-31 19:00:00.000000000 -0500
+++ e-smith-imap-2.2.0/root/etc/e-smith/templates/etc/hosts.allow/imaps 2014-02-09 19:03:19.664805790 -0500
@@ -0,0 +1,3 @@
+{
+    $DB->hosts_allow_spec('imaps', 'imaps');
+}
diff -ruN e-smith-imap-2.2.0.orig/root/etc/e-smith/templates/var/service/imaps/config/CipherSuite e-smith-imap-2.2.0/root/etc/e-smith/templates/var/service/imaps/config/CipherSuite
--- e-smith-imap-2.2.0.orig/root/etc/e-smith/templates/var/service/imaps/config/CipherSuite     1969-12-31 19:00:00.000000000 -0500
+++ e-smith-imap-2.2.0/root/etc/e-smith/templates/var/service/imaps/config/CipherSuite  2014-02-09 19:02:10.858153008 -0500
@@ -0,0 +1,5 @@
+{
+    my $setting = $imaps{CipherSuite} || $modSSL{CipherSuite}
+        || "HIGH:!SSLv2:!ADH:!aNULL:!MD5:!RC4";
+    "CipherSuite=$setting";
+}
diff -ruN e-smith-imap-2.2.0.orig/root/var/service/imaps/run e-smith-imap-2.2.0/root/var/service/imaps/run
--- e-smith-imap-2.2.0.orig/root/var/service/imaps/run  2014-02-09 18:56:32.735827213 -0500
+++ e-smith-imap-2.2.0/root/var/service/imaps/run       2014-02-09 19:04:18.467509405 -0500
@@ -13,6 +13,9 @@
        -l ${LOCALNAME:-0} \
        ${LISTENIP:-0} \
        ${PORT:-imaps} \
-           sslio -vv -/ ../imap/ssl -C imapd.pem -u stunnel \
+           /usr/sbin/stunnel-tls -p /service/imap/ssl/imapd.pem \
+              -C "${CipherSuite:-HIGH:!SSLv2:!ADH:!aNULL:!MD5:!RC4}" \
+              -N imaps \
+              -l /usr/bin/imapfront-auth -- \
                /usr/bin/imapfront-auth \
                    "${imapdpath:-/usr/libexec/dovecot/imap}"
1	charliebrady	1.1	diff -ruN e-smith-imap-2.2.0.orig/root/etc/e-smith/templates/etc/hosts.allow/imaps e-smith-imap-2.2.0/root/etc/e-smith/templates/etc/hosts.allow/imaps
2			--- e-smith-imap-2.2.0.orig/root/etc/e-smith/templates/etc/hosts.allow/imaps 1969-12-31 19:00:00.000000000 -0500
3			+++ e-smith-imap-2.2.0/root/etc/e-smith/templates/etc/hosts.allow/imaps 2014-02-09 19:03:19.664805790 -0500
4			@@ -0,0 +1,3 @@
5			+{
6			+ $DB->hosts_allow_spec('imaps', 'imaps');
7			+}
8			diff -ruN e-smith-imap-2.2.0.orig/root/etc/e-smith/templates/var/service/imaps/config/CipherSuite e-smith-imap-2.2.0/root/etc/e-smith/templates/var/service/imaps/config/CipherSuite
9			--- e-smith-imap-2.2.0.orig/root/etc/e-smith/templates/var/service/imaps/config/CipherSuite 1969-12-31 19:00:00.000000000 -0500
10			+++ e-smith-imap-2.2.0/root/etc/e-smith/templates/var/service/imaps/config/CipherSuite 2014-02-09 19:02:10.858153008 -0500
11			@@ -0,0 +1,5 @@
12			+{
13			+ my $setting = $imaps{CipherSuite} \|\| $modSSL{CipherSuite}
14			+ \|\| "HIGH:!SSLv2:!ADH:!aNULL:!MD5:!RC4";
15			+ "CipherSuite=$setting";
16			+}
17			diff -ruN e-smith-imap-2.2.0.orig/root/var/service/imaps/run e-smith-imap-2.2.0/root/var/service/imaps/run
18			--- e-smith-imap-2.2.0.orig/root/var/service/imaps/run 2014-02-09 18:56:32.735827213 -0500
19			+++ e-smith-imap-2.2.0/root/var/service/imaps/run 2014-02-09 19:04:18.467509405 -0500
20			@@ -13,6 +13,9 @@
21			-l ${LOCALNAME:-0} \
22			${LISTENIP:-0} \
23			${PORT:-imaps} \
24			- sslio -vv -/ ../imap/ssl -C imapd.pem -u stunnel \
25			+ /usr/sbin/stunnel-tls -p /service/imap/ssl/imapd.pem \
26			+ -C "${CipherSuite:-HIGH:!SSLv2:!ADH:!aNULL:!MD5:!RC4}" \
27			+ -N imaps \
28			+ -l /usr/bin/imapfront-auth -- \
29			/usr/bin/imapfront-auth \
30			"${imapdpath:-/usr/libexec/dovecot/imap}"