gentoo auto-resync : 15:07:2022 - 07:41:50

4 files changed, 43 insertions, 9 deletions

diff --git a/dev-util/samurai/Manifest b/dev-util/samurai/Manifest
index 8dff97ee5bde..a75ab4b76e9d 100644
--- a/dev-util/samurai/Manifest
+++ b/dev-util/samurai/Manifest
@@ -1,5 +1,5 @@
-AUX samurai-1.2-null_pointer_fix.patch 758 BLAKE2B c476434d74927d78dbd8f97e3d3e588abee22fc5650b40ead47b5b08e5dee6029253c54047f7f78f611e0ba3008c13b77775727ee547aee6d8bab5d56e99c80e SHA512 0504b137fc9ac113453075a22bdfac4ab7616f668e640b7125041400729aaecad1173c528934223246035f68a95d92c6a85e62d1ea5fea996d85647cb33483eb
+AUX samurai-1.2-null_pointer_fix.patch 2089 BLAKE2B f721cec4d42b4826ec52d4e88ee86b907956739f30427eeaee047eef8e59f953c1bcb2fda301cf3a8214c707954cbbb0abf0901c63ec557f4d9cc614962894d1 SHA512 5ead4b0aa47fd9c3bc84cf437744a36a9a1ed21b438883d32ab98b598c98a20561ba46954255553befdb9f46efa4f6251f73342de9000415f09bce63064e52eb
 DIST samurai-1.2.tar.gz 32709 BLAKE2B 86ed79f7d6ab492216cf3bf0e19ff8be8c1ca37e5c99de84b457875fa710d720624bd0de53105ed0b1d382c417aeb7397929cb9a35a8d1b36a11e053bf8d7ff5 SHA512 bbe6a582c34b04f1df53b76c1647aa3e03c4698ebf7591a203935f11ffa05971bbcb86dc1a8c06aeb904cdc741abb08918122810fc47216fed0a6d9f87fd1225
-EBUILD samurai-1.2-r1.ebuild 719 BLAKE2B 083a7a57c20ee650cdcd23063e2d4cf21a7b72e8bad821809429ef0f74cc8dc4f037af3bd5c578d90d9fa71f05ddd268b31ad683854e8caeb2f27f24d852e27d SHA512 f2a98101f6835a85642105633256dc62d443bc9e3fd264cbfba6c5e32ca4fd8dbc3d76ed7a5c68131045fbd0d82115c27037fc852bf4c5b35bfe4b13cd2109e8
-EBUILD samurai-9999.ebuild 655 BLAKE2B 758ccc46bbc5975620bfb9f07fc229c761318794a3db4637efe018f780eba4bcf86fd946e21d09ef4e60dcbfa449990012fd4a64f51afb0935f20946b60a185a SHA512 5b72cb8d504c2abddea126375cb7d1c3283f4b172e1d2288f838d53d2477b0ef270ec74fbbd089a48df21112ba5de6822ab349a5b33da409815e6bfda0b1f29b
+EBUILD samurai-1.2-r2.ebuild 725 BLAKE2B 505faf54c1b00aa5f3b7e1ea47346baf341f250d699c01c4e577ce3c6235e2b6d5075b39109a221a1cb760dffde0e50e0f84be372d18906663c18aa4c5b6aaf4 SHA512 e1eb5941b90e176a32038ac0125cf0c7634d3a8278ae166fc354049ecbd2b29bd35cf177c54c5287398ce9878487c95e900c0be9481ca5f74443eb87989e035f
+EBUILD samurai-9999.ebuild 660 BLAKE2B 07025a4190abf3106c4616c32728c375a567bc369c7bc41da0128b0880b077879c55e57e7fe37e4de280d8c4c3d9f063846d67b352507a2daab3f75bb3aaef4e SHA512 c589c262cf3b6c76c7be16c78ba945cd20b4a5d3f7fc08220ec68d9271f35ad9b7c54eb3123bb69696e86040e9b3eda8bbed9ba7c93c66b2c2c7aff788c4b586
 MISC metadata.xml 450 BLAKE2B 0c3c483cfd71441603a81d9c1c6015336ad104d14a6db7d77819dda52e7b3a58e141e82808b636f430ef501f8f7dbc96b48a56e41f79327ad8d458f42fef4c92 SHA512 511af6f135b9cce7f5fb8e66c583e398479e9639b42f26d63cd01937a5976317e8d9e5949f03cd36d908192a9a4413680872ca99aa6b9e8d882eaeaf1069e1b6
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
index fbc97b03d478..76ffc8cd350f 100644
--- a/dev-util/samurai/files/samurai-1.2-null_pointer_fix.patch
+++ b/dev-util/samurai/files/samurai-1.2-null_pointer_fix.patch
@@ -1,3 +1,37 @@
+CVE-2021-30218 + CVE-2021-30219
+Bug: https://bugs.gentoo.org/786951
+
+Upstream-Commit: https://github.com/michaelforney/samurai/commit/e84b6d99c85043fa1ba54851ee500540ec206918
+From e84b6d99c85043fa1ba54851ee500540ec206918 Mon Sep 17 00:00:00 2001
+From: Michael Forney <mforney@mforney.org>
+Date: Fri, 2 Apr 2021 17:27:48 -0700
+Subject: [PATCH] util: Check for NULL string in writefile
+
+This check was there previously, but was removed in f549b757 with
+the addition of a check during parse that every rule has rspfile
+if and only if it has rspfile_content. However, this fails to
+consider the possibility of those variables coming from the edge
+or global environment. So, re-add the check.
+
+Fixes #67 (https://github.com/michaelforney/samurai/issues/67).
+---
+ util.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/util.c b/util.c
+index ea5c3ce..2a59881 100644
+--- a/util.c
++++ b/util.c
+@@ -258,7 +258,7 @@ writefile(const char *name, struct string *s)
+ 		return -1;
+ 	}
+ 	ret = 0;
+-	if (fwrite(s->s, 1, s->n, f) != s->n || fflush(f) != 0) {
++	if (s && (fwrite(s->s, 1, s->n, f) != s->n || fflush(f) != 0)) {
+ 		warn("write %s:", name);
+ 		ret = -1;
+ 	}
+Upstream-Commit: https://github.com/michaelforney/samurai/commit/d2af3bc375e2a77139c3a28d6128c60cd8d08655
 From d2af3bc375e2a77139c3a28d6128c60cd8d08655 Mon Sep 17 00:00:00 2001
 From: Michael Forney <mforney@mforney.org>
 Date: Sun, 4 Apr 2021 03:50:09 -0700
@@ -6,7 +40,7 @@ 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.
+Fixes #68 (https://github.com/michaelforney/samurai/issues/68).
 ---
  parse.c | 2 ++
  1 file changed, 2 insertions(+)
diff --git a/dev-util/samurai/samurai-1.2-r1.ebuild b/dev-util/samurai/samurai-1.2-r2.ebuild
index c2072fc277b1..5a7727cbbf8c 100644
--- a/dev-util/samurai/samurai-1.2-r1.ebuild
+++ b/dev-util/samurai/samurai-1.2-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2021-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit toolchain-funcs
 
@@ -19,7 +19,7 @@ LICENSE="ISC Apache-2.0 MIT"
 SLOT="0"
 
 PATCHES=(
-	"${FILESDIR}/${P}-null_pointer_fix.patch" #786957
+	"${FILESDIR}/${P}-null_pointer_fix.patch" # 786951
 )
 
 src_compile() {
diff --git a/dev-util/samurai/samurai-9999.ebuild b/dev-util/samurai/samurai-9999.ebuild
index 6895ee86fc65..6e723875bada 100644
--- a/dev-util/samurai/samurai-9999.ebuild
+++ b/dev-util/samurai/samurai-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2021-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit toolchain-funcs