From ae6efe4fa581b135d67fda786846bcc0aaa4e7fa Mon Sep 17 00:00:00 2001
From: Celeste <20312-Celeste@users.gitlab.alpinelinux.org>
Date: Sat, 18 Nov 2023 03:35:35 +0000
Subject: [PATCH] main/nfs-utils: upgrade to 2.6.4

---
 main/nfs-utils/APKBUILD             | 15 +++++----------
 main/nfs-utils/include-unistd.patch | 20 ++++++++++++++++++++
 2 files changed, 25 insertions(+), 10 deletions(-)
 create mode 100644 main/nfs-utils/include-unistd.patch

diff --git a/main/nfs-utils/APKBUILD b/main/nfs-utils/APKBUILD
index 6cc6f2dc39f..bbdff437927 100644
--- a/main/nfs-utils/APKBUILD
+++ b/main/nfs-utils/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=nfs-utils
-pkgver=2.6.3
-pkgrel=3
+pkgver=2.6.4
+pkgrel=0
 pkgdesc="kernel-mode NFS"
 url="https://linux-nfs.org/"
 arch="all"
@@ -10,8 +10,6 @@ license="GPL-2.0-only"
 depends="rpcbind python3"
 options="suid"
 makedepends="
-	autoconf
-	automake
 	bsd-compat-headers
 	keyutils-dev
 	krb5-dev
@@ -38,6 +36,7 @@ source="https://www.kernel.org/pub/linux/utils/nfs-utils/$pkgver/nfs-utils-$pkgv
 	musl-getservbyport.patch
 	musl-svcgssd-sysconf.patch
 	musl-stat64.patch
+	include-unistd.patch
 
 	nfs.initd
 	nfsmount.initd
@@ -53,11 +52,6 @@ source="https://www.kernel.org/pub/linux/utils/nfs-utils/$pkgver/nfs-utils-$pkgv
 	nfsclient.confd
 	"
 
-prepare() {
-	default_prepare
-	./autogen.sh
-}
-
 build() {
 	./configure \
 		--build=$CBUILD \
@@ -134,10 +128,11 @@ ldap() {
 }
 
 sha512sums="
-6f22f3a0564501ce4dc747ca278aae0e76801093f6857996281f300438a92659c3f380943d2515fca54769389bf1ee964aa0ff0af10b3dc4ee512dc8554e457d  nfs-utils-2.6.3.tar.xz
+3aa4c28780c2dd46aa2d57dffdb79a6146478359d449f636cef3c789e9b1f111cd7492b7b817b9600c9805f45ae0afdc1319c7746fac95963383b92f7bddc114  nfs-utils-2.6.4.tar.xz
 94d7ba23164660f1da9298494dff75c57f5a300cb32b2922bc2226fcdaded7eaaa0c50a59a145ac7c75639d177558b5f5594fb1f03a50f60f4c577c93b135748  musl-getservbyport.patch
 52eeade44753f2002bf99d58ad4982086aab74ef8b14de46be547f23508197f58a6ff529145f96de7f031ac0bb7779b648d05fd981cdd91556dd13d068dfe57b  musl-svcgssd-sysconf.patch
 f186a758a7e1e489920be8f7d3b957f358cbcfc158b0ebfe25d8558f54491a4732bfb3b7a3778bc70da5c186d6e6c0901c6c94b7c0475a659420429ee948025f  musl-stat64.patch
+c4fd642960fab82956dc1386a0209c7f66f7bc52dc855ad7004ba31c999933f1d0c66ac37f97b6db9548c0b6c799bd3918373789238338f9942ffafe42d0f186  include-unistd.patch
 b7c2f8d0f8f7ff5fa59ef326432b3e063f52ccdf664fd2b4908adb8cac63bbfe12a60d3a75c4c3e893a0ff0fb6e8c726899d7b7245f1acd39efd5c2c29398e2d  nfs.initd
 89259b9f0878658d48792b5b2f42b43c966ed098dba1fecf9e07fb0de4aab37ad67655ea8dbcc2361ddab2b5013b2de35a03048a513aaeedf790e4b416a35a54  nfsmount.initd
 6e23897885cc33c49d9c7353b456585a1e0c7300822edba81bc48ba4ccc18297adce137260cc0aa9487aa5ef0aab3eecf931532cfa5bd40fd03bc9e0ddacfb28  nfsmount.confd
diff --git a/main/nfs-utils/include-unistd.patch b/main/nfs-utils/include-unistd.patch
new file mode 100644
index 00000000000..ae67e892991
--- /dev/null
+++ b/main/nfs-utils/include-unistd.patch
@@ -0,0 +1,20 @@
+--- a/support/reexport/fsidd.c
++++ b/support/reexport/fsidd.c
+@@ -7,6 +7,7 @@
+ #include <dlfcn.h>
+ #endif
+ #include <event2/event.h>
++#include <unistd.h>
+ 
+ #include "conffile.h"
+ #include "reexport_backend.h"
+--- a/support/reexport/reexport.c
++++ b/support/reexport/reexport.c
+@@ -7,6 +7,7 @@
+ #endif
+ #include <sys/types.h>
+ #include <sys/vfs.h>
++#include <unistd.h>
+ #include <errno.h>
+ 
+ #include "nfsd_path.h"