This backports 9bdff5feb60994d4ed3a0123b9977c6c6643a242 which fixed [1]. The patch didn't make it back into scarthgap and had to be reapplied for polkit 124.
[1]: https://github.com/openembedded/meta-openembedded/issues/860 Signed-off-by: Tafil Avdyli <[email protected]> --- ...penembedded-OS-for-PAM-configuration.patch | 47 +++++++++++++++++++ meta-oe/recipes-extended/polkit/polkit_124.bb | 5 ++ 2 files changed, 52 insertions(+) create mode 100644 meta-oe/recipes-extended/polkit/files/0001-meson-Support-openembedded-OS-for-PAM-configuration.patch diff --git a/meta-oe/recipes-extended/polkit/files/0001-meson-Support-openembedded-OS-for-PAM-configuration.patch b/meta-oe/recipes-extended/polkit/files/0001-meson-Support-openembedded-OS-for-PAM-configuration.patch new file mode 100644 index 0000000000..26ec537daf --- /dev/null +++ b/meta-oe/recipes-extended/polkit/files/0001-meson-Support-openembedded-OS-for-PAM-configuration.patch @@ -0,0 +1,47 @@ +From a318e9cb2beae02a2e23394ba200c4493dc0b53a Mon Sep 17 00:00:00 2001 +From: Yoann Congal <[email protected]> +Date: Tue, 3 Sep 2024 12:17:42 +0200 +Subject: [PATCH] meson: Support "openembedded" OS for PAM configuration + +In Openembedded, same as Suse/Solaris: PAM files are common-*: +* PAM_FILE_INCLUDE_AUTH: common-auth +* PAM_FILE_INCLUDE_ACCOUNT: common-account +* PAM_FILE_INCLUDE_PASSWORD: common-password +* PAM_FILE_INCLUDE_SESSION: common-session + +Signed-off-by: Yoann Congal <[email protected]> +(cherry picked from commit 1d4f7f4d9f3d74fb2649c96faa8677416c1aefc2) + +Upstream-Status: Backport [https://github.com/polkit-org/polkit/commit/1d4f7f4d9f3d74fb2649c96faa8677416c1aefc2] +Signed-off-by: Tafil Avdyli <[email protected]> +--- + meson.build | 2 +- + meson_options.txt | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/meson.build b/meson.build +index 2f81c90..0ca1276 100644 +--- a/meson.build ++++ b/meson.build +@@ -314,7 +314,7 @@ endif + + pam_include = get_option('pam_include') + if pam_include == '' +- if ['suse', 'solaris'].contains(os_type) ++ if ['suse', 'solaris', 'openembedded'].contains(os_type) + pam_conf = { + 'PAM_FILE_INCLUDE_AUTH': 'common-auth', + 'PAM_FILE_INCLUDE_ACCOUNT': 'common-account', +diff --git a/meson_options.txt b/meson_options.txt +index 71588ba..5af7e4c 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -6,7 +6,7 @@ option('polkitd_user', type: 'string', value: 'polkitd', description: 'User for + option('polkitd_uid', type: 'string', value: '-', description: 'Fixed UID for user running polkitd (polkitd)') + + option('authfw', type: 'combo', choices: ['pam', 'shadow', 'bsdauth'], value: 'pam', description: 'Authentication framework (pam/shadow)') +-option('os_type', type: 'combo', choices: ['redhat', 'suse', 'gentoo', 'pardus', 'solaris', 'netbsd', 'lfs', ''], value: '', description: 'distribution or OS') ++option('os_type', type: 'combo', choices: ['redhat', 'suse', 'gentoo', 'pardus', 'solaris', 'netbsd', 'lfs', 'openembedded', ''], value: '', description: 'distribution or OS') + + option('pam_include', type: 'string', value: '', description: 'pam file to include') + option('pam_module_dir', type: 'string', value: '', description: 'directory to install PAM security module') diff --git a/meta-oe/recipes-extended/polkit/polkit_124.bb b/meta-oe/recipes-extended/polkit/polkit_124.bb index 3709aa0ef4..6cf75b920f 100644 --- a/meta-oe/recipes-extended/polkit/polkit_124.bb +++ b/meta-oe/recipes-extended/polkit/polkit_124.bb @@ -8,6 +8,7 @@ BUGTRACKER = "https://github.com/polkit-org/polkit/issues"; SRC_URI = "\ git://github.com/polkit-org/polkit.git;protocol=https;branch=main \ file://CVE-2025-7519.patch \ + file://0001-meson-Support-openembedded-OS-for-PAM-configuration.patch \ " S = "${WORKDIR}/git" @@ -19,6 +20,10 @@ inherit meson pkgconfig useradd systemd gettext gobject-introspection features_c REQUIRED_DISTRO_FEATURES = "polkit" +# Prevent meson.build to try to autodetect host OS (which could lead to +# non-reproducibility) +EXTRA_OEMESON = "-Dos_type=openembedded" + PACKAGECONFIG = " \ ${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', 'consolekit', d)} \
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#124514): https://lists.openembedded.org/g/openembedded-devel/message/124514 Mute This Topic: https://lists.openembedded.org/mt/117898614/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
