From 6fc78a2104e5b1b22da02aaeb17f978b5439b2da Mon Sep 17 00:00:00 2001
From: Jamie Cameron <jcameron@webmin.com>
Date: Mon, 8 Aug 2022 14:08:38 -0700
Subject: [PATCH] Make version check take the release into account

---
 webmin/upgrade.cgi | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/webmin/upgrade.cgi b/webmin/upgrade.cgi
index 385eb20a3..72fc3de6a 100755
--- a/webmin/upgrade.cgi
+++ b/webmin/upgrade.cgi
@@ -51,11 +51,16 @@ elsif ($in{'source'} == 2) {
 	&error_setup($text{'upgrade_err3'});
 	($ok, $version, $release) = &get_latest_webmin_version();
 	$ok || &inst_error($version);
+	$full = $version.($release ? "-$release" : "");
 	if (!$in{'force'}) {
-		if ($version == &get_webmin_version()) {
+		# Is the new version and release actually newer
+		$curr_rel = &get_webmin_version_release();
+		$curr_full = &get_webmin_version().
+			     ($curr_rel ? "-".$curr_rel : "");
+		if (&compare_version_numbers($full, $curr_full) == 0) {
 			&inst_error(&text('upgrade_elatest', $version));
 			}
-		elsif ($version <= &get_webmin_version()) {
+		elsif (&compare_version_numbers($full, $curr_full) < 0) {
 			&inst_error(&text('upgrade_eversion', $version));
 			}
 		}