From 8dada63714bf23c74c967e56e2f543829a959094 Mon Sep 17 00:00:00 2001
From: Ilia Ross <ilia@ross.gdn>
Date: Wed, 28 May 2025 12:13:19 +0300
Subject: [PATCH] Add a better way to match standard `php-common` package

https://github.com/webmin/webmin/commit/fe0ad881f20c59dc95543ca21ee2815c896f1aeb#r158184285
---
 phpini/phpini-lib.pl | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/phpini/phpini-lib.pl b/phpini/phpini-lib.pl
index 03576e0e6..caeb1e9df 100755
--- a/phpini/phpini-lib.pl
+++ b/phpini/phpini-lib.pl
@@ -966,8 +966,11 @@ foreach my $pkg (&package_updates::list_available()) {
 	my $name = $pkg->{'name'};
 	next unless ($name =~ /^((?:rh-)?(php(?:\d[\d.]*)??)(?:-php)?-common|php\d*[\d.]*)$/);
 	$name = $2 || $1;
-	# Skip meta packages on Debian and Ubuntu
-	next if ($pkg->{'version'} =~ /^([\d]+)/ && $1 > 40);
+	# Skip the standard php-common meta package on Debian and Ubuntu, which
+	# never have a dash
+	next if ($pkg->{'system'} eq 'apt' &&
+		 $pkg->{'name'}   eq 'php-common' &&
+		 $pkg->{'version'} !~ /-/);
 	my ($phpver, $shortver, $bin) = &get_php_info($name, $pkg->{'version'});
 	push(@rv, { 'name' => $pkg->{'name'},
 		    'ver' => $pkg->{'version'},