diff options
| author |   Lars Wendler <polynomial-c@gentoo.org> | 2021-04-29 21:48:02 +0200 |
|---|---|---|
| committer | Lars Wendler <polynomial-c@gentoo.org> | 2021-04-29 21:49:45 +0200 |
| commit | dbb08ef521827282bc11c74418ac5dac1d9aba96 (patch) | |
| tree | 4773d3c19bd58c0788594e58fa13ee9a1c1ad66f /dev-util/samurai | |
| parent | dev-util/samurai: Security revbump to fix mull pointer dereference (diff) | |
| download | gentoo-dbb08ef521827282bc11c74418ac5dac1d9aba96.tar.gz gentoo-dbb08ef521827282bc11c74418ac5dac1d9aba96.tar.bz2 gentoo-dbb08ef521827282bc11c74418ac5dac1d9aba96.zip | |
Revert "dev-util/samurai: Security revbump to fix mull pointer dereference"
This reverts commit 05f98b2284e04f5078b8b38238d6688f9c76414b
because of wrong bug reference.
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
Diffstat (limited to 'dev-util/samurai')
| -rw-r--r-- | dev-util/samurai/files/samurai-1.2-null_pointer_fix.patch | 26 | ||||
| -rw-r--r-- | dev-util/samurai/samurai-1.2.ebuild (renamed from dev-util/samurai/samurai-1.2-r1.ebuild) | 4 |
2 files changed, 0 insertions, 30 deletions
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 deleted file mode 100644 index fbc97b03d478..000000000000 --- a/dev-util/samurai/files/samurai-1.2-null_pointer_fix.patch +++ /dev/null @@ -1,26 +0,0 @@ -From d2af3bc375e2a77139c3a28d6128c60cd8d08655 Mon Sep 17 00:00:00 2001 -From: Michael Forney <mforney@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-r1.ebuild b/dev-util/samurai/samurai-1.2.ebuild index ad8d964b12b3..4333d1997bfa 100644 --- a/dev-util/samurai/samurai-1.2-r1.ebuild +++ b/dev-util/samurai/samurai-1.2.ebuild @@ -16,10 +16,6 @@ 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 |