summaryrefslogtreecommitdiffstats
path: root/sysutils
diff options
context:
space:
mode:
authormarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2006-05-15 04:55:52 +0800
committermarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2006-05-15 04:55:52 +0800
commit5ba0266aae2c94f8b8746b230ddf61763212eddd (patch)
tree86886a3970b5d0603fcbbb5ab951b8b6fb52ba92 /sysutils
parent4a1599141c70d3b80cd665189459c8109ace46ab (diff)
downloadmarcuscom-ports-5ba0266aae2c94f8b8746b230ddf61763212eddd.tar
marcuscom-ports-5ba0266aae2c94f8b8746b230ddf61763212eddd.tar.gz
marcuscom-ports-5ba0266aae2c94f8b8746b230ddf61763212eddd.tar.bz2
marcuscom-ports-5ba0266aae2c94f8b8746b230ddf61763212eddd.tar.lz
marcuscom-ports-5ba0266aae2c94f8b8746b230ddf61763212eddd.tar.xz
marcuscom-ports-5ba0266aae2c94f8b8746b230ddf61763212eddd.tar.zst
marcuscom-ports-5ba0266aae2c94f8b8746b230ddf61763212eddd.zip
Update to a CVS HEAD snapshot of PolicyKit, and patch HAL to build.
This is an interim step before importing a new snapshot of HAL. git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@6252 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'sysutils')
-rw-r--r--sysutils/hal/Makefile4
-rw-r--r--sysutils/hal/files/patch-tools_hal-storage-mount.c20
-rw-r--r--sysutils/policykit/Makefile5
-rw-r--r--sysutils/policykit/distinfo6
-rw-r--r--sysutils/policykit/pkg-plist6
5 files changed, 30 insertions, 11 deletions
diff --git a/sysutils/hal/Makefile b/sysutils/hal/Makefile
index 34befc1b2..d42ef2bd6 100644
--- a/sysutils/hal/Makefile
+++ b/sysutils/hal/Makefile
@@ -3,12 +3,12 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/sysutils/hal/Makefile,v 1.9 2006/05/05 23:50:37 marcus Exp $
+# $MCom: ports/sysutils/hal/Makefile,v 1.10 2006/05/07 05:44:35 marcus Exp $
#
PORTNAME= hal
PORTVERSION= ${HALVERSION}.${SNAPVERSION}
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= sysutils gnome
MASTER_SITES= http://www.marcuscom.com/downloads/
diff --git a/sysutils/hal/files/patch-tools_hal-storage-mount.c b/sysutils/hal/files/patch-tools_hal-storage-mount.c
new file mode 100644
index 000000000..062a68a3f
--- /dev/null
+++ b/sysutils/hal/files/patch-tools_hal-storage-mount.c
@@ -0,0 +1,20 @@
+--- tools/hal-storage-mount.c.orig Sun May 14 16:52:00 2006
++++ tools/hal-storage-mount.c Sun May 14 16:52:51 2006
+@@ -441,6 +441,7 @@ handle_mount (LibHalContext *hal_ctx, Li
+ gboolean pol_change_uid;
+ char *privilege;
+ gboolean allowed_by_privilege;
++ gboolean is_temporary_privilege;
+ gboolean explicit_mount_point_given;
+ const char *end;
+
+@@ -673,7 +674,8 @@ handle_mount (LibHalContext *hal_ctx, Li
+ invoked_by_uid,
+ privilege,
+ udi,
+- &allowed_by_privilege) != LIBPOLKIT_RESULT_OK) {
++ &allowed_by_privilege,
++ &is_temporary_privilege) != LIBPOLKIT_RESULT_OK) {
+ printf ("cannot lookup privilege\n");
+ unknown_error ();
+ }
diff --git a/sysutils/policykit/Makefile b/sysutils/policykit/Makefile
index 1ab8540cb..37c25d380 100644
--- a/sysutils/policykit/Makefile
+++ b/sysutils/policykit/Makefile
@@ -3,12 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/sysutils/policykit/Makefile,v 1.6 2006/05/01 23:57:56 jylefort Exp $
+# $MCom: ports/sysutils/policykit/Makefile,v 1.7 2006/05/02 05:53:21 marcus Exp $
#
PORTNAME= policykit
-PORTVERSION= 0.1
-PORTREVISION= 4
+PORTVERSION= 0.1.20060514
CATEGORIES= sysutils gnome
MASTER_SITES= http://www.marcuscom.com/downloads/
DISTNAME= PolicyKit-${PORTVERSION}
diff --git a/sysutils/policykit/distinfo b/sysutils/policykit/distinfo
index dac5f20aa..2bf405212 100644
--- a/sysutils/policykit/distinfo
+++ b/sysutils/policykit/distinfo
@@ -1,3 +1,3 @@
-MD5 (PolicyKit-0.1.tar.bz2) = 2c7a9c6091d7cbbb8c3ab13801c7a251
-SHA256 (PolicyKit-0.1.tar.bz2) = 760e9bd9729086a8c3991021bd527cc9da97ae9d090ea9be89b13a14489fa8a9
-SIZE (PolicyKit-0.1.tar.bz2) = 327358
+MD5 (PolicyKit-0.1.20060514.tar.bz2) = f81ac5fb28603a4b419fca6c4efc027a
+SHA256 (PolicyKit-0.1.20060514.tar.bz2) = d9015a69d63902b091475ad2cad1b6fe012cf0e8fead6603cf822c2033c9d552
+SIZE (PolicyKit-0.1.20060514.tar.bz2) = 333800
diff --git a/sysutils/policykit/pkg-plist b/sysutils/policykit/pkg-plist
index bf94063fb..66c27dc14 100644
--- a/sysutils/policykit/pkg-plist
+++ b/sysutils/policykit/pkg-plist
@@ -1,6 +1,7 @@
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
@@ -14,6 +15,5 @@ sbin/polkitd
@dirrm include/libpolkit
@dirrm etc/PolicyKit/privilege.d
@dirrm etc/PolicyKit
-@cwd /var/run
-@unexec rm -f %D/polkitd/polkitd.pid
-@dirrm polkitd
+@unexec rm -f /var/run/polkitd/polkitd.pid 2>/dev/null || true
+@unexec rmdir /var/run/polkitd 2>/dev/null || true