diff -Nur --no-dereference smeserver-yum-2.6.2.old/createlinks smeserver-yum-2.6.2/createlinks --- smeserver-yum-2.6.2.old/createlinks 2022-07-11 11:10:46.000000000 -0400 +++ smeserver-yum-2.6.2/createlinks 2023-08-16 17:21:15.041000000 -0400 @@ -15,8 +15,6 @@ for ( qw(install remove update) ) { event_link("yum-action", "yum-$_", "20"); - event_link("initialize-default-databases", "yum-$_", "50"); - event_link("navigation-conf", "yum-$_", "80"); } safe_symlink("restart", "root/etc/e-smith/events/yum-modify/services2adjust/yum"); diff -Nur --no-dereference smeserver-yum-2.6.2.old/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/yum.pm smeserver-yum-2.6.2/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/yum.pm --- smeserver-yum-2.6.2.old/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/yum.pm 2023-08-16 12:04:03.784000000 -0400 +++ smeserver-yum-2.6.2/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/yum.pm 2023-08-16 17:26:55.967000000 -0400 @@ -80,7 +80,7 @@ sub new { shift; - my $self = esmith::FormMagick->new(); + my $self = esmith::FormMagick->new(csrfdelay=>600); $self->{calling_package} = (caller)[0]; bless $self; return $self; @@ -157,8 +157,8 @@ for ($dbs{$yumdb}->get_all_by_prop(type => $type)) { - $options{$_->key} = $_->key . " " . $_->prop("Version") . " - " . - $_->prop("Repo"); + $options{$_->key} = $_->key . " " . ($_->prop("Version")||"") . " - " . + ($_->prop("Repo")||""); } return \%options; @@ -286,9 +286,10 @@ my ($fm) = @_; my @yum_status; - open(YUM_STATUS, "; - close(YUM_STATUS); + if (open(YUM_STATUS, "; + close(YUM_STATUS); + } my @yum_log = $fm->format_yum_log(); @@ -400,6 +401,11 @@ } else { # effective reconfigure and reboot required $fm->success('HEADER_POSTUPGRADE_REQUIRED', 'YUM_PAGE_POSTUPGRADE'); + if ($fm->{csrf}) { + # we want to restart CSRF token timer from now + $fm->{cgi}->param(-name => 'csrf_timestamp', -value => time); + $fm->commit_session; + } $fm->{cgi}->param(-name => "page", -value => 0); $fm->{cgi}->param(-name => "page_stack", -value => ''); $fm->{cgi}->param(-name => "Next", -value => 'Next');