Merge pull request #861 from AriaXLi/revert_PA-6549

Revert "Merge pull request #860 from AriaXLi/PA-6549"
puppetlabs · Jun 13, 2024 · 01f84b4 · 01f84b4
2 parents db00b4c + 926168f
commit 01f84b4
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 12 deletions.
diff --git a/configs/components/_base-ruby-selinux.rb b/configs/components/_base-ruby-selinux.rb
@@ -4,7 +4,6 @@
 #
 
 pkg.add_source("file://resources/patches/ruby-selinux/selinuxswig_ruby_wrap.patch")
-pkg.add_source("file://resources/patches/ruby-selinux/selinuxswig_ruby_undefining_allocator.patch")
 
 # These can be overridden by the including component.
 ruby_version ||= settings[:ruby_version]
@@ -82,7 +81,6 @@
  unless platform.name =~ /^(debian-12|ubuntu-24|fedora-40)/
  steps << "#{platform.patch} --strip=0 --fuzz=0 --ignore-whitespace --no-backup-if-mismatch < ../selinuxswig_ruby_wrap.patch"
  end
- steps << "#{platform.patch} --strip=0 --fuzz=0 --ignore-whitespace --no-backup-if-mismatch < ../selinuxswig_ruby_undefining_allocator.patch"
  end
 
  # libselinux 3.3 is the minimum version we want to build on RHEL 9, but the

diff --git a/resources/patches/ruby-selinux/selinuxswig_ruby_undefining_allocator.patch b/resources/patches/ruby-selinux/selinuxswig_ruby_undefining_allocator.patch