pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

polkit: fix build on Darwin



Module Name:	pkgsrc-wip
Committed By:	youri <youri%NetBSD.org@localhost>
Pushed By:	youri
Date:		Thu Apr 7 13:18:07 2016 +0200
Changeset:	c99fd3f73bbfe944520a01837403ebaee40ca19d

Modified Files:
	polkit/Makefile
	polkit/distinfo
	polkit/patches/patch-src_polkitbackend_polkitd.c
	polkit/patches/patch-src_programs_pkttyagent.c
Added Files:
	polkit/patches/patch-test_mocklibc_src_netdb.c

Log Message:
polkit: fix build on Darwin

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=c99fd3f73bbfe944520a01837403ebaee40ca19d

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

diffstat:
 polkit/Makefile                                  | 14 ++++++++------
 polkit/distinfo                                  |  5 +++--
 polkit/patches/patch-src_polkitbackend_polkitd.c |  2 ++
 polkit/patches/patch-src_programs_pkttyagent.c   |  2 ++
 polkit/patches/patch-test_mocklibc_src_netdb.c   | 22 ++++++++++++++++++++++
 5 files changed, 37 insertions(+), 8 deletions(-)

diffs:
diff --git a/polkit/Makefile b/polkit/Makefile
index 9bd9b64..467d076 100644
--- a/polkit/Makefile
+++ b/polkit/Makefile
@@ -25,14 +25,16 @@ PKGCONFIG_OVERRIDE+=	data/polkit-agent-1.pc.in
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=	--with-polkitd-user=${POLKITD_USER}
 
-POLKITD_USER?=		polkitd
-POLKITD_GROUP?=		polkitd
-PKG_GROUPS+=		${POLKITD_GROUP}
-PKG_USERS+=		${POLKITD_USER}:${POLKITD_GROUP}
+.include "../../mk/bsd.prefs.mk"
+
+POLKITD_USER?=			polkitd
+POLKITD_GROUP?=			polkitd
+PKG_GROUPS+=			${POLKITD_GROUP}
+PKG_USERS+=			${POLKITD_USER}:${POLKITD_GROUP}
 PKG_GECOS.${POLKITD_USER}=	Polkit Daemon User
 PKG_HOME.${POLKITD_USER}=	${VARBASE}
-PKG_GROUPS_VARS+=	POLKITD_GROUP
-PKG_USERS_VARS+=	POLKITD_USER
+PKG_GROUPS_VARS+=		POLKITD_GROUP
+PKG_USERS_VARS+=		POLKITD_USER
 
 REPLACE_PERL+=		src/polkitbackend/toarray.pl
 
diff --git a/polkit/distinfo b/polkit/distinfo
index 784ca04..5ff7c45 100644
--- a/polkit/distinfo
+++ b/polkit/distinfo
@@ -7,7 +7,8 @@ Size (polkit-0.113.tar.gz) = 1448865 bytes
 SHA1 (patch-src_polkit_polkitunixprocess.c) = 347ce2b4093a126eedb5dd2168d70cf636a30236
 SHA1 (patch-src_polkitbackend_polkitbackendinteractiveauthority.c) = d8b7cbcd0db26969bc4b83c32a731ae920c2e87b
 SHA1 (patch-src_polkitbackend_polkitbackendjsauthority.c) = fec046c7776d81bee5641868e5ab790cb00d07ec
-SHA1 (patch-src_polkitbackend_polkitd.c) = 2f5075bcaff6b662de2aebdea31b38c7d60f50b6
-SHA1 (patch-src_programs_pkttyagent.c) = 0112c895ac0691baf31a6261e35d757e03e216c2
+SHA1 (patch-src_polkitbackend_polkitd.c) = a567b31131f63f92f8e2967c3aabfa7f3d41f627
+SHA1 (patch-src_programs_pkttyagent.c) = 72a1c3750e6b496b981eb5479201946da80b6d15
 SHA1 (patch-test_mocklibc_src_grp.c) = 1ad61ca043e0586ded84c3157d0271a1e3af2b9e
+SHA1 (patch-test_mocklibc_src_netdb.c) = f1b36025b8f574b68b46f20e269c520a82934e9f
 SHA1 (patch-test_mocklibc_src_pwd.c) = 8f2b35cb90f96a115f7621a8751b9e64cba0a106
diff --git a/polkit/patches/patch-src_polkitbackend_polkitd.c b/polkit/patches/patch-src_polkitbackend_polkitd.c
index dc9debe..678792a 100644
--- a/polkit/patches/patch-src_polkitbackend_polkitd.c
+++ b/polkit/patches/patch-src_polkitbackend_polkitd.c
@@ -1,5 +1,7 @@
 $NetBSD$
 
+Avoid %m usage in printf.
+
 --- src/polkitbackend/polkitd.c.orig	2015-06-18 20:20:50.000000000 +0000
 +++ src/polkitbackend/polkitd.c
 @@ -22,6 +22,7 @@
diff --git a/polkit/patches/patch-src_programs_pkttyagent.c b/polkit/patches/patch-src_programs_pkttyagent.c
index 4d65804..c62e740 100644
--- a/polkit/patches/patch-src_programs_pkttyagent.c
+++ b/polkit/patches/patch-src_programs_pkttyagent.c
@@ -1,5 +1,7 @@
 $NetBSD$
 
+Avoid %m usage in printf.
+
 --- src/programs/pkttyagent.c.orig	2015-06-18 20:20:50.000000000 +0000
 +++ src/programs/pkttyagent.c
 @@ -24,6 +24,7 @@
diff --git a/polkit/patches/patch-test_mocklibc_src_netdb.c b/polkit/patches/patch-test_mocklibc_src_netdb.c
new file mode 100644
index 0000000..592fd54
--- /dev/null
+++ b/polkit/patches/patch-test_mocklibc_src_netdb.c
@@ -0,0 +1,22 @@
+$NetBSD$
+
+Darwin has setnetgrent.
+
+--- test/mocklibc/src/netdb.c.orig	2014-01-14 22:42:25.000000000 +0000
++++ test/mocklibc/src/netdb.c
+@@ -36,6 +36,7 @@ static struct netgroup_iter global_iter;
+ 
+ // REMEMBER: 1 means success, 0 means failure for netgroup methods
+ 
++#ifndef __APPLE__
+ int setnetgrent(const char *netgroup) {
+   if (!global_netgroup_head)
+     global_netgroup_head = netgroup_parse_all();
+@@ -50,6 +51,7 @@ int setnetgrent(const char *netgroup) {
+   netgroup_iter_init(&global_iter, group);
+   return 1;
+ }
++#endif
+ 
+ void endnetgrent(void) {
+   netgroup_free_all(global_netgroup_head);


Home | Main Index | Thread Index | Old Index