From f38b952c758a9027bf7eb4767adacca50d545166 Mon Sep 17 00:00:00 2001 From: Cecil Hugh Watson Date: Sat, 4 Sep 2010 23:08:55 -0700 Subject: policykit*:Removed for LinHES 7 (replaced by polkit*). --- abs/extra-testing/policykit-gnome/PKGBUILD | 32 --------- .../policykit-gnome/policykit-gnome.install | 23 ------ abs/extra-testing/policykit/PKGBUILD | 43 ----------- abs/extra-testing/policykit/entry-leak.patch | 37 ---------- abs/extra-testing/policykit/pk-ck-api-change.patch | 83 ---------------------- abs/extra-testing/policykit/policykit.install | 30 -------- .../policykit/polkit-0.8-dbus-policy.patch | 12 ---- abs/extra-testing/policykit/polkit.pam | 7 -- 8 files changed, 267 deletions(-) delete mode 100644 abs/extra-testing/policykit-gnome/PKGBUILD delete mode 100644 abs/extra-testing/policykit-gnome/policykit-gnome.install delete mode 100644 abs/extra-testing/policykit/PKGBUILD delete mode 100644 abs/extra-testing/policykit/entry-leak.patch delete mode 100644 abs/extra-testing/policykit/pk-ck-api-change.patch delete mode 100644 abs/extra-testing/policykit/policykit.install delete mode 100644 abs/extra-testing/policykit/polkit-0.8-dbus-policy.patch delete mode 100644 abs/extra-testing/policykit/polkit.pam diff --git a/abs/extra-testing/policykit-gnome/PKGBUILD b/abs/extra-testing/policykit-gnome/PKGBUILD deleted file mode 100644 index e6a7d9c..0000000 --- a/abs/extra-testing/policykit-gnome/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# Maintainer: Jan de Groot -# Contributor: onestep_ua - -pkgname=policykit-gnome -pkgver=0.9.2 -pkgrel=2 -pkgdesc="PolicyKit integration for the GNOME desktop" -arch=('i686' 'x86_64') -url="http://hal.freedesktop.org/docs/PolicyKit-gnome/" -license=('GPL') -depends=('gconf>=2.24.0') -makedepends=('intltool' 'gtk-doc' 'gnome-doc-utils>=0.14.0') -options=(!emptydirs !libtool) -install=${pkgname}.install -source=(http://hal.freedesktop.org/releases/PolicyKit-gnome-${pkgver}.tar.bz2) -md5sums=('fc478b168d0c926a9766b0b415ff4bbf') - -build() { - cd "${srcdir}/PolicyKit-gnome-${pkgver}" - - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --libexecdir=/usr/lib/PolicyKit \ - --disable-gtk-doc \ - --disable-examples || return 1 - make || return 1 - make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install || return 1 - - install -m 755 -d "${pkgdir}/usr/share/gconf/schemas" - gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" ${pkgdir}/etc/gconf/schemas/*.schemas || return 1 - rm -f ${pkgdir}/etc/gconf/schemas/*.schemas -} diff --git a/abs/extra-testing/policykit-gnome/policykit-gnome.install b/abs/extra-testing/policykit-gnome/policykit-gnome.install deleted file mode 100644 index e2593d3..0000000 --- a/abs/extra-testing/policykit-gnome/policykit-gnome.install +++ /dev/null @@ -1,23 +0,0 @@ -pkgname=policykit-gnome - -## arg 1: the new package version -post_install() { - usr/sbin/gconfpkg --install ${pkgname} -} - -## arg 1: the new package version -## arg 2: the old package version -pre_upgrade() { - pre_remove $1 -} - -## arg 1: the new package version -## arg 2: the old package version -post_upgrade() { - post_install $1 -} - -## arg 1: the old package version -pre_remove() { - usr/sbin/gconfpkg --uninstall ${pkgname} -} diff --git a/abs/extra-testing/policykit/PKGBUILD b/abs/extra-testing/policykit/PKGBUILD deleted file mode 100644 index d7dd90e..0000000 --- a/abs/extra-testing/policykit/PKGBUILD +++ /dev/null @@ -1,43 +0,0 @@ -# $Id: $ -# Maintainer: Jan de Groot - -pkgname=policykit -pkgver=0.9 -pkgrel=9 -pkgdesc="Application development toolkit for controlling system-wide privileges" -arch=(i686 x86_64) -license=('custom') -url="http://hal.freedesktop.org/docs/PolicyKit/" -depends=('dbus-glib>=0.80' 'expat>=2.0.1' 'pam') -makedepends=('intltool' 'docbook-xsl' 'gtk-doc') -options=('!libtool') -backup=('etc/PolicyKit/PolicyKit.conf') -install=policykit.install -source=(http://hal.freedesktop.org/releases/PolicyKit-${pkgver}.tar.gz - polkit.pam - pk-ck-api-change.patch - polkit-0.8-dbus-policy.patch - entry-leak.patch) -md5sums=('802fd13ae41f73d79359e5ecb0a98716' - '6564f95878297b954f0572bc1610dd15' - '15b42b41e98410d8d7ec4f91d0cff190' - 'da5129eee9517d00985a354055d778a9' - '62adbf90657b17dae429fc92937af513') - -build() { - cd "${srcdir}/PolicyKit-${pkgver}" - patch -Np1 -i "${srcdir}/pk-ck-api-change.patch" || return 1 - patch -Np1 -i "${srcdir}/polkit-0.8-dbus-policy.patch" || return 1 - patch -Np1 -i "${srcdir}/entry-leak.patch" || return 1 - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --libexecdir=/usr/lib/PolicyKit --disable-static \ - --with-polkit-user=policykit --with-polkit-group=policykit || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 - - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" || return 1 - - rm -rf "${pkgdir}/etc/profile.d" - install -m644 "${srcdir}/polkit.pam" "${pkgdir}/etc/pam.d/polkit" || return 1 -} diff --git a/abs/extra-testing/policykit/entry-leak.patch b/abs/extra-testing/policykit/entry-leak.patch deleted file mode 100644 index f6b3295..0000000 --- a/abs/extra-testing/policykit/entry-leak.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff -up PolicyKit-0.9/src/polkit/polkit-policy-file-entry.c.entry-leak PolicyKit-0.9/src/polkit/polkit-policy-file-entry.c ---- PolicyKit-0.9/src/polkit/polkit-policy-file-entry.c.entry-leak 2008-08-29 21:47:22.000000000 -0400 -+++ PolicyKit-0.9/src/polkit/polkit-policy-file-entry.c 2008-08-29 21:50:13.000000000 -0400 -@@ -95,9 +95,11 @@ _polkit_policy_file_entry_new (const c - char *contents; - size_t contents_size; - PolKitPolicyFileEntry *pfe; -+ char **tokens; - - path = NULL; - contents = NULL; -+ tokens = NULL; - - kit_return_val_if_fail (action_id != NULL && polkit_action_validate_id (action_id), NULL); - -@@ -153,7 +155,6 @@ _polkit_policy_file_entry_new (const c - } - - if (contents != NULL) { -- char **tokens; - size_t num_tokens; - PolKitResult any; - PolKitResult inactive; -@@ -183,11 +184,13 @@ _polkit_policy_file_entry_new (const c - - kit_free (path); - kit_free (contents); -+ kit_strfreev (tokens); - - return pfe; - error: - kit_free (path); - kit_free (contents); -+ kit_strfreev (tokens); - if (pfe != NULL) - polkit_policy_file_entry_unref (pfe); - return NULL; diff --git a/abs/extra-testing/policykit/pk-ck-api-change.patch b/abs/extra-testing/policykit/pk-ck-api-change.patch deleted file mode 100644 index ae477f9..0000000 --- a/abs/extra-testing/policykit/pk-ck-api-change.patch +++ /dev/null @@ -1,83 +0,0 @@ -diff --git a/src/polkit-dbus/polkit-dbus.c b/src/polkit-dbus/polkit-dbus.c -index f7be03f..cad4a76 100644 ---- a/src/polkit-dbus/polkit-dbus.c -+++ b/src/polkit-dbus/polkit-dbus.c -@@ -214,11 +214,17 @@ polkit_session_new_from_objpath (DBusConnection *con, const char *objpath, uid_t - 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 @@ polkit_tracker_dbus_func (PolKitTracker *pk_tracker, DBusMessage *message) - - 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 @@ polkit_tracker_dbus_func (PolKitTracker *pk_tracker, DBusMessage *message) - - 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/abs/extra-testing/policykit/policykit.install b/abs/extra-testing/policykit/policykit.install deleted file mode 100644 index 7bc653e..0000000 --- a/abs/extra-testing/policykit/policykit.install +++ /dev/null @@ -1,30 +0,0 @@ -post_install() { - getent group policykit >/dev/null || usr/sbin/groupadd -g 102 policykit - getent passwd policykit >/dev/null || usr/sbin/useradd -c 'PolicyKit' -u 102 -g policykit -d '/' -s /sbin/nologin policykit - usr/bin/passwd -l policykit &>/dev/null - - # set correct permissions - chgrp policykit var/{run,lib}/PolicyKit - chown policykit var/lib/PolicyKit-public - chown policykit:policykit var/lib/misc/PolicyKit.reload - - chown policykit usr/lib/PolicyKit/polkit-set-default-helper - chmod u+s usr/lib/PolicyKit/polkit-set-default-helper - - for i in polkit-read-auth-helper polkit-revoke-helper polkit-grant-helper polkit-explicit-grant-helper; do - chgrp policykit usr/lib/PolicyKit/$i - chmod g+s usr/lib/PolicyKit/$i - done - - chgrp policykit usr/lib/PolicyKit/polkit-grant-helper-pam - chmod u+s usr/lib/PolicyKit/polkit-grant-helper-pam -} - -post_upgrade() { - post_install -} - -post_remove() { - usr/sbin/userdel policykit &>/dev/null - usr/sbin/groupdel policykit &>/dev/null -} diff --git a/abs/extra-testing/policykit/polkit-0.8-dbus-policy.patch b/abs/extra-testing/policykit/polkit-0.8-dbus-policy.patch deleted file mode 100644 index fa84936..0000000 --- a/abs/extra-testing/policykit/polkit-0.8-dbus-policy.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- PolicyKit-0.8.orig/polkitd/org.freedesktop.PolicyKit.conf.in 2008-12-08 10:55:12.000000000 -0500 -+++ PolicyKit-0.8/polkitd/org.freedesktop.PolicyKit.conf.in 2008-12-08 12:05:33.000000000 -0500 -@@ -8,4 +8,9 @@ - - - -+ -+ -+ -+ -+ - diff --git a/abs/extra-testing/policykit/polkit.pam b/abs/extra-testing/policykit/polkit.pam deleted file mode 100644 index 04f53e0..0000000 --- a/abs/extra-testing/policykit/polkit.pam +++ /dev/null @@ -1,7 +0,0 @@ -auth requisite pam_nologin.so -auth required pam_env.so -auth required pam_unix.so -account required pam_unix.so -session required pam_limits.so -session required pam_unix.so -password required pam_unix.so -- cgit v0.12