From deef5e57fb37764b75d0a552f4903c6b51df73dc Mon Sep 17 00:00:00 2001
From: "Todd C. Miller" <Todd.Miller@sudo.ws>
Date: Tue, 24 May 2022 15:58:39 -0600
Subject: [PATCH] CentOS Stream only uses a major version number, no minor
 version. This prevents the packages from being created as foo.el.arch.rpm
 since we were assuming that the version number was two digits.

---
 etc/sudo-logsrvd.pp | 4 ++++
 etc/sudo-python.pp  | 4 ++++
 etc/sudo.pp         | 4 ++++
 3 files changed, 12 insertions(+)

diff --git a/etc/sudo-logsrvd.pp b/etc/sudo-logsrvd.pp
index 1e49c65c1..242b21986 100644
--- a/etc/sudo-logsrvd.pp
+++ b/etc/sudo-logsrvd.pp
@@ -132,6 +132,10 @@ This makes it possible to have all sudo I/O logs on a central server."
 	osrelease=`echo "$pp_rpm_distro" | sed -e 's/^[^0-9]*\([0-9]\{1,2\}\).*/\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]}"
 		;;
 	sles*)
diff --git a/etc/sudo-python.pp b/etc/sudo-python.pp
index de7734072..9250da4f7 100644
--- a/etc/sudo-python.pp
+++ b/etc/sudo-python.pp
@@ -88,6 +88,10 @@
 	osrelease=`echo "$pp_rpm_distro" | sed -e 's/^[^0-9]*\([0-9]\{1,2\}\).*/\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]}"
 		;;
 	sles*)
diff --git a/etc/sudo.pp b/etc/sudo.pp
index 0c96a75bd..97d82856c 100644
--- a/etc/sudo.pp
+++ b/etc/sudo.pp
@@ -163,6 +163,10 @@ still allow people to get their work done."
 	osrelease=`echo "$pp_rpm_distro" | sed -e 's/^[^0-9]*\([0-9]\{1,2\}\).*/\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]}"
 		;;
 	sles*)