[rpms/nfs-ganesha] rawhide: nfs-ganesha 15.4 GA

[rpms/nfs-ganesha] rawhide: nfs-ganesha 15.4 GA

[Kaleb S. KEITHLEY]

            A new commit has been pushed.

            Repo   : rpms/nfs-ganesha
            Branch : rawhide
            Commit : 14251817f094d5a1197cb0d1e7063c3fec5e7945
            Author : Kaleb S. KEITHLEY <kkeithle@redhat.com>
            Date   : 2026-09-14T09:12:29-04:00
            Stats  : +5/-84 in 3 file(s)
            URL    : https://src.fedoraproject.org/rpms/nfs-ganesha/c/14251817f094d5a1197cb0d1e7063c3fec5e7945?branch=rawhide

            Log:
            nfs-ganesha 15.4 GA
f46-build-side-151546

---
diff --git a/0003-src-monitoring-prometheus_exposer.cc.patch b/0003-src-monitoring-prometheus_exposer.cc.patch
deleted file mode 100644
index 610facc..0000000
--- a/0003-src-monitoring-prometheus_exposer.cc.patch
+++ /dev/null
@@ -1,81 +0,0 @@
---- 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"
---- nfs-ganesha-15.3/src/monitoring/prometheus_exposer.cc.orig	2026-09-03 13:41:52.000000000 -0400
-+++ nfs-ganesha-15.3/src/monitoring/prometheus_exposer.cc	2026-09-04 10:55:02.630149296 -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>
-@@ -500,8 +498,10 @@
- 	LogFullDebug(
- 		COMPONENT_FSAL,
- 		"dynamic_metrics_export_info details :"
--		" dynamic_info.total_bytes %ld dynamic_info.avail_bytes  %ld"
--		" dynamic_info.total_files %ld dynamic_info.avail_files %ld",
-+		" dynamic_info.total_bytes %" PRIu64
-+		" dynamic_info.avail_bytes %" PRIu64
-+		" dynamic_info.total_files %" PRIu64
-+		" dynamic_info.avail_files %" PRIu64,
- 		dynamic_info.total_bytes, dynamic_info.avail_bytes,
- 		dynamic_info.total_files, dynamic_info.avail_files);
- 	dynamic_metrics_export_info(path, dynamic_info.total_bytes,

diff --git a/nfs-ganesha.spec b/nfs-ganesha.spec
index 74c793f..3502947 100644
--- a/nfs-ganesha.spec
+++ b/nfs-ganesha.spec
@@ -169,7 +169,7 @@ Requires: openSUSE-release
 %global kmip_ver_short	4f553ecaf
 
 Name:		nfs-ganesha
-Version:	15.3
+Version:	15.4
 Release:	1%{?dev:%{dev}}%{?dist}
 Summary:	NFS-Ganesha is a NFS Server running in user space
 License:	LGPL-3.0-or-later
@@ -179,7 +179,6 @@ 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
@@ -1032,6 +1031,9 @@ killall -SIGHUP dbus-daemon >/dev/null 2>&1 || :
 %endif
 
 %changelog
+* Mon Sep 14 2026 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 15.4-1
+- NFS-Ganesha 15.4 GA, build f46-build-side-151546
+
 * Thu Sep 3 2026 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 15.3-1
 - NFS-Ganesha 15.3 GA, build f46-build-side-150285
 

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