[rpms/nfs-ganesha] rawhide: NFS-Ganesha 15.3 GA

[rpms/nfs-ganesha] rawhide: NFS-Ganesha 15.3 GA

[Kaleb S. KEITHLEY]

            A new commit has been pushed.

            Repo   : rpms/nfs-ganesha
            Branch : rawhide
            Commit : 3238f3ca59f1c947bce52d38cc1f956f6282c262
            Author : Kaleb S. KEITHLEY <kkeithle@redhat.com>
            Date   : 2026-09-04T10:11:03-04:00
            Stats  : +85/-3 in 3 file(s)
            URL    : https://src.fedoraproject.org/rpms/nfs-ganesha/c/3238f3ca59f1c947bce52d38cc1f956f6282c262?branch=rawhide

            Log:
            NFS-Ganesha 15.3 GA
build in f46-build-side-150285

---
diff --git a/0003-src-monitoring-prometheus_exposer.cc.patch b/0003-src-monitoring-prometheus_exposer.cc.patch
new file mode 100644
index 0000000..11fe066
--- /dev/null
+++ b/0003-src-monitoring-prometheus_exposer.cc.patch
@@ -0,0 +1,68 @@
+--- nfs-ganesha-15.3/src/monitoring/prometheus_exposer.cc.orig	2026-09-04 07:50:02.845744222 -0400
++++ nfs-ganesha-15.3/src/monitoring/prometheus_exposer.cc	2026-09-04 07:50:31.319045108 -0400
+@@ -35,12 +35,10 @@
+ #include <streambuf>
+ #include <mutex>
+ 
+-extern "C" {
+ #include "fsal.h"
+ #include "nfs_core.h"
+ #include "gsh_config.h"
+ #include "log.h"
+-}
+ 
+ #include <vector>
+ #include <map>
+--- nfs-ganesha-15.3/src/include/fsal_api.h.orig	2026-09-04 07:52:20.458497713 -0400
++++ nfs-ganesha-15.3/src/include/fsal_api.h	2026-09-04 07:53:11.401666074 -0400
+@@ -42,6 +42,11 @@
+ #define FSAL_API
+ 
+ #include <urcu-bp.h>
++
++#ifdef __cplusplus
++extern "C" {
++#endif
++
+ #include "fsal_types.h"
+ #include "fsal_pnfs.h"
+ #include "sal_shared.h"
+@@ -3313,5 +3318,9 @@
+ #include "export_mgr.h"
+ #include "fsal_up.h"
+ 
++#ifdef __cplusplus
++}
++#endif /* extern "C" */
++
+ #endif /* !FSAL_API */
+ /** @} */
+--- nfs-ganesha-15.3/src/include/fsal.h.orig	2026-09-04 08:30:00.322575636 -0400
++++ nfs-ganesha-15.3/src/include/fsal.h	2026-09-04 08:45:15.295515047 -0400
+@@ -36,6 +36,9 @@
+  * @note  not called by other header files.
+  */
+ 
++#ifndef FSAL_H
++#define FSAL_H
++
+ /**
+  * @brief Thread Local Storage (TLS).
+  *
+@@ -55,10 +58,13 @@
+  * Test/assert opctx != NULL first (or let the SEGV kill you)
+  */
+ 
++#ifdef __cplusplus
++extern "C" {
++#endif
+ extern __thread struct req_op_context *op_ctx;
+-
+-#ifndef FSAL_H
+-#define FSAL_H
++#ifdef __cplusplus
++}
++#endif /* extern "C" */
+ 
+ #include "fsal_api.h"
+ #include "nfs23.h"

diff --git a/nfs-ganesha.spec b/nfs-ganesha.spec
index f9707c1..2f2694a 100644
--- a/nfs-ganesha.spec
+++ b/nfs-ganesha.spec
@@ -142,6 +142,9 @@ Requires: openSUSE-release
 %bcond_without monitoring
 %global use_monitoring %{on_off_switch monitoring}
 
+%bcond_without legacy_metrics
+%global legacy_metrics %{on_off_switch legacy_metrics}
+
 %bcond_without grpc
 %global use_grpc %{on_off_switch grpc}
 
@@ -149,6 +152,8 @@ Requires: openSUSE-release
 
 %bcond_without rpc_rdma
 
+%bcond_without ceph_fscrypt
+
 %if ( 0%{?rhel} && 0%{?rhel} < 7 )
 %global _rundir %{_localstatedir}/run
 %endif
@@ -160,7 +165,7 @@ Requires: openSUSE-release
 %global kmip_ver_short	4f553ecaf
 
 Name:		nfs-ganesha
-Version:	15.2
+Version:	15.3
 Release:	1%{?dev:%{dev}}%{?dist}
 Summary:	NFS-Ganesha is a NFS Server running in user space
 License:	LGPL-3.0-or-later
@@ -170,6 +175,7 @@ Source0:	https://github.com/%{name}/%{name}/archive/V%{version}%{?dev:-%{dev}}/%
 Source1:	https://github.com/ceph/libkmip/archive/%{kmip_ver_long}/libkmip-%{kmip_ver_short}.tar.gz
 Patch:		0001-config_samples-log_rotate.patch
 Patch:		0002-src-scripts-python.patch
+Patch:		0003-src-monitoring-prometheus_exposer.cc.patch
 
 BuildRequires:	cmake
 BuildRequires:	make
@@ -206,7 +212,7 @@ BuildRequires: libwbclient-devel
 %endif
 BuildRequires:	gcc gcc-c++
 %if ( 0%{?with_system_ntirpc} )
-BuildRequires:	libntirpc-devel >= 15.2
+BuildRequires:	libntirpc-devel >= 15.3
 %else
 Requires: libntirpc = @NTIRPC_VERSION_EMBED@
 %endif
@@ -621,6 +627,7 @@ cd src && %cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo	\
 	-DENABLE_QOS=%{use_qos}				\
 	-DENABLE_CLUSTER_QOS=%{use_cluster_qos}		\
 	-DUSE_MONITORING=%{use_monitoring}		\
+	-DLEGACY_METRICS=%{legacy_metrics}		\
 	-DUSE_TLS=%{use_tls}				\
 	-DUSE_PRIO_INHERIT=%{use_prio_inherit}		\
 	-DUSE_OPENSSL=%{use_openssl}			\
@@ -788,7 +795,9 @@ killall -SIGHUP dbus-daemon >/dev/null 2>&1 || :
 %license src/LICENSE.txt
 %{_bindir}/ganesha.nfsd
 %{_libdir}/libganesha_nfsd.so*
+%if %{with ceph_fscrypt}
 %{_libdir}/ganesha/libkmip_fscrypt*
+%endif
 %config %{_sysconfdir}/dbus-1/system.d/org.ganesha.nfsd.conf
 %config(noreplace) %{_sysconfdir}/sysconfig/ganesha
 %config(noreplace) %{_sysconfdir}/logrotate.d/ganesha
@@ -812,6 +821,8 @@ killall -SIGHUP dbus-daemon >/dev/null 2>&1 || :
 %{_mandir}/*/ganesha-export-config.8.gz
 %{_mandir}/*/ganesha-cache-config.8.gz
 %{_mandir}/*/ganesha-log-config.8.gz
+%{_mandir}/*/ganesha-fscrypt-config.8.gz
+%{_mandir}/*/ganesha-top.8.gz
 %endif
 %{_sysusersdir}/nfs-ganesha.conf
 
@@ -1017,6 +1028,9 @@ killall -SIGHUP dbus-daemon >/dev/null 2>&1 || :
 %endif
 
 %changelog
+* Thu Sep 3 2026 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 15.3-1
+- NFS-Ganesha 15.3 GA, build f46-build-side-150285
+
 * Mon Aug 24 2026 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 15.2-1
 - NFS-Ganesha 15.2 GA
 

diff --git a/sources b/sources
index 1d5941e..77e2aad 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (nfs-ganesha-15.2.tar.gz) = a9de098623be3d0266aee4673cb73249920ead9f5e53899719fb8134026677506120b61ab48e0c0c532bce08044281c08c579405b397990e4e7638433b284e0e
+SHA512 (nfs-ganesha-15.3.tar.gz) = ffd6d88e9849269464ed90d01e93cd7fae6e6edcc6458594ad732151340adb6ab0376cf064ec0ecf9fffc944f6fd5d5c724bc2230cc796a738db4b86ce4e8e2e
 SHA512 (libkmip-4f553ecaf.tar.gz) = 4aca809758773d919b9657f96a1384076ac34c5a88576d3e7ec4719a0cb1a3638b150f8506fda9476815fe7757cbbb6ea6e0daa943da86c2eaa3bf1a3f1d16f1