--- rpms/smeserver-vacation/contribs9/smeserver-vacation-1.1.bz8772.fix.vacation.message.translation.patch 2016/07/15 10:19:31 1.3 +++ rpms/smeserver-vacation/contribs9/smeserver-vacation-1.1.bz8772.fix.vacation.message.translation.patch 2016/07/16 06:19:59 1.5 @@ -29,7 +29,7 @@ diff -Nur smeserver-vacation-1.1.bz8772. diff -Nur smeserver-vacation-1.1.bz8772.old/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/uservacations.pm smeserver-vacation-1.1.bz8772.new/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/uservacations.pm --- smeserver-vacation-1.1.bz8772.old/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/uservacations.pm 2016-07-13 14:09:44.471013965 +0200 -+++ smeserver-vacation-1.1.bz8772.new/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/uservacations.pm 2016-07-13 21:37:43.779937434 +0200 ++++ smeserver-vacation-1.1.bz8772.new/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/uservacations.pm 2016-07-14 05:45:17.766830058 +0200 @@ -165,9 +165,10 @@ my $from = 'From:'; @@ -38,8 +38,8 @@ diff -Nur smeserver-vacation-1.1.bz8772. - my $ExistingMessage = "$from $fullname <\;$user\@$domain>\;\n". - "$away"; -+ my $ExistingMessage = "$from $fullname <\;$user\@$domain>\;\n"."subject: $return\n". -+ "\n$away"; ++ my $ExistingMessage = "$from $fullname <\;$user\@$domain>\;\n"."Subject: $return\n". ++ "\n$away\n"."\n--\n$fullname"; # if exists and is not empty if (( -e $vfile ) && (! -z $vfile )) @@ -51,8 +51,8 @@ diff -Nur smeserver-vacation-1.1.bz8772. - my $vacation_text = "$from $fullname \<$user\@$domain\>\n". - "$away \n"; -+ my $vacation_text = "$from $fullname \<$user\@$domain\>\n"."subject: $return\n". -+ "\n$away \n"; ++ my $vacation_text = "$from $fullname \<$user\@$domain\>\n"."Subject: $return\n". ++ "\n$away \n"."\n--\n$fullname"; my $reset = $vacation_text; @@ -64,8 +64,8 @@ diff -Nur smeserver-vacation-1.1.bz8772. - my $ExistingMessage = "$from $fullname <\;$user\@$domain>\;\n". - "$away"; -+ my $ExistingMessage = "$from $fullname <\;$user\@$domain>\;\n"."subject: $return\n". -+ "\n$away"; ++ my $ExistingMessage = "$from $fullname <\;$user\@$domain>\;\n"."Subject: $return\n". ++ "\n$away"."\n--\n$fullname"; # if exists and is not empty if (( -e $vfile ) && (! -z $vfile )) @@ -77,13 +77,8 @@ diff -Nur smeserver-vacation-1.1.bz8772. - my $vacation_text = "$from $fullname \<$user\@$domain\>\n". - "$away \n"; -+ my $vacation_text = "$from $fullname \<$user\@$domain\>\n"."subject: $return\n". -+ "\n$away \n"; ++ my $vacation_text = "$from $fullname \<$user\@$domain\>\n"."Subject: $return\n". ++ "\n$away \n"."\n--\n$fullname"; my $reset = $vacation_text; -@@ -438,3 +442,4 @@ - } - - 1; -+