e-smith-pop3/sme8/e-smith-pop3-2.2.0-sslio2stunnel.patch

diff -Nur e-smith-pop3-2.2.0/createlinks e-smith-pop3-2.2.0_bz8707/createlinks
--- e-smith-pop3-2.2.0/createlinks      2014-12-04 23:30:52.348000000 +0100
+++ e-smith-pop3-2.2.0_bz8707/createlinks       2014-12-04 23:31:55.646000000 +0100
@@ -5,7 +5,7 @@
 foreach my $event (qw(
     bootstrap-console-save network-delete network-create email-update))
 {
-    foreach (qw(pop3/peers/0 pop3/peers/local pop3s/peers/0 pop3s/peers/local))
+    foreach (qw(pop3/peers/0 pop3/peers/local pop3s/peers/0 pop3s/peers/local pop3s/stunnel.conf))
     {
         templates2events("/var/service/$_", $event);
     }
diff -Nur e-smith-pop3-2.2.0/root/etc/e-smith/templates/var/service/pop3s/env/MEMLIMIT e-smith-pop3-2.2.0_bz8707/root/etc/e-smith/templates/var/service/pop3s/env/MEMLIMIT
--- e-smith-pop3-2.2.0/root/etc/e-smith/templates/var/service/pop3s/env/MEMLIMIT        2014-12-04 23:30:52.351000000 +0100
+++ e-smith-pop3-2.2.0_bz8707/root/etc/e-smith/templates/var/service/pop3s/env/MEMLIMIT 2014-12-04 23:31:55.647000000 +0100
@@ -1,6 +1,6 @@
 {
 # memory limit to catch any memory leak before it kills the system
-my $MIN_MEMORY_LIMIT = 40000000;
+my $MIN_MEMORY_LIMIT = 80000000;
 
 # The MIN_MEMORY_LIMIT is returned unless the DB variable is defined and greater than MIN_MEMORY_LIMIT
 my $limit = $pop3s{MemLimit} || $MIN_MEMORY_LIMIT;
diff -Nur e-smith-pop3-2.2.0/root/etc/e-smith/templates/var/service/pop3s/stunnel.conf/10ssl e-smith-pop3-2.2.0_bz8707/root/etc/e-smith/templates/var/service/pop3s/stunnel.conf/10ssl
--- e-smith-pop3-2.2.0/root/etc/e-smith/templates/var/service/pop3s/stunnel.conf/10ssl  1970-01-01 01:00:00.000000000 +0100
+++ e-smith-pop3-2.2.0_bz8707/root/etc/e-smith/templates/var/service/pop3s/stunnel.conf/10ssl   2014-12-04 23:31:55.647000000 +0100
@@ -0,0 +1,4 @@
+cert = /service/imap/ssl/imapd.pem
+options = NO_SSLv2
+options = NO_SSLv3
+
diff -Nur e-smith-pop3-2.2.0/root/etc/e-smith/templates/var/service/pop3s/stunnel.conf/20foreground e-smith-pop3-2.2.0_bz8707/root/etc/e-smith/templates/var/service/pop3s/stunnel.conf/20foreground
--- e-smith-pop3-2.2.0/root/etc/e-smith/templates/var/service/pop3s/stunnel.conf/20foreground   1970-01-01 01:00:00.000000000 +0100
+++ e-smith-pop3-2.2.0_bz8707/root/etc/e-smith/templates/var/service/pop3s/stunnel.conf/20foreground    2014-12-04 23:31:55.647000000 +0100
@@ -0,0 +1 @@
+foreground = yes
diff -Nur e-smith-pop3-2.2.0/root/etc/e-smith/templates/var/service/pop3s/stunnel.conf/30service e-smith-pop3-2.2.0_bz8707/root/etc/e-smith/templates/var/service/pop3s/stunnel.conf/30service
--- e-smith-pop3-2.2.0/root/etc/e-smith/templates/var/service/pop3s/stunnel.conf/30service      1970-01-01 01:00:00.000000000 +0100
+++ e-smith-pop3-2.2.0_bz8707/root/etc/e-smith/templates/var/service/pop3s/stunnel.conf/30service       2014-12-04 23:31:55.647000000 +0100
@@ -0,0 +1 @@
+service = pop3s
diff -Nur e-smith-pop3-2.2.0/root/etc/e-smith/templates/var/service/pop3s/stunnel.conf/40exec e-smith-pop3-2.2.0_bz8707/root/etc/e-smith/templates/var/service/pop3s/stunnel.conf/40exec
--- e-smith-pop3-2.2.0/root/etc/e-smith/templates/var/service/pop3s/stunnel.conf/40exec 1970-01-01 01:00:00.000000000 +0100
+++ e-smith-pop3-2.2.0_bz8707/root/etc/e-smith/templates/var/service/pop3s/stunnel.conf/40exec  2014-12-04 23:31:55.648000000 +0100
@@ -0,0 +1,2 @@
+exec = /var/qmail/bin/qmail-popup
+execargs = qmail-popup {$SystemName}.{$DomainName} checkpassword-pam -s pop3 /var/qmail/bin/qmail-pop3d Maildir
diff -Nur e-smith-pop3-2.2.0/root/var/service/pop3s/run e-smith-pop3-2.2.0_bz8707/root/var/service/pop3s/run
--- e-smith-pop3-2.2.0/root/var/service/pop3s/run       2014-12-04 23:30:52.348000000 +0100
+++ e-smith-pop3-2.2.0_bz8707/root/var/service/pop3s/run        2014-12-04 23:31:55.648000000 +0100
@@ -1,8 +1,5 @@
 #!/bin/sh
 
-hostname=$(/sbin/e-smith/config get SystemName)
-domain=$(/sbin/e-smith/config get DomainName)
-fqdn="$hostname.$domain"
 MEM="`head -1 ./env/MEMLIMIT`"
 
 exec 2>&1
@@ -15,6 +12,4 @@
        -l ${LOCALNAME:-0} \
        ${LISTENIP:-0} \
        ${PORT:-pop3s} \
-           sslio -vv -/ /service/imap/ssl -u stunnel -C imapd.pem \
-                   /var/qmail/bin/qmail-popup $fqdn \
-                       checkpassword-pam -s pop3 /var/qmail/bin/qmail-pop3d Maildir
+           /usr/bin/stunnel stunnel.conf
1	diff -Nur e-smith-pop3-2.2.0/createlinks e-smith-pop3-2.2.0_bz8707/createlinks
2	--- e-smith-pop3-2.2.0/createlinks 2014-12-04 23:30:52.348000000 +0100
3	+++ e-smith-pop3-2.2.0_bz8707/createlinks 2014-12-04 23:31:55.646000000 +0100
4	@@ -5,7 +5,7 @@
5	foreach my $event (qw(
6	bootstrap-console-save network-delete network-create email-update))
7	{
8	- foreach (qw(pop3/peers/0 pop3/peers/local pop3s/peers/0 pop3s/peers/local))
9	+ foreach (qw(pop3/peers/0 pop3/peers/local pop3s/peers/0 pop3s/peers/local pop3s/stunnel.conf))
10	{
11	templates2events("/var/service/$_", $event);
12	}
13	diff -Nur e-smith-pop3-2.2.0/root/etc/e-smith/templates/var/service/pop3s/env/MEMLIMIT e-smith-pop3-2.2.0_bz8707/root/etc/e-smith/templates/var/service/pop3s/env/MEMLIMIT
14	--- e-smith-pop3-2.2.0/root/etc/e-smith/templates/var/service/pop3s/env/MEMLIMIT 2014-12-04 23:30:52.351000000 +0100
15	+++ e-smith-pop3-2.2.0_bz8707/root/etc/e-smith/templates/var/service/pop3s/env/MEMLIMIT 2014-12-04 23:31:55.647000000 +0100
16	@@ -1,6 +1,6 @@
17	{
18	# memory limit to catch any memory leak before it kills the system
19	-my $MIN_MEMORY_LIMIT = 40000000;
20	+my $MIN_MEMORY_LIMIT = 80000000;
21
22	# The MIN_MEMORY_LIMIT is returned unless the DB variable is defined and greater than MIN_MEMORY_LIMIT
23	my $limit = $pop3s{MemLimit} \|\| $MIN_MEMORY_LIMIT;
24	diff -Nur e-smith-pop3-2.2.0/root/etc/e-smith/templates/var/service/pop3s/stunnel.conf/10ssl e-smith-pop3-2.2.0_bz8707/root/etc/e-smith/templates/var/service/pop3s/stunnel.conf/10ssl
25	--- e-smith-pop3-2.2.0/root/etc/e-smith/templates/var/service/pop3s/stunnel.conf/10ssl 1970-01-01 01:00:00.000000000 +0100
26	+++ e-smith-pop3-2.2.0_bz8707/root/etc/e-smith/templates/var/service/pop3s/stunnel.conf/10ssl 2014-12-04 23:31:55.647000000 +0100
27	@@ -0,0 +1,4 @@
28	+cert = /service/imap/ssl/imapd.pem
29	+options = NO_SSLv2
30	+options = NO_SSLv3
31	+
32	diff -Nur e-smith-pop3-2.2.0/root/etc/e-smith/templates/var/service/pop3s/stunnel.conf/20foreground e-smith-pop3-2.2.0_bz8707/root/etc/e-smith/templates/var/service/pop3s/stunnel.conf/20foreground
33	--- e-smith-pop3-2.2.0/root/etc/e-smith/templates/var/service/pop3s/stunnel.conf/20foreground 1970-01-01 01:00:00.000000000 +0100
34	+++ e-smith-pop3-2.2.0_bz8707/root/etc/e-smith/templates/var/service/pop3s/stunnel.conf/20foreground 2014-12-04 23:31:55.647000000 +0100
35	@@ -0,0 +1 @@
36	+foreground = yes
37	diff -Nur e-smith-pop3-2.2.0/root/etc/e-smith/templates/var/service/pop3s/stunnel.conf/30service e-smith-pop3-2.2.0_bz8707/root/etc/e-smith/templates/var/service/pop3s/stunnel.conf/30service
38	--- e-smith-pop3-2.2.0/root/etc/e-smith/templates/var/service/pop3s/stunnel.conf/30service 1970-01-01 01:00:00.000000000 +0100
39	+++ e-smith-pop3-2.2.0_bz8707/root/etc/e-smith/templates/var/service/pop3s/stunnel.conf/30service 2014-12-04 23:31:55.647000000 +0100
40	@@ -0,0 +1 @@
41	+service = pop3s
42	diff -Nur e-smith-pop3-2.2.0/root/etc/e-smith/templates/var/service/pop3s/stunnel.conf/40exec e-smith-pop3-2.2.0_bz8707/root/etc/e-smith/templates/var/service/pop3s/stunnel.conf/40exec
43	--- e-smith-pop3-2.2.0/root/etc/e-smith/templates/var/service/pop3s/stunnel.conf/40exec 1970-01-01 01:00:00.000000000 +0100
44	+++ e-smith-pop3-2.2.0_bz8707/root/etc/e-smith/templates/var/service/pop3s/stunnel.conf/40exec 2014-12-04 23:31:55.648000000 +0100
45	@@ -0,0 +1,2 @@
46	+exec = /var/qmail/bin/qmail-popup
47	+execargs = qmail-popup {$SystemName}.{$DomainName} checkpassword-pam -s pop3 /var/qmail/bin/qmail-pop3d Maildir
48	diff -Nur e-smith-pop3-2.2.0/root/var/service/pop3s/run e-smith-pop3-2.2.0_bz8707/root/var/service/pop3s/run
49	--- e-smith-pop3-2.2.0/root/var/service/pop3s/run 2014-12-04 23:30:52.348000000 +0100
50	+++ e-smith-pop3-2.2.0_bz8707/root/var/service/pop3s/run 2014-12-04 23:31:55.648000000 +0100
51	@@ -1,8 +1,5 @@
52	#!/bin/sh
53
54	-hostname=$(/sbin/e-smith/config get SystemName)
55	-domain=$(/sbin/e-smith/config get DomainName)
56	-fqdn="$hostname.$domain"
57	MEM="`head -1 ./env/MEMLIMIT`"
58
59	exec 2>&1
60	@@ -15,6 +12,4 @@
61	-l ${LOCALNAME:-0} \
62	${LISTENIP:-0} \
63	${PORT:-pop3s} \
64	- sslio -vv -/ /service/imap/ssl -u stunnel -C imapd.pem \
65	- /var/qmail/bin/qmail-popup $fqdn \
66	- checkpassword-pam -s pop3 /var/qmail/bin/qmail-pop3d Maildir
67	+ /usr/bin/stunnel stunnel.conf