From 5e77c48e074a20e58a233ab5ed6d8ef09bbd55c8 Mon Sep 17 00:00:00 2001 From: Wang Mingyu Date: Mon, 30 Jun 2025 17:12:56 +0800 Subject: [PATCH] libpam: upgrade 1.7.0 -> 1.7.1 0001-meson.build-correct-check-for-existence-of-two-prepr.patch removed since it's included in 1.7.1 Changelog: =============== * pam_access: do not resolve ttys or display variables as hostnames. * pam_access: added "nodns" option to disallow resolving of tokens as hostnames (CVE-2024-10963). * pam_limits: added support for rttime (RLIMIT_RTTIME). * pam_namespace: fixed potential privilege escalation (CVE-2025-6020). * meson: added support of elogind as a logind provider. * Multiple minor bug fixes, build fixes, portability fixes, documentation improvements, and translation updates. Signed-off-by: Wang Mingyu Signed-off-by: Antonin Godard Signed-off-by: Richard Purdie --- ...ect-check-for-existence-of-two-prepr.patch | 40 ------------------- .../pam/{libpam_1.7.0.bb => libpam_1.7.1.bb} | 3 +- 2 files changed, 1 insertion(+), 42 deletions(-) delete mode 100644 meta/recipes-extended/pam/libpam/0001-meson.build-correct-check-for-existence-of-two-prepr.patch rename meta/recipes-extended/pam/{libpam_1.7.0.bb => libpam_1.7.1.bb} (97%) diff --git a/meta/recipes-extended/pam/libpam/0001-meson.build-correct-check-for-existence-of-two-prepr.patch b/meta/recipes-extended/pam/libpam/0001-meson.build-correct-check-for-existence-of-two-prepr.patch deleted file mode 100644 index ef087ffc06b..00000000000 --- a/meta/recipes-extended/pam/libpam/0001-meson.build-correct-check-for-existence-of-two-prepr.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 9b5182d4781bcd6fb37a4030faf325965fde3e93 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Thu, 28 Nov 2024 20:32:17 +0100 -Subject: [PATCH] meson: correct check for existence of two preprocessor - defines - -sizeof is meant for *types*, and in case of cross compiling -the test program produced by it has incorrect syntax - __NR_keyctl something; -and will always fail to compile. - -* meson.build: Use cc.get_define() instead of cc.sizeof() to check for -preprocessor symbols. - -Co-authored-by: Dmitry V. Levin -Upstream-Status: Backport [https://github.com/linux-pam/linux-pam/pull/861] -Signed-off-by: Alexander Kanavin ---- - meson.build | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/meson.build b/meson.build -index f6a7dafe9..307fed0aa 100644 ---- a/meson.build -+++ b/meson.build -@@ -198,12 +198,12 @@ foreach ident: check_functions - endif - endforeach - --enable_pam_keyinit = cc.sizeof('__NR_keyctl', prefix: '#include ') > 0 -+enable_pam_keyinit = cc.get_define('__NR_keyctl', prefix: '#include ') != '' - - if get_option('mailspool') != '' - cdata.set_quoted('PAM_PATH_MAILDIR', get_option('mailspool')) - else -- have = cc.sizeof('_PATH_MAILDIR', prefix: '#include ') > 0 -+ have = cc.get_define('_PATH_MAILDIR', prefix: '#include ') != '' - cdata.set('PAM_PATH_MAILDIR', have ? '_PATH_MAILDIR' : '"/var/spool/mail"') - endif - diff --git a/meta/recipes-extended/pam/libpam_1.7.0.bb b/meta/recipes-extended/pam/libpam_1.7.1.bb similarity index 97% rename from meta/recipes-extended/pam/libpam_1.7.0.bb rename to meta/recipes-extended/pam/libpam_1.7.1.bb index dea9ff592b6..565b00c264a 100644 --- a/meta/recipes-extended/pam/libpam_1.7.0.bb +++ b/meta/recipes-extended/pam/libpam_1.7.1.bb @@ -22,10 +22,9 @@ SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/Linux-PAM-${PV}.tar.xz \ file://pam.d/other \ file://run-ptest \ file://pam-volatiles.conf \ - file://0001-meson.build-correct-check-for-existence-of-two-prepr.patch \ " -SRC_URI[sha256sum] = "57dcd7a6b966ecd5bbd95e1d11173734691e16b68692fa59661cdae9b13b1697" +SRC_URI[sha256sum] = "21dbcec6e01dd578f14789eac9024a18941e6f2702a05cf91b28c232eeb26ab0" DEPENDS = "bison-native flex-native libxml2-native virtual/crypt" -- 2.47.2