summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWang Mingyu <wangmy@fujitsu.com>2024-04-24 16:42:03 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2024-04-25 10:05:58 +0100
commit2758bc1e521270c77c768a6d9701cb15dd30ea82 (patch)
tree614773fe9ef9b0c24e23b22756718d857fb5cd59
parentbd4ab2025bcaffcf2802ad09c9d83e2a4d2a0f2c (diff)
downloadopenembedded-core-2758bc1e521270c77c768a6d9701cb15dd30ea82.tar.gz
libpam: upgrade 1.6.0 -> 1.6.1
0001-pam_namespace-include-stdint-h.patch removed since it's included in 1.6.1 Changelog: =========== * build: fail if specified configure options cannot be satisfied. * pam_env: fixed --disable-econf --enable-vendordir support. * pam_unix: do not warn if password aging is disabled. * pam_unix: try to set uid to 0 before unix_chkpwd invocation. * pam_unix: allow empty passwords with non-empty hashes. * Multiple minor bug fixes, build fixes, portability fixes, documentation improvements, and translation updates. Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-extended/pam/libpam/0001-pam_namespace-include-stdint-h.patch42
-rw-r--r--meta/recipes-extended/pam/libpam_1.6.1.bb (renamed from meta/recipes-extended/pam/libpam_1.6.0.bb)3
2 files changed, 1 insertions, 44 deletions
diff --git a/meta/recipes-extended/pam/libpam/0001-pam_namespace-include-stdint-h.patch b/meta/recipes-extended/pam/libpam/0001-pam_namespace-include-stdint-h.patch
deleted file mode 100644
index 124e5f1c3c..0000000000
--- a/meta/recipes-extended/pam/libpam/0001-pam_namespace-include-stdint-h.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From cc9d40b7cdbd3e15ccaa324a0dda1680ef9dea13 Mon Sep 17 00:00:00 2001
-From: Jacob Heider <jacob@pkgx.dev>
-Date: Wed, 17 Jan 2024 11:49:26 -0500
-Subject: [PATCH] pam_namespace: include stdint.h
-
-pam_namespace.c makes use of SIZE_MAX but doesn't include stdint.h,
-resulting in the following build failures on 1.6.0:
-
- pam_namespace.c: In function 'process_line':
- pam_namespace.c:649:41: error: 'SIZE_MAX' undeclared (first use in this function)
- 649 | if (count > UINT_MAX || count > SIZE_MAX / sizeof(uid_t)) {
- | ^~~~~~~~
- pam_namespace.c:41:1: note: 'SIZE_MAX' is defined in header '<stdint.h>'; did you forget to '#include <stdint.h>'?
- 40 | #include "argv_parse.h"
- +++ |+#include <stdint.h>
- 41 |
- pam_namespace.c:649:41: note: each undeclared identifier is reported only once for each function it appears in
- 649 | if (count > UINT_MAX || count > SIZE_MAX / sizeof(uid_t)) {
- | ^~~~~~~~
-
-Fixes: v1.6.0~100 ("pam_namespace: validate amount of uids in config")
-Resolves: https://github.com/linux-pam/linux-pam/issues/733
-
-Upstream-Status: Backport [https://github.com/linux-pam/linux-pam/commit/cc9d40b7cdbd3e15ccaa324a0dda1680ef9dea13]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- modules/pam_namespace/pam_namespace.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/modules/pam_namespace/pam_namespace.c b/modules/pam_namespace/pam_namespace.c
-index f72d67189..b16731c22 100644
---- a/modules/pam_namespace/pam_namespace.c
-+++ b/modules/pam_namespace/pam_namespace.c
-@@ -34,6 +34,8 @@
-
- #define _ATFILE_SOURCE
-
-+#include "config.h"
-+#include <stdint.h>
- #include "pam_cc_compat.h"
- #include "pam_inline.h"
- #include "pam_namespace.h"
diff --git a/meta/recipes-extended/pam/libpam_1.6.0.bb b/meta/recipes-extended/pam/libpam_1.6.1.bb
index e1ed940d1e..849f485f75 100644
--- a/meta/recipes-extended/pam/libpam_1.6.0.bb
+++ b/meta/recipes-extended/pam/libpam_1.6.1.bb
@@ -23,10 +23,9 @@ SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/Linux-PAM-${PV}.tar.xz \
file://libpam-xtests.patch \
file://run-ptest \
file://pam-volatiles.conf \
- file://0001-pam_namespace-include-stdint-h.patch \
"
-SRC_URI[sha256sum] = "fff4a34e5bbee77e2e8f1992f27631e2329bcbf8a0563ddeb5c3389b4e3169ad"
+SRC_URI[sha256sum] = "f8923c740159052d719dbfc2a2f81942d68dd34fcaf61c706a02c9b80feeef8e"
DEPENDS = "bison-native flex-native cracklib libxml2-native virtual/crypt"