[Midnightbsd-cvs] mports: sysutils/policykit: update to 0.8.

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Sat May 31 12:58:24 EDT 2008


Log Message:
-----------
update to 0.8.  There is still an issue with docbook we're going to need to fix

Modified Files:
--------------
    mports/sysutils/policykit:
        Makefile (r1.2 -> r1.3)
        distinfo (r1.1 -> r1.2)
        pkg-install (r1.1 -> r1.2)
        pkg-plist (r1.1 -> r1.2)
    mports/sysutils/policykit/files:
        patch-Makefile.in (r1.1 -> r1.2)

Removed Files:
-------------
    mports/sysutils/policykit/files:
        patch-polkitd_policy.c
        patch-tools_Makefile.in
        polkitd.in

-------------- next part --------------
Index: pkg-install
===================================================================
RCS file: /home/cvs/mports/sysutils/policykit/pkg-install,v
retrieving revision 1.1
retrieving revision 1.2
diff -L sysutils/policykit/pkg-install -L sysutils/policykit/pkg-install -u -r1.1 -r1.2
--- sysutils/policykit/pkg-install
+++ sysutils/policykit/pkg-install
@@ -32,7 +32,16 @@
 		fi
 	fi
 
-	/usr/bin/install -d -o ${USER} -g ${GROUP} /var/run/polkitd
+	/usr/bin/install -d -o root -m 0770 -g ${GROUP} /var/run/PolicyKit
+	/usr/bin/install -d -o root -m 0770 -g ${GROUP} /var/lib/PolicyKit
+	/usr/bin/install -d -o root -m 0775 -g ${GROUP} /var/lib/PolicyKit-public
+	/bin/mkdir -p /var/lib/misc
+	/usr/bin/touch -f /var/lib/misc/PolicyKit.reload
+	/usr/bin/chgrp ${GROUP} /var/lib/misc/PolicyKit.reload
+	/bin/chmod 0775 /var/lib/misc/PolicyKit.reload
+	for i in ${PKG_PREFIX}/libexec/polkit-read-auth-helper ${PKG_PREFIX}/libexec/polkit-set-default-helper ${PKG_PREFIX}/libexec/polkit-grant-helper ${PKG_PREFIX}/libexec/polkit-grant-helper-pam ${PKG_PREFIX}/libexec/polkit-explicit-grant-helper ${PKG_PREFIX}/libexec/polkit-revoke-helper /var/lib/misc/PolicyKit.reload; do
+	    /usr/bin/chgrp ${GROUP} ${i}
+	done
 	exit 0
 	;;
 esac
Index: pkg-plist
===================================================================
RCS file: /home/cvs/mports/sysutils/policykit/pkg-plist,v
retrieving revision 1.1
retrieving revision 1.2
diff -L sysutils/policykit/pkg-plist -L sysutils/policykit/pkg-plist -u -r1.1 -r1.2
--- sysutils/policykit/pkg-plist
+++ sysutils/policykit/pkg-plist
@@ -1,19 +1,71 @@
-bin/polkit-grant-privilege
-bin/polkit-is-privileged
-bin/polkit-list-privileges
-bin/polkit-revoke-privilege
-etc/PolicyKit/privilege.d/desktop-console.privilege
-etc/dbus-1/system.d/PolicyKit.conf
-etc/pam.d/policy-kit
-include/libpolkit/libpolkit.h
+bin/polkit-action
+bin/polkit-auth
+bin/polkit-config-file-validate
+bin/polkit-policy-file-validate
+ at unexec if cmp -s %D/etc/PolicyKit/PolicyKit.conf %D/etc/PolicyKit/PolicyKit.conf.dist; then rm -f %D/etc/PolicyKit/PolicyKit.conf ; fi
+etc/PolicyKit/PolicyKit.conf.dist
+ at exec [ -f %B/PolicyKit.conf ] || cp %B/%f %B/PolicyKit.conf
+etc/dbus-1/system.d/org.freedesktop.PolicyKit.conf
+etc/pam.d/polkit
+etc/profile.d/polkit-bash-completion.sh
+include/PolicyKit/polkit-dbus/polkit-dbus.h
+include/PolicyKit/polkit-dbus/polkit-simple.h
+include/PolicyKit/polkit-grant/polkit-grant.h
+include/PolicyKit/polkit/polkit-action.h
+include/PolicyKit/polkit/polkit-authorization-constraint.h
+include/PolicyKit/polkit/polkit-authorization-db.h
+include/PolicyKit/polkit/polkit-authorization.h
+include/PolicyKit/polkit/polkit-caller.h
+include/PolicyKit/polkit/polkit-config.h
+include/PolicyKit/polkit/polkit-context.h
+include/PolicyKit/polkit/polkit-error.h
+include/PolicyKit/polkit/polkit-policy-cache.h
+include/PolicyKit/polkit/polkit-policy-default.h
+include/PolicyKit/polkit/polkit-policy-file-entry.h
+include/PolicyKit/polkit/polkit-policy-file.h
+include/PolicyKit/polkit/polkit-result.h
+include/PolicyKit/polkit/polkit-seat.h
+include/PolicyKit/polkit/polkit-session.h
+include/PolicyKit/polkit/polkit-sysdeps.h
+include/PolicyKit/polkit/polkit-types.h
+include/PolicyKit/polkit/polkit.h
+lib/libpolkit-dbus.a
+lib/libpolkit-dbus.la
+lib/libpolkit-dbus.so
+lib/libpolkit-dbus.so.2
+lib/libpolkit-grant.a
+lib/libpolkit-grant.la
+lib/libpolkit-grant.so
+lib/libpolkit-grant.so.2
 lib/libpolkit.a
 lib/libpolkit.la
 lib/libpolkit.so
-lib/libpolkit.so.0
+lib/libpolkit.so.2
+libdata/pkgconfig/polkit-dbus.pc
+libdata/pkgconfig/polkit-grant.pc
 libdata/pkgconfig/polkit.pc
-sbin/polkitd
- at dirrm include/libpolkit
- at dirrm etc/PolicyKit/privilege.d
+libexec/polkit-explicit-grant-helper
+libexec/polkit-grant-helper
+libexec/polkit-grant-helper-pam
+libexec/polkit-read-auth-helper
+libexec/polkit-resolve-exe-helper
+libexec/polkit-revoke-helper
+libexec/polkit-set-default-helper
+libexec/polkitd
+share/PolicyKit/config.dtd
+share/PolicyKit/policy/org.freedesktop.policykit.policy
+share/dbus-1/interfaces/org.freedesktop.PolicyKit.AuthenticationAgent.xml
+share/dbus-1/system-services/org.freedesktop.PolicyKit.service
+ at dirrmtry share/PolicyKit/policy
+ at dirrmtry share/PolicyKit
+ at dirrm include/PolicyKit/polkit
+ at dirrm include/PolicyKit/polkit-grant
+ at dirrm include/PolicyKit/polkit-dbus
+ at dirrm include/PolicyKit
+ at dirrmtry etc/profile.d
 @dirrm etc/PolicyKit
- at unexec rm -f /var/run/polkitd/polkitd.pid 2>/dev/null || true
- at unexec rmdir /var/run/polkitd 2>/dev/null || true
+ at unexec rm -rf /var/run/PolicyKit 2>/dev/null || true
+ at unexec rmdir /var/lib/PolicyKit 2>/dev/null || true
+ at unexec rmdir /var/lib/PolicyKit-public 2>/dev/null || true
+ at unexec rm -f /var/lib/misc/PolicyKit.reload 2>/dev/null || true
+ at unexec rmdir /var/lib/misc 2>/dev/null || true
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/sysutils/policykit/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -L sysutils/policykit/Makefile -L sysutils/policykit/Makefile -u -r1.2 -r1.3
--- sysutils/policykit/Makefile
+++ sysutils/policykit/Makefile
@@ -3,37 +3,56 @@
 # Whom:				Joe Marcus Clarke <marcus at FreeBSD.org>
 #
 # $MidnightBSD$
-# $FreeBSD: ports/sysutils/policykit/Makefile,v 1.3 2006/11/04 19:13:32 marcus Exp $
-#   $MCom: ports/sysutils/policykit/Makefile,v 1.12 2006/10/07 19:45:38 marcus Exp $
+# $FreeBSD: ports/sysutils/policykit/Makefile,v 1.11 2008/05/01 01:01:48 marcus Exp $
+#   $MCom: ports/sysutils/policykit/Makefile,v 1.19 2008/01/20 04:41:31 marcus Exp $
 #
 
 PORTNAME=	policykit
-PORTVERSION=	0.1.20060514
-PORTREVISION=	3
+PORTVERSION=	0.8
+PORTREVISION=	0
 CATEGORIES=	sysutils gnome
-MASTER_SITES=	http://www.marcuscom.com/downloads/
+MASTER_SITES=	http://hal.freedesktop.org/releases/
 DISTNAME=	PolicyKit-${PORTVERSION}
 
 MAINTAINER=	ports at MidnightBSD.org
 COMMENT=	Framework for controlling access to system-wide components
 LICENSE=	gpl2
 
-LIB_DEPENDS=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
+BUILD_DEPENDS=	${LOCALBASE}/share/sgml/docbook/4.1/catalog:${PORTSDIR}/textproc/docbook-410 \
+		xsltproc:${PORTSDIR}/textproc/libxslt \
+		${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl
+LIB_DEPENDS=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
+    		expat.6:${PORTSDIR}/textproc/expat2
 
-USE_BZIP2=	yes
-USE_GNOME=	gnomehack gnometarget
+USE_GNOME=	gnomehack gnometarget glib20 intlhack
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--disable-gtk-doc \
-		--with-pid-file=/var/run/polkitd/polkitd.pid \
-		--with-pam-include=system
+		--with-pam-include=system \
+		--with-os-type=freebsd \
+		--localstatedir=/var \
+		--with-polkit-user=polkit \
+		--with-polkit-group=polkit
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib" \
 		GTKDOC="false"
 
-USE_RC_SUBR=	polkitd
-USE_GNOME_SUBR=	yes
+MAN1=		polkit-action.1 polkit-auth.1 polkit-config-file-validate.1 \
+		polkit-policy-file-validate.1
+MAN5=		PolicyKit.conf.5
+MAN8=		PolicyKit.8
+
+post-install:
+	${MKDIR} ${PREFIX}/etc/PolicyKit
+	if [ ! -f ${PREFIX}/etc/PolicyKit/PolicyKit.conf ]; then \
+	    	${INSTALL_DATA} ${WRKSRC}/data/PolicyKit.conf \
+			${PREFIX}/etc/PolicyKit/PolicyKit.conf ; \
+	fi
+	${INSTALL_DATA} ${WRKSRC}/data/PolicyKit.conf \
+	    	${PREFIX}/etc/PolicyKit/PolicyKit.conf.dist
+.if !defined(PACKAGE_BUILDING)
+	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+.endif
 
 .include <bsd.port.mk>
-
Index: distinfo
===================================================================
RCS file: /home/cvs/mports/sysutils/policykit/distinfo,v
retrieving revision 1.1
retrieving revision 1.2
diff -L sysutils/policykit/distinfo -L sysutils/policykit/distinfo -u -r1.1 -r1.2
--- sysutils/policykit/distinfo
+++ sysutils/policykit/distinfo
@@ -1,3 +1,3 @@
-MD5 (PolicyKit-0.1.20060514.tar.bz2) = f81ac5fb28603a4b419fca6c4efc027a
-SHA256 (PolicyKit-0.1.20060514.tar.bz2) = d9015a69d63902b091475ad2cad1b6fe012cf0e8fead6603cf822c2033c9d552
-SIZE (PolicyKit-0.1.20060514.tar.bz2) = 333800
+MD5 (PolicyKit-0.8.tar.gz) = 5c1a4445dbd5cb853132766c5d0ab336
+SHA256 (PolicyKit-0.8.tar.gz) = 92ddda8f5ffb0981c9ac50cf419f73796ccee8d94b4c935735f2f30f6ccd21ba
+SIZE (PolicyKit-0.8.tar.gz) = 1226699
--- sysutils/policykit/files/patch-tools_Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
---- tools/Makefile.in.orig	Sun Oct  8 03:37:21 2006
-+++ tools/Makefile.in	Sun Oct  8 03:37:37 2006
-@@ -252,9 +252,9 @@ INCLUDES = \
- 	@DBUS_CFLAGS@
- 
- polkit_is_privileged_SOURCES = polkit-is-privileged.c
--polkit_is_privileged_LDADD = @DBUS_CFLAGS@ @GLIB_LIBS@ $(top_builddir)/libpolkit/libpolkit.la
-+polkit_is_privileged_LDADD = @DBUS_LIBS@ @GLIB_LIBS@ $(top_builddir)/libpolkit/libpolkit.la
- polkit_list_privileges_SOURCES = polkit-list-privileges.c
--polkit_list_privileges_LDADD = @DBUS_CFLAGS@ @GLIB_LIBS@ $(top_builddir)/libpolkit/libpolkit.la
-+polkit_list_privileges_LDADD = @DBUS_LIBS@ @GLIB_LIBS@ $(top_builddir)/libpolkit/libpolkit.la
- polkit_grant_privilege_SOURCES = \
- 	polkit-grant-privilege.c					\
- 					polkit-interface-manager-glue.h \
Index: patch-Makefile.in
===================================================================
RCS file: /home/cvs/mports/sysutils/policykit/files/patch-Makefile.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -L sysutils/policykit/files/patch-Makefile.in -L sysutils/policykit/files/patch-Makefile.in -u -r1.1 -r1.2
--- sysutils/policykit/files/patch-Makefile.in
+++ sysutils/policykit/files/patch-Makefile.in
@@ -1,11 +1,11 @@
---- Makefile.in.orig	Mon May  1 01:11:30 2006
-+++ Makefile.in	Mon May  1 01:11:43 2006
-@@ -231,7 +231,7 @@ sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
+--- Makefile.in.orig	2007-12-22 19:11:03.000000000 -0500
++++ Makefile.in	2007-12-22 19:11:13.000000000 -0500
+@@ -246,7 +246,7 @@ sysconfdir = @sysconfdir@
  target_alias = @target_alias@
--SUBDIRS = libpolkit polkitd doc tools privileges
-+SUBDIRS = libpolkit polkitd tools privileges
- pamdir = $(sysconfdir)/pam.d
- pam_DATA = policy-kit
- pkgconfigdir = $(prefix)/libdata/pkgconfig
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-SUBDIRS = data src polkitd doc tools policy po test
++SUBDIRS = data src polkitd doc tools policy po
+ EXTRA_DIST = \
+ 	HACKING 		\
+ 	mkinstalldirs 		\
--- sysutils/policykit/files/patch-polkitd_policy.c
+++ /dev/null
@@ -1,118 +0,0 @@
---- polkitd/policy.c.orig	Tue Mar 14 07:14:33 2006
-+++ polkitd/policy.c	Tue May  2 01:53:06 2006
-@@ -537,13 +537,15 @@
- 	int rc;
- 	char *res;
- 	char *buf = NULL;
--	unsigned int bufsize;
-+	long bufsize;
- 	struct passwd pwd;
- 	struct passwd *pwdp;
- 
- 	res = NULL;
- 
- 	bufsize = sysconf (_SC_GETPW_R_SIZE_MAX);
-+	if (bufsize < 0)
-+		bufsize = 1024;
- 	buf = g_new0 (char, bufsize);
- 
- 	rc = getpwuid_r (uid, &pwd, buf, bufsize, &pwdp);
-@@ -567,13 +569,15 @@
- 	int rc;
- 	char *res;
- 	char *buf = NULL;
--	unsigned int bufsize;
-+	long bufsize;
- 	struct group gbuf;
- 	struct group *gbufp;
- 
- 	res = NULL;
- 
- 	bufsize = sysconf (_SC_GETGR_R_SIZE_MAX);
-+	if (bufsize < 0)
-+		bufsize = 1024;
- 	buf = g_new0 (char, bufsize);
- 		
- 	rc = getgrgid_r (gid, &gbuf, buf, bufsize, &gbufp);
-@@ -597,13 +601,15 @@
- 	int rc;
- 	uid_t res;
- 	char *buf = NULL;
--	unsigned int bufsize;
-+	long bufsize;
- 	struct passwd pwd;
- 	struct passwd *pwdp;
- 
- 	res = (uid_t) -1;
- 
- 	bufsize = sysconf (_SC_GETPW_R_SIZE_MAX);
-+	if (bufsize < 0)
-+		bufsize = 1024;
- 	buf = g_new0 (char, bufsize);
- 		
- 	rc = getpwnam_r (username, &pwd, buf, bufsize, &pwdp);
-@@ -627,13 +633,15 @@
- 	int rc;
- 	gid_t res;
- 	char *buf = NULL;
--	unsigned int bufsize;
-+	long bufsize;
- 	struct group gbuf;
- 	struct group *gbufp;
- 
- 	res = (gid_t) -1;
- 
- 	bufsize = sysconf (_SC_GETGR_R_SIZE_MAX);
-+	if (bufsize < 0)
-+		bufsize = 1024;
- 	buf = g_new0 (char, bufsize);
- 		
- 	rc = getgrnam_r (groupname, &gbuf, buf, bufsize, &gbufp);
-@@ -649,6 +657,23 @@
- 	return res;
- }
- 
-+static int
-+getgrouplist_ala_linux (const char *name,
-+			gid_t basegid,
-+			gid_t *groups,
-+			int *ngroups)
-+{
-+	if (groups)
-+		return getgrouplist (name, basegid, groups, ngroups);
-+	else {
-+		for (*ngroups = 1;; (*ngroups)++) {
-+			gid_t _groups[*ngroups];
-+			if (getgrouplist (name, basegid, _groups, ngroups) != -1)
-+				return 0;
-+		}
-+	}
-+}
-+
- PolicyResult 
- policy_get_allowed_resources_for_policy_for_uid (uid_t                  uid, 
- 						 const char            *policy, 
-@@ -665,9 +690,9 @@
- 	if ((username = policy_util_uid_to_name (uid, &default_gid)) == NULL)
- 		goto out;
- 
--	if (getgrouplist(username, default_gid, NULL, &num_groups) < 0) {
-+	if (getgrouplist_ala_linux(username, default_gid, NULL, &num_groups) < 0) {
- 		groups = (gid_t *) g_new0 (gid_t, num_groups);
--		if (getgrouplist(username, default_gid, groups, &num_groups) < 0) {
-+		if (getgrouplist_ala_linux(username, default_gid, groups, &num_groups) < 0) {
- 			g_warning ("getgrouplist() failed");
- 			goto out;
- 		}
-@@ -702,9 +727,9 @@
- 	if ((username = policy_util_uid_to_name (uid, &default_gid)) == NULL)
- 		goto out;
- 
--	if (getgrouplist(username, default_gid, NULL, &num_groups) < 0) {
-+	if (getgrouplist_ala_linux(username, default_gid, NULL, &num_groups) < 0) {
- 		groups = (gid_t *) g_new0 (gid_t, num_groups);
--		if (getgrouplist(username, default_gid, groups, &num_groups) < 0) {
-+		if (getgrouplist_ala_linux(username, default_gid, groups, &num_groups) < 0) {
- 			g_warning ("getgrouplist() failed");
- 			goto out;
- 		}
--- sysutils/policykit/files/polkitd.in
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD: ports/sysutils/policykit/files/polkitd.in,v 1.2 2006/10/31 09:40:42 jylefort Exp $
-#
-# PROVIDE: polkitd
-# REQUIRE: DAEMON dbus
-#
-# Add the following line to /etc/rc.conf to enable the PolicyKit daemon:
-#
-# polkitd_enable="YES"
-#
-
-. %%RC_SUBR%%
-. %%GNOME_SUBR%%
-
-polkitd_enable=${polkitd_enable-${gnome_enable}}
-
-name=polkitd
-rcvar=`set_rcvar`
-
-command="%%PREFIX%%/sbin/polkitd"
-pidfile="/var/run/${name}/${name}.pid"
-
-start_precmd="polkitd_precmd"
-stop_postcmd="polkitd_postcmd"
-
-local_force_depend()
-{
-    _depend="$1"
-    if [ -f %%LOCALBASE%%/etc/rc.d/${_depend}.sh ]; then
-	_depend="${_depend}.sh"
-    fi
-
-    if ! %%LOCALBASE%%/etc/rc.d/${_depend} forcestatus 1>/dev/null 2>&1 &&
-       ! %%LOCALBASE%%/etc/rc.d/${_depend} forcestart; then
-       return 1
-   fi
-   return 0
-}
-
-polkitd_precmd()
-{
-    if ! checkyesno dbus_enable
-    then
-	local_force_depend dbus || return 1
-    fi
-
-    mkdir -p $(dirname $pidfile)
-}
-
-polkitd_postcmd()
-{
-    	rm -f $pidfile
-}
-
-load_rc_config ${name}
-run_rc_command "$1"


More information about the Midnightbsd-cvs mailing list