net-fs/nfs-utils: replace svcgssd patch with upstream version

Closes: https://bugs.gentoo.org/643848
Package-Manager: Portage-2.3.19_p11, Repoman-2.3.6_p45

diff --git a/net-fs/nfs-utils/files/nfs-utils-2.3.1-svcgssd_undefined_reference.patch b/net-fs/nfs-utils/files/nfs-utils-2.3.1-svcgssd_undefined_reference.patch
index 2134cedaea49ce2d1ecf2000e2b807fc91479872..77c902f2727b0dada6ee621ad3cdeb1a8bf44f9d 100644 (file)
--- a/net-fs/nfs-utils/files/nfs-utils-2.3.1-svcgssd_undefined_reference.patch
+++ b/net-fs/nfs-utils/files/nfs-utils-2.3.1-svcgssd_undefined_reference.patch
@@ -1,13 +1,40 @@
-https://bugs.gentoo.org/641912
+From 1451d7585bf1c622658ccc04abac7e79ffe40263 Mon Sep 17 00:00:00 2001
+From: Justin Mitchell <jumitche@redhat.com>
+Date: Mon, 8 Jan 2018 09:14:11 -0500
+Subject: [PATCH] svcgssd: Update svcgssd so that it builds
 
---- nfs-utils-2.3.1/utils/gssd/svcgssd.c
-+++ nfs-utils-2.3.1/utils/gssd/svcgssd.c
-@@ -101,7 +101,7 @@
+Since a15bd948 the --enable-svcgss option no longer builds
+as svcgssd references functions which were changed at that time.
+Fix those, and other function changes since then.
+
+Signed-off-by: Justin Mitchell <jumitche@redhat.com>
+Signed-off-by: Steve Dickson <steved@redhat.com>
+---
+ utils/gssd/svcgssd.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/utils/gssd/svcgssd.c b/utils/gssd/svcgssd.c
+index 3514ae1..23f0c0b 100644
+--- a/utils/gssd/svcgssd.c
++++ b/utils/gssd/svcgssd.c
+@@ -63,6 +63,8 @@
+ #include "err_util.h"
+ #include "conffile.h"
+ 
++struct state_paths etab;
++
+ void
+ sig_die(int signal)
+ {
+@@ -101,7 +103,7 @@ main(int argc, char *argv[])
        char *principal = NULL;
        char *s;
  
 -      conf_init(NFS_CONFFILE); 
-+      conf_init_file(NFS_CONFFILE); 
++      conf_init_file(NFS_CONFFILE);
  
        s = conf_get_str("svcgssd", "principal");
        if (!s)
+-- 
+1.8.3.1
+