mir/sudo
2
0
Fork 0
mirror of https://github.com/sudo-project/sudo.git synced 2025-09-04 16:25:25 +00:00
Code Issues Releases Wiki Activity

Recognize Alma Linux and Rocky Linux (Open Source RHEL clones)

Browse Source
This commit is contained in:
Todd C. Miller
2023-01-27 14:44:45 -07:00
parent fd0021ee5c
commit 53389b5743
5 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
etc/sudo-logsrvd.pp
View File

@@ -87,7 +87,7 @@ This makes it possible to have all sudo I/O logs on a central server."
# For RedHat the doc dir is expected to include version and release # For RedHat the doc dir is expected to include version and release
case "$pp_rpm_distro" in case "$pp_rpm_distro" in
centos*|rhel*|f[0-9]*) alma*|centos*|rhel*|rocky*|f[0-9]*)
docdir="${docdir}-${pp_rpm_version}-${pp_rpm_release}" docdir="${docdir}-${pp_rpm_version}-${pp_rpm_release}"
exampledir="${docdir}/examples" exampledir="${docdir}/examples"
;; ;;
@@ -131,7 +131,7 @@ This makes it possible to have all sudo I/O logs on a central server."
# Add distro info to release # 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,2\}\).*/\1/'`
case "$pp_rpm_distro" in case "$pp_rpm_distro" in
centos*|rhel*|f[0-9]*) alma*|centos*|rhel*|rocky*|f[0-9]*)
# CentOS Stream has a single-digit version # CentOS Stream has a single-digit version
if test $osrelease -lt 10; then if test $osrelease -lt 10; then
osrelease="${osrelease}0" osrelease="${osrelease}0"

4
etc/sudo-python.pp
View File

@@ -47,7 +47,7 @@
# For RedHat the doc dir is expected to include version and release # For RedHat the doc dir is expected to include version and release
case "$pp_rpm_distro" in case "$pp_rpm_distro" in
centos*|rhel*|f[0-9]*) alma*|centos*|rhel*|rocky*|f[0-9]*)
docdir="${docdir}-${pp_rpm_version}-${pp_rpm_release}" docdir="${docdir}-${pp_rpm_version}-${pp_rpm_release}"
exampledir="${docdir}/examples" exampledir="${docdir}/examples"
;; ;;
@@ -87,7 +87,7 @@
# Add distro info to release # 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,2\}\).*/\1/'`
case "$pp_rpm_distro" in case "$pp_rpm_distro" in
centos*|rhel*|f[0-9]*) alma*|centos*|rhel*|rocky*|f[0-9]*)
# CentOS Stream has a single-digit version # CentOS Stream has a single-digit version
if test $osrelease -lt 10; then if test $osrelease -lt 10; then
osrelease="${osrelease}0" osrelease="${osrelease}0"

4
etc/sudo.pp
View File

@@ -105,7 +105,7 @@ still allow people to get their work done."
# For RedHat the doc dir is expected to include version and release # For RedHat the doc dir is expected to include version and release
case "$pp_rpm_distro" in case "$pp_rpm_distro" in
centos*|rhel*|f[0-9]*) alma*|centos*|rhel*|rocky*|f[0-9]*)
docdir="${docdir}-${pp_rpm_version}-${pp_rpm_release}" docdir="${docdir}-${pp_rpm_version}-${pp_rpm_release}"
exampledir="${docdir}/examples" exampledir="${docdir}/examples"
;; ;;
@@ -162,7 +162,7 @@ still allow people to get their work done."
# Add distro info to release # 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,2\}\).*/\1/'`
case "$pp_rpm_distro" in case "$pp_rpm_distro" in
centos*|rhel*|f[0-9]*) alma*|centos*|rhel*|rocky*|f[0-9]*)
# CentOS Stream has a single-digit version # CentOS Stream has a single-digit version
if test $osrelease -lt 10; then if test $osrelease -lt 10; then
osrelease="${osrelease}0" osrelease="${osrelease}0"

4
scripts/mkpkg
View File

@@ -165,9 +165,9 @@ with_python=false
# Choose configure options by osversion. # Choose configure options by osversion.
# We use the same configure options as vendor packages when possible. # We use the same configure options as vendor packages when possible.
case "$osversion" in case "$osversion" in
centos*|rhel*|f[0-9]*) alma*|centos*|rhel*|rocky*|f[0-9]*)
case "$osversion" in case "$osversion" in
centos*|rhel*) alma*|centos*|rhel*|rocky*)
osmajor=`sed -n -e 's/^.*release \([0-9][0-9]*\).*$/\1/p' /etc/redhat-release` osmajor=`sed -n -e 's/^.*release \([0-9][0-9]*\).*$/\1/p' /etc/redhat-release`
if [ $osmajor -ge 4 ]; then if [ $osmajor -ge 4 ]; then
# RHEL 4 and up support SELinux # RHEL 4 and up support SELinux

4
scripts/pp
View File

@@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
# Copyright 2023 One Identity LLC. ALL RIGHTS RESERVED # Copyright 2023 One Identity LLC. ALL RIGHTS RESERVED
pp_revision="20230120" pp_revision="20230127"
# Copyright 2018 One Identity LLC. ALL RIGHTS RESERVED. # Copyright 2018 One Identity LLC. ALL RIGHTS RESERVED.
# #
# Redistribution and use in source and binary forms, with or without # Redistribution and use in source and binary forms, with or without
@@ -5569,6 +5569,8 @@ pp_rpm_detect_distro () {
pp_rpm_distro=`sed -n \ pp_rpm_distro=`sed -n \
-e 's/^Red Hat Linux.*release \([0-9][0-9\.]*\).*/rh\1/p' \ -e 's/^Red Hat Linux.*release \([0-9][0-9\.]*\).*/rh\1/p' \
-e 's/^Red Hat Enterprise Linux.*release \([0-9][0-9\.]*\).*/rhel\1/p' \ -e 's/^Red Hat Enterprise Linux.*release \([0-9][0-9\.]*\).*/rhel\1/p' \
-e 's/^Rocky Linux.*release \([0-9][0-9\.]*\).*/rocky\1/p' \
-e 's/^AlmaLinux.*release \([0-9][0-9\.]*\).*/alma\1/p' \
-e 's/^CentOS.*release \([0-9][0-9\.]*\).*/centos\1/p' \ -e 's/^CentOS.*release \([0-9][0-9\.]*\).*/centos\1/p' \
/etc/redhat-release` /etc/redhat-release`
elif test -f /etc/SuSE-release; then elif test -f /etc/SuSE-release; then