Tue Sep 27 21:56:13 2016 UTC ()
polkit: avoid declaring conflicting setgrent on FreeBSD.
Should fix the build failure on FreeBSD-10.3.


(maya)
diff -r1.2 -r1.3 pkgsrc/security/polkit/distinfo
diff -r1.2 -r1.3 pkgsrc/security/polkit/patches/patch-test_mocklibc_src_grp.c
cvs diff -r1.2 -r1.3 pkgsrc/security/polkit/distinfo (expand / switch to unified diff)

--- pkgsrc/security/polkit/distinfo 2016/06/18 12:16:23 1.2
+++ pkgsrc/security/polkit/distinfo 2016/09/27 21:56:13 1.3
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1$NetBSD: distinfo,v 1.2 2016/06/18 12:16:23 youri Exp $ 1$NetBSD: distinfo,v 1.3 2016/09/27 21:56:13 maya Exp $
2 2
3SHA1 (polkit-0.113.tar.gz) = ef855c2d04184dceb38e0940dc7bec9cc3da415c 3SHA1 (polkit-0.113.tar.gz) = ef855c2d04184dceb38e0940dc7bec9cc3da415c
4RMD160 (polkit-0.113.tar.gz) = 661b0a678f7c770c213404db3af604935fdb25bc 4RMD160 (polkit-0.113.tar.gz) = 661b0a678f7c770c213404db3af604935fdb25bc
5SHA512 (polkit-0.113.tar.gz) = ab177c89a20eeb2978ddbe28afb205d3619f9c5defe833eb68a85e71a0f2c905367f1295cbbfb85da5eafdd661bce474d5d84aca9195cd425a18c9b4170eb5f9 5SHA512 (polkit-0.113.tar.gz) = ab177c89a20eeb2978ddbe28afb205d3619f9c5defe833eb68a85e71a0f2c905367f1295cbbfb85da5eafdd661bce474d5d84aca9195cd425a18c9b4170eb5f9
6Size (polkit-0.113.tar.gz) = 1448865 bytes 6Size (polkit-0.113.tar.gz) = 1448865 bytes
7SHA1 (patch-src_polkit_polkitunixprocess.c) = dbfdfd441b211c80183ea5c63a20252c58a594b2 7SHA1 (patch-src_polkit_polkitunixprocess.c) = dbfdfd441b211c80183ea5c63a20252c58a594b2
8SHA1 (patch-src_polkitbackend_polkitbackendinteractiveauthority.c) = d8b7cbcd0db26969bc4b83c32a731ae920c2e87b 8SHA1 (patch-src_polkitbackend_polkitbackendinteractiveauthority.c) = d8b7cbcd0db26969bc4b83c32a731ae920c2e87b
9SHA1 (patch-src_polkitbackend_polkitbackendjsauthority.c) = f0771b27e192ed199c65ed7514962ec5a8cb28a4 9SHA1 (patch-src_polkitbackend_polkitbackendjsauthority.c) = f0771b27e192ed199c65ed7514962ec5a8cb28a4
10SHA1 (patch-src_polkitbackend_polkitd.c) = a567b31131f63f92f8e2967c3aabfa7f3d41f627 10SHA1 (patch-src_polkitbackend_polkitd.c) = a567b31131f63f92f8e2967c3aabfa7f3d41f627
11SHA1 (patch-src_programs_pkexec.c) = bfc0414c7a943c8e8b8412566a2519198eab8abd 11SHA1 (patch-src_programs_pkexec.c) = bfc0414c7a943c8e8b8412566a2519198eab8abd
12SHA1 (patch-src_programs_pkttyagent.c) = 72a1c3750e6b496b981eb5479201946da80b6d15 12SHA1 (patch-src_programs_pkttyagent.c) = 72a1c3750e6b496b981eb5479201946da80b6d15
13SHA1 (patch-test_mocklib_src_netdb.c) = 5d24d5d37eabd552bc8a3cf1d6de03c6c8ffa600 13SHA1 (patch-test_mocklib_src_netdb.c) = 5d24d5d37eabd552bc8a3cf1d6de03c6c8ffa600
14SHA1 (patch-test_mocklibc_src_grp.c) = 6e82f05c89658ed166c3752a802d4b03f1c90bcb 14SHA1 (patch-test_mocklibc_src_grp.c) = b393dad5f7b2242e431d9b7db9e48d2f837b0235
15SHA1 (patch-test_mocklibc_src_pwd.c) = ff69388ad64f883b1bb459f198e8fc24be1089fd 15SHA1 (patch-test_mocklibc_src_pwd.c) = ff69388ad64f883b1bb459f198e8fc24be1089fd
cvs diff -r1.2 -r1.3 pkgsrc/security/polkit/patches/patch-test_mocklibc_src_grp.c (expand / switch to unified diff)

--- pkgsrc/security/polkit/patches/patch-test_mocklibc_src_grp.c 2016/06/18 12:16:23 1.2
+++ pkgsrc/security/polkit/patches/patch-test_mocklibc_src_grp.c 2016/09/27 21:56:13 1.3
@@ -1,19 +1,31 @@ @@ -1,19 +1,31 @@
1$NetBSD: patch-test_mocklibc_src_grp.c,v 1.2 2016/06/18 12:16:23 youri Exp $ 1$NetBSD: patch-test_mocklibc_src_grp.c,v 1.3 2016/09/27 21:56:13 maya Exp $
2 2
3* XXX: no fgetgrent(3) 3* XXX: no fgetgrent(3)
4 4
 5Avoid conflicting with builtin setgrent on FreeBSD, it has a different
 6prototype: int setgrent(void)
 7
5--- test/mocklibc/src/grp.c.orig 2014-01-14 22:42:25.000000000 +0000 8--- test/mocklibc/src/grp.c.orig 2014-01-14 22:42:25.000000000 +0000
6+++ test/mocklibc/src/grp.c 9+++ test/mocklibc/src/grp.c
7@@ -27,6 +27,12 @@ 10@@ -27,6 +27,13 @@
8  11
9 static FILE *global_stream = NULL; 12 static FILE *global_stream = NULL;
10  13
11+#if defined(__NetBSD__) || defined(__FreeBSD__) 14+#if defined(__NetBSD__) || defined(__FreeBSD__)
12+static struct group *fgetgrent(FILE *stream) { 15+static struct group *fgetgrent(FILE *stream) {
13+ return NULL; 16+ return NULL;
14+} 17+}
15+#endif 18+#endif
16+ 19+
 20+#if !defined(__FreeBSD__)
17 void setgrent(void) { 21 void setgrent(void) {
18 if (global_stream) 22 if (global_stream)
19 endgrent(); 23 endgrent();
 24@@ -37,6 +44,7 @@ void setgrent(void) {
 25
 26 global_stream = fopen(path, "r");
 27 }
 28+#endif
 29
 30 struct group *getgrent(void) {
 31 if (!global_stream)