1 |
commit: dbb08ef521827282bc11c74418ac5dac1d9aba96 |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Apr 29 19:48:02 2021 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Apr 29 19:49:45 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dbb08ef5 |
7 |
|
8 |
Revert "dev-util/samurai: Security revbump to fix mull pointer dereference" |
9 |
|
10 |
This reverts commit 05f98b2284e04f5078b8b38238d6688f9c76414b |
11 |
because of wrong bug reference. |
12 |
|
13 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
14 |
|
15 |
.../files/samurai-1.2-null_pointer_fix.patch | 26 ---------------------- |
16 |
.../{samurai-1.2-r1.ebuild => samurai-1.2.ebuild} | 4 ---- |
17 |
2 files changed, 30 deletions(-) |
18 |
|
19 |
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 |
20 |
deleted file mode 100644 |
21 |
index fbc97b03d47..00000000000 |
22 |
--- a/dev-util/samurai/files/samurai-1.2-null_pointer_fix.patch |
23 |
+++ /dev/null |
24 |
@@ -1,26 +0,0 @@ |
25 |
-From d2af3bc375e2a77139c3a28d6128c60cd8d08655 Mon Sep 17 00:00:00 2001 |
26 |
-From: Michael Forney <mforney@×××××××.org> |
27 |
-Date: Sun, 4 Apr 2021 03:50:09 -0700 |
28 |
-Subject: [PATCH] parse: Check for non-empty command/rspfile/rspfile_content |
29 |
- |
30 |
-This matches ninja behavior and prevents the possibility of a rule |
31 |
-with an empty (NULL) command string. |
32 |
- |
33 |
-Fixes #68. |
34 |
---- |
35 |
- parse.c | 2 ++ |
36 |
- 1 file changed, 2 insertions(+) |
37 |
- |
38 |
-diff --git a/parse.c b/parse.c |
39 |
-index f79a5ee..b4b98a1 100644 |
40 |
---- a/parse.c |
41 |
-+++ b/parse.c |
42 |
-@@ -42,6 +42,8 @@ parserule(struct scanner *s, struct environment *env) |
43 |
- var = scanname(s); |
44 |
- parselet(s, &val); |
45 |
- ruleaddvar(r, var, val); |
46 |
-+ if (!val) |
47 |
-+ continue; |
48 |
- if (strcmp(var, "command") == 0) |
49 |
- hascommand = true; |
50 |
- else if (strcmp(var, "rspfile") == 0) |
51 |
|
52 |
diff --git a/dev-util/samurai/samurai-1.2-r1.ebuild b/dev-util/samurai/samurai-1.2.ebuild |
53 |
similarity index 90% |
54 |
rename from dev-util/samurai/samurai-1.2-r1.ebuild |
55 |
rename to dev-util/samurai/samurai-1.2.ebuild |
56 |
index ad8d964b12b..4333d1997bf 100644 |
57 |
--- a/dev-util/samurai/samurai-1.2-r1.ebuild |
58 |
+++ b/dev-util/samurai/samurai-1.2.ebuild |
59 |
@@ -16,10 +16,6 @@ fi |
60 |
LICENSE="ISC Apache-2.0 MIT" |
61 |
SLOT="0" |
62 |
|
63 |
-PATCHES=( |
64 |
- "${FILESDIR}/${P}-null_pointer_fix.patch" #786957 |
65 |
-) |
66 |
- |
67 |
src_install() { |
68 |
emake DESTDIR="${D}" PREFIX="${EPREFIX}"/usr install |
69 |
dodoc README.md |