diff options
author | Andrew Geissler <geissonator@yahoo.com> | 2021-02-13 00:55:30 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2021-02-25 23:15:06 +0300 |
commit | 706d5aacd7ab7b37c00df1a1b210e4ced06119e1 (patch) | |
tree | ed0bec373424d01accfb2e9c895c177a3e2d7abe /poky/meta/recipes-devtools/patch | |
parent | ac970dd705934286df062e0f1501f776dc2ef01d (diff) | |
download | openbmc-706d5aacd7ab7b37c00df1a1b210e4ced06119e1.tar.xz |
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>
Diffstat (limited to 'poky/meta/recipes-devtools/patch')
-rw-r--r-- | poky/meta/recipes-devtools/patch/patch/CVE-2019-20633.patch | 31 | ||||
-rw-r--r-- | poky/meta/recipes-devtools/patch/patch_2.7.6.bb | 1 |
2 files changed, 0 insertions, 32 deletions
diff --git a/poky/meta/recipes-devtools/patch/patch/CVE-2019-20633.patch b/poky/meta/recipes-devtools/patch/patch/CVE-2019-20633.patch deleted file mode 100644 index 03988a179..000000000 --- a/poky/meta/recipes-devtools/patch/patch/CVE-2019-20633.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 15b158db3ae11cb835f2eb8d2eb48e09d1a4af48 Mon Sep 17 00:00:00 2001 -From: Andreas Gruenbacher <agruen@gnu.org> -Date: Mon, 15 Jul 2019 19:10:02 +0200 -Subject: Avoid invalid memory access in context format diffs - -* src/pch.c (another_hunk): Avoid invalid memory access in context format -diffs. - -CVE: CVE-2019-20633 -Upstream-Status: Backport[https://git.savannah.gnu.org/cgit/patch.git/patch/?id=15b158db3ae11cb835f2eb8d2eb48e09d1a4af48] -Signed-off-by: Scott Murray <scott.murray@konsulko.com> - ---- - src/pch.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/pch.c b/src/pch.c -index a500ad9..cb54e03 100644 ---- a/src/pch.c -+++ b/src/pch.c -@@ -1328,6 +1328,7 @@ another_hunk (enum diff difftype, bool rev) - ptrn_prefix_context = context; - ptrn_suffix_context = context; - if (repl_beginning -+ || p_end <= 0 - || (p_end - != p_ptrn_lines + 1 + (p_Char[p_end - 1] == '\n'))) - { --- -cgit v1.2.1 - diff --git a/poky/meta/recipes-devtools/patch/patch_2.7.6.bb b/poky/meta/recipes-devtools/patch/patch_2.7.6.bb index 1997af0c2..b5897b357 100644 --- a/poky/meta/recipes-devtools/patch/patch_2.7.6.bb +++ b/poky/meta/recipes-devtools/patch/patch_2.7.6.bb @@ -10,7 +10,6 @@ SRC_URI += "file://0001-Unset-need_charset_alias-when-building-for-musl.patch \ file://0001-Invoke-ed-directly-instead-of-using-the-shell.patch \ file://0001-Don-t-leak-temporary-file-on-failed-ed-style-patch.patch \ file://0001-Don-t-leak-temporary-file-on-failed-multi-file-ed.patch \ - file://CVE-2019-20633.patch \ " SRC_URI[md5sum] = "4c68cee989d83c87b00a3860bcd05600" |