Version in base suite: 6.5-5 Base version: nfs-ganesha_6.5-5 Target version: nfs-ganesha_6.5-6~bpo13+1 Base file: /srv/ftp-master.debian.org/ftp/pool/main/n/nfs-ganesha/nfs-ganesha_6.5-5.dsc Target file: /srv/ftp-master.debian.org/policy/pool/main/n/nfs-ganesha/nfs-ganesha_6.5-6~bpo13+1.dsc changelog | 13 ++++ patches/0002-build-bump-cmake_minimum_required-to-3.5.0.patch | 24 ++++++++ patches/0003-fix-fsal_obj_handle_fine-position-in-FSAL_GLUSTER.patch | 30 ++++++++++ patches/series | 2 4 files changed, 69 insertions(+) diff -Nru nfs-ganesha-6.5/debian/changelog nfs-ganesha-6.5/debian/changelog --- nfs-ganesha-6.5/debian/changelog 2025-04-18 21:24:56.000000000 +0000 +++ nfs-ganesha-6.5/debian/changelog 2025-11-03 09:59:24.000000000 +0000 @@ -1,3 +1,16 @@ +nfs-ganesha (6.5-6~bpo13+1) trixie-backports; urgency=medium + + * trixie backport rebuild + + -- Christoph Martin Mon, 03 Nov 2025 10:59:24 +0100 + +nfs-ganesha (6.5-6) unstable; urgency=medium + + * Backport upstream fix for FTBFS with CMake 4. (Closes: #1113322) + * fix fsal_obj_handle_fine position in FSAL_GLUSTER (closes: #1111501) + + -- Christoph Martin Wed, 29 Oct 2025 11:44:12 +0100 + nfs-ganesha (6.5-5) unstable; urgency=medium * make installation of genesha-top.8 architecture independant (closes: diff -Nru nfs-ganesha-6.5/debian/patches/0002-build-bump-cmake_minimum_required-to-3.5.0.patch nfs-ganesha-6.5/debian/patches/0002-build-bump-cmake_minimum_required-to-3.5.0.patch --- nfs-ganesha-6.5/debian/patches/0002-build-bump-cmake_minimum_required-to-3.5.0.patch 1970-01-01 00:00:00.000000000 +0000 +++ nfs-ganesha-6.5/debian/patches/0002-build-bump-cmake_minimum_required-to-3.5.0.patch 2025-10-28 22:39:44.000000000 +0000 @@ -0,0 +1,24 @@ +commit 9b492a314a578d155ccc08270aa503a8600716a1 +Author: Rubén Alcolea Núñez +Date: Fri Sep 26 12:27:24 2025 +0200 + + build: bump cmake_minimum_required to 3.5.0 + + This commit closes #1325 + + Change-Id: I9df21e7cc1244778d5e52cf31c3f061ded884a42 + Signed-off-by: Rubén Alcolea Núñez + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index aa884350c..39b606db1 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -23,7 +23,7 @@ + + # Current version as of Fedora 16. Not tested with earlier. + +-cmake_minimum_required(VERSION 2.6.3) ++cmake_minimum_required(VERSION 3.5.0) + + message( STATUS "cmake version ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" ) + diff -Nru nfs-ganesha-6.5/debian/patches/0003-fix-fsal_obj_handle_fine-position-in-FSAL_GLUSTER.patch nfs-ganesha-6.5/debian/patches/0003-fix-fsal_obj_handle_fine-position-in-FSAL_GLUSTER.patch --- nfs-ganesha-6.5/debian/patches/0003-fix-fsal_obj_handle_fine-position-in-FSAL_GLUSTER.patch 1970-01-01 00:00:00.000000000 +0000 +++ nfs-ganesha-6.5/debian/patches/0003-fix-fsal_obj_handle_fine-position-in-FSAL_GLUSTER.patch 2025-10-29 10:40:53.000000000 +0000 @@ -0,0 +1,30 @@ +commit 72565026ac69d40c586b9adc447339aea5eeeaff +Author: Guillaume PENIN +Date: Tue Mar 11 18:35:14 2025 +0100 + + Move fsal_obj_handle_fini() just before gsh_free() in FSAL_GLUSTER handle_release() to prevent SIGSEGV. + + Change-Id: I21bff9de535251755b5b1f2893ed92c71f72b9ff + Signed-off-by: Guillaume PENIN + +diff --git a/src/FSAL/FSAL_GLUSTER/handle.c b/src/FSAL/FSAL_GLUSTER/handle.c +index 93bab059f..8724af1fa 100644 +--- a/src/FSAL/FSAL_GLUSTER/handle.c ++++ b/src/FSAL/FSAL_GLUSTER/handle.c +@@ -64,8 +64,6 @@ static void handle_release(struct fsal_obj_handle *obj_hdl) + now(&s_time); + #endif + +- fsal_obj_handle_fini(&objhandle->handle, true); +- + if (obj_hdl->type == REGULAR_FILE) { + fsal_status_t st; + +@@ -97,6 +95,7 @@ static void handle_release(struct fsal_obj_handle *obj_hdl) + if (objhandle->handle.type == REGULAR_FILE) + destroy_fsal_fd(&my_fd->fsal_fd); + ++ fsal_obj_handle_fini(&objhandle->handle, true); + gsh_free(objhandle); + + #ifdef GLTIMING diff -Nru nfs-ganesha-6.5/debian/patches/series nfs-ganesha-6.5/debian/patches/series --- nfs-ganesha-6.5/debian/patches/series 2025-04-18 21:24:56.000000000 +0000 +++ nfs-ganesha-6.5/debian/patches/series 2025-10-29 10:43:18.000000000 +0000 @@ -1,4 +1,6 @@ 0001-src-CMakeLists.text.patch +0002-build-bump-cmake_minimum_required-to-3.5.0.patch +0003-fix-fsal_obj_handle_fine-position-in-FSAL_GLUSTER.patch CMakeLists-LIB_INSTALL_DIR.patch add-latomic-linking-as-needed.patch spelling.patch