Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=4af6de0177daeb88377817084e189f00e1e34183
commit 4af6de0177daeb88377817084e189f00e1e34183 Author: Miklos Vajna <vmik...@frugalware.org> Date: Wed Feb 17 22:04:59 2010 +0100 policykit-0.9-5-i686 - bin, replaced by polkit diff --git a/source/apps/policykit/FrugalBuild b/source/apps/policykit/FrugalBuild deleted file mode 100644 index 3b4a923..0000000 --- a/source/apps/policykit/FrugalBuild +++ /dev/null @@ -1,32 +0,0 @@ -# Compiling Time: 0.14 SBU -# Maintainer: bouleetbil <bouleet...@frogdev.info> - -pkgname=policykit -_F_archive_name=PolicyKit -pkgver=0.9 -pkgrel=5 -pkgdesc="Policy framework for controlling privileges for system-wide services" -url="http://hal.freedesktop.org/docs/PolicyKit"; -depends=('pam' 'dbus-glib') -makedepends=('intltool') -groups=('apps') -archs=('i686' 'x86_64' 'ppc') -up2date="Flasttar http://hal.freedesktop.org/releases/"; -source=(http://hal.freedesktop.org/releases/$_F_archive_name-$pkgver.tar.gz \ - policykit-0.9-consolekit03.patch \ - policykit-0.9-dbus-auth.patch \ - PolicyKit.conf) -sha1sums=('ac99c580eff72f6d5df261c155fb047306439f85' \ - 'cfba9d4fb2a18b711dd4133654ad9a2faba27c12' \ - 'a0b7d1ebbc0f269facab712978eaeed6a1bc8617' \ - '61f4fdc0d624739b3ec359d2848877ee1ccbdf3d') -backup=("etc/PolicyKit/PolicyKit.conf") - -build() { - Fbuild authdb=--with-authdb=default --with-authfw=pam --with-os-type=FrugalWare \ - --disable-selinux --enable-man-pages - Fmkdir etc/PolicyKit - Fcp PolicyKit.conf etc/PolicyKit -} - -# optimization OK diff --git a/source/apps/policykit/PolicyKit.conf b/source/apps/policykit/PolicyKit.conf deleted file mode 100644 index 3698aa0..0000000 --- a/source/apps/policykit/PolicyKit.conf +++ /dev/null @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> <!-- -*- XML -*- --> - -<!DOCTYPE pkconfig PUBLIC "-//freedesktop//DTD PolicyKit Configuration 1.0//EN" -"http://hal.freedesktop.org/releases/PolicyKit/1.0/config.dtd";> - -<!-- See the manual page PolicyKit.conf(5) for file format --> - -<config version="0.1"> - <define_admin_auth group="wheel|storage"/> - <match user="root"> - <return result="yes"/> - </match> - <match action="org.freedesktop.hal.storage.*"> - <return result="yes"/> - </match> - <!-- for shutdown, hibernate --> - <match action="org.freedesktop.hal.power.management.*"> - <return result="yes"/> - </match> -</config> - diff --git a/source/apps/policykit/policykit-0.9-consolekit03.patch b/source/apps/policykit/policykit-0.9-consolekit03.patch deleted file mode 100644 index fe0abd8..0000000 --- a/source/apps/policykit/policykit-0.9-consolekit03.patch +++ /dev/null @@ -1,86 +0,0 @@ -# Description: Make PolicyKit work with ConsoleKit 0.3 API as well -# Ubuntu: https://bugs.launchpad.net/273711 -# Upstream: http://cvs.fedoraproject.org/viewvc/rpms/PolicyKit/devel/pk-ck-api-change.patch?view=markup ---- policykit-0.9/src/polkit-dbus/polkit-dbus.c 2008-05-30 23:24:44.000000000 +0200 -+++ policykit-0.9.new/src/polkit-dbus/polkit-dbus.c 2008-09-24 13:40:37.000000000 +0200 -@@ -214,11 +214,17 @@ - dbus_message_unref (reply); - goto out; - } -+ /* GetUnixUser API Changed in CK 0.3.0 */ - if (!dbus_message_get_args (reply, NULL, -- DBUS_TYPE_INT32, &uid, -+ DBUS_TYPE_UINT32, &uid, - DBUS_TYPE_INVALID)) { -- kit_warning ("Invalid GetUnixUser reply from CK"); -- goto out; -+ /* try the older API */ -+ if (!dbus_message_get_args (reply, NULL, -+ DBUS_TYPE_INT32, &uid, -+ DBUS_TYPE_INVALID)) { -+ kit_warning ("Invalid GetUnixUser reply from CK"); -+ goto out; -+ } - } - dbus_message_unref (message); - dbus_message_unref (reply); -@@ -1326,16 +1332,21 @@ - - dbus_error_init (&error); - seat_objpath = dbus_message_get_path (message); -- if (!dbus_message_get_args (message, &error, -- DBUS_TYPE_STRING, &session_objpath, -+ /* API fixed in CK 0.3 to match spec */ -+ if (!dbus_message_get_args (message, &error, -+ DBUS_TYPE_OBJECT_PATH, &session_objpath, - DBUS_TYPE_INVALID)) { -+ if (!dbus_message_get_args (message, &error, -+ DBUS_TYPE_STRING, &session_objpath, -+ DBUS_TYPE_INVALID)) { -+ -+ /* TODO: should be _pk_critical */ -+ kit_warning ("The SessionAdded signal on the org.freedesktop.ConsoleKit.Seat " -+ "interface for object %s has the wrong signature! " -+ "Your system is misconfigured.", seat_objpath); - -- /* TODO: should be _pk_critical */ -- kit_warning ("The SessionAdded signal on the org.freedesktop.ConsoleKit.Seat " -- "interface for object %s has the wrong signature! " -- "Your system is misconfigured.", seat_objpath); -- -- goto out; -+ goto out; -+ } - } - - /* TODO: add to sessions - see polkit_tracker_is_authorization_relevant() */ -@@ -1353,16 +1364,21 @@ - - dbus_error_init (&error); - seat_objpath = dbus_message_get_path (message); -- if (!dbus_message_get_args (message, &error, -- DBUS_TYPE_STRING, &session_objpath, -+ /* API fixed in CK 0.3 to match spec */ -+ if (!dbus_message_get_args (message, &error, -+ DBUS_TYPE_OBJECT_PATH, &session_objpath, - DBUS_TYPE_INVALID)) { -+ if (!dbus_message_get_args (message, &error, -+ DBUS_TYPE_STRING, &session_objpath, -+ DBUS_TYPE_INVALID)) { -+ -+ /* TODO: should be _pk_critical */ -+ kit_warning ("The SessionRemoved signal on the org.freedesktop.ConsoleKit.Seat " -+ "interface for object %s has the wrong signature! " -+ "Your system is misconfigured.", seat_objpath); - -- /* TODO: should be _pk_critical */ -- kit_warning ("The SessionRemoved signal on the org.freedesktop.ConsoleKit.Seat " -- "interface for object %s has the wrong signature! " -- "Your system is misconfigured.", seat_objpath); -- -- goto out; -+ goto out; -+ } - } - - _remove_caller_by_session (pk_tracker, session_objpath); diff --git a/source/apps/policykit/policykit-0.9-dbus-auth.patch b/source/apps/policykit/policykit-0.9-dbus-auth.patch deleted file mode 100644 index 16d1f52..0000000 --- a/source/apps/policykit/policykit-0.9-dbus-auth.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN PolicyKit-0.9.orig/polkitd/org.freedesktop.PolicyKit.conf.in PolicyKit-0.9/polkitd/org.freedesktop.PolicyKit.conf.in ---- PolicyKit-0.9.orig/polkitd/org.freedesktop.PolicyKit.conf.in 2008-05-30 17:24:44.000000000 -0400 -+++ PolicyKit-0.9/polkitd/org.freedesktop.PolicyKit.conf.in 2009-04-24 22:14:57.000000000 -0400 -@@ -8,4 +8,9 @@ - <policy user="@polkituser@"> - <allow own="org.freedesktop.PolicyKit"/> - </policy> -+ -+ <!-- any user can talk to the service (fd.o #18948) --> -+ <policy context="default"> -+ <allow send_destination="org.freedesktop.PolicyKit"/> -+ </policy> - </busconfig> diff --git a/source/apps/policykit/policykit.install b/source/apps/policykit/policykit.install deleted file mode 100644 index 64496c1..0000000 --- a/source/apps/policykit/policykit.install +++ /dev/null @@ -1,46 +0,0 @@ -post_install() { - if ! grep -q 'polkituser' /etc/group; then - echo "added polkituser" - #create group - /usr/sbin/groupadd -g 67 polkituser 2>/dev/null - #create user - /usr/sbin/useradd -s /bin/false -c "polkituser" -u 67 -g polkituser polkituser 2>/dev/null - fi - #create directory - mkdir -p /var/run/PolicyKit 2>/dev/null - mkdir -p /var/lib/PolicyKit 2>/dev/null - touch /var/lib/misc/PolicyKit.reload 2>/dev/null - - # set correct permissions - chgrp polkituser var/{run,lib}/PolicyKit - chown polkituser var/lib/PolicyKit-public - chown polkituser:polkituser var/lib/misc/PolicyKit.reload - - chown polkituser /usr/libexec/polkit-set-default-helper - chmod u+s /usr/libexec/polkit-set-default-helper - - for i in polkit-read-auth-helper polkit-revoke-helper polkit-grant-helper polkit-explicit-grant-helper; do - chgrp polkituser /usr/libexec/$i - chmod g+s /usr/libexec/$i - done - - chgrp polkituser /usr/libexec/polkit-grant-helper-pam - chmod u+s /usr/libexec/polkit-grant-helper-pam -} - -post_upgrade() -{ - post_install - -} - -pre_remove() -{ - rm -Rf /var/run/PolicyKit 2>/dev/null - rm -Rf /var/lib/PolicyKit 2>/dev/null - rm -f /var/lib/misc/PolicyKit.reload 2>/dev/null -} - -op=$1 -shift -$op $* _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
