[gentoo-commits] gentoo-x86 commit in sys-auth/policykit/files: policykit-0.9-consolekit03.patch policykit-0.9-pk-debug.patch policykit-0.9-pam-headers.patch policykit-0.7-completions.patch

[Gilles Dartiguelongue (eva)]

eva         08/12/01 22:13:41

  Added:                policykit-0.9-consolekit03.patch
                        policykit-0.9-pk-debug.patch
                        policykit-0.9-pam-headers.patch
                        policykit-0.7-completions.patch
  Log:
  Bump to 0.9. Fix bug #214801.
  (Portage version: 2.2_rc16/cvs/Linux 2.6.24-gentoo-r8-mactel x86_64)

Revision  Changes    Path
1.1                  sys-auth/policykit/files/policykit-0.9-consolekit03.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-auth/policykit/files/policykit-0.9-consolekit03.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-auth/policykit/files/policykit-0.9-consolekit03.patch?rev=1.1&content-type=text/plain

Index: policykit-0.9-consolekit03.patch
===================================================================
# 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);



1.1                  sys-auth/policykit/files/policykit-0.9-pk-debug.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-auth/policykit/files/policykit-0.9-pk-debug.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-auth/policykit/files/policykit-0.9-pk-debug.patch?rev=1.1&content-type=text/plain

Index: policykit-0.9-pk-debug.patch
===================================================================
#
# Fix use of undefined _pk_debug
#
# Gentoo:   https://bugs.gentoo.org/show_bug.cgi?id=239573
# Upstream: https://bugs.freedesktop.org/show_bug.cgi?id=17904
#
--- a/src/polkit/polkit-authorization-db-dummy.c	2008-05-31 07:24:44.000000000 +1000
+++ b/src/polkit/polkit-authorization-db-dummy.c	2008-10-05 03:54:29.000000000 +1100
@@ -105,7 +105,7 @@
 polkit_authorization_db_debug (PolKitAuthorizationDB *authdb)
 {
         kit_return_if_fail (authdb != NULL);
-        _pk_debug ("PolKitAuthorizationDB: refcount=%d", authdb->refcount);
+        polkit_debug ("PolKitAuthorizationDB: refcount=%d", authdb->refcount);
 }
 
 polkit_bool_t



1.1                  sys-auth/policykit/files/policykit-0.9-pam-headers.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-auth/policykit/files/policykit-0.9-pam-headers.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-auth/policykit/files/policykit-0.9-pam-headers.patch?rev=1.1&content-type=text/plain

Index: policykit-0.9-pam-headers.patch
===================================================================
# Remove unwanted pam header
#
# Gentoo:   https://bugs.gentoo.org/show_bug.cgi?id=239554
# Upstream: https://bugs.freedesktop.org/show_bug.cgi?id=16131
#
diff --git a/src/polkit-dbus/polkit-resolve-exe-helper.c b/src/polkit-dbus/polkit-resolve-exe-helper.c
index c56b2f5..5992b67 100644
--- a/src/polkit-dbus/polkit-resolve-exe-helper.c
+++ b/src/polkit-dbus/polkit-resolve-exe-helper.c
@@ -43,7 +43,6 @@
 #ifdef HAVE_FREEBSD
 #include <sys/param.h>
 #endif
-#include <security/pam_appl.h>
 #include <grp.h>
 #include <pwd.h>
 #include <syslog.h>



1.1                  sys-auth/policykit/files/policykit-0.7-completions.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-auth/policykit/files/policykit-0.7-completions.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-auth/policykit/files/policykit-0.7-completions.patch?rev=1.1&content-type=text/plain

Index: policykit-0.7-completions.patch
===================================================================
commit afb4535accaa08e20050a7b2d508d884b02f45a0
Author: Saleem Abdulrasool <compnerd@××××××××.org>
Date:   Mon Nov 19 15:35:03 2007 -0800

    add zsh completion and optionalize bash and zsh completion
    
    Signed-off-by: Saleem Abdulrasool <compnerd@××××××××.org>

diff --git a/configure.in b/configure.in
index 2fdb935..a9ea35a 100644
--- a/configure.in
+++ b/configure.in
@@ -495,6 +495,21 @@ AC_DEFINE_UNQUOTED(PAM_FILE_INCLUDE_PASSWORD, "$PAM_FILE_INCLUDE_PASSWORD", [pam
 AC_DEFINE_UNQUOTED(PAM_FILE_INCLUDE_SESSION, "$PAM_FILE_INCLUDE_SESSION", [pam file session])
 
 # ********************
+# Shell Completion
+# ********************
+
+AC_ARG_WITH([bash-completion],
+            AC_HELP_STRING([--with-bash-completion],[Install bash completion scripts]),,
+            [with_bash_completion=yes])
+
+AC_ARG_WITH([zsh-completion],
+            AC_HELP_STRING([--with-zsh-completion],[Install zsh completion scripts]),,
+            [with_zsh_completion=no])
+
+AM_CONDITIONAL([WITH_BASH_COMPLETION], test x"$with_bash_completion" != x"no")
+AM_CONDITIONAL([WITH_ZSH_COMPLETION], test x"$with_zsh_completion" != x"no")
+
+# ********************
 # Internationalisation
 # ********************
 
diff --git a/tools/Makefile.am b/tools/Makefile.am
index a76e9fc..0449e12 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -25,10 +25,17 @@ polkit_auth_LDADD = @GLIB_LIBS@ @DBUS_LIBS@ $(top_builddir)/src/polkit/libpolkit
 polkit_action_SOURCES = polkit-action.c
 polkit_action_LDADD = $(top_builddir)/src/polkit/libpolkit.la
 
+if WITH_BASH_COMPLETION
 profiledir = $(sysconfdir)/profile.d
 profile_SCRIPTS = polkit-bash-completion.sh
+endif
 
-EXTRA_DIST = $(profile_SCRIPTS)
+if WITH_ZSH_COMPLETION
+zshcompletiondir = $(DESTDIR)$(datadir)/zsh/site-functions
+zshcompletion_SCRIPTS = _polkit _polkit_auth _polkit_action
+endif
+
+EXTRA_DIST = polkit-bash-completion.sh _polkit _polkit_auth _polkit_action
 
 clean-local :
 	rm -f *~ polkit-reload-config
diff --git a/tools/_polkit b/tools/_polkit
new file mode 100644
index 0000000..bc7bdac
--- /dev/null
+++ b/tools/_polkit
@@ -0,0 +1,54 @@
+#autoload
+
+# vim: set et sw=3 sts=3 ts=3 ft=zsh:
+# ZSH Completion for polkit-auth
+# Written by Saleem Abdulrasool <compnerd@××××××××.org>
+# Usage: _polkit actions|constraints|authorization|overriden-actions|obtainable-actions|authorized-actions
+
+_polkit_actions() {
+   local actions
+   actions=( $(polkit-action) )
+   compadd "$@" -k actions
+}
+
+_polkit_constraints() {
+   local constraints
+   constraints=( local active local+active )
+   compadd "$@" -k constraints
+}
+
+_polkit_authorization() {
+   local authorization
+   authorization=( no auth_admin_one_shot auth_admin auth_admin_keep_session auth_admin_keep_always auth_self_one_shot auth_self auth_self_keep_session auth_self_keep_always yes )
+   compadd "$@" -k authorization
+}
+
+_polkit_overriden_actions() {
+   local overrides
+   overrides=( $(polkit-action --show-overrides) )
+   compadd "$@" -k overrides
+}
+
+_polkit_obtainable_actions() {
+   local actions
+   actions=( $(polkit-auth --show-obtainable) )
+   compadd "$@" -k actions
+}
+
+_polkit_authorized_actions() {
+   local actions
+   actions=( $(polkit-auth --explicit) )
+   compadd "$@" -k actions
+}
+
+_polkit() {
+   local command="$argv[$#]"
+
+   [[ "$command" == (actions|constraints|authorization|overriden-actions|obtainable-actions|authorized-actions) ]] || {
+      _message "unknown command: $command"
+   }
+
+   _polkit_${command/-/_}
+}
+
+_polkit "$@"
diff --git a/tools/_polkit_action b/tools/_polkit_action
new file mode 100644
index 0000000..7ec7365
--- /dev/null
+++ b/tools/_polkit_action
@@ -0,0 +1,24 @@
+#compdef polkit-action
+
+# vim: set et sw=3 sts=3 ts=3 ft=zsh:
+# ZSH Completion for polkit-action
+# Written by Saleem Abdulrasool <compnerd@××××××××.org>
+
+_polkit_action() {
+   local arguments
+
+   arguments=(
+      "(-)--action[Show detailed information about a specific action]:action:_polkit actions"
+      "(-)--reset-defaults[Reset the defaults for the specified action]:Overridden Action:_polkit overriden-actions"
+      "(-)--show-overrides[List actions where the defaults are overridden]"
+      "(-)--set-defaults-any[Override the any stanza for an action]:Action:_polkit _actions:Authorization:_polkit authorization"
+      "(-)--set-defaults-inactive[Override the inactive stanza for an action]:Action:polkit _actions:Authorization:_polkit authorization"
+      "(-)--set-defaults-active[Override the active stanza for an action]:Action:polkit _actions:Authorization:_polkit authorization"
+      "(-)--version[Display program version]"
+      "(-)--help[Display program help]"
+   )
+
+   _arguments $arguments
+}
+
+_polkit_action "$@"
diff --git a/tools/_polkit_auth b/tools/_polkit_auth
new file mode 100644
index 0000000..e70f1a0
--- /dev/null
+++ b/tools/_polkit_auth
@@ -0,0 +1,50 @@
+#compdef polkit-auth
+
+# vim: set et sw=3 sts=3 ts=3 ft=zsh:
+# ZSH Completion for polkit-auth
+# Written by Saleem Abdulrasool <compnerd@××××××××.org>
+
+_polkit_auth() {
+   local arguments action_arguments user_arguments grant_arguments
+   local commands actions grant=0
+
+   commands=( --show-obtainable --version --help )
+   actions=( --obtain --explicit --explicit-detail --grant --revoke )
+
+   for (( i = 0 ; i < ${#words[@]} ; i++ )) ; do
+      if [[ "${words[$i]##--#}" == "grant" ]] ; then
+         grant=1
+         break
+      fi
+   done
+
+   arguments=(
+      '(-)--show-obtainable[Show all actions that can be obtained via authentication]'
+      '(-)--version[Show version and exit]'
+      '(-)--help[Show help information]'
+   )
+
+   action_arguments=(
+      "($commands $actions)--obtain[Attempt to obtain authorization to do an action]:Obtainable Actions:_polkit obtainable-actions"
+      "($commands $actions)--explicit[Show explicit authorizations]"
+      "($commands $actions)--explicit-detail[Show detailed information about explicit authorizations]"
+      "($commands $actions)--grant[Grant an authorization for an action]:Obtainable Actions:_polkit actions"
+      "($commands $actions)--revoke[Revoke all authorization for an action]:Authorized Actions:_polkit authorized-actions"
+   )
+
+   user_arguments=(
+      "($commands)--user[The user the authorization applies to]:User:_users"
+   )
+
+   grant_arguments=(
+      "($commands)--constraint[Optional constraints on the granted authorization]:Constraint:_polkit constraints"
+   )
+
+   if [[ grant -eq 1 ]] ; then
+      _arguments $arguments $user_arguments $action_arguments $grant_arguments
+   else
+      _arguments $arguments $user_arguments $action_arguments
+   fi
+}
+
+_polkit_auth "$@"