diff options
| author | Wang Mingyu <wangmy@fujitsu.com> | 2024-04-24 16:42:03 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-04-25 10:06:02 +0100 |
| commit | 114559289070c3062c3b4f06061a82f3aefb7f3d (patch) | |
| tree | 4e89bf44c4a9bae2a086908dd93c3c04b7fbe6ed /meta/recipes-extended | |
| parent | 94c08708b804097c0a7577ca2b3c2500ecaa8896 (diff) | |
| download | poky-114559289070c3062c3b4f06061a82f3aefb7f3d.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.
(From OE-Core rev: 2758bc1e521270c77c768a6d9701cb15dd30ea82)
Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended')
| -rw-r--r-- | meta/recipes-extended/pam/libpam/0001-pam_namespace-include-stdint-h.patch | 42 | ||||
| -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 @@ | |||
| 1 | From cc9d40b7cdbd3e15ccaa324a0dda1680ef9dea13 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Jacob Heider <jacob@pkgx.dev> | ||
| 3 | Date: Wed, 17 Jan 2024 11:49:26 -0500 | ||
| 4 | Subject: [PATCH] pam_namespace: include stdint.h | ||
| 5 | |||
| 6 | pam_namespace.c makes use of SIZE_MAX but doesn't include stdint.h, | ||
| 7 | resulting in the following build failures on 1.6.0: | ||
| 8 | |||
| 9 | pam_namespace.c: In function 'process_line': | ||
| 10 | pam_namespace.c:649:41: error: 'SIZE_MAX' undeclared (first use in this function) | ||
| 11 | 649 | if (count > UINT_MAX || count > SIZE_MAX / sizeof(uid_t)) { | ||
| 12 | | ^~~~~~~~ | ||
| 13 | pam_namespace.c:41:1: note: 'SIZE_MAX' is defined in header '<stdint.h>'; did you forget to '#include <stdint.h>'? | ||
| 14 | 40 | #include "argv_parse.h" | ||
| 15 | +++ |+#include <stdint.h> | ||
| 16 | 41 | | ||
| 17 | pam_namespace.c:649:41: note: each undeclared identifier is reported only once for each function it appears in | ||
| 18 | 649 | if (count > UINT_MAX || count > SIZE_MAX / sizeof(uid_t)) { | ||
| 19 | | ^~~~~~~~ | ||
| 20 | |||
| 21 | Fixes: v1.6.0~100 ("pam_namespace: validate amount of uids in config") | ||
| 22 | Resolves: https://github.com/linux-pam/linux-pam/issues/733 | ||
| 23 | |||
| 24 | Upstream-Status: Backport [https://github.com/linux-pam/linux-pam/commit/cc9d40b7cdbd3e15ccaa324a0dda1680ef9dea13] | ||
| 25 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 26 | --- | ||
| 27 | modules/pam_namespace/pam_namespace.c | 2 ++ | ||
| 28 | 1 file changed, 2 insertions(+) | ||
| 29 | |||
| 30 | diff --git a/modules/pam_namespace/pam_namespace.c b/modules/pam_namespace/pam_namespace.c | ||
| 31 | index f72d67189..b16731c22 100644 | ||
| 32 | --- a/modules/pam_namespace/pam_namespace.c | ||
| 33 | +++ b/modules/pam_namespace/pam_namespace.c | ||
| 34 | @@ -34,6 +34,8 @@ | ||
| 35 | |||
| 36 | #define _ATFILE_SOURCE | ||
| 37 | |||
| 38 | +#include "config.h" | ||
| 39 | +#include <stdint.h> | ||
| 40 | #include "pam_cc_compat.h" | ||
| 41 | #include "pam_inline.h" | ||
| 42 | #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 \ | |||
| 23 | file://libpam-xtests.patch \ | 23 | file://libpam-xtests.patch \ |
| 24 | file://run-ptest \ | 24 | file://run-ptest \ |
| 25 | file://pam-volatiles.conf \ | 25 | file://pam-volatiles.conf \ |
| 26 | file://0001-pam_namespace-include-stdint-h.patch \ | ||
| 27 | " | 26 | " |
| 28 | 27 | ||
| 29 | SRC_URI[sha256sum] = "fff4a34e5bbee77e2e8f1992f27631e2329bcbf8a0563ddeb5c3389b4e3169ad" | 28 | SRC_URI[sha256sum] = "f8923c740159052d719dbfc2a2f81942d68dd34fcaf61c706a02c9b80feeef8e" |
| 30 | 29 | ||
| 31 | DEPENDS = "bison-native flex-native cracklib libxml2-native virtual/crypt" | 30 | DEPENDS = "bison-native flex-native cracklib libxml2-native virtual/crypt" |
| 32 | 31 | ||
