diff --git a/Ports/AvailablePorts.md b/Ports/AvailablePorts.md index ea8e47d59c..7318a2ddc8 100644 --- a/Ports/AvailablePorts.md +++ b/Ports/AvailablePorts.md @@ -310,6 +310,7 @@ This list is also available at [ports.serenityos.net](https://ports.serenityos.n | [`x264`](x264/) | x264 | baee400 | https://www.videolan.org/developers/x264.html | | [`x265`](x265/) | x265 | 3.5 | https://bitbucket.org/multicoreware/x265_git/wiki/Home | | [`xash3d-fwgs`](xash3d-fwgs/) | Xash3D FWGS game engine | 2022.12.26 | https://github.com/FWGS/xash3d-fwgs | +| [`xorriso`](xorriso/) | xorriso | 1.5.6 | https://www.gnu.org/software/xorriso | | [`xz`](xz/) | xz | 5.2.5 | https://tukaani.org/xz/ | | [`yasm`](yasm/) | Yasm Modular Assembler | 1.3.0 | https://yasm.tortall.net/ | | [`zig`](zig/) | Zig programming language | 0.11.0-dev.4003+c6aa29b6f | https://ziglang.org/ | diff --git a/Ports/xorriso/package.sh b/Ports/xorriso/package.sh new file mode 100755 index 0000000000..b3fd603420 --- /dev/null +++ b/Ports/xorriso/package.sh @@ -0,0 +1,11 @@ +#!/usr/bin/env -S bash ../.port_include.sh +port='xorriso' +version='1.5.6' +files=( + "https://www.gnu.org/software/xorriso/xorriso-${version}.tar.gz d4b6b66bd04c49c6b358ee66475d806d6f6d7486e801106a47d331df1f2f8feb" +) +depends=( + 'libiconv' +) +useconfigure='true' +use_fresh_config_sub='true' diff --git a/Ports/xorriso/patches/0001-parse_exec-replace-wait3-with-waitpid.patch b/Ports/xorriso/patches/0001-parse_exec-replace-wait3-with-waitpid.patch new file mode 100644 index 0000000000..0091af00df --- /dev/null +++ b/Ports/xorriso/patches/0001-parse_exec-replace-wait3-with-waitpid.patch @@ -0,0 +1,22 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Beckett Normington +Date: Thu, 10 Aug 2023 09:48:21 -0400 +Subject: [PATCH] parse_exec: replace wait3() with waitpid() + +--- + xorriso/parse_exec.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/xorriso/parse_exec.c b/xorriso/parse_exec.c +index e94abcbac719e82a617f4135a77686632d04866b..52fb60dc516ed30f2debd921e4e52145b63cfb54 100644 +--- a/xorriso/parse_exec.c ++++ b/xorriso/parse_exec.c +@@ -2988,7 +2988,7 @@ int Xorriso_execv(struct XorrisO *xorriso, char *cmd, + + Xorriso_alloc_meM(prog, char, 5 * SfileadrL); + +- wait3(NULL,WNOHANG,NULL); /* just to remove any old dead child */ ++ waitpid(-1,NULL,WNOHANG); /* just to remove any old dead child */ + + if(flag & 2) { + ret= Xorriso_make_argv_with_null(xorriso, in_argc, in_argv, diff --git a/Ports/xorriso/patches/ReadMe.md b/Ports/xorriso/patches/ReadMe.md new file mode 100644 index 0000000000..4e8d236e0d --- /dev/null +++ b/Ports/xorriso/patches/ReadMe.md @@ -0,0 +1,7 @@ +# Patches for xorriso on SerenityOS + +## `0001-parse_exec-replace-wait3-with-waitpid.patch` + +parse_exec: replace wait3() with waitpid() + +