1 |
vip-ire |
1.1 |
diff -Nur -x '*.orig' -x '*.rej' e-smith-pop3-2.2.0/createlinks mezzanine_patched_e-smith-pop3-2.2.0/createlinks |
2 |
|
|
--- e-smith-pop3-2.2.0/createlinks 2008-10-07 19:36:47.000000000 +0200 |
3 |
|
|
+++ mezzanine_patched_e-smith-pop3-2.2.0/createlinks 2010-09-22 19:49:19.000000000 +0200 |
4 |
|
|
@@ -11,6 +11,9 @@ |
5 |
|
|
} |
6 |
|
|
} |
7 |
|
|
|
8 |
|
|
+templates2events("/etc/pam.d/pop3", "console-save"); |
9 |
|
|
+templates2events("/etc/pam.d/pop3", "bootstrap-console-save"); |
10 |
|
|
+ |
11 |
|
|
foreach my $event (qw(network-delete network-create email-update)) |
12 |
|
|
{ |
13 |
|
|
safe_symlink("sigusr1", |
14 |
|
|
diff -Nur -x '*.orig' -x '*.rej' e-smith-pop3-2.2.0/root/etc/e-smith/templates/etc/pam.d/pop3/10authPOP3users mezzanine_patched_e-smith-pop3-2.2.0/root/etc/e-smith/templates/etc/pam.d/pop3/10authPOP3users |
15 |
|
|
--- e-smith-pop3-2.2.0/root/etc/e-smith/templates/etc/pam.d/pop3/10authPOP3users 1970-01-01 01:00:00.000000000 +0100 |
16 |
|
|
+++ mezzanine_patched_e-smith-pop3-2.2.0/root/etc/e-smith/templates/etc/pam.d/pop3/10authPOP3users 2010-09-22 19:45:14.000000000 +0200 |
17 |
|
|
@@ -0,0 +1 @@ |
18 |
|
|
+auth required pam_listfile.so item=user sense=allow file=/etc/e-smith/pam/accounts.allow onerr=fail |
19 |
|
|
diff -Nur -x '*.orig' -x '*.rej' e-smith-pop3-2.2.0/root/etc/e-smith/templates/etc/pam.d/pop3/20auth mezzanine_patched_e-smith-pop3-2.2.0/root/etc/e-smith/templates/etc/pam.d/pop3/20auth |
20 |
|
|
--- e-smith-pop3-2.2.0/root/etc/e-smith/templates/etc/pam.d/pop3/20auth 1970-01-01 01:00:00.000000000 +0100 |
21 |
|
|
+++ mezzanine_patched_e-smith-pop3-2.2.0/root/etc/e-smith/templates/etc/pam.d/pop3/20auth 2010-09-22 19:45:14.000000000 +0200 |
22 |
|
|
@@ -0,0 +1,3 @@ |
23 |
|
|
+auth { -f "/lib/security/pam_pwdb.so" || |
24 |
|
|
+ -f "/lib64/security/pam_pwdb.so" ? "required pam_stack.so service=system-auth" : |
25 |
|
|
+ "include system-auth" } |
26 |
|
|
diff -Nur -x '*.orig' -x '*.rej' e-smith-pop3-2.2.0/root/etc/e-smith/templates/etc/pam.d/pop3/30account mezzanine_patched_e-smith-pop3-2.2.0/root/etc/e-smith/templates/etc/pam.d/pop3/30account |
27 |
|
|
--- e-smith-pop3-2.2.0/root/etc/e-smith/templates/etc/pam.d/pop3/30account 1970-01-01 01:00:00.000000000 +0100 |
28 |
|
|
+++ mezzanine_patched_e-smith-pop3-2.2.0/root/etc/e-smith/templates/etc/pam.d/pop3/30account 2010-09-22 19:45:14.000000000 +0200 |
29 |
|
|
@@ -0,0 +1,3 @@ |
30 |
|
|
+account { -f "/lib/security/pam_pwdb.so" || |
31 |
|
|
+ -f "/lib64/security/pam_pwdb.so" ? "required pam_stack.so service=system-auth" : |
32 |
|
|
+ "include system-auth" } |
33 |
|
|
diff -Nur -x '*.orig' -x '*.rej' e-smith-pop3-2.2.0/root/etc/e-smith/templates/etc/pam.d/pop3/40session mezzanine_patched_e-smith-pop3-2.2.0/root/etc/e-smith/templates/etc/pam.d/pop3/40session |
34 |
|
|
--- e-smith-pop3-2.2.0/root/etc/e-smith/templates/etc/pam.d/pop3/40session 1970-01-01 01:00:00.000000000 +0100 |
35 |
|
|
+++ mezzanine_patched_e-smith-pop3-2.2.0/root/etc/e-smith/templates/etc/pam.d/pop3/40session 2010-09-22 19:45:14.000000000 +0200 |
36 |
|
|
@@ -0,0 +1,3 @@ |
37 |
|
|
+session { -f "/lib/security/pam_pwdb.so" || |
38 |
|
|
+ -f "/lib64/security/pam_pwdb.so" ? "required pam_stack.so service=system-auth" : |
39 |
|
|
+ "include system-auth" } |
40 |
|
|
diff -Nur -x '*.orig' -x '*.rej' e-smith-pop3-2.2.0/root/var/service/pop3/run mezzanine_patched_e-smith-pop3-2.2.0/root/var/service/pop3/run |
41 |
|
|
--- e-smith-pop3-2.2.0/root/var/service/pop3/run 2006-03-15 22:34:47.000000000 +0100 |
42 |
|
|
+++ mezzanine_patched_e-smith-pop3-2.2.0/root/var/service/pop3/run 2010-09-22 19:45:14.000000000 +0200 |
43 |
|
|
@@ -7,7 +7,7 @@ |
44 |
|
|
exec 2>&1 |
45 |
|
|
# Generate ACL files in ./peers |
46 |
|
|
./control/1 |
47 |
|
|
-exec /usr/local/bin/softlimit -m 5000000 \ |
48 |
|
|
+exec /usr/local/bin/softlimit -m 10000000 \ |
49 |
|
|
tcpsvd \ |
50 |
|
|
-v \ |
51 |
|
|
-i ./peers \ |
52 |
|
|
@@ -17,4 +17,4 @@ |
53 |
|
|
${LISTENIP:-0} \ |
54 |
|
|
${PORT:-pop3} \ |
55 |
|
|
/var/qmail/bin/qmail-popup $fqdn \ |
56 |
|
|
- checkpassword /var/qmail/bin/qmail-pop3d Maildir |
57 |
|
|
+ checkpassword-pam -s pop3 /var/qmail/bin/qmail-pop3d Maildir |
58 |
|
|
diff -Nur -x '*.orig' -x '*.rej' e-smith-pop3-2.2.0/root/var/service/pop3s/run mezzanine_patched_e-smith-pop3-2.2.0/root/var/service/pop3s/run |
59 |
|
|
--- e-smith-pop3-2.2.0/root/var/service/pop3s/run 2005-08-10 22:49:11.000000000 +0200 |
60 |
|
|
+++ mezzanine_patched_e-smith-pop3-2.2.0/root/var/service/pop3s/run 2010-09-22 19:45:14.000000000 +0200 |
61 |
|
|
@@ -5,7 +5,7 @@ |
62 |
|
|
fqdn="$hostname.$domain" |
63 |
|
|
|
64 |
|
|
exec 2>&1 |
65 |
|
|
-exec /usr/local/bin/softlimit -m 5000000 \ |
66 |
|
|
+exec /usr/local/bin/softlimit -m 10000000 \ |
67 |
|
|
tcpsvd \ |
68 |
|
|
-v \ |
69 |
|
|
-i ./peers \ |
70 |
|
|
@@ -16,4 +16,4 @@ |
71 |
|
|
${PORT:-pop3s} \ |
72 |
|
|
sslio -vv -/ /service/imap/ssl -u stunnel -C imapd.pem \ |
73 |
|
|
/var/qmail/bin/qmail-popup $fqdn \ |
74 |
|
|
- checkpassword /var/qmail/bin/qmail-pop3d Maildir |
75 |
|
|
+ checkpassword-pam -s pop3 /var/qmail/bin/qmail-pop3d Maildir |