summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2013-03-22 09:26:38 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-03-23 11:44:13 (GMT)
commit619e1df31d246f4779c1ef834dddd81e9242555c (patch)
tree0198bc4da0229d3e157ed0b74abc547f998f8cca
parente887bd9f512790e494aa87c3f5556dd8f27cffba (diff)
downloadpoky-619e1df31d246f4779c1ef834dddd81e9242555c.tar.gz
polkit: remove
Previous commits have meant that PolicyKit isn't used by default anymore, so remove this now that it's been integrated into meta-gnome. Rationales for this move inludes that PolicyKit isn't "core" for embedded systems, and future versions require the SpiderMonkey JavaScript runtime. (From OE-Core rev: 8c9fad86d8bd86f13d61a1a5cd65d12b16a9e0de) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-extended/polkit/polkit-0.104/0001-PolkitUnixSession-Set-error-if-we-cannot-find-a-sess.patch70
-rw-r--r--meta/recipes-extended/polkit/polkit-0.104/0002-PolkitUnixSession-Actually-return-TRUE-if-a-session-.patch46
-rw-r--r--meta/recipes-extended/polkit/polkit-0.104/obsolete_automake_macros.patch23
-rw-r--r--meta/recipes-extended/polkit/polkit-0.104/polkit-1_pam.patch23
-rw-r--r--meta/recipes-extended/polkit/polkit-gnome_0.102.bb26
-rw-r--r--meta/recipes-extended/polkit/polkit_0.104.bb45
6 files changed, 0 insertions, 233 deletions
diff --git a/meta/recipes-extended/polkit/polkit-0.104/0001-PolkitUnixSession-Set-error-if-we-cannot-find-a-sess.patch b/meta/recipes-extended/polkit/polkit-0.104/0001-PolkitUnixSession-Set-error-if-we-cannot-find-a-sess.patch
deleted file mode 100644
index c021bfb..0000000
--- a/meta/recipes-extended/polkit/polkit-0.104/0001-PolkitUnixSession-Set-error-if-we-cannot-find-a-sess.patch
+++ /dev/null
@@ -1,70 +0,0 @@
1From c46d2d13eac240d2a609b2dd8fc617ea18a78bfa Mon Sep 17 00:00:00 2001
2From: David Zeuthen <davidz@redhat.com>
3Date: Mon, 6 Feb 2012 11:24:53 -0500
4Subject: [PATCH 1/2] PolkitUnixSession: Set error if we cannot find a session for the given pid
5
6Also, don't treat the integer returned by sd_pid_get_session() as a
7boolean because that's just confusing. Also, don't confuse memory
8supposed to be freed by g_free() and free(3) with each other. See
9
10 https://bugzilla.redhat.com/show_bug.cgi?id=787222
11
12for more details.
13
14Signed-off-by: David Zeuthen <davidz@redhat.com>
15---
16
17Upstream-Status: Accepted
18
19 src/polkit/polkitunixsession-systemd.c | 21 ++++++++++++++++-----
20 1 files changed, 16 insertions(+), 5 deletions(-)
21
22diff --git a/src/polkit/polkitunixsession-systemd.c b/src/polkit/polkitunixsession-systemd.c
23index e7e913f..94a7ee4 100644
24--- a/src/polkit/polkitunixsession-systemd.c
25+++ b/src/polkit/polkitunixsession-systemd.c
26@@ -23,6 +23,7 @@
27 # include "config.h"
28 #endif
29
30+#include <stdlib.h>
31 #include <string.h>
32 #include "polkitunixsession.h"
33 #include "polkitsubject.h"
34@@ -450,9 +451,8 @@ polkit_unix_session_initable_init (GInitable *initable,
35 GError **error)
36 {
37 PolkitUnixSession *session = POLKIT_UNIX_SESSION (initable);
38- gboolean ret;
39-
40- ret = FALSE;
41+ gboolean ret = FALSE;
42+ char *s;
43
44 if (session->session_id != NULL)
45 {
46@@ -461,8 +461,19 @@ polkit_unix_session_initable_init (GInitable *initable,
47 goto out;
48 }
49
50- if (!sd_pid_get_session (session->pid, &session->session_id))
51- ret = TRUE;
52+ if (sd_pid_get_session (session->pid, &s) == 0)
53+ {
54+ session->session_id = g_strdup (s);
55+ free (s);
56+ ret = TRUE;
57+ goto out;
58+ }
59+
60+ g_set_error (error,
61+ POLKIT_ERROR,
62+ POLKIT_ERROR_FAILED,
63+ "No session for pid %d",
64+ (gint) session->pid);
65
66 out:
67 return ret;
68--
691.7.2.5
70
diff --git a/meta/recipes-extended/polkit/polkit-0.104/0002-PolkitUnixSession-Actually-return-TRUE-if-a-session-.patch b/meta/recipes-extended/polkit/polkit-0.104/0002-PolkitUnixSession-Actually-return-TRUE-if-a-session-.patch
deleted file mode 100644
index 49f8ce2..0000000
--- a/meta/recipes-extended/polkit/polkit-0.104/0002-PolkitUnixSession-Actually-return-TRUE-if-a-session-.patch
+++ /dev/null
@@ -1,46 +0,0 @@
1From 8fb8b406bab50c5ef8c5d4f743e3f13924bd5f73 Mon Sep 17 00:00:00 2001
2From: David Zeuthen <davidz@redhat.com>
3Date: Mon, 6 Feb 2012 11:26:06 -0500
4Subject: [PATCH 2/2] PolkitUnixSession: Actually return TRUE if a session exists
5
6Also, don't treat the integer returned by sd_session_get_uid() as a
7boolean because that's just confusing.
8
9Signed-off-by: David Zeuthen <davidz@redhat.com>
10---
11
12Upstream-Status: Accepted
13
14 src/polkit/polkitunixsession-systemd.c | 12 +++++-------
15 1 files changed, 5 insertions(+), 7 deletions(-)
16
17diff --git a/src/polkit/polkitunixsession-systemd.c b/src/polkit/polkitunixsession-systemd.c
18index 94a7ee4..8a8bf65 100644
19--- a/src/polkit/polkitunixsession-systemd.c
20+++ b/src/polkit/polkitunixsession-systemd.c
21@@ -361,17 +361,15 @@ polkit_unix_session_to_string (PolkitSubject *subject)
22
23 static gboolean
24 polkit_unix_session_exists_sync (PolkitSubject *subject,
25- GCancellable *cancellable,
26- GError **error)
27+ GCancellable *cancellable,
28+ GError **error)
29 {
30 PolkitUnixSession *session = POLKIT_UNIX_SESSION (subject);
31- gboolean ret;
32+ gboolean ret = FALSE;
33 uid_t uid;
34
35- ret = FALSE;
36-
37- if (!sd_session_get_uid (session->session_id, &uid))
38- ret = FALSE;
39+ if (sd_session_get_uid (session->session_id, &uid) == 0)
40+ ret = TRUE;
41
42 return ret;
43 }
44--
451.7.2.5
46
diff --git a/meta/recipes-extended/polkit/polkit-0.104/obsolete_automake_macros.patch b/meta/recipes-extended/polkit/polkit-0.104/obsolete_automake_macros.patch
deleted file mode 100644
index 5a6046c..0000000
--- a/meta/recipes-extended/polkit/polkit-0.104/obsolete_automake_macros.patch
+++ /dev/null
@@ -1,23 +0,0 @@
1Upstream-Status: Submitted [https://bugs.freedesktop.org/show_bug.cgi?id=59091]
2
3Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
4diff -Nurd polkit-0.104/configure.ac polkit-0.104/configure.ac
5--- polkit-0.104/configure.ac 2012-01-03 18:25:49.000000000 +0200
6+++ polkit-0.104/configure.ac 2013-01-07 03:13:31.862125625 +0200
7@@ -3,7 +3,7 @@
8 AC_PREREQ(2.59c)
9 AC_INIT(polkit, 0.104, http://lists.freedesktop.org/mailman/listinfo/polkit-devel)
10 AM_INIT_AUTOMAKE(polkit, 0.104)
11-AM_CONFIG_HEADER(config.h)
12+AC_CONFIG_HEADERS(config.h)
13 AM_MAINTAINER_MODE
14
15 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
16@@ -24,7 +24,6 @@
17
18 AC_ISC_POSIX
19 AC_PROG_CC
20-AM_PROG_CC_STDC
21 AC_HEADER_STDC
22 AM_PROG_LIBTOOL
23 AC_PROG_MAKE_SET
diff --git a/meta/recipes-extended/polkit/polkit-0.104/polkit-1_pam.patch b/meta/recipes-extended/polkit/polkit-0.104/polkit-1_pam.patch
deleted file mode 100644
index 74647ef..0000000
--- a/meta/recipes-extended/polkit/polkit-0.104/polkit-1_pam.patch
+++ /dev/null
@@ -1,23 +0,0 @@
1polkit: No system-auth in OE-Core, we can use common-* in place of it.
2
3Upstream-Status:Inappropriate [configuration]
4
5Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
6
7--- a/configure.ac 2011-03-04 02:26:20.000000000 +0800
8+++ b/configure.ac.new 2011-07-18 10:14:12.516818852 +0800
9@@ -350,10 +350,10 @@
10 PAM_FILE_INCLUDE_PASSWORD=system
11 PAM_FILE_INCLUDE_SESSION=system
12 else
13- PAM_FILE_INCLUDE_AUTH=system-auth
14- PAM_FILE_INCLUDE_ACCOUNT=system-auth
15- PAM_FILE_INCLUDE_PASSWORD=system-auth
16- PAM_FILE_INCLUDE_SESSION=system-auth
17+ PAM_FILE_INCLUDE_AUTH=common-auth
18+ PAM_FILE_INCLUDE_ACCOUNT=common-account
19+ PAM_FILE_INCLUDE_PASSWORD=common-password
20+ PAM_FILE_INCLUDE_SESSION=common-session
21 fi
22
23 AC_SUBST(PAM_FILE_INCLUDE_AUTH)
diff --git a/meta/recipes-extended/polkit/polkit-gnome_0.102.bb b/meta/recipes-extended/polkit/polkit-gnome_0.102.bb
deleted file mode 100644
index 7e9fc2b..0000000
--- a/meta/recipes-extended/polkit/polkit-gnome_0.102.bb
+++ /dev/null
@@ -1,26 +0,0 @@
1SUMMARY = "GNOME Authentication Agent for PolicyKit"
2DESCRIPTION = "PolicyKit-gnome provides an Authentication Agent for PolicyKit that integrates well with the GNOME desktop environment"
3HOMEPAGE = "http://www.packagekit.org/"
4BUGTRACKER = "http://bugzilla.gnome.org/"
5DEPENDS = "polkit dbus-glib gconf gtk+"
6LICENSE = "LGPLv2+"
7LIC_FILES_CHKSUM = "file://COPYING;md5=74579fab173e4c5e12aac0cd83ee98ec \
8 file://src/main.c;beginline=1;endline=20;md5=aba145d1802f2329ba561e3e48ecb795"
9
10SRC_URI = "http://hal.freedesktop.org/releases/polkit-gnome-${PV}.tar.bz2 \
11 "
12
13PR = "r2"
14
15EXTRA_OECONF = " --disable-scrollkeeper \
16 --disable-man-pages \
17 --disable-examples \
18 --disable-introspection "
19
20inherit autotools gtk-doc pkgconfig
21
22FILES_${PN} += " ${datadir}/dbus-1 \
23 ${datadir}/PolicyKit \
24 "
25SRC_URI[md5sum] = "f6b485ffd7bd605af815fd2747180481"
26SRC_URI[sha256sum] = "81caa6972e651e90ef4ac31d7ed41bc79543d46b850dbd5b14b40f8ef7107d11"
diff --git a/meta/recipes-extended/polkit/polkit_0.104.bb b/meta/recipes-extended/polkit/polkit_0.104.bb
deleted file mode 100644
index 342fbe1..0000000
--- a/meta/recipes-extended/polkit/polkit_0.104.bb
+++ /dev/null
@@ -1,45 +0,0 @@
1SUMMARY = "PolicyKit Authorization Framework"
2DESCRIPTION = "The polkit package is an application-level toolkit for defining and handling the policy that allows unprivileged processes to speak to privileged processes."
3HOMEPAGE = "http://www.freedesktop.org/wiki/Software/polkit"
4LICENSE = "LGPLv2+"
5LIC_FILES_CHKSUM = "file://COPYING;md5=155db86cdbafa7532b41f390409283eb \
6 file://src/polkit/polkit.h;beginline=1;endline=20;md5=0a8630b0133176d0504c87a0ded39db4"
7
8DEPENDS = "expat glib-2.0 intltool-native gobject-introspection-stub"
9
10PACKAGECONFIG = "${@base_contains('DISTRO_FEATURES', 'pam', 'pam', '', d)} \
11 ${@base_contains('DISTRO_FEATURES','systemd','systemd','consolekit',d)}"
12
13PACKAGECONFIG[pam] = "--with-authfw=pam,--with-authfw=shadow,libpam,libpam"
14PACKAGECONFIG[systemd] = "--enable-systemd,--disable-systemd,systemd"
15# There is no --enable/--disable option for consolekit, so disable systemd to
16# force it. ConsoleKit is accessed via DBus, so add it to RDEPENDS.
17PACKAGECONFIG[consolekit] = "--disable-systemd,,,consolekit"
18
19PR = "r9"
20
21PAM_SRC_URI = "file://polkit-1_pam.patch"
22SRC_URI = "http://www.freedesktop.org/software/polkit/releases/polkit-${PV}.tar.gz \
23 ${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} \
24 file://0001-PolkitUnixSession-Set-error-if-we-cannot-find-a-sess.patch \
25 file://0002-PolkitUnixSession-Actually-return-TRUE-if-a-session-.patch \
26 file://obsolete_automake_macros.patch \
27 "
28
29SRC_URI[md5sum] = "e380b4c6fb1e7bccf854e92edc0a8ce1"
30SRC_URI[sha256sum] = "6b0a13d8381e4a7b7e37c18a54595191b50757e0fcd186cd9918e9ad0f18c7f9"
31
32EXTRA_OECONF = "--with-os-type=moblin --disable-man-pages --disable-introspection"
33
34inherit autotools gtk-doc pkgconfig
35
36do_install_append() {
37 rm -f ${D}${libdir}/${BPN}-1/extensions/*.a
38}
39
40FILES_${PN} += "${libdir}/${BPN}-1/extensions/*.so \
41 ${datadir}/${BPN}-1/actions/* \
42 ${datadir}/dbus-1/system-services/*"
43FILES_${PN}-dbg += "${libdir}/${BPN}-1/extensions/.debug/*.so"
44FILES_${PN}-dev += "${libdir}/${BPN}-1/extensions/*.la "
45