From d340dda71a51b4f77637060a41a063ca20cf11fc Mon Sep 17 00:00:00 2001 From: Sayan Chowdhury Date: Mon, 20 Jun 2022 21:01:24 +0530 Subject: [PATCH] app-admin/sudo: Apply Flatcar patches - Remove Perl Runtime Dependency - Remove OpenLDAP schema files for sudo - Remove sudo.conf file as it is shipped via baselayout Signed-off-by: Sayan Chowdhury --- .../coreos-overlay/app-admin/sudo/README.md | 8 ++++++++ .../app-admin/sudo/sudo-1.9.12_p1.ebuild | 11 ++++++++--- 2 files changed, 16 insertions(+), 3 deletions(-) create mode 100644 sdk_container/src/third_party/coreos-overlay/app-admin/sudo/README.md diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/sudo/README.md b/sdk_container/src/third_party/coreos-overlay/app-admin/sudo/README.md new file mode 100644 index 0000000000..c90febe8b2 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/app-admin/sudo/README.md @@ -0,0 +1,8 @@ +## Flatcar changes +- Remove Perl Runtime Dependency +- Remove OpenLDAP schema files for sudo +``` +insinto /etc/openldap/schema +newins doc/schema.OpenLDAP sudo.schema +``` +- Remove sudo.conf file as it is shipped via baselayout diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/sudo/sudo-1.9.12_p1.ebuild b/sdk_container/src/third_party/coreos-overlay/app-admin/sudo/sudo-1.9.12_p1.ebuild index e96bf564cc..a54b4252c1 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-admin/sudo/sudo-1.9.12_p1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-admin/sudo/sudo-1.9.12_p1.ebuild @@ -65,11 +65,12 @@ DEPEND=" ssl? ( dev-libs/openssl:0= ) sssd? ( sys-auth/sssd[sudo] ) " +#Flatcar: Remove Perl runtime dependency +# ldap? ( dev-lang/perl ) RDEPEND=" ${DEPEND} >=app-misc/editor-wrapper-3 virtual/editor - ldap? ( dev-lang/perl ) pam? ( sys-auth/pambase ) selinux? ( sec-policy/selinux-sudo ) sendmail? ( virtual/mta ) @@ -215,8 +216,8 @@ src_install() { doins "${T}"/ldap.conf.sudo fperms 0440 /etc/ldap.conf.sudo - insinto /etc/openldap/schema - newins docs/schema.OpenLDAP sudo.schema + #Flatcar: we don't ship OpenLDAP schemas + fi if use pam ; then @@ -235,6 +236,10 @@ src_install() { # bug #697812 find "${ED}" -type f -name "*.la" -delete || die + + # Flatcar: Remove sudo.conf as it is shipped via baselayout + rm "${ED}/etc/sudo.conf" || die + } pkg_postinst() {