| 1 |
jpp |
1.1 |
diff -Nur --no-dereference e-smith-email-5.6.0.old/createlinks e-smith-email-5.6.0/createlinks |
| 2 |
|
|
--- e-smith-email-5.6.0.old/createlinks 2022-07-29 22:06:44.023000000 -0400 |
| 3 |
|
|
+++ e-smith-email-5.6.0/createlinks 2022-07-29 22:23:12.338000000 -0400 |
| 4 |
|
|
@@ -27,6 +27,7 @@ |
| 5 |
|
|
)); |
| 6 |
|
|
} |
| 7 |
|
|
|
| 8 |
|
|
+event_link('fetchmail-migrate-fetchids', "bootstrap-console-save", '91'); |
| 9 |
|
|
# pine-conf |
| 10 |
|
|
|
| 11 |
|
|
for ( qw(/etc/pine.conf /etc/Muttrc) ) |
| 12 |
|
|
@@ -49,6 +50,7 @@ |
| 13 |
|
|
$event = "console-save"; |
| 14 |
|
|
|
| 15 |
|
|
safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/smtp-auth-proxy"); |
| 16 |
|
|
+event_link('fetchmail-migrate-fetchids', $event, '91'); |
| 17 |
|
|
|
| 18 |
|
|
#-------------------------------------------------- |
| 19 |
|
|
# actions for domain-create event: |
| 20 |
|
|
@@ -72,6 +74,7 @@ |
| 21 |
|
|
$event = "email-update"; |
| 22 |
|
|
|
| 23 |
|
|
safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/smtp-auth-proxy"); |
| 24 |
|
|
+event_link('fetchmail-migrate-fetchids', $event, '91'); |
| 25 |
|
|
|
| 26 |
|
|
#-------------------------------------------------- |
| 27 |
|
|
# actions for group-create event: |
| 28 |
|
|
@@ -122,6 +125,7 @@ |
| 29 |
|
|
# systemd-specific action mandatory for this package-update event |
| 30 |
|
|
event_link("systemd-reload", $event, "89"); |
| 31 |
|
|
event_link("systemd-default", $event, "88"); |
| 32 |
|
|
+event_link('fetchmail-migrate-fetchids', $event, '91'); |
| 33 |
|
|
safe_symlink("try-restart", "root/etc/e-smith/events/$event/services2adjust/smtp-auth-proxy"); |
| 34 |
|
|
|
| 35 |
|
|
#-------------------------------------------------- |
| 36 |
|
|
diff -Nur --no-dereference e-smith-email-5.6.0.old/root/etc/e-smith/events/actions/fetchmail-migrate-fetchids e-smith-email-5.6.0/root/etc/e-smith/events/actions/fetchmail-migrate-fetchids |
| 37 |
|
|
--- e-smith-email-5.6.0.old/root/etc/e-smith/events/actions/fetchmail-migrate-fetchids 1969-12-31 19:00:00.000000000 -0500 |
| 38 |
|
|
+++ e-smith-email-5.6.0/root/etc/e-smith/events/actions/fetchmail-migrate-fetchids 2022-07-29 22:17:09.306000000 -0400 |
| 39 |
|
|
@@ -0,0 +1,13 @@ |
| 40 |
|
|
+#!/usr/bin/perl |
| 41 |
|
|
+ |
| 42 |
|
|
+my $original_file = "/run/lock/fetchmail/.fetchids"; |
| 43 |
|
|
+my $new_file = "/var/lib/fetchmail/.fetchids"; |
| 44 |
|
|
+ |
| 45 |
|
|
+exit 0 if ( -f $new_file ) ; |
| 46 |
|
|
+exit 0 unless ( -f $original_file ) ; |
| 47 |
jpp |
1.2 |
+while ( -f "/run/lock/fetchmail/fetchmail.pid" ) { |
| 48 |
jpp |
1.1 |
+ print "waiting for fetchmail to finish"; |
| 49 |
|
|
+ sleep 10; |
| 50 |
|
|
+} |
| 51 |
|
|
+ |
| 52 |
|
|
+system("/usr/bin/mv $original_file $new_file") == 0 or warn "The move $original_file to $new_file operation failed: $!"; |
| 53 |
|
|
diff -Nur --no-dereference e-smith-email-5.6.0.old/root/etc/e-smith/templates/etc/fetchmail/50multi-drop e-smith-email-5.6.0/root/etc/e-smith/templates/etc/fetchmail/50multi-drop |
| 54 |
|
|
--- e-smith-email-5.6.0.old/root/etc/e-smith/templates/etc/fetchmail/50multi-drop 2016-02-04 18:52:20.000000000 -0500 |
| 55 |
|
|
+++ e-smith-email-5.6.0/root/etc/e-smith/templates/etc/fetchmail/50multi-drop 2022-07-29 22:15:05.227000000 -0400 |
| 56 |
|
|
@@ -41,6 +41,7 @@ |
| 57 |
|
|
$OUT .= "retrieves all mail from a remote POP mailbox:\n"; |
| 58 |
|
|
$OUT .= "\n"; |
| 59 |
|
|
$OUT .= "/usr/bin/fetchmail --syslog $verbosity "; |
| 60 |
|
|
+ $OUT .= " -i /var/lib/fetchmail/.fetchids "; # fix SME: 11979/12131 |
| 61 |
|
|
|
| 62 |
|
|
my $AuthenticationMethod = |
| 63 |
|
|
$fetchmail{"AuthenticationMethod"} |
Parent Directory
| 
Revision Log
| 
Revision Graph
