Skip to content

Commit 2cbdf64

Browse files
committed
(PA-6549) Fix warning:undefining the allocator of T_DATA class for RHEL7
This commit adds a patch that patches selinux_ruby_wrap.c in RHEL 7 and RHEL FIPS 7 to fix the warning: undefining the allocator of T_DATA class SWIG::TYPE_p_selabel_handle. These platforms cannot use the original patch (even with increased fuzz values), selinuxswig_ruby_undefining_allocator.patch, that fixed the warning for other platforms. RHEL 7 and RHEL FIPS 7 use an older version of swig and due to that, have an older version of selinux_ruby_wrap.c.
1 parent 2a1a136 commit 2cbdf64

File tree

2 files changed

+22
-1
lines changed

2 files changed

+22
-1
lines changed

configs/components/_base-ruby-selinux.rb

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
pkg.add_source("file://resources/patches/ruby-selinux/selinuxswig_ruby_wrap.patch")
77
pkg.add_source("file://resources/patches/ruby-selinux/selinuxswig_ruby_undefining_allocator.patch")
8+
pkg.add_source("file://resources/patches/ruby-selinux/undefining_allocator_el_7.patch")
89

910
# These can be overridden by the including component.
1011
ruby_version ||= settings[:ruby_version]
@@ -82,7 +83,17 @@
8283
unless platform.name =~ /^(debian-12|ubuntu-24|fedora-40)/
8384
steps << "#{platform.patch} --strip=0 --fuzz=0 --ignore-whitespace --no-backup-if-mismatch < ../selinuxswig_ruby_wrap.patch"
8485
end
85-
steps << "#{platform.patch} --strip=0 --fuzz=0 --ignore-whitespace --no-backup-if-mismatch < ../selinuxswig_ruby_undefining_allocator.patch"
86+
# EL 7 uses an older version of swig (2.0) so a different patch is needed to
87+
# fix warning:undefining the allocator of T_DATA class
88+
if platform.name =~ /el-7|redhatfips-7/
89+
steps << "#{platform.patch} --strip=0 --fuzz=0 --ignore-whitespace --no-backup-if-mismatch < ../undefining_allocator_el_7.patch"
90+
else
91+
# Ubuntu 24 & Fedora 40 use a newer swig that already has the fix that's
92+
# being patched
93+
unless platform.name =~ /^(ubuntu-24|fedora-40)/
94+
steps << "#{platform.patch} --strip=0 --fuzz=0 --ignore-whitespace --no-backup-if-mismatch < ../selinuxswig_ruby_undefining_allocator.patch"
95+
end
96+
end
8697
end
8798

8899
# libselinux 3.3 is the minimum version we want to build on RHEL 9, but the
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
--- selinuxswig_ruby_wrap_orig.c 2024-06-14 18:03:11.946019756 +0000
2+
+++ selinuxswig_ruby_wrap.c 2024-06-14 18:08:23.057169863 +0000
3+
@@ -1486,7 +1486,7 @@
4+
_cSWIG_Pointer = rb_define_class_under(_mSWIG, "Pointer", rb_cObject);
5+
rb_undef_method(CLASS_OF(_cSWIG_Pointer), "new");
6+
}
7+
- klass = rb_define_class_under(_mSWIG, klass_name, _cSWIG_Pointer);
8+
+ rb_undef_alloc_func(rb_define_class_under(_mSWIG, klass_name, _cSWIG_Pointer));
9+
free((void *) klass_name);
10+
}

0 commit comments

Comments
 (0)