From a978c074e4272bb901fbe4a10de0a7b2af574f17 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Tue, 4 May 2021 22:28:33 +0100
Subject: gentoo resync : 04.05.2021

---
 dev-util/samurai/Manifest                          |  3 ++-
 .../files/samurai-1.2-null_pointer_fix.patch       | 26 ++++++++++++++++++++++
 dev-util/samurai/samurai-1.2-r1.ebuild             | 26 ++++++++++++++++++++++
 dev-util/samurai/samurai-1.2.ebuild                | 22 ------------------
 4 files changed, 54 insertions(+), 23 deletions(-)
 create mode 100644 dev-util/samurai/files/samurai-1.2-null_pointer_fix.patch
 create mode 100644 dev-util/samurai/samurai-1.2-r1.ebuild
 delete mode 100644 dev-util/samurai/samurai-1.2.ebuild

(limited to 'dev-util/samurai')

diff --git a/dev-util/samurai/Manifest b/dev-util/samurai/Manifest
index 784f36e842dd..7ce2b34bf515 100644
--- a/dev-util/samurai/Manifest
+++ b/dev-util/samurai/Manifest
@@ -1,4 +1,5 @@
+AUX samurai-1.2-null_pointer_fix.patch 758 BLAKE2B c476434d74927d78dbd8f97e3d3e588abee22fc5650b40ead47b5b08e5dee6029253c54047f7f78f611e0ba3008c13b77775727ee547aee6d8bab5d56e99c80e SHA512 0504b137fc9ac113453075a22bdfac4ab7616f668e640b7125041400729aaecad1173c528934223246035f68a95d92c6a85e62d1ea5fea996d85647cb33483eb
 DIST samurai-1.2.tar.gz 32709 BLAKE2B 86ed79f7d6ab492216cf3bf0e19ff8be8c1ca37e5c99de84b457875fa710d720624bd0de53105ed0b1d382c417aeb7397929cb9a35a8d1b36a11e053bf8d7ff5 SHA512 bbe6a582c34b04f1df53b76c1647aa3e03c4698ebf7591a203935f11ffa05971bbcb86dc1a8c06aeb904cdc741abb08918122810fc47216fed0a6d9f87fd1225
-EBUILD samurai-1.2.ebuild 587 BLAKE2B 6fa336e85f0c650f436c6e36083b90b37398e0c688a9a341ee5663f1b15d74ec92374c290c0f426add46a34f7c0b24deb65a4be396e928e1a35b00e193fa22c8 SHA512 6c2c92f6751892a7842f4033d75a3ae15faa54e234db866dd9333ed2435409d1ac062681e14c4b719802442581e259a0286861d5319b6a97a2a34513ba4ba444
+EBUILD samurai-1.2-r1.ebuild 651 BLAKE2B b2cfc0bbf51b51e13e71edbf5e473166ff13f0b7fffd3fe7cfb951c17ea3d2c05da603ea080e27b1ce86712d7b461246f94b7f7cb0e07c25c27f758657d63464 SHA512 967ea36c1f675da1178a02de56d0220637e441150ea96a4b37d8eaadd1f97e16f04f2cb8d7ebb4b0d63fa2c488ff1da52b781cda2f38645233920b4445f91ecf
 EBUILD samurai-9999.ebuild 587 BLAKE2B 6fa336e85f0c650f436c6e36083b90b37398e0c688a9a341ee5663f1b15d74ec92374c290c0f426add46a34f7c0b24deb65a4be396e928e1a35b00e193fa22c8 SHA512 6c2c92f6751892a7842f4033d75a3ae15faa54e234db866dd9333ed2435409d1ac062681e14c4b719802442581e259a0286861d5319b6a97a2a34513ba4ba444
 MISC metadata.xml 470 BLAKE2B 9f86033b2410be9ab907e95be93a590792d8f586d80f00a44f6788ec5b61eb4fd79d1b93be7a345a90dcfdc48087a80d87b7143699fbc17ea672e8ab741c554c SHA512 6de8f7a6372fb52ea9a0b9c43afe4569d570491252385f06a1445376a56d6e12e768932348cacdb3118961720b4837e07b8a5bc39b03427cbd4289173d5bc995
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 000000000000..fbc97b03d478
--- /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 <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-r1.ebuild
new file mode 100644
index 000000000000..ad8d964b12b3
--- /dev/null
+++ b/dev-util/samurai/samurai-1.2-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="ninja-compatible build tool written in C"
+HOMEPAGE="https://github.com/michaelforney/samurai"
+if [[ "${PV}" == *9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/michaelforney/samurai.git"
+else
+	SRC_URI="https://github.com/michaelforney/samurai/releases/download/${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+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
+}
diff --git a/dev-util/samurai/samurai-1.2.ebuild b/dev-util/samurai/samurai-1.2.ebuild
deleted file mode 100644
index 4333d1997bfa..000000000000
--- a/dev-util/samurai/samurai-1.2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="ninja-compatible build tool written in C"
-HOMEPAGE="https://github.com/michaelforney/samurai"
-if [[ "${PV}" == *9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/michaelforney/samurai.git"
-else
-	SRC_URI="https://github.com/michaelforney/samurai/releases/download/${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-fi
-
-LICENSE="ISC Apache-2.0 MIT"
-SLOT="0"
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="${EPREFIX}"/usr install
-	dodoc README.md
-}
-- 
cgit v1.2.3