v2.0.3: fix spec mageia10

mageia/bastionguard-mageia10.spec

@@ -288,7 +288,7 @@ export LDFLAGS="${LDFLAGS:-} -L$YARA_LIBDIR"
   -DENABLE_CEF_DAEMON=OFF \
   -DENABLE_SYSTEM_CA_INSTALL=OFF \
   -DBASTIONGUARD_INIT_SYSTEM=SYSTEMD \
-  -DROOTGUARD_INIT_SYSTEM=systemd \
+  -DBASTIONGUARD_ROOTGUARD_INIT_SYSTEM=systemd \
   -DCMAKE_BUILD_WITH_INSTALL_RPATH=ON \
   -DCMAKE_INSTALL_RPATH='$ORIGIN/../share/BastionGuard/lib;$ORIGIN/../share/BastionGuard/cef' \
   -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=OFF

mageia/change_cmake_mageia/CMakeLists.txt

@@ -808,6 +808,12 @@ set(BASTIONGUARD_ROOTGUARD_INIT_SYSTEM
     "RootGuard init integration: auto, systemd, openrc, dinit, sysvinit or none"
 )
 
+set_property(
+    CACHE BASTIONGUARD_ROOTGUARD_INIT_SYSTEM
+    PROPERTY STRINGS
+    auto systemd openrc dinit sysvinit none
+)
+
 set(BASTIONGUARD_ROOTGUARD_BTF
     "/sys/kernel/btf/vmlinux"
     CACHE FILEPATH
@@ -838,20 +844,78 @@ if(ENABLE_BASTIONGUARD_ROOTGUARD)
         )
     endif()
 
+    # -------------------------------------------------------------------------
+    # Resolve RootGuard init system.
+    #
+    # Preferred public option:
+    #   -DBASTIONGUARD_ROOTGUARD_INIT_SYSTEM=systemd
+    #
+    # Backward-compatible override:
+    #   -DROOTGUARD_INIT_SYSTEM=systemd
+    #
+    # BASTIONGUARD_ROOTGUARD_INIT_SYSTEM wins when explicitly set to something
+    # other than "auto". Otherwise an explicit ROOTGUARD_INIT_SYSTEM is honored.
+    # -------------------------------------------------------------------------
+    set(_BG_ROOTGUARD_INIT_SYSTEM
+        "${BASTIONGUARD_ROOTGUARD_INIT_SYSTEM}"
+    )
+
+    if(_BG_ROOTGUARD_INIT_SYSTEM STREQUAL "auto"
+       AND DEFINED ROOTGUARD_INIT_SYSTEM
+       AND NOT "${ROOTGUARD_INIT_SYSTEM}" STREQUAL "")
+        set(_BG_ROOTGUARD_INIT_SYSTEM
+            "${ROOTGUARD_INIT_SYSTEM}"
+        )
+    endif()
+
+    # Normalize packaging/user input.
+    string(TOLOWER
+        "${_BG_ROOTGUARD_INIT_SYSTEM}"
+        _BG_ROOTGUARD_INIT_SYSTEM
+    )
+
+    # Compatibility aliases.
+    if(_BG_ROOTGUARD_INIT_SYSTEM STREQUAL "sysv")
+        set(_BG_ROOTGUARD_INIT_SYSTEM "sysvinit")
+    elseif(_BG_ROOTGUARD_INIT_SYSTEM STREQUAL "dninit")
+        set(_BG_ROOTGUARD_INIT_SYSTEM "dinit")
+    endif()
+
+    set(_BG_ROOTGUARD_VALID_INIT_SYSTEMS
+        auto
+        systemd
+        openrc
+        dinit
+        sysvinit
+        none
+    )
+
+    if(NOT _BG_ROOTGUARD_INIT_SYSTEM
+       IN_LIST _BG_ROOTGUARD_VALID_INIT_SYSTEMS)
+        message(FATAL_ERROR
+            "[RootGuard] Invalid init system: "
+            "${_BG_ROOTGUARD_INIT_SYSTEM}. "
+            "Accepted values: auto, systemd, openrc, dinit, sysvinit, none"
+        )
+    endif()
+
     set(ROOTGUARD_BUILD_DAEMON
-        ON CACHE BOOL
+        ON
+        CACHE BOOL
         "Build RootGuard daemon"
         FORCE
     )
 
     set(ROOTGUARD_BUILD_GTK_PAGE
-        ON CACHE BOOL
+        ON
+        CACHE BOOL
         "Build RootGuardPage"
         FORCE
     )
 
     set(ROOTGUARD_BUILD_GTK_DEMO
-        OFF CACHE BOOL
+        OFF
+        CACHE BOOL
         "Disable standalone GTK demo"
         FORCE
     )
@@ -863,8 +927,9 @@ if(ENABLE_BASTIONGUARD_ROOTGUARD)
         FORCE
     )
 
+    # Pass the already-resolved value to the RootGuard subproject.
     set(ROOTGUARD_INIT_SYSTEM
-        "${BASTIONGUARD_ROOTGUARD_INIT_SYSTEM}"
+        "${_BG_ROOTGUARD_INIT_SYSTEM}"
         CACHE STRING
         "RootGuard init system"
         FORCE
@@ -917,6 +982,9 @@ if(ENABLE_BASTIONGUARD_ROOTGUARD)
 
     message(STATUS "[RootGuard] Native module enabled")
     message(STATUS "[RootGuard] =====================================")
+
+    unset(_BG_ROOTGUARD_INIT_SYSTEM)
+    unset(_BG_ROOTGUARD_VALID_INIT_SYSTEMS)
 endif()
 
 if(ENABLE_EMBEDDED_CEF)