/[smecontribs]/rpms/smeserver-wbl/contribs10/smeserver-wbl-0.5.0-bz11678-bz11955.patch
ViewVC logotype

Contents of /rpms/smeserver-wbl/contribs10/smeserver-wbl-0.5.0-bz11678-bz11955.patch

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

Revision 1.1 - (show annotations) (download)
Sun Apr 17 19:34:02 2022 UTC (2 years, 1 month ago) by jpp
Branch: MAIN
CVS Tags: smeserver-wbl-0_5_0-8_el7_sme, smeserver-wbl-0_5_0-9_el7_sme, smeserver-wbl-0_5_0-7_el7_sme, HEAD 
* Sun Apr 17 2022 Jean-Philippe Pialasse <tests@pialasse.com> 0.5.0-7.sme
- fix multiple rpm owned files [SME: 11678]
- fix long update time [SME: 11955]
1 diff -Nur --no-dereference smeserver-wbl-0.5.0.old/createlinks smeserver-wbl-0.5.0/createlinks
2 --- smeserver-wbl-0.5.0.old/createlinks 2022-04-17 15:25:33.797000000 -0400
3 +++ smeserver-wbl-0.5.0/createlinks 2022-04-17 15:31:16.600000000 -0400
4 @@ -7,13 +7,26 @@
5 my $panel = "manager";
6 panel_link("wbl", $panel);
7
8 -templates2events("/var/qmail/control/badmailfrom", "email-update");
9 templates2events("/var/service/qpsmtpd/config/badmailfrom", "email-update");
10 -templates2events("/var/service/qpsmtpd/config/badhelo", "email-update");
11 templates2events("/var/service/qpsmtpd/config/whitelisthelo", "email-update");
12 templates2events("/var/service/qpsmtpd/config/whitelisthosts", "email-update");
13 templates2events("/var/service/qpsmtpd/config/whitelistsenders", "email-update");
14
15 +
16 +my $wbl = "wbl-update";
17 +templates2events("/var/qmail/control/badmailfrom", "$wbl");
18 +templates2events("/var/service/qpsmtpd/config/badmailfrom", "$wbl");
19 +templates2events("/var/service/qpsmtpd/config/badhelo", "$wbl");
20 +templates2events("/var/service/qpsmtpd/config/dnsbl_zones", "$wbl");
21 +templates2events("/var/service/qpsmtpd/config/rhsbl_zones ", "$wbl");
22 +templates2events("/var/service/qpsmtpd/config/whitelisthelo", "$wbl");
23 +templates2events("/var/service/qpsmtpd/config/whitelisthosts", "$wbl");
24 +templates2events("/var/service/qpsmtpd/config/whitelistsenders", "$wbl");
25 +templates2events("/etc/mail/spamassassin/local.cf", "$wbl");
26 +safe_symlink("restart", "root/etc/e-smith/events/$wbl/services2adjust/spamassassin");
27 +safe_symlink("../../plugins/11whitelist",
28 + "root/etc/e-smith/templates/var/service/qpsmtpd/config/peers/0/11whitelist");
29 +
30 # own event
31 my $wbl = "smeserver-wbl-update";
32 templates2events("/var/qmail/control/badmailfrom", "$wbl");
33 diff -Nur --no-dereference smeserver-wbl-0.5.0.old/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/wbl.pm smeserver-wbl-0.5.0/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/wbl.pm
34 --- smeserver-wbl-0.5.0.old/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/wbl.pm 2022-04-17 15:25:33.784000000 -0400
35 +++ smeserver-wbl-0.5.0/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/wbl.pm 2022-04-17 15:28:04.611000000 -0400
36 @@ -228,7 +228,7 @@
37 }
38
39 ##Update email settings
40 - unless ( system ("/sbin/e-smith/signal-event", "smeserver-wbl-update") == 0 ){
41 + unless ( system ("/sbin/e-smith/signal-event", "wbl-update") == 0 ){
42 $fm->error('ERROR_UPDATING');
43 return undef;
44 }
45 @@ -321,7 +321,7 @@
46 }
47
48 ##Update email settings
49 - unless ( system ("/sbin/e-smith/signal-event", "smeserver-wbl-update") == 0 ){
50 + unless ( system ("/sbin/e-smith/signal-event", "wbl-update") == 0 ){
51 $fm->error('ERROR_UPDATING');
52 return undef;
53 }
54 @@ -334,7 +334,7 @@
55 my $fm = shift;
56 my $q = $fm->{'cgi'};
57
58 - unless ( system ("/sbin/e-smith/signal-event", "smeserver-wbl-update") == 0 )
59 + unless ( system ("/sbin/e-smith/signal-event", "wbl-update") == 0 )
60 {
61 $fm->error('ERROR_UPDATING');
62 return undef;
63 @@ -394,7 +394,7 @@
64
65 ##Update email settings
66
67 - unless ( system ("/sbin/e-smith/signal-event", "smeserver-wbl-update") == 0 ){
68 + unless ( system ("/sbin/e-smith/signal-event", "wbl-update") == 0 ){
69 $fm->error('ERROR_UPDATING');
70 return undef;
71 }
72 diff -Nur --no-dereference smeserver-wbl-0.5.0.old/root/usr/share/smanager/lib/SrvMngr/Controller/Wbl.pm smeserver-wbl-0.5.0/root/usr/share/smanager/lib/SrvMngr/Controller/Wbl.pm
73 --- smeserver-wbl-0.5.0.old/root/usr/share/smanager/lib/SrvMngr/Controller/Wbl.pm 2020-06-06 13:25:03.000000000 -0400
74 +++ smeserver-wbl-0.5.0/root/usr/share/smanager/lib/SrvMngr/Controller/Wbl.pm 2022-04-17 15:28:28.183000000 -0400
75 @@ -369,7 +369,7 @@
76 $db->set_prop('qpsmtpd', 'RBLList', "$rbllistdb");
77
78 #Update email settings
79 - unless ( system ("/sbin/e-smith/signal-event", "smeserver-wbl-update") == 0 ){
80 + unless ( system ("/sbin/e-smith/signal-event", "wbl-update") == 0 ){
81 return 'RBL : ' . $c->l('wbl_ERROR_UPDATING');
82 }
83
84 @@ -441,7 +441,7 @@
85 }
86
87 #Update email settings
88 - unless ( system ("/sbin/e-smith/signal-event", "smeserver-wbl-update") == 0 ) {
89 + unless ( system ("/sbin/e-smith/signal-event", "wbl-update") == 0 ) {
90 return 'BLACK: '. $c->l('wbl_ERROR_UPDATING');
91 }
92
93 @@ -541,7 +541,7 @@
94 }
95
96 #Update email settings
97 - unless ( system ("/sbin/e-smith/signal-event", "smeserver-wbl-update") == 0 ) {
98 + unless ( system ("/sbin/e-smith/signal-event", "wbl-update") == 0 ) {
99 return 'WHITE: '. $c->l('wbl_ERROR_UPDATING');
100 }
101
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed