openbsd/ports
1
0
Fork 0
mirror of https://github.com/openbsd/ports.git synced 2026-06-17 23:13:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update samurai to 1.3.

Browse Source
This commit is contained in:
fcambus
2026-05-14 16:19:13 +00:00
parent e13f79b27f
commit 6ea1820c07
5 changed files with 9 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
devel/samurai/Makefile
+1 -2
View File
@@ -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
devel/samurai/distinfo
+2 -2
View File
@@ -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
devel/samurai/patches/patch-Makefile
+6 -4
View File
@@ -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\
devel/samurai/patches/patch-parse_c
-15
View File
@@ -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)
devel/samurai/patches/patch-util_c
-15
View File
@@ -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;
}