From f90da6f325b136bbb4372d7571faf5e92484b2f4 Mon Sep 17 00:00:00 2001
From: maya <maya>
Date: Tue, 27 Sep 2016 21:56:13 +0000
Subject: polkit: avoid declaring conflicting setgrent on FreeBSD. Should fix
 the build failure on FreeBSD-10.3.

---
 security/polkit/distinfo                              |  4 ++--
 security/polkit/patches/patch-test_mocklibc_src_grp.c | 16 ++++++++++++++--
 2 files changed, 16 insertions(+), 4 deletions(-)

(limited to 'security')

diff --git a/security/polkit/distinfo b/security/polkit/distinfo
index d1e2a31679d..751d0d91b7d 100644
--- a/security/polkit/distinfo
+++ b/security/polkit/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2016/06/18 12:16:23 youri Exp $
+$NetBSD: distinfo,v 1.3 2016/09/27 21:56:13 maya Exp $
 
 SHA1 (polkit-0.113.tar.gz) = ef855c2d04184dceb38e0940dc7bec9cc3da415c
 RMD160 (polkit-0.113.tar.gz) = 661b0a678f7c770c213404db3af604935fdb25bc
@@ -11,5 +11,5 @@ SHA1 (patch-src_polkitbackend_polkitd.c) = a567b31131f63f92f8e2967c3aabfa7f3d41f
 SHA1 (patch-src_programs_pkexec.c) = bfc0414c7a943c8e8b8412566a2519198eab8abd
 SHA1 (patch-src_programs_pkttyagent.c) = 72a1c3750e6b496b981eb5479201946da80b6d15
 SHA1 (patch-test_mocklib_src_netdb.c) = 5d24d5d37eabd552bc8a3cf1d6de03c6c8ffa600
-SHA1 (patch-test_mocklibc_src_grp.c) = 6e82f05c89658ed166c3752a802d4b03f1c90bcb
+SHA1 (patch-test_mocklibc_src_grp.c) = b393dad5f7b2242e431d9b7db9e48d2f837b0235
 SHA1 (patch-test_mocklibc_src_pwd.c) = ff69388ad64f883b1bb459f198e8fc24be1089fd
diff --git a/security/polkit/patches/patch-test_mocklibc_src_grp.c b/security/polkit/patches/patch-test_mocklibc_src_grp.c
index b028d41e496..63cc062c985 100644
--- a/security/polkit/patches/patch-test_mocklibc_src_grp.c
+++ b/security/polkit/patches/patch-test_mocklibc_src_grp.c
@@ -1,10 +1,13 @@
-$NetBSD: patch-test_mocklibc_src_grp.c,v 1.2 2016/06/18 12:16:23 youri Exp $
+$NetBSD: patch-test_mocklibc_src_grp.c,v 1.3 2016/09/27 21:56:13 maya Exp $
 
 * XXX: no fgetgrent(3)
 
+Avoid conflicting with builtin setgrent on FreeBSD, it has a different
+prototype: int setgrent(void)
+
 --- test/mocklibc/src/grp.c.orig	2014-01-14 22:42:25.000000000 +0000
 +++ test/mocklibc/src/grp.c
-@@ -27,6 +27,12 @@
+@@ -27,6 +27,13 @@
  
  static FILE *global_stream = NULL;
  
@@ -14,6 +17,15 @@ $NetBSD: patch-test_mocklibc_src_grp.c,v 1.2 2016/06/18 12:16:23 youri Exp $
 +}
 +#endif
 +
++#if !defined(__FreeBSD__)
  void setgrent(void) {
    if (global_stream)
      endgrent();
+@@ -37,6 +44,7 @@ void setgrent(void) {
+ 
+   global_stream = fopen(path, "r");
+ }
++#endif
+ 
+ struct group *getgrent(void) {
+   if (!global_stream)
-- 
cgit v1.2.3