From 926168f5177bf7944bd520538072bb222c21006d Mon Sep 17 00:00:00 2001 From: Aria Li Date: Thu, 13 Jun 2024 09:10:35 -0700 Subject: [PATCH] Revert "Merge pull request #860 from AriaXLi/PA-6549" This reverts commit db00b4c15bc62494c26eb006e2dda09acba12add, reversing changes made to 2f233469ff7d316be54814c485fc63e9271411a7. --- configs/components/_base-ruby-selinux.rb | 2 -- .../selinuxswig_ruby_undefining_allocator.patch | 10 ---------- 2 files changed, 12 deletions(-) delete mode 100644 resources/patches/ruby-selinux/selinuxswig_ruby_undefining_allocator.patch diff --git a/configs/components/_base-ruby-selinux.rb b/configs/components/_base-ruby-selinux.rb index 090deec3f..868565ef3 100644 --- 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 deleted file mode 100644 index 8a141ff8d..000000000 --- a/resources/patches/ruby-selinux/selinuxswig_ruby_undefining_allocator.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- selinuxswig_ruby_wrap.c.orig 2024-06-11 20:02:30.112707265 +0000 -+++ selinuxswig_ruby_wrap.c 2024-06-11 22:34:16.000151780 +0000 -@@ -1510,7 +1510,7 @@ - _cSWIG_Pointer = rb_define_class_under(_mSWIG, "Pointer", rb_cObject); - rb_undef_method(CLASS_OF(_cSWIG_Pointer), "new"); - } -- rb_define_class_under(_mSWIG, klass_name, _cSWIG_Pointer); -+ rb_undef_alloc_func(rb_define_class_under(_mSWIG, klass_name, _cSWIG_Pointer)); - free((void *) klass_name); - }