diff options
author | Ross Burton <ross.burton@intel.com> | 2013-03-19 17:11:51 +0000 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2013-03-21 22:01:08 +0100 |
commit | 8a1c0ebb3d9447228fef5ec6de4077991b73edc4 (patch) | |
tree | 56dfd3f031d19908d578fdfa8a0a22742a3e7011 /meta-oe/recipes-extended | |
parent | ea7e9c2e00ce88573a20fcb04bd3176ca0238885 (diff) | |
download | meta-openembedded-8a1c0ebb3d9447228fef5ec6de4077991b73edc4.tar.gz |
polkit: add (taken from oe-core)
PolKit will be removed from oe-core as it isn't massively applicable in
embedded, isn't used by anything by default anymore, and future upgrades require
the SpiderMonkey JavaScript runtime.
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-extended')
7 files changed, 232 insertions, 1 deletions
diff --git a/meta-oe/recipes-extended/polkit/polkit-0.104/0001-PolkitUnixSession-Set-error-if-we-cannot-find-a-sess.patch b/meta-oe/recipes-extended/polkit/polkit-0.104/0001-PolkitUnixSession-Set-error-if-we-cannot-find-a-sess.patch new file mode 100644 index 000000000..c021bfb96 --- /dev/null +++ b/meta-oe/recipes-extended/polkit/polkit-0.104/0001-PolkitUnixSession-Set-error-if-we-cannot-find-a-sess.patch | |||
@@ -0,0 +1,70 @@ | |||
1 | From c46d2d13eac240d2a609b2dd8fc617ea18a78bfa Mon Sep 17 00:00:00 2001 | ||
2 | From: David Zeuthen <davidz@redhat.com> | ||
3 | Date: Mon, 6 Feb 2012 11:24:53 -0500 | ||
4 | Subject: [PATCH 1/2] PolkitUnixSession: Set error if we cannot find a session for the given pid | ||
5 | |||
6 | Also, don't treat the integer returned by sd_pid_get_session() as a | ||
7 | boolean because that's just confusing. Also, don't confuse memory | ||
8 | supposed 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 | |||
12 | for more details. | ||
13 | |||
14 | Signed-off-by: David Zeuthen <davidz@redhat.com> | ||
15 | --- | ||
16 | |||
17 | Upstream-Status: Accepted | ||
18 | |||
19 | src/polkit/polkitunixsession-systemd.c | 21 ++++++++++++++++----- | ||
20 | 1 files changed, 16 insertions(+), 5 deletions(-) | ||
21 | |||
22 | diff --git a/src/polkit/polkitunixsession-systemd.c b/src/polkit/polkitunixsession-systemd.c | ||
23 | index 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 | -- | ||
69 | 1.7.2.5 | ||
70 | |||
diff --git a/meta-oe/recipes-extended/polkit/polkit-0.104/0002-PolkitUnixSession-Actually-return-TRUE-if-a-session-.patch b/meta-oe/recipes-extended/polkit/polkit-0.104/0002-PolkitUnixSession-Actually-return-TRUE-if-a-session-.patch new file mode 100644 index 000000000..49f8ce2a0 --- /dev/null +++ b/meta-oe/recipes-extended/polkit/polkit-0.104/0002-PolkitUnixSession-Actually-return-TRUE-if-a-session-.patch | |||
@@ -0,0 +1,46 @@ | |||
1 | From 8fb8b406bab50c5ef8c5d4f743e3f13924bd5f73 Mon Sep 17 00:00:00 2001 | ||
2 | From: David Zeuthen <davidz@redhat.com> | ||
3 | Date: Mon, 6 Feb 2012 11:26:06 -0500 | ||
4 | Subject: [PATCH 2/2] PolkitUnixSession: Actually return TRUE if a session exists | ||
5 | |||
6 | Also, don't treat the integer returned by sd_session_get_uid() as a | ||
7 | boolean because that's just confusing. | ||
8 | |||
9 | Signed-off-by: David Zeuthen <davidz@redhat.com> | ||
10 | --- | ||
11 | |||
12 | Upstream-Status: Accepted | ||
13 | |||
14 | src/polkit/polkitunixsession-systemd.c | 12 +++++------- | ||
15 | 1 files changed, 5 insertions(+), 7 deletions(-) | ||
16 | |||
17 | diff --git a/src/polkit/polkitunixsession-systemd.c b/src/polkit/polkitunixsession-systemd.c | ||
18 | index 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 | -- | ||
45 | 1.7.2.5 | ||
46 | |||
diff --git a/meta-oe/recipes-extended/polkit/polkit-0.104/obsolete_automake_macros.patch b/meta-oe/recipes-extended/polkit/polkit-0.104/obsolete_automake_macros.patch new file mode 100644 index 000000000..5a6046cc3 --- /dev/null +++ b/meta-oe/recipes-extended/polkit/polkit-0.104/obsolete_automake_macros.patch | |||
@@ -0,0 +1,23 @@ | |||
1 | Upstream-Status: Submitted [https://bugs.freedesktop.org/show_bug.cgi?id=59091] | ||
2 | |||
3 | Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> | ||
4 | diff -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-oe/recipes-extended/polkit/polkit-0.104/polkit-1_pam.patch b/meta-oe/recipes-extended/polkit/polkit-0.104/polkit-1_pam.patch new file mode 100644 index 000000000..74647efce --- /dev/null +++ b/meta-oe/recipes-extended/polkit/polkit-0.104/polkit-1_pam.patch | |||
@@ -0,0 +1,23 @@ | |||
1 | polkit: No system-auth in OE-Core, we can use common-* in place of it. | ||
2 | |||
3 | Upstream-Status:Inappropriate [configuration] | ||
4 | |||
5 | Signed-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-oe/recipes-extended/polkit/polkit-gnome_0.102.bb b/meta-oe/recipes-extended/polkit/polkit-gnome_0.102.bb new file mode 100644 index 000000000..7e9fc2b2c --- /dev/null +++ b/meta-oe/recipes-extended/polkit/polkit-gnome_0.102.bb | |||
@@ -0,0 +1,26 @@ | |||
1 | SUMMARY = "GNOME Authentication Agent for PolicyKit" | ||
2 | DESCRIPTION = "PolicyKit-gnome provides an Authentication Agent for PolicyKit that integrates well with the GNOME desktop environment" | ||
3 | HOMEPAGE = "http://www.packagekit.org/" | ||
4 | BUGTRACKER = "http://bugzilla.gnome.org/" | ||
5 | DEPENDS = "polkit dbus-glib gconf gtk+" | ||
6 | LICENSE = "LGPLv2+" | ||
7 | LIC_FILES_CHKSUM = "file://COPYING;md5=74579fab173e4c5e12aac0cd83ee98ec \ | ||
8 | file://src/main.c;beginline=1;endline=20;md5=aba145d1802f2329ba561e3e48ecb795" | ||
9 | |||
10 | SRC_URI = "http://hal.freedesktop.org/releases/polkit-gnome-${PV}.tar.bz2 \ | ||
11 | " | ||
12 | |||
13 | PR = "r2" | ||
14 | |||
15 | EXTRA_OECONF = " --disable-scrollkeeper \ | ||
16 | --disable-man-pages \ | ||
17 | --disable-examples \ | ||
18 | --disable-introspection " | ||
19 | |||
20 | inherit autotools gtk-doc pkgconfig | ||
21 | |||
22 | FILES_${PN} += " ${datadir}/dbus-1 \ | ||
23 | ${datadir}/PolicyKit \ | ||
24 | " | ||
25 | SRC_URI[md5sum] = "f6b485ffd7bd605af815fd2747180481" | ||
26 | SRC_URI[sha256sum] = "81caa6972e651e90ef4ac31d7ed41bc79543d46b850dbd5b14b40f8ef7107d11" | ||
diff --git a/meta-oe/recipes-extended/polkit/polkit_0.104.bb b/meta-oe/recipes-extended/polkit/polkit_0.104.bb new file mode 100644 index 000000000..ab2547b83 --- /dev/null +++ b/meta-oe/recipes-extended/polkit/polkit_0.104.bb | |||
@@ -0,0 +1,44 @@ | |||
1 | SUMMARY = "PolicyKit Authorization Framework" | ||
2 | DESCRIPTION = "The polkit package is an application-level toolkit for defining and handling the policy that allows unprivileged processes to speak to privileged processes." | ||
3 | HOMEPAGE = "http://www.freedesktop.org/wiki/Software/polkit" | ||
4 | LICENSE = "LGPLv2+" | ||
5 | LIC_FILES_CHKSUM = "file://COPYING;md5=155db86cdbafa7532b41f390409283eb \ | ||
6 | file://src/polkit/polkit.h;beginline=1;endline=20;md5=0a8630b0133176d0504c87a0ded39db4" | ||
7 | |||
8 | DEPENDS = "expat glib-2.0 intltool-native gobject-introspection-stub" | ||
9 | |||
10 | PACKAGECONFIG = "${@base_contains('DISTRO_FEATURES', 'pam', 'pam', '', d)} \ | ||
11 | ${@base_contains('DISTRO_FEATURES','systemd','systemd','consolekit',d)}" | ||
12 | |||
13 | PACKAGECONFIG[pam] = "--with-authfw=pam,--with-authfw=shadow,libpam,libpam" | ||
14 | PACKAGECONFIG[systemd] = "--enable-systemd,--disable-systemd,systemd" | ||
15 | # there is no --enable/--disable option for consolekit and it's not picked by shlibs, so add it to RDEPENDS | ||
16 | PACKAGECONFIG[consolekit] = ",,,consolekit" | ||
17 | |||
18 | PR = "r9" | ||
19 | |||
20 | PAM_SRC_URI = "file://polkit-1_pam.patch" | ||
21 | SRC_URI = "http://www.freedesktop.org/software/polkit/releases/polkit-${PV}.tar.gz \ | ||
22 | ${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} \ | ||
23 | file://0001-PolkitUnixSession-Set-error-if-we-cannot-find-a-sess.patch \ | ||
24 | file://0002-PolkitUnixSession-Actually-return-TRUE-if-a-session-.patch \ | ||
25 | file://obsolete_automake_macros.patch \ | ||
26 | " | ||
27 | |||
28 | SRC_URI[md5sum] = "e380b4c6fb1e7bccf854e92edc0a8ce1" | ||
29 | SRC_URI[sha256sum] = "6b0a13d8381e4a7b7e37c18a54595191b50757e0fcd186cd9918e9ad0f18c7f9" | ||
30 | |||
31 | EXTRA_OECONF = "--with-os-type=moblin --disable-man-pages --disable-introspection" | ||
32 | |||
33 | inherit autotools gtk-doc pkgconfig | ||
34 | |||
35 | do_install_append() { | ||
36 | rm -f ${D}${libdir}/${BPN}-1/extensions/*.a | ||
37 | } | ||
38 | |||
39 | FILES_${PN} += "${libdir}/${BPN}-1/extensions/*.so \ | ||
40 | ${datadir}/${BPN}-1/actions/* \ | ||
41 | ${datadir}/dbus-1/system-services/*" | ||
42 | FILES_${PN}-dbg += "${libdir}/${BPN}-1/extensions/.debug/*.so" | ||
43 | FILES_${PN}-dev += "${libdir}/${BPN}-1/extensions/*.la " | ||
44 | |||
diff --git a/meta-oe/recipes-extended/polkit/polkit_0.104.bbappend b/meta-oe/recipes-extended/polkit/polkit_0.104.bbappend deleted file mode 100644 index ceb2b6b3b..000000000 --- a/meta-oe/recipes-extended/polkit/polkit_0.104.bbappend +++ /dev/null | |||
@@ -1 +0,0 @@ | |||
1 | PRINC := "${@int(PRINC) + 5}" | ||