CVS commit: pkgsrc/security/polkit

["Maya Rashish" <maya%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   maya
Date:           Tue Sep 27 21:56:13 UTC 2016

Modified Files:
        pkgsrc/security/polkit: distinfo
        pkgsrc/security/polkit/patches: patch-test_mocklibc_src_grp.c

Log Message:
polkit: avoid declaring conflicting setgrent on FreeBSD.
Should fix the build failure on FreeBSD-10.3.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/security/polkit/distinfo
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/security/polkit/patches/patch-test_mocklibc_src_grp.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/security/polkit/distinfo
diff -u pkgsrc/security/polkit/distinfo:1.2 pkgsrc/security/polkit/distinfo:1.3
--- pkgsrc/security/polkit/distinfo:1.2 Sat Jun 18 12:16:23 2016
+++ pkgsrc/security/polkit/distinfo     Tue Sep 27 21:56:13 2016
@@ -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)
 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

Index: pkgsrc/security/polkit/patches/patch-test_mocklibc_src_grp.c
diff -u pkgsrc/security/polkit/patches/patch-test_mocklibc_src_grp.c:1.2 pkgsrc/security/polkit/patches/patch-test_mocklibc_src_grp.c:1.3
--- pkgsrc/security/polkit/patches/patch-test_mocklibc_src_grp.c:1.2    Sat Jun 18 12:16:23 2016
+++ pkgsrc/security/polkit/patches/patch-test_mocklibc_src_grp.c        Tue Sep 27 21:56:13 2016
@@ -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
 +}
 +#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)