/[smecontribs]/rpms/smeserver-fetchmail/contribs10/smeserver-fetchmail-1.6-bz11979-ids.patch
ViewVC logotype

Diff of /rpms/smeserver-fetchmail/contribs10/smeserver-fetchmail-1.6-bz11979-ids.patch

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

Revision 1.1 by jpp, Thu Jul 28 15:13:34 2022 UTC Revision 1.4 by jpp, Sat Jul 30 02:33:49 2022 UTC
# Line 1  Line 1 
1  diff -Nur --no-dereference smeserver-fetchmail-1.6.old/createlinks smeserver-fetchmail-1.6/createlinks  diff -Nur --no-dereference smeserver-fetchmail-1.6.old/createlinks smeserver-fetchmail-1.6/createlinks
2  --- smeserver-fetchmail-1.6.old/createlinks     2022-07-28 10:33:25.211000000 -0400  --- smeserver-fetchmail-1.6.old/createlinks     2022-07-28 10:33:25.211000000 -0400
3  +++ smeserver-fetchmail-1.6/createlinks 2022-07-28 11:10:53.157000000 -0400  +++ smeserver-fetchmail-1.6/createlinks 2022-07-29 22:20:19.665000000 -0400
4  @@ -12,8 +12,9 @@  @@ -6,20 +6,17 @@
5     #see the /etc/systemd/system-preset/49-koozali.preset should be present for systemd integration on all you yum update event
6    
7     foreach my $file (qw(
8    -                /etc/systemd/system-preset/49-koozali.preset
9    +               /etc/fetchmail
10    +               /etc/startmail
11    +               /etc/crontab
12     ))
13     {
14       templates2events( $file, $event );       templates2events( $file, $event );
15   }   }
16   #action needed in case we have a systemd unit   #action needed in case we have a systemd unit
17  -event_link('systemd-default', $event, '10');  -event_link('systemd-default', $event, '10');
18  -event_link('systemd-reload', $event, '50');  -event_link('systemd-reload', $event, '50');
19    -#action specific to this package
20    -#event_link('action', $event, '30');
21    -#services we need to restart
22    -#safe_symlink('restart',root/etc/e-smith/events/$event/services2adjust/service);
23    -#and Server Manager panel link
24    -#panel_link('somefunction', 'manager');
25  +event_link('systemd-default', $event, '88');  +event_link('systemd-default', $event, '88');
26  +event_link('systemd-reload', $event, '89');  +event_link('systemd-reload', $event, '89');
 +event_link('fetchmail-migrate-fetchids', $event, '91');  
  #action specific to this package  
  #event_link('action', $event, '30');  
  #services we need to restart  
 diff -Nur --no-dereference smeserver-fetchmail-1.6.old/root/etc/e-smith/events/actions/fetchmail-migrate-fetchids smeserver-fetchmail-1.6/root/etc/e-smith/events/actions/fetchmail-migrate-fetchids  
 --- smeserver-fetchmail-1.6.old/root/etc/e-smith/events/actions/fetchmail-migrate-fetchids      1969-12-31 19:00:00.000000000 -0500  
 +++ smeserver-fetchmail-1.6/root/etc/e-smith/events/actions/fetchmail-migrate-fetchids  2022-07-28 11:06:55.577000000 -0400  
 @@ -0,0 +1,15 @@  
 +#!/usr/bin/perl  
27  +  +
28  +use File::Copy;  
29  +   #--------------------------------------------------
30  +my $original_file = "/run/lock/fetchmail/.fetchids";   # functions for manager panel
31  +my $new_file = "/var/lib/fetchmail/.fetchids";  diff -Nur --no-dereference smeserver-fetchmail-1.6.old/root/etc/e-smith/templates/etc/fetchmail/90fetchmail smeserver-fetchmail-1.6/root/etc/e-smith/templates/etc/fetchmail/90fetchmail
32  +my $status=`/usr/bin/systemctl is-active fetchmail.service`;  --- smeserver-fetchmail-1.6.old/root/etc/e-smith/templates/etc/fetchmail/90fetchmail    2022-07-28 10:33:25.177000000 -0400
33  +  +++ smeserver-fetchmail-1.6/root/etc/e-smith/templates/etc/fetchmail/90fetchmail        2022-07-28 11:17:18.575000000 -0400
34  +exit 0 if ( -f $new_file ) ;  @@ -322,6 +322,7 @@
35  +exit 0 unless ( -f $original_file ) ;                          my $size = $db->get_prop('qmail','MaxMessageSize') || '0';
36  +                          my $mdbg='-l' . $size . ' -d0 --silent --syslog';
37  +system("/usr/bin/systemctl stop fetchmail.service") if ( $status eq "active");                          if($Debug eq "YES") { $mdbg='-l' . $size . ' -d0 --verbose --syslog'; }
38  +#move($original_file, $new_file) or warn "The move operation failed: $!";  +                       $mdbg .= " -i /var/lib/fetchmail/.fetchids "; # fix SME: 11979
39  +system("/usr/bin/mv $original_file $new_file") == 0 or warn "The move operation failed: $!";  
40  +system("/usr/bin/systemctl start fetchmail.service") if ( $status eq "active");                                  my $staticvalue  = "/usr/bin/fetchmail $mdbg --fetchmailrc - <<EOF\n" ;
41                             $staticvalue .= "set postmaster \"postmaster\@$dom\"\n" ;

Legend:
Removed lines/characters  
Changed lines/characters
  Added lines/characters
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed