Reset poky to before our libpam hacks
Things got a bit out of synch with openbmc-config due to the libpam
issues and the migration from the meta-* layers.
Revert the two previous commits and then put the latest poky in with the
libpam revert and get openbmc-config right again.
Revert "Revert "libpam: update 1.3.1 -> 1.5.1""
This reverts commit 87ddd3eab4df68e624b5350ccaab28b3b97547c0.
Revert "poky: subtree update:796be0593a..10c69538c0"
This reverts commit c723b72979bfac6362509cf1fe086900f6641f28.
Change-Id: I3a1f405193aee6a21fe0cd24be9927c143a23d9a
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
diff --git a/poky/meta/recipes-devtools/pseudo/files/0002-pseudo_client-Lessen-indentation-of-pseudo_client_ig.patch b/poky/meta/recipes-devtools/pseudo/files/0002-pseudo_client-Lessen-indentation-of-pseudo_client_ig.patch
new file mode 100644
index 0000000..e4a5356
--- /dev/null
+++ b/poky/meta/recipes-devtools/pseudo/files/0002-pseudo_client-Lessen-indentation-of-pseudo_client_ig.patch
@@ -0,0 +1,69 @@
+From 28c760542eecd7c5b35ea88aa2b14d62afbda961 Mon Sep 17 00:00:00 2001
+From: Peter Kjellerstedt <pkj@axis.com>
+Date: Sat, 21 Nov 2020 17:22:38 +0100
+Subject: [PATCH] pseudo_client: Lessen indentation of
+ pseudo_client_ignore_path_chroot()
+
+Change-Id: I739b18efb7a95ce2d2d907d0faf7df539ab9af1c
+---
+ pseudo_client.c | 45 +++++++++++++++++++++++++--------------------
+ 1 file changed, 25 insertions(+), 20 deletions(-)
+
+diff --git a/pseudo_client.c b/pseudo_client.c
+index 116d926..a8bc3dc 100644
+--- a/pseudo_client.c
++++ b/pseudo_client.c
+@@ -1527,28 +1527,33 @@ int pseudo_client_ignore_fd(int fd) {
+
+ int pseudo_client_ignore_path_chroot(const char *path, int ignore_chroot) {
+ char *env;
+- if (path) {
+- if (ignore_chroot && pseudo_chroot && strncmp(path, pseudo_chroot, pseudo_chroot_len) == 0)
+- return 0;
+- env = pseudo_get_value("PSEUDO_IGNORE_PATHS");
+- if (env) {
+- char *p = env;
+- while (*p) {
+- char *next = strchr(p, ',');
+- if (!next)
+- next = strchr(p, '\0');
+- if ((next - p) && !strncmp(path, p, next - p)) {
+- pseudo_debug(PDBGF_PATH | PDBGF_VERBOSE, "ignoring path: '%s'\n", path);
+- return 1;
+- }
+- if (next && *next != '\0')
+- p = next+1;
+- else
+- break;
+- }
+- free(env);
++
++ if (!path)
++ return 0;
++
++ if (ignore_chroot && pseudo_chroot && strncmp(path, pseudo_chroot, pseudo_chroot_len) == 0)
++ return 0;
++
++ env = pseudo_get_value("PSEUDO_IGNORE_PATHS");
++ if (!env)
++ return 0;
++
++ char *p = env;
++ while (*p) {
++ char *next = strchr(p, ',');
++ if (!next)
++ next = strchr(p, '\0');
++ if ((next - p) && !strncmp(path, p, next - p)) {
++ pseudo_debug(PDBGF_PATH | PDBGF_VERBOSE, "ignoring path: '%s'\n", path);
++ return 1;
+ }
++ if (next && *next != '\0')
++ p = next+1;
++ else
++ break;
+ }
++ free(env);
++
+ return 0;
+ }
+
diff --git a/poky/meta/recipes-devtools/pseudo/files/0003-pseudo_client-Simplify-pseudo_client_ignore_path_chr.patch b/poky/meta/recipes-devtools/pseudo/files/0003-pseudo_client-Simplify-pseudo_client_ignore_path_chr.patch
new file mode 100644
index 0000000..a657a27
--- /dev/null
+++ b/poky/meta/recipes-devtools/pseudo/files/0003-pseudo_client-Simplify-pseudo_client_ignore_path_chr.patch
@@ -0,0 +1,50 @@
+From a1d61d68777373a50ae23b9dd83b428abe2f748d Mon Sep 17 00:00:00 2001
+From: Peter Kjellerstedt <pkj@axis.com>
+Date: Sat, 21 Nov 2020 17:30:33 +0100
+Subject: [PATCH] pseudo_client: Simplify pseudo_client_ignore_path_chroot()
+
+This also plugs a memory leak by making sure env is freed.
+
+Change-Id: Ia8635fd2c6b1e85919e4743713a85e0b52c28fac
+---
+ pseudo_client.c | 21 ++++++++++-----------
+ 1 file changed, 10 insertions(+), 11 deletions(-)
+
+diff --git a/pseudo_client.c b/pseudo_client.c
+index a8bc3dc..7dc0345 100644
+--- a/pseudo_client.c
++++ b/pseudo_client.c
+@@ -1538,23 +1538,22 @@ int pseudo_client_ignore_path_chroot(const char *path, int ignore_chroot) {
+ if (!env)
+ return 0;
+
++ int ret = 0;
+ char *p = env;
+- while (*p) {
++ while (p) {
+ char *next = strchr(p, ',');
+- if (!next)
+- next = strchr(p, '\0');
+- if ((next - p) && !strncmp(path, p, next - p)) {
+- pseudo_debug(PDBGF_PATH | PDBGF_VERBOSE, "ignoring path: '%s'\n", path);
+- return 1;
+- }
+- if (next && *next != '\0')
+- p = next+1;
+- else
++ if (next)
++ *next++ = '\0';
++ if (*p && !strncmp(path, p, strlen(p))) {
++ pseudo_debug(PDBGF_PATH | PDBGF_VERBOSE, "ignoring path: '%s'\n", path);
++ ret = 1;
+ break;
++ }
++ p = next;
+ }
+ free(env);
+
+- return 0;
++ return ret;
+ }
+
+ int pseudo_client_ignore_path(const char *path) {
diff --git a/poky/meta/recipes-devtools/pseudo/pseudo_git.bb b/poky/meta/recipes-devtools/pseudo/pseudo_git.bb
index 7fa11a5..a9f7aa9 100644
--- a/poky/meta/recipes-devtools/pseudo/pseudo_git.bb
+++ b/poky/meta/recipes-devtools/pseudo/pseudo_git.bb
@@ -4,9 +4,11 @@
file://0001-configure-Prune-PIE-flags.patch \
file://fallback-passwd \
file://fallback-group \
+ file://0002-pseudo_client-Lessen-indentation-of-pseudo_client_ig.patch \
+ file://0003-pseudo_client-Simplify-pseudo_client_ignore_path_chr.patch \
"
-SRCREV = "1ee9a1e05e200f189f6644411ba9304e8a479b0b"
+SRCREV = "69f205c41902e17933b81b1450636848e8da2126"
S = "${WORKDIR}/git"
PV = "1.9.0+git${SRCPV}"