Merge branch '3.0-dev' into 3.0

Merge branch '3.0-dev' commit 1440982

Signed-off-by: Lee Chee Yang <chee.yang.lee@intel.com>

Author: cheeyanglee

LICENSES-AND-NOTICES/SPECS/LICENSES-MAP.md

@@ -624,6 +624,7 @@
                 "libcdr",
                 "libcgroup",
                 "libchewing",
+                "libclc",
                 "libcli",
                 "libcmis",
                 "libcmpiutil",

LICENSES-AND-NOTICES/SPECS/data/licenses.json

@@ -3,7 +3,7 @@
 Summary:        Web server with automatic HTTPS
 Name:           caddy
 Version:        2.9.1
-Release:        12%{?dist}
+Release:        13%{?dist}
 Distribution:   Edge Microvisor Toolkit
 Vendor:         Intel Corporation
 # main source code is Apache-2.0
@@ -32,7 +32,7 @@ Patch3:         CVE-2024-45339.patch
 Patch4:         CVE-2025-22872.patch
 BuildRequires:  go-rpm-macros
 # https://github.com/caddyserver/caddy/commit/2028da4e74cd41f0f7f94222c6599da1a371d4b8
-BuildRequires:  golang >= 1.22.3
+BuildRequires:  golang >= 1.24.4
 # dario.cat/mergo : BSD-3-Clause
 Provides:       bundled(golang(dario.cat/mergo)) = 1.0.1
 # filippo.io/edwards25519 : BSD-3-Clause
@@ -452,6 +452,9 @@ fi
 %{_datadir}/fish/vendor_completions.d/caddy.fish
 
 %changelog
+* Tue Sep 2 2025 Polmoorx shiva kumar <polmoorx.shiva.kumar@intel.com> - 2.9.1-13
+- Update go version to use above 1.24.4
+
 * Fri Jun 13 2025 Tham Jing Hui <jing.hui.tham@intel.com> - 2.9.1-12
 - Include patch for CVE-2025-22872
 

SPECS/caddy/caddy.spec

@@ -0,0 +1,26 @@
+From eaa962545716175e3915305e398394d32ef4eac6 Mon Sep 17 00:00:00 2001
+From: kintalix jayanth <jayanthx.kintali@intel.com>
+Date: Tue, 2 Sep 2025 13:01:02 +0530
+Subject: [PATCH] Change users module to use attended_config.json
+
+Signed-off-by: kintalix jayanth <jayanthx.kintali@intel.com>
+---
+ src/modules/users/Config.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/modules/users/Config.cpp b/src/modules/users/Config.cpp
+index d11fe40..c3ec978 100644
+--- a/src/modules/users/Config.cpp
++++ b/src/modules/users/Config.cpp
+@@ -978,7 +978,7 @@ Config::createJobs() const
+     // j = new SetupGroupsJob( this );
+     // jobs.append( Calamares::job_ptr( j ) );
+ 
+-    const std::string confPath = "/etc/calamares/unattended_config.json";
++    const std::string confPath = "/etc/calamares/attended_config.json";
+     j = new MarinerconfJob( m_hostname, loginName(), userPassword(), confPath );
+     jobs.append( Calamares::job_ptr( j ) );
+ 
+-- 
+2.34.1
+

SPECS/calamares/0001-Change-users-module-to-use-attended_config.json.patch

@@ -7,7 +7,7 @@ Summary:        Installer from a live CD/DVD/USB to disk
 # https://github.com/calamares/calamares/issues/1051
 Name:           calamares
 Version:        3.3.1
-Release:        13%{?dist}
+Release:        14%{?dist}
 License:        GPLv3+
 Vendor:         Intel Corporation
 Distribution:   Edge Microvisor Toolkit
@@ -60,6 +60,7 @@ Patch8:          change-completion-from-second-to-minute.patch
 Patch9:          ui_redesign.patch
 Patch10:         c69e229be0be9bd7a033776ebe3bec63206b8151.patch
 Patch11:         change-wording-in-welcomepage.patch
+Patch12:         0001-Change-users-module-to-use-attended_config.json.patch
 # Compilation tools
 BuildRequires:  cmake
 BuildRequires:  extra-cmake-modules
@@ -160,6 +161,7 @@ mv %{SOURCE56} data/images/wait.png
 %patch -P 9 -p1
 %patch -P 10 -p1
 %patch -P 11 -p1
+%patch -P 12 -p1
 
 %build
 %cmake_kf \
@@ -237,6 +239,9 @@ install -p -m 644 %{SOURCE21} %{buildroot}%{_sysconfdir}/calamares/settings.conf
 %{_libdir}/libcalamaresui.so
 
 %changelog
+* Tue Sep 01 2025 kintalix jayanth <kintalix.jayanth@intel.com> - 3.3.1-14
+-  switched config path to attended_config.json instead of unattended_config.json
+
 * Tue June 17 2025 Tan Jia Yong <jia.yong.tan@intel.com> - 3.3.1-13
 - Change welcome page wording.
 

SPECS/calamares/calamares.spec

@@ -1,7 +1,7 @@
 Summary:        Installs/uninstalls orchestration software on an edge node using command obtained from Cluster Orchestrator.
 Name:           cluster-agent
 Version:        1.7.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        Apache-2.0
 Vendor:         Intel Corporation
 Distribution:   Edge Microvisor Toolkit 
@@ -14,7 +14,7 @@ Source4:        rke2-path.conf
 Source5:        cluster-agent.sudoers
 Source6:        cluster_agent.te
 Source7:        cluster_agent.fc
-BuildRequires:  golang >= 1.24.1
+BuildRequires:  golang >= 1.24.4
 BuildRequires:  systemd-rpm-macros
 Requires(pre):  %{_bindir}/systemd-sysusers
 Requires:       curl
@@ -128,6 +128,9 @@ install -m 644 %{modulename}.pp %{buildroot}%{_datadir}/selinux/packages/%{modul
 %selinux_modules_uninstall -s %{selinuxtype} %{modulename}
 
 %changelog
+* Tue Sep 2 2025 Polmoorx shiva kumar <polmoorx.shiva.kumar@intel.com> - 1.7.3-2
+- Update go version to use above 1.24.4
+
 * Wed Jun 04 2025 Rajeev Ranjan <rajeev2.ranjan@intel.com> - 1.7.3-1
 - Add backoff/retry on northbound grpc interfaces
 

SPECS/cluster-agent/cluster-agent.spec

@@ -4,7 +4,7 @@ Summary:        Device Discovery Agent for Edge Node
 Name:           device-discovery
 Epoch:          1
 Version:        0.0.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Distribution:   Edge Microvisor Toolkit
 Vendor:         Intel Corporation
 License:        Apache-2.0
@@ -15,7 +15,7 @@ Source2:        %{name}-%{version}-vendor.tar.gz
 
 %{?systemd_requires}
 
-BuildRequires:  golang >= 1.24.1
+BuildRequires:  golang >= 1.24.4
 BuildRequires:  systemd-rpm-macros
 Requires: curl
 Requires: dmidecode
@@ -49,6 +49,9 @@ install -Dp -m0644 %{SOURCE1} %{buildroot}%{_unitdir}/device-discovery.service
 %{_unitdir}/device-discovery.service
 
 %changelog
+* Tue Sep 2 2025 Polmoorx shiva kumar <polmoorx.shiva.kumar@intel.com> - 1:0.0.3-2
+- Update go version to use above 1.24.4
+
 * Wed Jun 18 2025 Andy <andy.peng@intel.com> - 1:0.0.3-1
 - Update go version to 1.24.1
 

SPECS/device-discovery/device-discovery.spec

@@ -4,7 +4,7 @@
 Summary:        An agent to manage systems via in-band connection
 Name:           inbm
 Version:        4.2.8.6
-Release:        1%{?dist}
+Release:        2%{?dist}
 Distribution:   Edge Microvisor Toolkit
 Vendor:         Intel Corporation
 License:        Apache-2.0
@@ -14,7 +14,7 @@ Source1:        intel_manageability.conf
 Source2:        inbm-configuration-replace-FQDN.sh
 Source3:        inbm.te
 Source4:        inbm.fc
-BuildRequires:  golang
+BuildRequires:  golang >= 1.24.4
 BuildRequires:  python3-devel
 BuildRequires:  systemd-rpm-macros
 BuildRequires:  selinux-policy-devel
@@ -225,6 +225,9 @@ rm -rf %{buildroot}%{_docdir}
 %postun
 
 %changelog
+* Tue Sep 2 2025 Polmoorx shiva kumar <polmoorx.shiva.kumar@intel.com> - 4.2.8.6-2
+- Update go version to use above 1.24.4
+
 * Thu Apr 03 2025 Yeng Liong Wong <yeng.liong.wong@intel.com> - 4.2.8.6-1
 - Update INBM to v4.2.8.6
 

SPECS/inbm/inbm.spec

@@ -0,0 +1,5 @@
+{
+ "Signatures": {
+  "libclc-18.1.2.src.tar.xz": "13465a087f2f13d4f0e0adab7dfd9c538c242f631a8c4571ed85e4e50f8c2570"
+ }
+}