From ed2b5bec382fbc8acb89c4d7e77d68f6a307628c Mon Sep 17 00:00:00 2001 From: AlmaLinux RelEng Bot Date: Mon, 30 Mar 2026 11:03:46 -0400 Subject: [PATCH] import CS sblim-cmpi-base-1.6.4-21.el9 --- .../sblim-cmpi-base-1.6.4-image-mode.patch | 88 +++++++++++++++++++ SPECS/sblim-cmpi-base.spec | 41 ++++++--- 2 files changed, 117 insertions(+), 12 deletions(-) create mode 100644 SOURCES/sblim-cmpi-base-1.6.4-image-mode.patch diff --git a/SOURCES/sblim-cmpi-base-1.6.4-image-mode.patch b/SOURCES/sblim-cmpi-base-1.6.4-image-mode.patch new file mode 100644 index 0000000..89ded5d --- /dev/null +++ b/SOURCES/sblim-cmpi-base-1.6.4-image-mode.patch @@ -0,0 +1,88 @@ +diff -up sblim-cmpi-base-1.6.4/provider-register.sh.orig sblim-cmpi-base-1.6.4/provider-register.sh +--- sblim-cmpi-base-1.6.4/provider-register.sh.orig 2025-09-12 09:02:08.864655498 +0200 ++++ sblim-cmpi-base-1.6.4/provider-register.sh 2025-09-12 09:05:12.403814496 +0200 +@@ -221,6 +221,20 @@ pegasus_install() + echo "Failed to build pegasus registration MOF." >&2 + return 1 + fi ++ ++ # Image Mode: Update factory directory with current Pegasus repository state ++ if [ -d /usr/share/factory/var/lib/Pegasus ] ++ then ++ chatter "Image Mode detected: updating tmpfiles factory" ++ if [ -w /usr/share/factory/var/lib ] && [ -r /var/lib/Pegasus ] ++ then ++ rm -rf /usr/share/factory/var/lib/Pegasus && ++ cp -a /var/lib/Pegasus /usr/share/factory/var/lib/Pegasus ++ [ $? -eq 0 ] && chatter "Image Mode: factory directory updated successfully" ++ else ++ echo "Warning: Image Mode factory directory update failed - insufficient permissions" >&2 ++ fi ++ fi + } + + pegasus_uninstall() +@@ -316,6 +330,21 @@ EOFX + EOFE + $WBEMEXEC > /dev/null $_DELETE_NAME + done ++ ++ # Image Mode: Update factory directory with current Pegasus repository state ++ if [ -d /usr/share/factory/var/lib/Pegasus ] ++ then ++ chatter "Image Mode detected: updating tmpfiles factory after uninstall" ++ if [ -w /usr/share/factory/var/lib ] && [ -r /var/lib/Pegasus ] ++ then ++ rm -rf /usr/share/factory/var/lib/Pegasus && ++ cp -a /var/lib/Pegasus /usr/share/factory/var/lib/Pegasus ++ [ $? -eq 0 ] && chatter "Image Mode: factory directory updated successfully" ++ else ++ echo "Warning: Image Mode factory directory update failed - insufficient permissions" >&2 ++ fi ++ fi ++ + else + echo "Sorry, cimserver must be running to deregister the providers." >&2 + return 1 +@@ -433,6 +462,20 @@ sfcb_install() + echo "Failed to build sfcb registration file." >&2 + return 1 + fi ++ ++ # Image Mode: Update factory directory with current sfcb repository state ++ if [ -d /usr/share/factory/var/lib/sfcb ] ++ then ++ chatter "Image Mode detected: updating tmpfiles factory" ++ if [ -w /usr/share/factory/var/lib ] && [ -r /var/lib/sfcb ] ++ then ++ rm -rf /usr/share/factory/var/lib/sfcb && ++ cp -a /var/lib/sfcb /usr/share/factory/var/lib/sfcb ++ [ $? -eq 0 ] && chatter "Image Mode: factory directory updated successfully" ++ else ++ echo "Warning: Image Mode factory directory update failed - insufficient permissions" >&2 ++ fi ++ fi + } + + sfcb_uninstall() +@@ -459,6 +502,20 @@ sfcb_uninstall() + + # Rebuild repository + sfcb_rebuild ++ ++ # Image Mode: Update factory directory with current sfcb repository state ++ if [ -d /usr/share/factory/var/lib/sfcb ] ++ then ++ chatter "Image Mode detected: updating tmpfiles factory after uninstall" ++ if [ -w /usr/share/factory/var/lib ] && [ -r /var/lib/sfcb ] ++ then ++ rm -rf /usr/share/factory/var/lib/sfcb && ++ cp -a /var/lib/sfcb /usr/share/factory/var/lib/sfcb ++ [ $? -eq 0 ] && chatter "Image Mode: factory directory updated successfully" ++ else ++ echo "Warning: Image Mode factory directory update failed - insufficient permissions" >&2 ++ fi ++ fi + } + + openwbem_transform() diff --git a/SPECS/sblim-cmpi-base.spec b/SPECS/sblim-cmpi-base.spec index 220b9f8..1a0eaa7 100644 --- a/SPECS/sblim-cmpi-base.spec +++ b/SPECS/sblim-cmpi-base.spec @@ -1,6 +1,8 @@ +%global with_test_subpackage 0 + Name: sblim-cmpi-base Version: 1.6.4 -Release: 20%{?dist} +Release: 21%{?dist} Summary: SBLIM CMPI Base Providers License: EPL-1.0 @@ -24,6 +26,8 @@ Patch7: sblim-cmpi-base-1.6.4-dont-install-license.patch Patch8: sblim-cmpi-base-1.6.4-fix-get-os-install-date.patch # Patch9: fixes possible null pointer dereferences after strstr calls Patch9: sblim-cmpi-base-1.6.4-fix-possible-null-dereference.patch +# Patch10: adds support for Image Mode +Patch10: sblim-cmpi-base-1.6.4-image-mode.patch Requires: cim-server sblim-indication_helper BuildRequires: make BuildRequires: perl-generators @@ -45,6 +49,7 @@ SBLIM (Standards Based Linux Instrumentation for Manageability) CMPI (Common Manageability Programming Interface) Base Provider development header files and link libraries. +%if 0%{?with_test_subpackage} %package test Summary: SBLIM CMPI Base Providers Test Cases Requires: %{name} = %{version}-%{release} @@ -54,23 +59,29 @@ Requires: sblim-testsuite SBLIM (Standards Based Linux Instrumentation for Manageability) CMPI (Common Manageability Programming Interface) Base Provider Testcase Files for the SBLIM Testsuite. +%endif %prep %setup -q autoreconf --install --force -%patch0 -p0 -b .missing-fclose -%patch1 -p0 -b .methods-enable -%patch2 -p1 -b .double-fclose -%patch3 -p1 -b .docdir -%patch4 -p1 -b .pegasus-interop -%patch5 -p1 -b .prov-reg-sfcb-systemd -%patch6 -p1 -b .list-lib-dependencies -%patch7 -p1 -b .dont-install-license -%patch8 -p1 -b .fix-get-os-install-date -%patch9 -p1 -b .fix-possible-null-dereference.patch +%patch -P 0 -p0 -b .missing-fclose +%patch -P 1 -p0 -b .methods-enable +%patch -P 2 -p1 -b .double-fclose +%patch -P 3 -p1 -b .docdir +%patch -P 4 -p1 -b .pegasus-interop +%patch -P 5 -p1 -b .prov-reg-sfcb-systemd +%patch -P 6 -p1 -b .list-lib-dependencies +%patch -P 7 -p1 -b .dont-install-license +%patch -P 8 -p1 -b .fix-get-os-install-date +%patch -P 9 -p1 -b .fix-possible-null-dereference.patch +%patch -P 10 -p1 -b .image-mode %build -%configure TESTSUITEDIR=%{_datadir}/sblim-testsuite --disable-static +%configure --disable-static \ +%if 0%{?with_test_subpackage} + TESTSUITEDIR=%{_datadir}/sblim-testsuite \ +%endif + sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool make @@ -94,6 +105,7 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/cmpi/*a %{_includedir}/* %{_libdir}/*.so +%if 0%{?with_test_subpackage} %files test %dir %{_datadir}/sblim-testsuite/cim %dir %{_datadir}/sblim-testsuite/system @@ -103,6 +115,7 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/cmpi/*a %{_datadir}/sblim-testsuite/system/linux/*.system %{_datadir}/sblim-testsuite/system/linux/*.sh %{_datadir}/sblim-testsuite/system/linux/*.pl +%endif %global SCHEMA %{_datadir}/%{name}/Linux_Base.mof %{_datadir}/%{name}/Linux_BaseIndication.mof @@ -120,6 +133,10 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/cmpi/*a %postun -p /sbin/ldconfig %changelog +* Thu Dec 11 2025 Vitezslav Crhonek - 1.6.4-21 +- Add support for Image Mode + Resolves: RHEL-132483 + * Tue Aug 10 2021 Mohan Boddu - 1.6.4-20 - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags Related: rhbz#1991688