Don't assume RHEL major version is only a single digit

Fixes handling of RHEL 10 and higher.

Author: millert

etc/sudo-logsrvd.pp

@@ -129,14 +129,14 @@
 
 %if [rpm]
 	# Add distro info to release
-	osrelease=`echo "$pp_rpm_distro" | sed -e 's/^[^0-9]*\([0-9]\{1,2\}\).*/\1/'`
+	osrelease=`echo "$pp_rpm_distro" | sed -e 's/^[^0-9]*\([0-9]\{1,3\}\).*/\1/'`
 	case "$pp_rpm_distro" in
 	centos*|rhel*|f[0-9]*)
 		# CentOS Stream has a single-digit version
 		if test $osrelease -lt 10; then
 		    osrelease="${osrelease}0"
 		fi
-		pp_rpm_release="$pp_rpm_release.el${osrelease%%[0-9]}"
+		pp_rpm_release="$pp_rpm_release.el${osrelease%[0-9]}"
 		;;
 	sles*)
 		pp_rpm_release="$pp_rpm_release.sles$osrelease"

etc/sudo-python.pp

@@ -85,14 +85,14 @@
 
 %if [rpm]
 	# Add distro info to release
-	osrelease=`echo "$pp_rpm_distro" | sed -e 's/^[^0-9]*\([0-9]\{1,2\}\).*/\1/'`
+	osrelease=`echo "$pp_rpm_distro" | sed -e 's/^[^0-9]*\([0-9]\{1,3\}\).*/\1/'`
 	case "$pp_rpm_distro" in
 	centos*|rhel*|f[0-9]*)
 		# CentOS Stream has a single-digit version
 		if test $osrelease -lt 10; then
 		    osrelease="${osrelease}0"
 		fi
-		pp_rpm_release="$pp_rpm_release.el${osrelease%%[0-9]}"
+		pp_rpm_release="$pp_rpm_release.el${osrelease%[0-9]}"
 		;;
 	sles*)
 		pp_rpm_release="$pp_rpm_release.sles$osrelease"

etc/sudo.pp

@@ -150,14 +150,14 @@
 
 %if [rpm]
 	# Add distro info to release
-	osrelease=`echo "$pp_rpm_distro" | sed -e 's/^[^0-9]*\([0-9]\{1,2\}\).*/\1/'`
+	osrelease=`echo "$pp_rpm_distro" | sed -e 's/^[^0-9]*\([0-9]\{1,3\}\).*/\1/'`
 	case "$pp_rpm_distro" in
 	centos*|rhel*|f[0-9]*)
 		# CentOS Stream has a single-digit version
 		if test $osrelease -lt 10; then
 		    osrelease="${osrelease}0"
 		fi
-		pp_rpm_release="$pp_rpm_release.el${osrelease%%[0-9]}"
+		pp_rpm_release="$pp_rpm_release.el${osrelease%[0-9]}"
 		;;
 	sles*)
 		pp_rpm_release="$pp_rpm_release.sles$osrelease"

scripts/pp

@@ -5581,7 +5581,7 @@ pp_rpm_detect_distro () {
          -e 's/^Red Hat Enterprise Linux.*release \([0-9][0-9\.]*\).*/rhel\1/p' \
          -e 's/^Rocky Linux.*release \([0-9][0-9\.]*\).*/rhel\1/p' \
          -e 's/^AlmaLinux.*release \([0-9][0-9\.]*\).*/rhel\1/p' \
-         -e 's/^CentOS.*release \([0-9][0-9\.]*\).*/centos\1/p' \
+         -e 's/^CentOS.*release \([0-9]\{1,\}\)\(\.[0-9]*\)\{0,1\}.*/centos\1\2/p' \
        /etc/redhat-release`
     elif test -f /etc/SuSE-release; then
        pp_rpm_distro=`awk '