From 70a711d319229d769da1d7d83697ef16ff0a9b81 Mon Sep 17 00:00:00 2001
From: ajacoutot <ajacoutot@openbsd.org>
Date: Sat, 10 Oct 2009 15:09:20 +0000
Subject: [PATCH] Some cleanups, modes and owner/group fixes.

---
 sysutils/policykit/Makefile    | 37 ++++++++++++++++++----------------
 sysutils/policykit/pkg/MESSAGE |  5 +++++
 sysutils/policykit/pkg/PLIST   | 28 +++++++++++++++++--------
 3 files changed, 45 insertions(+), 25 deletions(-)
 create mode 100644 sysutils/policykit/pkg/MESSAGE

diff --git a/sysutils/policykit/Makefile b/sysutils/policykit/Makefile
index 6a3362fded1..0e212e2c777 100644
--- a/sysutils/policykit/Makefile
+++ b/sysutils/policykit/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.3 2009/06/07 08:30:31 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.4 2009/10/10 15:09:20 ajacoutot Exp $
 
 COMMENT=	authorization framework
 
 DISTNAME=	PolicyKit-0.9
-PKGNAME=	${DISTNAME:L}p1
+PKGNAME=	${DISTNAME:L}p2
+
 CATEGORIES=	sysutils security
 
 SHARED_LIBS+=	polkit-dbus	0.0 \
@@ -22,27 +23,29 @@ WANTLIB=	c
 
 MASTER_SITES=	http://hal.freedesktop.org/releases/
 
-MODULES=		textproc/intltool \
-			devel/gettext
+MODULES=	textproc/intltool \
+		devel/gettext
 
-BUILD_DEPENDS=		::textproc/gtk-doc
+BUILD_DEPENDS=	::textproc/gtk-doc
 
-AUTOCONF_VERSION=	2.62
-CONFIGURE_STYLE=	autoconf
+AUTOCONF_VERSION= 2.62
+
+CONFIGURE_STYLE= autoconf
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS=		${CONFIGURE_SHARED} \
-			--enable-man-pages \
-			--enable-gtk-doc \
-			--with-authfw=bsdauth \
-			--with-os-type=openbsd \
-			--enable-man-pages \
-			--disable-selinux
-
-USE_GMAKE=		Yes
+CONFIGURE_ARGS=	${CONFIGURE_SHARED} \
+		--with-polkit-user=_polkituser \
+		--with-polkit-group=_polkituser \
+		--enable-man-pages \
+		--enable-gtk-doc \
+		--with-authfw=bsdauth \
+		--with-os-type=openbsd \
+		--enable-man-pages \
+		--disable-selinux
 
+USE_GMAKE=	Yes
 USE_LIBTOOL=	Yes
 
-FAKE_FLAGS=		sysconfdir=${PREFIX}/share/examples/policykit
+FAKE_FLAGS=	sysconfdir=${PREFIX}/share/examples/policykit
 
 .include <bsd.port.mk>
diff --git a/sysutils/policykit/pkg/MESSAGE b/sysutils/policykit/pkg/MESSAGE
new file mode 100644
index 00000000000..b67acba962a
--- /dev/null
+++ b/sysutils/policykit/pkg/MESSAGE
@@ -0,0 +1,5 @@
+XXX
+
+if [ -x "${PREFIX}/bin/polkit-auth ]; then
+	install -d -m 0770 -o _polkituser /var/run/PolicyKit
+fi
diff --git a/sysutils/policykit/pkg/PLIST b/sysutils/policykit/pkg/PLIST
index f1a22eede95..de793d93ef6 100644
--- a/sysutils/policykit/pkg/PLIST
+++ b/sysutils/policykit/pkg/PLIST
@@ -1,4 +1,6 @@
-@comment $OpenBSD: PLIST,v 1.2 2009/06/07 08:11:39 ajacoutot Exp $
+@comment $OpenBSD: PLIST,v 1.3 2009/10/10 15:09:20 ajacoutot Exp $
+@newgroup _polkituser:639
+@newuser _polkituser:639:_polkituser::PolicyKit User:/var/empty:/sbin/nologin
 %%SHARED%%
 @bin bin/polkit-action
 @bin bin/polkit-auth
@@ -40,19 +42,25 @@ lib/pkgconfig/polkit-dbus.pc
 lib/pkgconfig/polkit-grant.pc
 lib/pkgconfig/polkit.pc
 @mode 2755
-libexec/polkit-explicit-grant-helper
-libexec/polkit-grant-helper
+@group _polkituser
+@bin libexec/polkit-explicit-grant-helper
+@bin libexec/polkit-grant-helper
 @mode 4750
-libexec/polkit-grant-helper-bsdauth
+@group
+@bin libexec/polkit-grant-helper-bsdauth
 @mode 2755
-libexec/polkit-read-auth-helper
+@group _polkituser
+@bin libexec/polkit-read-auth-helper
 @mode 4755
-libexec/polkit-resolve-exe-helper
+@bin libexec/polkit-resolve-exe-helper
 @mode 2755
-libexec/polkit-revoke-helper
+@bin libexec/polkit-revoke-helper
 @mode 4755
-libexec/polkit-set-default-helper
+@owner _polkituser
+@group
+@bin libexec/polkit-set-default-helper
 @mode
+@owner
 @bin libexec/polkitd
 @man man/man1/polkit-action.1
 @man man/man1/polkit-auth.1
@@ -82,6 +90,10 @@ share/examples/policykit/dbus-1/system.d/org.freedesktop.PolicyKit.conf
 @sample ${SYSCONFDIR}/dbus-1/system.d/org.freedesktop.PolicyKit.conf
 share/examples/policykit/profile.d/
 share/examples/policykit/profile.d/polkit-bash-completion.sh
+@sample /var/lib/
+@owner _polkituser
+@sample /var/lib/PolicyKit-public/
+@owner
 share/gtk-doc/
 share/gtk-doc/html/
 share/gtk-doc/html/polkit/