From c79618532660507040904c303b9aa281c034c68a Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Mon, 12 Aug 2024 12:17:50 +0100 Subject: polkit: update 124 -> 125 Signed-off-by: Luca Boccassi Signed-off-by: Khem Raj --- meta-oe/recipes-extended/polkit/polkit_124.bb | 62 -------------------------- meta-oe/recipes-extended/polkit/polkit_125.bb | 64 +++++++++++++++++++++++++++ 2 files changed, 64 insertions(+), 62 deletions(-) delete mode 100644 meta-oe/recipes-extended/polkit/polkit_124.bb create mode 100644 meta-oe/recipes-extended/polkit/polkit_125.bb diff --git a/meta-oe/recipes-extended/polkit/polkit_124.bb b/meta-oe/recipes-extended/polkit/polkit_124.bb deleted file mode 100644 index 417e8dda43..0000000000 --- a/meta-oe/recipes-extended/polkit/polkit_124.bb +++ /dev/null @@ -1,62 +0,0 @@ -SUMMARY = "Polkit Authorization Framework" -DESCRIPTION = "The polkit package is an application-level toolkit for defining and handling the policy that allows unprivileged processes to speak to privileged processes." -HOMEPAGE = "http://www.freedesktop.org/wiki/Software/polkit" -LICENSE = "LGPL-2.0-or-later" -LIC_FILES_CHKSUM = "file://COPYING;md5=155db86cdbafa7532b41f390409283eb" -BUGTRACKER = "https://github.com/polkit-org/polkit/issues" - -SRC_URI = "git://github.com/polkit-org/polkit.git;protocol=https;branch=main" - -S = "${WORKDIR}/git" -SRCREV = "82f0924dc0eb23b9df68e88dbaf9e07c81940a5a" - -DEPENDS = "expat glib-2.0" - -inherit meson pkgconfig useradd systemd gettext gobject-introspection features_check - -REQUIRED_DISTRO_FEATURES = "polkit" - -PACKAGECONFIG = " \ - ${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', 'consolekit', d)} \ - dbus \ - mozjs \ -" -PACKAGECONFIG[dbus] = ",,dbus" -PACKAGECONFIG[gtk-doc] = "-Dgtk_doc=true,-Dgtk_doc=false,gtk-doc-native" -PACKAGECONFIG[pam] = "-Dauthfw=pam,-Dauthfw=shadow,libpam,libpam" -PACKAGECONFIG[systemd] = "-Dsession_tracking=libsystemd-login,,systemd,,,consolekit elogind" -PACKAGECONFIG[consolekit] = "-Dsession_tracking=ConsoleKit,,,consolekit,,systemd elogind" -PACKAGECONFIG[elogind] = "-Dsession_tracking=libelogin,,elogind,,,systemd consolekit" -PACKAGECONFIG[libs-only] = "-Dlibs-only=true,-Dlibs-only=false" - -# Default to mozjs javascript library -PACKAGECONFIG[mozjs] = "-Djs_engine=mozjs,,mozjs-115,,,duktape" -# duktape javascript engine is much smaller and faster but is not compatible with -# same javascript standards as mozjs. For example array.includes() function is not -# supported. Test rule compatibility when switching to duktape. -PACKAGECONFIG[duktape] = "-Djs_engine=duktape,,duktape,,,mozjs" - -USERADD_PACKAGES = "${PN}" -USERADD_PARAM:${PN} = "--system --no-create-home --user-group --home-dir ${sysconfdir}/${BPN}-1 --shell /bin/nologin polkitd" - -SYSTEMD_SERVICE:${PN} = "${BPN}.service" -SYSTEMD_AUTO_ENABLE = "disable" - -do_install:append() { - #Fix up permissions on polkit rules.d to work with rpm4 constraints - if ${@bb.utils.contains('PACKAGECONFIG', 'libs-only', 'false', 'true', d)}; then - chmod 700 ${D}/${sysconfdir}/polkit-1/rules.d - chown polkitd:root ${D}/${sysconfdir}/polkit-1/rules.d - fi -} - -FILES:${PN} += " \ - ${libdir}/pam.d/polkit-1 \ - ${libdir}/sysusers.d \ - ${libdir}/polkit-1 \ - ${nonarch_libdir}/pam.d/polkit-1 \ - ${nonarch_libdir}/sysusers.d \ - ${nonarch_libdir}/polkit-1 \ - ${datadir} \ -" diff --git a/meta-oe/recipes-extended/polkit/polkit_125.bb b/meta-oe/recipes-extended/polkit/polkit_125.bb new file mode 100644 index 0000000000..fe1ee467c3 --- /dev/null +++ b/meta-oe/recipes-extended/polkit/polkit_125.bb @@ -0,0 +1,64 @@ +SUMMARY = "Polkit Authorization Framework" +DESCRIPTION = "The polkit package is an application-level toolkit for defining and handling the policy that allows unprivileged processes to speak to privileged processes." +HOMEPAGE = "http://www.freedesktop.org/wiki/Software/polkit" +LICENSE = "LGPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=155db86cdbafa7532b41f390409283eb" +BUGTRACKER = "https://github.com/polkit-org/polkit/issues" + +SRC_URI = "git://github.com/polkit-org/polkit.git;protocol=https;branch=main" + +S = "${WORKDIR}/git" +SRCREV = "112752c12da812a163dac67d7f675b60de8f7d7b" + +DEPENDS = "expat glib-2.0" + +inherit meson pkgconfig useradd systemd gettext gobject-introspection features_check + +REQUIRED_DISTRO_FEATURES = "polkit" + +PACKAGECONFIG = " \ + ${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', 'consolekit', d)} \ + dbus \ + mozjs \ +" +PACKAGECONFIG[dbus] = ",,dbus" +PACKAGECONFIG[gtk-doc] = "-Dgtk_doc=true,-Dgtk_doc=false,gtk-doc-native" +PACKAGECONFIG[pam] = "-Dauthfw=pam,-Dauthfw=shadow,libpam,libpam" +PACKAGECONFIG[systemd] = "-Dsession_tracking=logind,,systemd,,,consolekit elogind" +PACKAGECONFIG[consolekit] = "-Dsession_tracking=ConsoleKit,,,consolekit,,systemd elogind" +PACKAGECONFIG[elogind] = "-Dsession_tracking=libelogin,,elogind,,,systemd consolekit" +PACKAGECONFIG[libs-only] = "-Dlibs-only=true,-Dlibs-only=false" + +# Default to mozjs javascript library +PACKAGECONFIG[mozjs] = "-Djs_engine=mozjs,,mozjs-115,,,duktape" +# duktape javascript engine is much smaller and faster but is not compatible with +# same javascript standards as mozjs. For example array.includes() function is not +# supported. Test rule compatibility when switching to duktape. +PACKAGECONFIG[duktape] = "-Djs_engine=duktape,,duktape,,,mozjs" + +USERADD_PACKAGES = "${PN}" +USERADD_PARAM:${PN} = "--system --no-create-home --user-group --home-dir ${sysconfdir}/${BPN}-1 --shell /bin/nologin polkitd" + +SYSTEMD_SERVICE:${PN} = "${BPN}.service" +SYSTEMD_AUTO_ENABLE = "disable" + +do_install:append() { + #Fix up permissions on polkit rules.d to work with rpm4 constraints + if ${@bb.utils.contains('PACKAGECONFIG', 'libs-only', 'false', 'true', d)}; then + chmod 700 ${D}/${sysconfdir}/polkit-1/rules.d + chown polkitd:root ${D}/${sysconfdir}/polkit-1/rules.d + fi +} + +FILES:${PN} += " \ + ${libdir}/pam.d/polkit-1 \ + ${libdir}/sysusers.d \ + ${libdir}/tmpfiles.d \ + ${libdir}/polkit-1 \ + ${nonarch_libdir}/pam.d/polkit-1 \ + ${nonarch_libdir}/sysusers.d \ + ${nonarch_libdir}/tmpfiles.d \ + ${nonarch_libdir}/polkit-1 \ + ${datadir} \ +" -- cgit v1.2.3-54-g00ecf