From 5ce60ac3687bcd09943d223221ad1b8e438c4961 Mon Sep 17 00:00:00 2001
From: MilhouseVH <milhouseVH.github@nmacleod.com>
Date: Wed, 21 Dec 2016 13:19:06 +0000
Subject: [PATCH] rpcbind: update to rpcbind-0.2.4

---
 packages/network/rpcbind/package.mk           |  2 +-
 .../patches/rpcbind-0.2.3-xp_auth.patch       | 22 -------------------
 ...cbind-01-drop-warm-start-as-it-fails.patch | 18 +++++++++++++++
 3 files changed, 19 insertions(+), 23 deletions(-)
 delete mode 100644 packages/network/rpcbind/patches/rpcbind-0.2.3-xp_auth.patch
 create mode 100644 packages/network/rpcbind/patches/rpcbind-01-drop-warm-start-as-it-fails.patch

diff --git a/packages/network/rpcbind/package.mk b/packages/network/rpcbind/package.mk
index df959b32fc..8a5c2a6e57 100644
--- a/packages/network/rpcbind/package.mk
+++ b/packages/network/rpcbind/package.mk
@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="rpcbind"
-PKG_VERSION="0.2.3"
+PKG_VERSION="0.2.4"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"
diff --git a/packages/network/rpcbind/patches/rpcbind-0.2.3-xp_auth.patch b/packages/network/rpcbind/patches/rpcbind-0.2.3-xp_auth.patch
deleted file mode 100644
index c2162189de..0000000000
--- a/packages/network/rpcbind/patches/rpcbind-0.2.3-xp_auth.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -up rpcbind-0.2.3/src/rpcb_svc_com.c.orig rpcbind-0.2.3/src/rpcb_svc_com.c
---- rpcbind-0.2.3/src/rpcb_svc_com.c.orig	2015-11-02 16:23:08.584000000 -0500
-+++ rpcbind-0.2.3/src/rpcb_svc_com.c	2015-11-02 16:58:20.386000000 -0500
-@@ -1295,10 +1295,17 @@ handle_reply(int fd, SVCXPRT *xprt)
- 	a.rmt_localvers = fi->versnum;
- 
- 	xprt_set_caller(xprt, fi);
-+#if defined(SVC_XP_AUTH)
-+	SVC_XP_AUTH(xprt) = svc_auth_none;
-+#else 
- 	xprt->xp_auth = &svc_auth_none;
-+#endif
- 	svc_sendreply(xprt, (xdrproc_t) xdr_rmtcall_result, (char *) &a);
-+#if !defined(SVC_XP_AUTH)
- 	SVCAUTH_DESTROY(xprt->xp_auth);
- 	xprt->xp_auth = NULL;
-+#endif
-+
- done:
- 	if (buffer)
- 		free(buffer);
-
diff --git a/packages/network/rpcbind/patches/rpcbind-01-drop-warm-start-as-it-fails.patch b/packages/network/rpcbind/patches/rpcbind-01-drop-warm-start-as-it-fails.patch
new file mode 100644
index 0000000000..6776ca75f5
--- /dev/null
+++ b/packages/network/rpcbind/patches/rpcbind-01-drop-warm-start-as-it-fails.patch
@@ -0,0 +1,18 @@
+diff -Naur a/systemd/rpcbind.service.in b/systemd/rpcbind.service.in
+--- a/systemd/rpcbind.service.in	2016-12-20 03:18:51.839794796 +0000
++++ b/systemd/rpcbind.service.in	2016-12-20 03:21:30.476854474 +0000
+@@ -6,12 +6,12 @@
+ # Make sure we use the IP addresses listed for
+ # rpcbind.socket, no matter how this unit is started.
+ Wants=rpcbind.socket
+-After=rpcbind.socket
++After=rpcbind.socket var.mount
+ 
+ [Service]
+ Type=notify
+ # distro can provide a drop-in adding EnvironmentFile=-/??? if needed.
+-ExecStart=@_bindir@/rpcbind $RPCBIND_OPTIONS -w -f
++ExecStart=@_bindir@/rpcbind $RPCBIND_OPTIONS -f
+ 
+ [Install]
+ WantedBy=multi-user.target