From ab8215d6df9754f25737010391d99d98e5d0b0c4 Mon Sep 17 00:00:00 2001 From: Josh Cooper Date: Tue, 7 May 2024 00:07:05 -0700 Subject: [PATCH] Future proof ruby-selinux We only need to patch older Debian/Fedora/Ubuntu, but shouldn't need to for future additions. --- configs/components/_base-ruby-selinux.rb | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/configs/components/_base-ruby-selinux.rb b/configs/components/_base-ruby-selinux.rb index 868565ef3..129ada954 100644 --- a/configs/components/_base-ruby-selinux.rb +++ b/configs/components/_base-ruby-selinux.rb @@ -77,8 +77,11 @@ ] if ruby_version =~ /^3/ - # swig 4.1 generated interface does not need patching - unless platform.name =~ /^(debian-12|ubuntu-24|fedora-40)/ + # swig 4.1 generated interface does not need patching, so skip + # when running debian >= 12, fedora >= 40, etc + unless (platform.is_debian? && platform.os_version.to_i >= 12) || + (platform.is_fedora? && platform.os_version.to_i >= 40) || + (platform.is_ubuntu? && platform.os_version.to_i >= 24) steps << "#{platform.patch} --strip=0 --fuzz=0 --ignore-whitespace --no-backup-if-mismatch < ../selinuxswig_ruby_wrap.patch" end end