commit: 68b485ff058af6b943ff6633724e3d2ddeb2c7b2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> AuthorDate: Thu Apr 29 19:40:38 2021 +0000 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> CommitDate: Thu Apr 29 19:49:57 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68b485ff
dev-util/samurai: Security revbump to fix null pointer dereference Removed old Bug: https://bugs.gentoo.org/786951 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> .../files/samurai-1.2-null_pointer_fix.patch | 26 ++++++++++++++++++++++ .../{samurai-1.2.ebuild => samurai-1.2-r1.ebuild} | 4 ++++ 2 files changed, 30 insertions(+) diff --git a/dev-util/samurai/files/samurai-1.2-null_pointer_fix.patch b/dev-util/samurai/files/samurai-1.2-null_pointer_fix.patch new file mode 100644 index 00000000000..fbc97b03d47 --- /dev/null +++ b/dev-util/samurai/files/samurai-1.2-null_pointer_fix.patch @@ -0,0 +1,26 @@ +From d2af3bc375e2a77139c3a28d6128c60cd8d08655 Mon Sep 17 00:00:00 2001 +From: Michael Forney <mfor...@mforney.org> +Date: Sun, 4 Apr 2021 03:50:09 -0700 +Subject: [PATCH] parse: Check for non-empty command/rspfile/rspfile_content + +This matches ninja behavior and prevents the possibility of a rule +with an empty (NULL) command string. + +Fixes #68. +--- + parse.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/parse.c b/parse.c +index f79a5ee..b4b98a1 100644 +--- a/parse.c ++++ b/parse.c +@@ -42,6 +42,8 @@ parserule(struct scanner *s, struct environment *env) + var = scanname(s); + parselet(s, &val); + ruleaddvar(r, var, val); ++ if (!val) ++ continue; + if (strcmp(var, "command") == 0) + hascommand = true; + else if (strcmp(var, "rspfile") == 0) diff --git a/dev-util/samurai/samurai-1.2.ebuild b/dev-util/samurai/samurai-1.2-r1.ebuild similarity index 90% rename from dev-util/samurai/samurai-1.2.ebuild rename to dev-util/samurai/samurai-1.2-r1.ebuild index 4333d1997bf..ad8d964b12b 100644 --- a/dev-util/samurai/samurai-1.2.ebuild +++ b/dev-util/samurai/samurai-1.2-r1.ebuild @@ -16,6 +16,10 @@ fi LICENSE="ISC Apache-2.0 MIT" SLOT="0" +PATCHES=( + "${FILESDIR}/${P}-null_pointer_fix.patch" #786957 +) + src_install() { emake DESTDIR="${D}" PREFIX="${EPREFIX}"/usr install dodoc README.md
