From 6ea1820c07252cde5a45b89fe9d750c6c52d9b62 Mon Sep 17 00:00:00 2001
From: fcambus <fcambus@openbsd.org>
Date: Thu, 14 May 2026 16:19:13 +0000
Subject: [PATCH] Update samurai to 1.3.

---
 devel/samurai/Makefile               |  3 +--
 devel/samurai/distinfo               |  4 ++--
 devel/samurai/patches/patch-Makefile | 10 ++++++----
 devel/samurai/patches/patch-parse_c  | 15 ---------------
 devel/samurai/patches/patch-util_c   | 15 ---------------
 5 files changed, 9 insertions(+), 38 deletions(-)
 delete mode 100644 devel/samurai/patches/patch-parse_c
 delete mode 100644 devel/samurai/patches/patch-util_c

diff --git a/devel/samurai/Makefile b/devel/samurai/Makefile
index d56755803c7..f8b7fd317a3 100644
--- a/devel/samurai/Makefile
+++ b/devel/samurai/Makefile
@@ -1,8 +1,7 @@
 COMMENT =	ninja-compatible build tool written in C
 
-V =		1.2
+V =		1.3
 DISTNAME =	samurai-$V
-REVISION =	1
 CATEGORIES =	devel
 
 HOMEPAGE =	https://github.com/michaelforney/samurai
diff --git a/devel/samurai/distinfo b/devel/samurai/distinfo
index 99088dbd447..a36c7305b06 100644
--- a/devel/samurai/distinfo
+++ b/devel/samurai/distinfo
@@ -1,2 +1,2 @@
-SHA256 (samurai-1.2.tar.gz) = O4z1FUjfxJt+/gNeGR/14ZY+vE/o9gZKXu/FND6veKU=
-SIZE (samurai-1.2.tar.gz) = 32709
+SHA256 (samurai-1.3.tar.gz) = G8AgqeEzQy31GRGsccw0Mi+CiTTZoigropFtiMFZdq8=
+SIZE (samurai-1.3.tar.gz) = 33562
diff --git a/devel/samurai/patches/patch-Makefile b/devel/samurai/patches/patch-Makefile
index dbfdbd082ec..4f97a150457 100644
--- a/devel/samurai/patches/patch-Makefile
+++ b/devel/samurai/patches/patch-Makefile
@@ -1,14 +1,16 @@
-Remove flags that base-gcc doesn't like
+- Remove flags that base-gcc doesn't like
+- Remove hardcoded librt
 
 Index: Makefile
 --- Makefile.orig
 +++ Makefile
-@@ -3,7 +3,7 @@
+@@ -5,8 +5,7 @@ OS=posix
  PREFIX=/usr/local
  BINDIR=$(PREFIX)/bin
  MANDIR=$(PREFIX)/share/man
--ALL_CFLAGS=$(CFLAGS) -std=c99 -Wall -Wextra -Wpedantic -Wno-unused-parameter
-+ALL_CFLAGS=$(CFLAGS) -std=c99 -Wall -Wextra
+-ALL_CFLAGS=$(CFLAGS) -std=c99 -Wall -Wextra -Wshadow -Wmissing-prototypes -Wpedantic -Wno-unused-parameter
+-LDLIBS=-lrt
++ALL_CFLAGS=$(CFLAGS) -std=c99 -Wall -Wextra -Wshadow -Wmissing-prototypes
  OBJ=\
  	build.o\
  	deps.o\
diff --git a/devel/samurai/patches/patch-parse_c b/devel/samurai/patches/patch-parse_c
deleted file mode 100644
index 7f4575383d9..00000000000
--- a/devel/samurai/patches/patch-parse_c
+++ /dev/null
@@ -1,15 +0,0 @@
-CVE-2021-30219
-https://github.com/michaelforney/samurai/commit/d2af3bc375e2a77139c3a28d6128c60cd8d08655
-
-Index: parse.c
---- parse.c.orig
-+++ 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/devel/samurai/patches/patch-util_c b/devel/samurai/patches/patch-util_c
deleted file mode 100644
index 098fde0be51..00000000000
--- a/devel/samurai/patches/patch-util_c
+++ /dev/null
@@ -1,15 +0,0 @@
-CVE-2021-30218
-https://github.com/michaelforney/samurai/commit/e84b6d99c85043fa1ba54851ee500540ec206918
-
-Index: util.c
---- util.c.orig
-+++ 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;
- 	}