From d404f544fc673959adf2049e105fa790f011445c Mon Sep 17 00:00:00 2001 From: "Todd C. Miller" Date: Tue, 1 Aug 2023 11:20:54 -0600 Subject: [PATCH] Don't use sudo when building AIX packages PolyPkg uses "sudo installp -l" to list the built package by default but we may not have sudo privileges on the build host. --- etc/sudo-logsrvd.pp | 4 ++-- etc/sudo-python.pp | 4 ++-- etc/sudo.pp | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/etc/sudo-logsrvd.pp b/etc/sudo-logsrvd.pp index 242b21986..dd65f510d 100644 --- a/etc/sudo-logsrvd.pp +++ b/etc/sudo-logsrvd.pp @@ -11,8 +11,8 @@ This makes it possible to have all sudo I/O logs on a central server." # Convert to 4 part version for AIX, including patch level pp_aix_version=`echo $version|sed -e 's/^\([0-9]*\.[0-9]*\.[0-9]*\)p\([0-9]*\)$/\1.\2/' -e 's/^\([0-9]*\.[0-9]*\.[0-9]*\)[^0-9\.].*$/\1/' -e 's/^\([0-9]*\.[0-9]*\.[0-9]*\)$/\1.0/'` - # Don't allow sudo to prompt for a password - pp_aix_sudo="sudo -n" + # Don't use sudo to list the package. + pp_aix_sudo= %endif %if [sd] diff --git a/etc/sudo-python.pp b/etc/sudo-python.pp index 9250da4f7..098741d93 100644 --- a/etc/sudo-python.pp +++ b/etc/sudo-python.pp @@ -9,8 +9,8 @@ # Convert to 4 part version for AIX, including patch level pp_aix_version=`echo $version|sed -e 's/^\([0-9]*\.[0-9]*\.[0-9]*\)p\([0-9]*\)$/\1.\2/' -e 's/^\([0-9]*\.[0-9]*\.[0-9]*\)[^0-9\.].*$/\1/' -e 's/^\([0-9]*\.[0-9]*\.[0-9]*\)$/\1.0/'` - # Don't allow sudo to prompt for a password - pp_aix_sudo="sudo -n" + # Don't use sudo to list the package. + pp_aix_sudo= %endif %if [sd] diff --git a/etc/sudo.pp b/etc/sudo.pp index 4dd5e7c19..9abc26b0e 100644 --- a/etc/sudo.pp +++ b/etc/sudo.pp @@ -21,8 +21,8 @@ still allow people to get their work done." # Convert to 4 part version for AIX, including patch level pp_aix_version=`echo $version|sed -e 's/^\([0-9]*\.[0-9]*\.[0-9]*\)p\([0-9]*\)$/\1.\2/' -e 's/^\([0-9]*\.[0-9]*\.[0-9]*\)[^0-9\.].*$/\1/' -e 's/^\([0-9]*\.[0-9]*\.[0-9]*\)$/\1.0/'` - # Don't allow sudo to prompt for a password - pp_aix_sudo="sudo -n" + # Don't use sudo to list the package. + pp_aix_sudo= %endif %if [sd]