[PATCH v2 1/4] polkit 0.104: convert pam code to PACKAGECONFIG and adhere to OE recipe styleguide

[PATCH v2 1/4] polkit 0.104: convert pam code to PACKAGECONFIG and adhere to OE recipe styleguide

[Koen Kooi]

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---
 meta/recipes-extended/polkit/polkit_0.104.bb |   25 +++++++++++++++----------
 1 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/meta/recipes-extended/polkit/polkit_0.104.bb b/meta/recipes-extended/polkit/polkit_0.104.bb
index 2737a4a..5dc82c5 100644
--- a/meta/recipes-extended/polkit/polkit_0.104.bb
+++ b/meta/recipes-extended/polkit/polkit_0.104.bb
@@ -6,28 +6,33 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=155db86cdbafa7532b41f390409283eb \
                     file://src/polkit/polkit.h;beginline=1;endline=20;md5=0a8630b0133176d0504c87a0ded39db4 \
                     file://docs/polkit/html/license.html;md5=d85a36709a446c10f4ee123f9dda0e38"
 
+DEPENDS = "expat dbus-glib eggdbus intltool-native"
+
+PACKAGECONFIG = "${@base_contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}"
+PACKAGECONFIG[pam] = "--with-authfw=pam,--with-authfw=none,libpam,libpam"
+
+PR = "r3"
+
+PAM_SRC_URI = "file://polkit-1_pam.patch"
 SRC_URI = "http://hal.freedesktop.org/releases/polkit-${PV}.tar.gz \
            file://introspection.patch \
-           ${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)}"
+           ${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} \
+          "
 
 SRC_URI[md5sum] = "e380b4c6fb1e7bccf854e92edc0a8ce1"
 SRC_URI[sha256sum] = "6b0a13d8381e4a7b7e37c18a54595191b50757e0fcd186cd9918e9ad0f18c7f9"
 
-PAM_SRC_URI = "file://polkit-1_pam.patch"
-PR = "r2"
-DEPENDS = "libpam expat dbus-glib eggdbus intltool-native"
-RDEPENDS_${PN} = "libpam"
-EXTRA_OECONF = "--with-authfw=pam --with-os-type=moblin --disable-man-pages --disable-gtk-doc --disable-introspection"
+EXTRA_OECONF = "--with-os-type=moblin --disable-man-pages --disable-gtk-doc --disable-introspection"
 
 inherit autotools pkgconfig
 
+do_install_append() {
+	rm -f ${D}${libdir}/${PN}-1/extensions/*.a
+}
+
 FILES_${PN} += "${libdir}/${PN}-1/extensions/*.so \
                 ${datadir}/${PN}-1/actions/* \
                 ${datadir}/dbus-1/system-services/*"
 FILES_${PN}-dbg += "${libdir}/${PN}-1/extensions/.debug/*.so"
 FILES_${PN}-dev += "${libdir}/${PN}-1/extensions/*.la "
 
-do_install_append() {
-	rm -f ${D}${libdir}/${PN}-1/extensions/*.a
-}
-
-- 
1.7.2.5

[PATCH v2 2/4] polkit 0.104: add 2 backports from upstream to fix crashes during auth

[Koen Kooi]

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---
 ...ession-Set-error-if-we-cannot-find-a-sess.patch |   70 ++++++++++++++++++++
 ...ession-Actually-return-TRUE-if-a-session-.patch |   46 +++++++++++++
 meta/recipes-extended/polkit/polkit_0.104.bb       |    4 +-
 3 files changed, 119 insertions(+), 1 deletions(-)
 create mode 100644 meta/recipes-extended/polkit/polkit-0.104/0001-PolkitUnixSession-Set-error-if-we-cannot-find-a-sess.patch
 create mode 100644 meta/recipes-extended/polkit/polkit-0.104/0002-PolkitUnixSession-Actually-return-TRUE-if-a-session-.patch

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
new file mode 100644
index 0000000..aaa989e
--- /dev/null
+++ b/meta/recipes-extended/polkit/polkit-0.104/0001-PolkitUnixSession-Set-error-if-we-cannot-find-a-sess.patch
@@ -0,0 +1,70 @@
+From c46d2d13eac240d2a609b2dd8fc617ea18a78bfa Mon Sep 17 00:00:00 2001
+From: David Zeuthen <davidz@redhat.com>
+Date: Mon, 6 Feb 2012 11:24:53 -0500
+Subject: [PATCH 1/2] PolkitUnixSession: Set error if we cannot find a session for the given pid
+
+Also, don't treat the integer returned by sd_pid_get_session() as a
+boolean because that's just confusing. Also, don't confuse memory
+supposed to be freed by g_free() and free(3) with each other. See
+
+ https://bugzilla.redhat.com/show_bug.cgi?id=787222
+
+for more details.
+
+Signed-off-by: David Zeuthen <davidz@redhat.com>
+---
+
+Upstream-status: Accepted
+
+ src/polkit/polkitunixsession-systemd.c |   21 ++++++++++++++++-----
+ 1 files changed, 16 insertions(+), 5 deletions(-)
+
+diff --git a/src/polkit/polkitunixsession-systemd.c b/src/polkit/polkitunixsession-systemd.c
+index e7e913f..94a7ee4 100644
+--- a/src/polkit/polkitunixsession-systemd.c
++++ b/src/polkit/polkitunixsession-systemd.c
+@@ -23,6 +23,7 @@
+ #  include "config.h"
+ #endif
+ 
++#include <stdlib.h>
+ #include <string.h>
+ #include "polkitunixsession.h"
+ #include "polkitsubject.h"
+@@ -450,9 +451,8 @@ polkit_unix_session_initable_init (GInitable     *initable,
+                                    GError       **error)
+ {
+   PolkitUnixSession *session = POLKIT_UNIX_SESSION (initable);
+-  gboolean ret;
+-
+-  ret = FALSE;
++  gboolean ret = FALSE;
++  char *s;
+ 
+   if (session->session_id != NULL)
+     {
+@@ -461,8 +461,19 @@ polkit_unix_session_initable_init (GInitable     *initable,
+       goto out;
+     }
+ 
+-  if (!sd_pid_get_session (session->pid, &session->session_id))
+-    ret = TRUE;
++  if (sd_pid_get_session (session->pid, &s) == 0)
++    {
++      session->session_id = g_strdup (s);
++      free (s);
++      ret = TRUE;
++      goto out;
++    }
++
++  g_set_error (error,
++               POLKIT_ERROR,
++               POLKIT_ERROR_FAILED,
++               "No session for pid %d",
++               (gint) session->pid);
+ 
+ out:
+   return ret;
+-- 
+1.7.2.5
+
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
new file mode 100644
index 0000000..3fdc731
--- /dev/null
+++ b/meta/recipes-extended/polkit/polkit-0.104/0002-PolkitUnixSession-Actually-return-TRUE-if-a-session-.patch
@@ -0,0 +1,46 @@
+From 8fb8b406bab50c5ef8c5d4f743e3f13924bd5f73 Mon Sep 17 00:00:00 2001
+From: David Zeuthen <davidz@redhat.com>
+Date: Mon, 6 Feb 2012 11:26:06 -0500
+Subject: [PATCH 2/2] PolkitUnixSession: Actually return TRUE if a session exists
+
+Also, don't treat the integer returned by sd_session_get_uid() as a
+boolean because that's just confusing.
+
+Signed-off-by: David Zeuthen <davidz@redhat.com>
+---
+
+Upstream-status: Accepted
+
+ src/polkit/polkitunixsession-systemd.c |   12 +++++-------
+ 1 files changed, 5 insertions(+), 7 deletions(-)
+
+diff --git a/src/polkit/polkitunixsession-systemd.c b/src/polkit/polkitunixsession-systemd.c
+index 94a7ee4..8a8bf65 100644
+--- a/src/polkit/polkitunixsession-systemd.c
++++ b/src/polkit/polkitunixsession-systemd.c
+@@ -361,17 +361,15 @@ polkit_unix_session_to_string (PolkitSubject *subject)
+ 
+ static gboolean
+ polkit_unix_session_exists_sync (PolkitSubject   *subject,
+-                                    GCancellable    *cancellable,
+-                                    GError         **error)
++                                 GCancellable    *cancellable,
++                                 GError         **error)
+ {
+   PolkitUnixSession *session = POLKIT_UNIX_SESSION (subject);
+-  gboolean ret;
++  gboolean ret = FALSE;
+   uid_t uid;
+ 
+-  ret = FALSE;
+-
+-  if (!sd_session_get_uid (session->session_id, &uid))
+-    ret = FALSE;
++  if (sd_session_get_uid (session->session_id, &uid) == 0)
++    ret = TRUE;
+ 
+   return ret;
+ }
+-- 
+1.7.2.5
+
diff --git a/meta/recipes-extended/polkit/polkit_0.104.bb b/meta/recipes-extended/polkit/polkit_0.104.bb
index 5dc82c5..dfbd300 100644
--- a/meta/recipes-extended/polkit/polkit_0.104.bb
+++ b/meta/recipes-extended/polkit/polkit_0.104.bb
@@ -11,12 +11,14 @@ DEPENDS = "expat dbus-glib eggdbus intltool-native"
 PACKAGECONFIG = "${@base_contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}"
 PACKAGECONFIG[pam] = "--with-authfw=pam,--with-authfw=none,libpam,libpam"
 
-PR = "r3"
+PR = "r4"
 
 PAM_SRC_URI = "file://polkit-1_pam.patch"
 SRC_URI = "http://hal.freedesktop.org/releases/polkit-${PV}.tar.gz \
            file://introspection.patch \
            ${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} \
+           file://0001-PolkitUnixSession-Set-error-if-we-cannot-find-a-sess.patch \
+           file://0002-PolkitUnixSession-Actually-return-TRUE-if-a-session-.patch \
           "
 
 SRC_URI[md5sum] = "e380b4c6fb1e7bccf854e92edc0a8ce1"
-- 
1.7.2.5

[PATCH v2 3/4] gtk+ 2.24.8: bump PR to force rebuild and feed update

[Koen Kooi]

This should errors similar to this one:

/usr/libexec/gdm-simple-greeter: symbol lookup error: /usr/lib/libgdk-x11-2.0.so.0: undefined symbol: _XGetRequest

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---
 meta/recipes-gnome/gtk+/gtk+_2.24.8.bb |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/meta/recipes-gnome/gtk+/gtk+_2.24.8.bb b/meta/recipes-gnome/gtk+/gtk+_2.24.8.bb
index dab66c7..0b29ae1 100644
--- a/meta/recipes-gnome/gtk+/gtk+_2.24.8.bb
+++ b/meta/recipes-gnome/gtk+/gtk+_2.24.8.bb
@@ -27,7 +27,7 @@ SRC_URI = "http://download.gnome.org/sources/gtk+/2.24/gtk+-${PV}.tar.bz2 \
 #        file://combo-arrow-size.patch;striplevel=0
 #            file://configurefix.patch
 
-PR = "r3"
+PR = "r4"
 
 SRC_URI[md5sum] = "0413187f7e596aef00ccd1b54776ff03"
 SRC_URI[sha256sum] = "ac2325a65312922a6722a7c02a389f3f4072d79e13131485cc7b7226e2537043"
-- 
1.7.2.5

[PATCH v2 4/4] libx11: reinstate PE=1 that got lost in the big meta-oe Xorg merge

[Koen Kooi]

This prevents package managers 'upgrading' 1.4.4 to 1:1.4.3

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---
 meta/recipes-graphics/xorg-lib/libx11.inc      |    2 ++
 meta/recipes-graphics/xorg-lib/libx11_1.4.4.bb |    2 +-
 2 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/meta/recipes-graphics/xorg-lib/libx11.inc b/meta/recipes-graphics/xorg-lib/libx11.inc
index 9057edc..a1e4386 100644
--- a/meta/recipes-graphics/xorg-lib/libx11.inc
+++ b/meta/recipes-graphics/xorg-lib/libx11.inc
@@ -8,6 +8,8 @@ require xorg-lib-common.inc
 
 inherit siteinfo
 
+PE = "1"
+
 PROVIDES = "virtual/libx11"
 
 XORG_PN = "libX11"
diff --git a/meta/recipes-graphics/xorg-lib/libx11_1.4.4.bb b/meta/recipes-graphics/xorg-lib/libx11_1.4.4.bb
index 0428ff5..1ad8046 100644
--- a/meta/recipes-graphics/xorg-lib/libx11_1.4.4.bb
+++ b/meta/recipes-graphics/xorg-lib/libx11_1.4.4.bb
@@ -1,7 +1,7 @@
 require libx11.inc
 inherit gettext
 
-PR = "r2"
+PR = "r3"
 
 BBCLASSEXTEND = "native nativesdk"
 
-- 
1.7.2.5

Re: [PATCH v2 1/4] polkit 0.104: convert pam code to PACKAGECONFIG and adhere to OE recipe styleguide

[Richard Purdie]

On Mon, 2012-03-05 at 08:38 +0100, Koen Kooi wrote:
> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
> ---
>  meta/recipes-extended/polkit/polkit_0.104.bb |   25 +++++++++++++++----------
>  1 files changed, 15 insertions(+), 10 deletions(-)

Merged to master, thanks (patches 1-4).

Cheers,

Richard

Re: [PATCH v2 1/4] polkit 0.104: convert pam code to PACKAGECONFIG and adhere to OE recipe styleguide

[Richard Purdie]

On Mon, 2012-03-05 at 08:38 +0100, Koen Kooi wrote:
> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
> ---
>  meta/recipes-extended/polkit/polkit_0.104.bb |   25 +++++++++++++++----------
>  1 files changed, 15 insertions(+), 10 deletions(-)
> 
> diff --git a/meta/recipes-extended/polkit/polkit_0.104.bb b/meta/recipes-extended/polkit/polkit_0.104.bb
> index 2737a4a..5dc82c5 100644
> --- a/meta/recipes-extended/polkit/polkit_0.104.bb
> +++ b/meta/recipes-extended/polkit/polkit_0.104.bb
> @@ -6,28 +6,33 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=155db86cdbafa7532b41f390409283eb \
>                      file://src/polkit/polkit.h;beginline=1;endline=20;md5=0a8630b0133176d0504c87a0ded39db4 \
>                      file://docs/polkit/html/license.html;md5=d85a36709a446c10f4ee123f9dda0e38"
>  
> +DEPENDS = "expat dbus-glib eggdbus intltool-native"
> +
> +PACKAGECONFIG = "${@base_contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}"
> +PACKAGECONFIG[pam] = "--with-authfw=pam,--with-authfw=none,libpam,libpam"
> +

After this merged I found a few issues on the autobuilder. There were
two problems. If DISTRO_FEATURES didn't contain pam and was empty, the
PACKAGECONFIG code would not trigger at all (and not add the
authfw=none). Secondly, I think we need "shadow", not "none" as
otherwise the builds fail due to an invalid configuration.

I've pushed the two fixes for this since builds were breaking.

Cheers,

Richard

Re: [PATCH v2 1/4] polkit 0.104: convert pam code to PACKAGECONFIG and adhere to OE recipe styleguide

[Koen Kooi]

Op 5 mrt. 2012, om 22:14 heeft Richard Purdie het volgende geschreven:

> On Mon, 2012-03-05 at 08:38 +0100, Koen Kooi wrote:
>> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
>> ---
>> meta/recipes-extended/polkit/polkit_0.104.bb |   25 +++++++++++++++----------
>> 1 files changed, 15 insertions(+), 10 deletions(-)
>> 
>> diff --git a/meta/recipes-extended/polkit/polkit_0.104.bb b/meta/recipes-extended/polkit/polkit_0.104.bb
>> index 2737a4a..5dc82c5 100644
>> --- a/meta/recipes-extended/polkit/polkit_0.104.bb
>> +++ b/meta/recipes-extended/polkit/polkit_0.104.bb
>> @@ -6,28 +6,33 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=155db86cdbafa7532b41f390409283eb \
>>                     file://src/polkit/polkit.h;beginline=1;endline=20;md5=0a8630b0133176d0504c87a0ded39db4 \
>>                     file://docs/polkit/html/license.html;md5=d85a36709a446c10f4ee123f9dda0e38"
>> 
>> +DEPENDS = "expat dbus-glib eggdbus intltool-native"
>> +
>> +PACKAGECONFIG = "${@base_contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}"
>> +PACKAGECONFIG[pam] = "--with-authfw=pam,--with-authfw=none,libpam,libpam"
>> +
> 
> After this merged I found a few issues on the autobuilder. There were
> two problems. If DISTRO_FEATURES didn't contain pam and was empty, the
> PACKAGECONFIG code would not trigger at all (and not add the
> authfw=none).

Beth mailed me the log and I asked her is PACKAGECONFIG is broken, and it seems it is since the --disable-foo isn't triggering. Or have I misunderstood how PACKAGECONFIG is supposed to work?

regards,

Koen

Re: [PATCH v2 1/4] polkit 0.104: convert pam code to PACKAGECONFIG and adhere to OE recipe styleguide

[Koen Kooi]

Op 5 mrt. 2012, om 22:16 heeft Koen Kooi het volgende geschreven:

> 
> Op 5 mrt. 2012, om 22:14 heeft Richard Purdie het volgende geschreven:
> 
>> On Mon, 2012-03-05 at 08:38 +0100, Koen Kooi wrote:
>>> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
>>> ---
>>> meta/recipes-extended/polkit/polkit_0.104.bb |   25 +++++++++++++++----------
>>> 1 files changed, 15 insertions(+), 10 deletions(-)
>>> 
>>> diff --git a/meta/recipes-extended/polkit/polkit_0.104.bb b/meta/recipes-extended/polkit/polkit_0.104.bb
>>> index 2737a4a..5dc82c5 100644
>>> --- a/meta/recipes-extended/polkit/polkit_0.104.bb
>>> +++ b/meta/recipes-extended/polkit/polkit_0.104.bb
>>> @@ -6,28 +6,33 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=155db86cdbafa7532b41f390409283eb \
>>>                    file://src/polkit/polkit.h;beginline=1;endline=20;md5=0a8630b0133176d0504c87a0ded39db4 \
>>>                    file://docs/polkit/html/license.html;md5=d85a36709a446c10f4ee123f9dda0e38"
>>> 
>>> +DEPENDS = "expat dbus-glib eggdbus intltool-native"
>>> +
>>> +PACKAGECONFIG = "${@base_contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}"
>>> +PACKAGECONFIG[pam] = "--with-authfw=pam,--with-authfw=none,libpam,libpam"
>>> +
>> 
>> After this merged I found a few issues on the autobuilder. There were
>> two problems. If DISTRO_FEATURES didn't contain pam and was empty, the
>> PACKAGECONFIG code would not trigger at all (and not add the
>> authfw=none).
> 
> Beth mailed me the log and I asked her is PACKAGECONFIG is broken, and it seems it is since the --disable-foo isn't triggering. Or have I misunderstood how PACKAGECONFIG is supposed to work?

http://cgit.openembedded.org/openembedded-core/commit/?id=d7b8c247227f3cc82f92292407f548927e9fde78 :)

Re: [PATCH v2 1/4] polkit 0.104: convert pam code to PACKAGECONFIG and adhere to OE recipe styleguide

[Koen Kooi]

Op 5 mrt. 2012, om 22:14 heeft Richard Purdie het volgende geschreven:

> On Mon, 2012-03-05 at 08:38 +0100, Koen Kooi wrote:
>> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
>> ---
>> meta/recipes-extended/polkit/polkit_0.104.bb |   25 +++++++++++++++----------
>> 1 files changed, 15 insertions(+), 10 deletions(-)
>> 
>> diff --git a/meta/recipes-extended/polkit/polkit_0.104.bb b/meta/recipes-extended/polkit/polkit_0.104.bb
>> index 2737a4a..5dc82c5 100644
>> --- a/meta/recipes-extended/polkit/polkit_0.104.bb
>> +++ b/meta/recipes-extended/polkit/polkit_0.104.bb
>> @@ -6,28 +6,33 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=155db86cdbafa7532b41f390409283eb \
>>                     file://src/polkit/polkit.h;beginline=1;endline=20;md5=0a8630b0133176d0504c87a0ded39db4 \
>>                     file://docs/polkit/html/license.html;md5=d85a36709a446c10f4ee123f9dda0e38"
>> 
>> +DEPENDS = "expat dbus-glib eggdbus intltool-native"
>> +
>> +PACKAGECONFIG = "${@base_contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}"
>> +PACKAGECONFIG[pam] = "--with-authfw=pam,--with-authfw=none,libpam,libpam"
>> +
> 
> After this merged I found a few issues on the autobuilder. There were
> two problems. If DISTRO_FEATURES didn't contain pam and was empty, the
> PACKAGECONFIG code would not trigger at all (and not add the
> authfw=none). Secondly, I think we need "shadow", not "none" as
> otherwise the builds fail due to an invalid configuration.

I've thought about that, but if we choose 'shadow', we need to add (R)DEPENDS for it to work properly. So 'none' seems like the best option. 

Anyway, how can I take over maintainership of polkit, I'm getting tired of every commit breaking it subtly and taking another week of my time finding out that $random error is actually caused by polkit deep down. It's like dbus, breakage does not always point to the culprit.

Takes this one for example:

http://cgit.openembedded.org/openembedded-core/commit/meta/recipes-extended/polkit?id=6bc6406b019ebc104a4abfb15c2d2e1263968664

PAM is hardcoded to be enabled, but you'll only get a working config if you put it in DISTRO_FEATURES.

regards,

Koen