From 154ecf734a7c6aa5d7eb838799bc701cf8b206c0 Mon Sep 17 00:00:00 2001
From: Jamie Cameron <jcameron@webmin.com>
Date: Sat, 28 Aug 2021 11:56:47 -0700
Subject: [PATCH] Also check for minor relesae version

---
 webmin/webmin-lib.pl | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/webmin/webmin-lib.pl b/webmin/webmin-lib.pl
index 49d9c26a4..9058c991d 100755
--- a/webmin/webmin-lib.pl
+++ b/webmin/webmin-lib.pl
@@ -1231,15 +1231,23 @@ if (&foreign_available($module_name) && !$gconfig{'nowebminup'} && !$noupdates &
 	if (!$config{'last_version_check'} ||
          $now - $config{'last_version_check'} > 24*60*60) {
 		# Cached last version has expired .. re-fetch
-		my ($ok, $version) = &get_latest_webmin_version();
+		my ($ok, $version, $release) = &get_latest_webmin_version();
 		if ($ok) {
 			$config{'last_version_check'} = $now;
 			$config{'last_version_number'} = $version;
+			$config{'last_version_release'} = $release;
+			$config{'last_version_full'} =
+				$version.($release ? "-".$release : "");
 			&save_module_config();
 			}
 		}
+	my $ver = &get_webmin_version();
+	my $rel = &get_webmin_version_release();
+	my $full = $ver.($rel ? "-".$rel : "");
 	if ($config{'last_version_number'} &&
-	    $config{'last_version_number'} > &get_webmin_version()) {
+	    ($config{'last_version_number'} > $ver ||
+	     $config{'last_version_number'} == $ver &&
+	     $config{'last_version_release'} > $rel)) {
 		# New version is out there .. offer to upgrade
 		my $mode = &get_install_type();
 		my $checksig = 0;
@@ -1255,8 +1263,8 @@ if (&foreign_available($module_name) && !$gconfig{'nowebminup'} && !$noupdates &
 		     &ui_hidden("source", 2).
 		     &ui_hidden("sig", $checksig).
 		     &ui_hidden("mode", $mode).
-		     &text('notif_upgrade', $config{'last_version_number'},
-			   &get_webmin_version())."<p>\n".
+		     &text('notif_upgrade', $config{'last_version_full'},
+			   $full)."<p>\n".
 		     &ui_form_end([ [ undef, $text{'notif_upgradeok'} ] ]));
 		}
 	}