From c45ccbd3a0acf76b99d0e29ddb0ad64dad641182 Mon Sep 17 00:00:00 2001
From: Rudi Heitbaum <rudi@heitbaum.com>
Date: Wed, 11 Dec 2024 22:06:23 +0000
Subject: [PATCH 1/3] libnfs: update to 6.0.0

---
 packages/network/libnfs/package.mk | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/network/libnfs/package.mk b/packages/network/libnfs/package.mk
index e548cd216d6..fefc3bf1e80 100644
--- a/packages/network/libnfs/package.mk
+++ b/packages/network/libnfs/package.mk
@@ -3,8 +3,8 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="libnfs"
-PKG_VERSION="5.0.3"
-PKG_SHA256="d945cb4f4c8f82ee1f3640893a168810f794a28e1010bb007ec5add345e9df3e"
+PKG_VERSION="6.0.0"
+PKG_SHA256="6fe64b5a47b2558484c8beb05819c1f1f3e52cc52a7b3a8b805faf398e9a9c24"
 PKG_LICENSE="LGPL2.1+"
 PKG_SITE="https://github.com/sahlberg/libnfs"
 PKG_URL="https://github.com/sahlberg/libnfs/archive/libnfs-${PKG_VERSION}.tar.gz"
@@ -12,7 +12,8 @@ PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="A client library for accessing NFS shares over a network."
 PKG_TOOLCHAIN="autotools"
 
-PKG_CONFIGURE_OPTS_TARGET="--disable-examples"
+PKG_CONFIGURE_OPTS_TARGET="--disable-examples \
+                           --without-libkrb5"
 
 pre_configure_target() {
   export CFLAGS="${CFLAGS} -D_FILE_OFFSET_BITS=64"

From 5303bd9dcf6d8e5d507d2d9b965731501a629e62 Mon Sep 17 00:00:00 2001
From: Rudi Heitbaum <rudi@heitbaum.com>
Date: Thu, 12 Dec 2024 13:20:50 +0000
Subject: [PATCH 2/3] kodi: support libnfs-6.0.0

- https://github.com/sahlberg/libnfs/commit/5e8f7ce273308eb77f94248f4501e574a703c1a5
---
 .../kodi/patches/kodi-999.99-nfs.patch        | 44 +++++++++++++++++++
 1 file changed, 44 insertions(+)
 create mode 100644 packages/mediacenter/kodi/patches/kodi-999.99-nfs.patch

diff --git a/packages/mediacenter/kodi/patches/kodi-999.99-nfs.patch b/packages/mediacenter/kodi/patches/kodi-999.99-nfs.patch
new file mode 100644
index 00000000000..de9cb4a61d2
--- /dev/null
+++ b/packages/mediacenter/kodi/patches/kodi-999.99-nfs.patch
@@ -0,0 +1,44 @@
+--- a/xbmc/filesystem/NFSFile.cpp	2024-11-15 21:22:52.000000000 +0000
++++ b/xbmc/filesystem/NFSFile.cpp	2024-12-12 13:15:36.937126708 +0000
+@@ -477,7 +477,11 @@
+ 
+   nfs_lseek(pContext, _pFileHandle, 0, SEEK_CUR, &offset);
+ 
++#ifdef LIBNFS_API_V2
++  int bytes = nfs_read(pContext, _pFileHandle, buffer, 32);
++#else
+   int bytes = nfs_read(pContext, _pFileHandle, 32, buffer);
++#endif
+   if (bytes < 0)
+   {
+     CLog::LogF(LOGERROR, "nfs_read - Error ({}, {})", bytes, nfs_get_error(pContext));
+@@ -742,7 +746,11 @@
+   if (m_pFileHandle == NULL || m_pNfsContext == NULL )
+     return -1;
+ 
++#ifdef LIBNFS_API_V2
++  numberOfBytesRead = nfs_read(m_pNfsContext, m_pFileHandle, (char *)lpBuf, uiBufSize);
++#else
+   numberOfBytesRead = nfs_read(m_pNfsContext, m_pFileHandle, uiBufSize, (char *)lpBuf);
++#endif
+ 
+   lock.unlock(); //no need to keep the connection lock after that
+ 
+@@ -843,10 +851,17 @@
+     }
+     //write chunk
+     //! @bug libnfs < 2.0.0 isn't const correct
++#ifdef LIBNFS_API_V2
++    writtenBytes = nfs_write(m_pNfsContext,
++                                  m_pFileHandle,
++                                  const_cast<char*>((const char *)lpBuf) + numberOfBytesWritten,
++                                  chunkSize);
++#else
+     writtenBytes = nfs_write(m_pNfsContext,
+                                   m_pFileHandle,
+                                   chunkSize,
+                                   const_cast<char*>((const char *)lpBuf) + numberOfBytesWritten);
++#endif
+     //decrease left bytes
+     leftBytes-= writtenBytes;
+     //increase overall written bytes

From 963d0eb132d2a4eb4d3c87fdf3053e3ea1d22cb7 Mon Sep 17 00:00:00 2001
From: Rudi Heitbaum <rudi@heitbaum.com>
Date: Sat, 14 Dec 2024 11:10:27 +0000
Subject: [PATCH 3/3] libnfs: update to 6.0.2

---
 packages/network/libnfs/package.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/network/libnfs/package.mk b/packages/network/libnfs/package.mk
index fefc3bf1e80..3555595236d 100644
--- a/packages/network/libnfs/package.mk
+++ b/packages/network/libnfs/package.mk
@@ -3,8 +3,8 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="libnfs"
-PKG_VERSION="6.0.0"
-PKG_SHA256="6fe64b5a47b2558484c8beb05819c1f1f3e52cc52a7b3a8b805faf398e9a9c24"
+PKG_VERSION="6.0.2"
+PKG_SHA256="4e5459cc3e0242447879004e9ad28286d4d27daa42cbdcde423248fad911e747"
 PKG_LICENSE="LGPL2.1+"
 PKG_SITE="https://github.com/sahlberg/libnfs"
 PKG_URL="https://github.com/sahlberg/libnfs/archive/libnfs-${PKG_VERSION}.tar.gz"