/[smeserver]/rpms/e-smith-pop3/sme9/e-smith-pop3-2.4.0-sslio2stunnel.patch
ViewVC logotype

Contents of /rpms/e-smith-pop3/sme9/e-smith-pop3-2.4.0-sslio2stunnel.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph

Revision 1.1 - (show annotations) (download)
Thu Dec 4 22:23:08 2014 UTC (9 years, 11 months ago) by vip-ire
Branch: MAIN
CVS Tags: e-smith-pop3-2_4_0-4_el6_sme, e-smith-pop3-2_4_0-5_el6_sme, e-smith-pop3-2_4_0-6_el6_sme, e-smith-pop3-2_4_0-8_el6_sme, e-smith-pop3-2_4_0-3_el6_sme, e-smith-pop3-2_4_0-2_el6_sme, e-smith-pop3-2_4_0-7_el6_sme, HEAD 
* Thu Dec 4 2014 Daniel Berteaud <daniel@firewall-services.com> 2.4.0-2
- Use stunnel instead of sslio to support TLS [SME: 8716]
1 diff -Nur e-smith-pop3-2.4.0/createlinks e-smith-pop3-2.4.0_bz8716/createlinks
2 --- e-smith-pop3-2.4.0/createlinks 2013-02-07 23:09:04.000000000 +0100
3 +++ e-smith-pop3-2.4.0_bz8716/createlinks 2014-12-04 23:10:43.715000000 +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.4.0/root/etc/e-smith/templates/var/service/pop3s/env/MEMLIMIT e-smith-pop3-2.4.0_bz8716/root/etc/e-smith/templates/var/service/pop3s/env/MEMLIMIT
14 --- e-smith-pop3-2.4.0/root/etc/e-smith/templates/var/service/pop3s/env/MEMLIMIT 2013-02-07 23:09:04.000000000 +0100
15 +++ e-smith-pop3-2.4.0_bz8716/root/etc/e-smith/templates/var/service/pop3s/env/MEMLIMIT 2014-12-04 23:12:04.622000000 +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.4.0/root/etc/e-smith/templates/var/service/pop3s/stunnel.conf/10ssl e-smith-pop3-2.4.0_bz8716/root/etc/e-smith/templates/var/service/pop3s/stunnel.conf/10ssl
25 --- e-smith-pop3-2.4.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.4.0_bz8716/root/etc/e-smith/templates/var/service/pop3s/stunnel.conf/10ssl 2014-12-04 23:07:29.433000000 +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.4.0/root/etc/e-smith/templates/var/service/pop3s/stunnel.conf/20foreground e-smith-pop3-2.4.0_bz8716/root/etc/e-smith/templates/var/service/pop3s/stunnel.conf/20foreground
33 --- e-smith-pop3-2.4.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.4.0_bz8716/root/etc/e-smith/templates/var/service/pop3s/stunnel.conf/20foreground 2014-12-04 23:07:46.342000000 +0100
35 @@ -0,0 +1 @@
36 +foreground = yes
37 diff -Nur e-smith-pop3-2.4.0/root/etc/e-smith/templates/var/service/pop3s/stunnel.conf/30service e-smith-pop3-2.4.0_bz8716/root/etc/e-smith/templates/var/service/pop3s/stunnel.conf/30service
38 --- e-smith-pop3-2.4.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.4.0_bz8716/root/etc/e-smith/templates/var/service/pop3s/stunnel.conf/30service 2014-12-04 23:07:58.608000000 +0100
40 @@ -0,0 +1 @@
41 +service = pop3s
42 diff -Nur e-smith-pop3-2.4.0/root/etc/e-smith/templates/var/service/pop3s/stunnel.conf/40exec e-smith-pop3-2.4.0_bz8716/root/etc/e-smith/templates/var/service/pop3s/stunnel.conf/40exec
43 --- e-smith-pop3-2.4.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.4.0_bz8716/root/etc/e-smith/templates/var/service/pop3s/stunnel.conf/40exec 2014-12-04 23:08:39.614000000 +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.4.0/root/var/service/pop3s/run e-smith-pop3-2.4.0_bz8716/root/var/service/pop3s/run
49 --- e-smith-pop3-2.4.0/root/var/service/pop3s/run 2013-02-07 23:09:04.000000000 +0100
50 +++ e-smith-pop3-2.4.0_bz8716/root/var/service/pop3s/run 2014-12-04 23:13:04.307000000 +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
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed