Ports/stress-ng: Update stress-ng to 0.13.12

This required updating a bunch of patches which had conflicts
in the latest version.

New Patches:
- serenity: Add bogus O_NDELAY just to allow the port to compile
- serenity: Disable nice() stress workload as we do not implement it
- serenity: Disable prctl stressor on serenity

18 files changed, 221 insertions, 140 deletions

diff --git a/Ports/AvailablePorts.md b/Ports/AvailablePorts.md
index fb98216a3a..6b5b330cd8 100644
--- a/Ports/AvailablePorts.md
+++ b/Ports/AvailablePorts.md
@@ -191,7 +191,7 @@ Please make sure to keep this list up to date when adding and updating ports. :^
 | [`soltys`](soltys/)                    | Soltys                                                          | 1.0                      | https://www.scummvm.org/games/#games-soltys                                    |
 | [`sqlite`](sqlite/)                    | SQLite                                                          | 3350500                  | https://www.sqlite.org/                                                        |
 | [`stpuzzles`](stpuzzles/)              | Simon Tatham's Portable Puzzle Collection                       |                          | https://www.chiark.greenend.org.uk/~sgtatham/puzzles/                          |
-| [`stress-ng`](stress-ng/)              | stress-ng                                                       | 0.13.10                  | https://github.com/ColinIanKing/stress-ng                                      |
+| [`stress-ng`](stress-ng/)              | stress-ng                                                       | 0.13.12                  | https://github.com/ColinIanKing/stress-ng                                      |
 | [`Super-Mario`](Super-Mario/)          | Super-Mario Clone                                               |                          | https://github.com/Bennyhwanggggg/Super-Mario-Clone-Cpp                        |
 | [`tuxracer`](tuxracer/)                | Tux Racer                                                       | 0.61                     | http://tuxracer.sourceforge.net/                                               |
 | [`tcl`](tcl/)                          | Tcl                                                             | 8.6.11                   | https://www.tcl-lang.org/                                                      |
diff --git a/Ports/stress-ng/package.sh b/Ports/stress-ng/package.sh
index 6a00edc558..39b60adf27 100755
--- a/Ports/stress-ng/package.sh
+++ b/Ports/stress-ng/package.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env -S bash ../.port_include.sh
 port=stress-ng
-version=0.13.10
-files="https://github.com/ColinIanKing/stress-ng/archive/V${version}.tar.gz stress-ng-${version}.tar.gz 972b429f9eb0afbceabf7f3babab8599d8224b5d146e244c2cfe65129befb973"
+version=0.13.12
+files="https://github.com/ColinIanKing/stress-ng/archive/V${version}.tar.gz stress-ng-${version}.tar.gz 16540d9cfa80d6a274fc0238d7251675ee38df6d5be805d14a67ce9efcb59ce9"
 auth_type=sha256
 depends=("zlib")
 
diff --git a/Ports/stress-ng/patches/0001-serenity-Disable-linux-scheduler-integration-on-Sere.patch b/Ports/stress-ng/patches/0001-serenity-Disable-linux-scheduler-integration-on-Sere.patch
index 42729cee1e..d0b76c370e 100644
--- a/Ports/stress-ng/patches/0001-serenity-Disable-linux-scheduler-integration-on-Sere.patch
+++ b/Ports/stress-ng/patches/0001-serenity-Disable-linux-scheduler-integration-on-Sere.patch
@@ -1,7 +1,7 @@
-From d5955e243cc81d6565eec57ccec282523348e735 Mon Sep 17 00:00:00 2001
+From bb67e44f840df4b833ea3316cf20dee42d62cdb8 Mon Sep 17 00:00:00 2001
 From: Brian Gianforcaro <b.gianfo@gmail.com>
 Date: Mon, 27 Dec 2021 20:53:47 -0800
-Subject: [PATCH 01/12] serenity: Disable linux scheduler integration on
+Subject: [PATCH 01/14] serenity: Disable linux scheduler integration on
  Serenity
 
 Follow the path of other platforms, and make this code nop
@@ -12,10 +12,10 @@ when compiling for serenity.
  2 files changed, 4 insertions(+), 2 deletions(-)
 
 diff --git a/core-sched.c b/core-sched.c
-index a27d15a..65ebe8c 100644
+index af8cb48..0406ff9 100644
 --- a/core-sched.c
 +++ b/core-sched.c
-@@ -68,7 +68,8 @@ const char *stress_get_sched_name(const int sched)
+@@ -75,7 +75,8 @@ const char *stress_get_sched_name(const int sched)
  #if (defined(_POSIX_PRIORITY_SCHEDULING) || defined(__linux__)) && 	\
      !defined(__OpenBSD__) && 						\
      !defined(__minix__) &&						\
@@ -26,10 +26,10 @@ index a27d15a..65ebe8c 100644
  static const char prefix[] = "sched";
  
 diff --git a/stress-schedpolicy.c b/stress-schedpolicy.c
-index e57b1d8..749e0c1 100644
+index 91d1d02..6f172d3 100644
 --- a/stress-schedpolicy.c
 +++ b/stress-schedpolicy.c
-@@ -33,7 +33,8 @@ static const stress_help_t help[] = {
+@@ -37,7 +37,8 @@ static const stress_help_t help[] = {
  #if (defined(_POSIX_PRIORITY_SCHEDULING) || defined(__linux__)) &&	\
       !defined(__OpenBSD__) &&						\
       !defined(__minix__) &&						\
@@ -40,5 +40,5 @@ index e57b1d8..749e0c1 100644
  static const int policies[] = {
  #if defined(SCHED_IDLE)
 -- 
-2.34.1
+2.32.0
 
diff --git a/Ports/stress-ng/patches/0002-serenity-Disable-itimer-testing-when-compiling-for-S.patch b/Ports/stress-ng/patches/0002-serenity-Disable-itimer-testing-when-compiling-for-S.patch
index 72ea5cc4d0..014fb7384b 100644
--- a/Ports/stress-ng/patches/0002-serenity-Disable-itimer-testing-when-compiling-for-S.patch
+++ b/Ports/stress-ng/patches/0002-serenity-Disable-itimer-testing-when-compiling-for-S.patch
@@ -1,47 +1,50 @@
-From c77af92eb60ed81f0956d82361ac3a4ae88e9cf6 Mon Sep 17 00:00:00 2001
+From daec883ade0af0b20a4e2f3ef584cde57e22bf3b Mon Sep 17 00:00:00 2001
 From: Brian Gianforcaro <b.gianfo@gmail.com>
 Date: Mon, 27 Dec 2021 20:57:05 -0800
-Subject: [PATCH 02/12] serenity: Disable itimer testing when compiling for
+Subject: [PATCH 02/14] serenity: Disable itimer testing when compiling for
  Serenity
 
 The itimer APIs are not implemented in serenity, so just disable
 these tests.
 ---
- stress-itimer.c     |  7 +++++++
- stress-sysbadaddr.c | 14 ++++++++++++++
- 2 files changed, 21 insertions(+)
+ stress-itimer.c     | 10 ++++++++++
+ stress-sysbadaddr.c | 12 ++++++++++++
+ 2 files changed, 22 insertions(+)
 
 diff --git a/stress-itimer.c b/stress-itimer.c
-index 7fa8cea..f4aee66 100644
+index b2e466a..e8ead6a 100644
 --- a/stress-itimer.c
 +++ b/stress-itimer.c
-@@ -24,6 +24,7 @@
-  */
- #include "stress-ng.h"
+@@ -35,6 +35,8 @@ static const stress_help_t help[] = {
+ 	{ NULL, NULL,		NULL }
+ };
  
-+#ifndef __serenity__
- static volatile uint64_t itimer_counter = 0;
- static uint64_t max_ops;
- static double rate_us;
-@@ -218,3 +219,9 @@ stressor_info_t stress_itimer_info = {
- 	.opt_set_funcs = opt_set_funcs,
++#if !defined(__serenity__)
++
+ static const int stress_itimers[] = {
+ #if defined(ITIMER_REAL)
+ 	ITIMER_REAL,
+@@ -223,3 +225,11 @@ stressor_info_t stress_itimer_info = {
+ 	.verify = VERIFY_ALWAYS,
  	.help = help
  };
 +#else
 +stressor_info_t stress_itimer_info = {
 +	.stressor = stress_not_implemented,
 +	.class = CLASS_INTERRUPT | CLASS_OS,
++    .help = help
 +};
 +#endif
++
 diff --git a/stress-sysbadaddr.c b/stress-sysbadaddr.c
-index b7abae5..8d0481b 100644
+index 5d9a10a..cacd01c 100644
 --- a/stress-sysbadaddr.c
 +++ b/stress-sysbadaddr.c
-@@ -344,10 +344,12 @@ static int bad_gethostname(void *addr)
+@@ -385,10 +385,12 @@ static int bad_gethostname(void *addr)
  }
  #endif
  
-+#ifndef __serenity__
++#if !defined(__serenity__)
  static int bad_getitimer(void *addr)
  {
  	return getitimer(ITIMER_PROF, (struct itimerval *)addr);
@@ -50,11 +53,11 @@ index b7abae5..8d0481b 100644
  
  static int bad_getpeername(void *addr)
  {
-@@ -639,11 +641,13 @@ static int bad_select(void *addr)
+@@ -694,11 +696,13 @@ static int bad_select(void *addr)
  	return ret;
  }
  
-+#ifndef __serenity__
++#if !defined(__serenity__)
  static int bad_setitimer(void *addr)
  {
  	return setitimer(ITIMER_PROF, (struct itimerval *)addr,
@@ -64,47 +67,45 @@ index b7abae5..8d0481b 100644
  
  static int bad_setrlimit(void *addr)
  {
-@@ -825,7 +829,10 @@ static stress_bad_syscall_t bad_syscalls[] = {
+@@ -892,7 +896,9 @@ static stress_bad_syscall_t bad_syscalls[] = {
  #if defined(HAVE_GETHOSTNAME)
  	bad_gethostname,
  #endif
-+
-+#ifndef __serenity__
++#if !defined(__serenity__)
  	bad_getitimer,
 +#endif
  	bad_getpeername,
  	bad_getrandom,
  	bad_getrlimit,
-@@ -899,7 +906,10 @@ static stress_bad_syscall_t bad_syscalls[] = {
+@@ -966,7 +972,9 @@ static stress_bad_syscall_t bad_syscalls[] = {
  	bad_sched_getaffinity,
  #endif
  	bad_select,
-+
-+#ifndef __serenity__
++#if !defined(__serenity__)
  	bad_setitimer,
 +#endif
  	bad_setrlimit,
  	bad_stat,
  #if defined(HAVE_STATFS)
-@@ -955,7 +965,9 @@ static inline int stress_do_syscall(
+@@ -1022,7 +1030,9 @@ static inline int stress_do_syscall(
  	if (pid < 0) {
  		_exit(EXIT_NO_RESOURCE);
  	} else if (pid == 0) {
-+#ifndef __serenity__
++#if !defined(__serenity__)
  		struct itimerval it;
 +#endif
  		size_t i;
  		int ret;
  
-@@ -978,6 +990,7 @@ static inline int stress_do_syscall(
+@@ -1045,6 +1055,7 @@ static inline int stress_do_syscall(
  		stress_parent_died_alarm();
  		(void)sched_settings_apply(true);
  
-+#ifndef __serenity__
++#if !defined(__serenity__)
  		/*
  		 * Force abort if we take too long
  		 */
-@@ -990,6 +1003,7 @@ static inline int stress_do_syscall(
+@@ -1057,6 +1068,7 @@ static inline int stress_do_syscall(
  				args->name, errno, strerror(errno));
  			_exit(EXIT_NO_RESOURCE);
  		}
@@ -113,5 +114,5 @@ index b7abae5..8d0481b 100644
  		ret = bad_syscall(addr);
  		if (ret < 0)
 -- 
-2.34.1
+2.32.0
 
diff --git a/Ports/stress-ng/patches/0003-serenity-Fix-duplicate-definition-of-ALWAYS_INLINE-o.patch b/Ports/stress-ng/patches/0003-serenity-Fix-duplicate-definition-of-ALWAYS_INLINE-o.patch
index 536addad29..e77230012b 100644
--- a/Ports/stress-ng/patches/0003-serenity-Fix-duplicate-definition-of-ALWAYS_INLINE-o.patch
+++ b/Ports/stress-ng/patches/0003-serenity-Fix-duplicate-definition-of-ALWAYS_INLINE-o.patch
@@ -1,7 +1,7 @@
-From fc1915941417ecea79023636925448d2a0f06853 Mon Sep 17 00:00:00 2001
+From 26423a861528dd878910c58af5c13b1d3edb29b1 Mon Sep 17 00:00:00 2001
 From: Brian Gianforcaro <b.gianfo@gmail.com>
 Date: Mon, 27 Dec 2021 20:58:41 -0800
-Subject: [PATCH 03/12] serenity: Fix duplicate definition of ALWAYS_INLINE on
+Subject: [PATCH 03/14] serenity: Fix duplicate definition of ALWAYS_INLINE on
  serenity
 
 ---
@@ -9,10 +9,10 @@ Subject: [PATCH 03/12] serenity: Fix duplicate definition of ALWAYS_INLINE on
  1 file changed, 5 insertions(+)
 
 diff --git a/stress-ng.h b/stress-ng.h
-index 41fb906..837790b 100644
+index 84d3bfa..5af02e1 100644
 --- a/stress-ng.h
 +++ b/stress-ng.h
-@@ -1234,6 +1234,11 @@ typedef struct {
+@@ -560,6 +560,11 @@ typedef struct {
  #define WEAK
  #endif
  
@@ -25,5 +25,5 @@ index 41fb906..837790b 100644
  #if (defined(__GNUC__) && NEED_GNUC(3, 4, 0) 					\
       && ((!defined(__s390__) && !defined(__s390x__)) || NEED_GNUC(6, 0, 1))) ||	\
 -- 
-2.34.1
+2.32.0
 
diff --git a/Ports/stress-ng/patches/0004-serenity-ifdef-out-key_t-type-usage-which-serenity-d.patch b/Ports/stress-ng/patches/0004-serenity-ifdef-out-key_t-type-usage-which-serenity-d.patch
index 559b1b4e0b..854265a8ee 100644
--- a/Ports/stress-ng/patches/0004-serenity-ifdef-out-key_t-type-usage-which-serenity-d.patch
+++ b/Ports/stress-ng/patches/0004-serenity-ifdef-out-key_t-type-usage-which-serenity-d.patch
@@ -1,7 +1,7 @@
-From 871d6d7e7bc3d7f85bdff69cb4b6122e78a82063 Mon Sep 17 00:00:00 2001
+From a6387e37e265be01a76d64d2730bcf390a886104 Mon Sep 17 00:00:00 2001
 From: Brian Gianforcaro <b.gianfo@gmail.com>
 Date: Mon, 27 Dec 2021 20:59:35 -0800
-Subject: [PATCH 04/12] serenity: ifdef out key_t type usage, which serenity
+Subject: [PATCH 04/14] serenity: ifdef out key_t type usage, which serenity
  does not have
 
 ---
@@ -9,10 +9,10 @@ Subject: [PATCH 04/12] serenity: ifdef out key_t type usage, which serenity
  1 file changed, 3 insertions(+)
 
 diff --git a/stress-ng.h b/stress-ng.h
-index 837790b..2388815 100644
+index 5af02e1..dac6113 100644
 --- a/stress-ng.h
 +++ b/stress-ng.h
-@@ -2501,11 +2501,14 @@ typedef struct {
+@@ -990,11 +990,14 @@ typedef struct {
  		uint32_t futex[STRESS_PROCS_MAX];	/* Shared futexes */
  		uint64_t timeout[STRESS_PROCS_MAX];	/* Shared futex timeouts */
  	} futex;
@@ -28,5 +28,5 @@ index 837790b..2388815 100644
  	struct {
  		bool no_perf;				/* true = Perf not available */
 -- 
-2.34.1
+2.32.0
 
diff --git a/Ports/stress-ng/patches/0005-serenity-Mark-hsearch-stressor-as-not-implemented-on.patch b/Ports/stress-ng/patches/0005-serenity-Mark-hsearch-stressor-as-not-implemented-on.patch
index 78f0864511..bbbb4c6a00 100644
--- a/Ports/stress-ng/patches/0005-serenity-Mark-hsearch-stressor-as-not-implemented-on.patch
+++ b/Ports/stress-ng/patches/0005-serenity-Mark-hsearch-stressor-as-not-implemented-on.patch
@@ -1,27 +1,28 @@
-From 6e46eec4b5490c810bf12e89aabc49c23ddd272e Mon Sep 17 00:00:00 2001
+From a2e86111bb205405fdd3066864aaf1000704fe26 Mon Sep 17 00:00:00 2001
 From: Brian Gianforcaro <b.gianfo@gmail.com>
 Date: Mon, 27 Dec 2021 21:01:59 -0800
-Subject: [PATCH 05/12] serenity: Mark hsearch stressor as not implemented on
+Subject: [PATCH 05/14] serenity: Mark hsearch stressor as not implemented on
  Serenity
 
 ---
- stress-hsearch.c | 8 ++++++++
- 1 file changed, 8 insertions(+)
+ stress-hsearch.c | 9 +++++++++
+ 1 file changed, 9 insertions(+)
 
 diff --git a/stress-hsearch.c b/stress-hsearch.c
-index 61c71a6..345a2ca 100644
+index 90bf3f6..9d97418 100644
 --- a/stress-hsearch.c
 +++ b/stress-hsearch.c
-@@ -31,6 +31,7 @@ static const stress_help_t help[] = {
+@@ -30,6 +30,8 @@ static const stress_help_t help[] = {
  	{ NULL,	NULL,		  NULL }
  };
  
-+#ifndef __serenity__
++#if !defined(__serenity__)
++
  /*
   *  stress_set_hsearch_size()
   *      set hsearch size from given option string
-@@ -158,3 +159,10 @@ stressor_info_t stress_hsearch_info = {
- 	.opt_set_funcs = opt_set_funcs,
+@@ -158,3 +160,10 @@ stressor_info_t stress_hsearch_info = {
+ 	.verify = VERIFY_OPTIONAL,
  	.help = help
  };
 +#else
@@ -32,5 +33,5 @@ index 61c71a6..345a2ca 100644
 +};
 +#endif
 -- 
-2.34.1
+2.32.0
 
diff --git a/Ports/stress-ng/patches/0006-serenity-Disable-signal-code-validation-for-Serenity.patch b/Ports/stress-ng/patches/0006-serenity-Disable-signal-code-validation-for-Serenity.patch
index 1dbb949711..3f313032d5 100644
--- a/Ports/stress-ng/patches/0006-serenity-Disable-signal-code-validation-for-Serenity.patch
+++ b/Ports/stress-ng/patches/0006-serenity-Disable-signal-code-validation-for-Serenity.patch
@@ -1,7 +1,7 @@
-From e8fd707250d04c8d782175bec85fc82c2fe9ac67 Mon Sep 17 00:00:00 2001
+From 955e2e55837b71175a229b0871c57f6b5017f82a Mon Sep 17 00:00:00 2001
 From: Brian Gianforcaro <b.gianfo@gmail.com>
 Date: Mon, 27 Dec 2021 23:30:03 -0800
-Subject: [PATCH 06/12] serenity: Disable signal code validation for Serenity
+Subject: [PATCH 06/14] serenity: Disable signal code validation for Serenity
 
 We don't currently have a definition for SEGV_ACCERR, so
 this validation is meaningless for SerenityOS.
@@ -10,10 +10,10 @@ this validation is meaningless for SerenityOS.
  1 file changed, 3 insertions(+)
 
 diff --git a/stress-sigsegv.c b/stress-sigsegv.c
-index 18b1ca6..e6bdf17 100644
+index 9930c0e..d6ce99a 100644
 --- a/stress-sigsegv.c
 +++ b/stress-sigsegv.c
-@@ -196,10 +196,13 @@ static int stress_sigsegv(const stress_args_t *args)
+@@ -250,10 +250,13 @@ static int stress_sigsegv(const stress_args_t *args)
  				pr_fail("%s: expecting SIGSEGV/SIGILL/SIGBUS, got %s instead\n",
  					args->name, strsignal(signo));
  			}
@@ -28,5 +28,5 @@ index 18b1ca6..e6bdf17 100644
  			inc_counter(args);
  		} else {
 -- 
-2.34.1
+2.32.0
 
diff --git a/Ports/stress-ng/patches/0007-serenity-Disable-rand48-cpu-stressor-it-s-not-implem.patch b/Ports/stress-ng/patches/0007-serenity-Disable-rand48-cpu-stressor-it-s-not-implem.patch
index 031a4e9e95..58b3847f70 100644
--- a/Ports/stress-ng/patches/0007-serenity-Disable-rand48-cpu-stressor-it-s-not-implem.patch
+++ b/Ports/stress-ng/patches/0007-serenity-Disable-rand48-cpu-stressor-it-s-not-implem.patch
@@ -1,26 +1,26 @@
-From c6fd5831cbd21c3c6d3689bea6c790a221b6c96d Mon Sep 17 00:00:00 2001
+From 0b17904ec60c45d00a6fca397e86b27b966403b8 Mon Sep 17 00:00:00 2001
 From: Brian Gianforcaro <b.gianfo@gmail.com>
 Date: Mon, 27 Dec 2021 23:46:44 -0800
-Subject: [PATCH 07/12] serenity: Disable rand48 cpu stressor, it's not
+Subject: [PATCH 07/14] serenity: Disable rand48 cpu stressor, it's not
  implemented for Serenity
 
 ---
- stress-cpu.c | 5 +++++
- 1 file changed, 5 insertions(+)
+ stress-cpu.c | 4 ++++
+ 1 file changed, 4 insertions(+)
 
 diff --git a/stress-cpu.c b/stress-cpu.c
-index 81dd882..b3a586d 100644
+index 0a08f1d..c1f1fc5 100644
 --- a/stress-cpu.c
 +++ b/stress-cpu.c
-@@ -611,6 +611,7 @@ static void HOT OPTIMIZE3 stress_cpu_rand(const char *name)
- 			"pseudo-random values\n", name);
+@@ -668,6 +668,7 @@ static void HOT OPTIMIZE3 stress_cpu_logmap(const char *name)
+ 	stress_double_put(x);
  }
  
 +#if !defined(__serenity__)
  /*
   *  stress_cpu_rand48()
   *	generate random values using rand48 family of functions
-@@ -631,6 +632,7 @@ static void HOT OPTIMIZE3 stress_cpu_rand48(const char *name)
+@@ -688,6 +689,7 @@ static void HOT OPTIMIZE3 stress_cpu_rand48(const char *name)
  	stress_double_put(d);
  	stress_uint64_put((uint64_t)l);
  }
@@ -28,17 +28,16 @@ index 81dd882..b3a586d 100644
  
  /*
   *  stress_cpu_lfsr32()
-@@ -3190,7 +3192,10 @@ static const stress_cpu_method_info_t cpu_methods[] = {
+@@ -3116,7 +3118,9 @@ static const stress_cpu_method_info_t cpu_methods[] = {
  	{ "psi",		stress_cpu_psi },
  	{ "queens",		stress_cpu_queens },
  	{ "rand",		stress_cpu_rand },
-+
 +#if !defined(__serenity__)
  	{ "rand48",		stress_cpu_rand48 },
 +#endif
  	{ "rgb",		stress_cpu_rgb },
- 	{ "sdbm",		stress_cpu_sdbm },
  	{ "sieve",		stress_cpu_sieve },
+ 	{ "stats",		stress_cpu_stats },
 -- 
-2.34.1
+2.32.0
 
diff --git a/Ports/stress-ng/patches/0008-serenity-Make-lsearch-stressor-a-nop-on-Serenity.patch b/Ports/stress-ng/patches/0008-serenity-Make-lsearch-stressor-a-nop-on-Serenity.patch
index d4b8a71e19..024a67bfb9 100644
--- a/Ports/stress-ng/patches/0008-serenity-Make-lsearch-stressor-a-nop-on-Serenity.patch
+++ b/Ports/stress-ng/patches/0008-serenity-Make-lsearch-stressor-a-nop-on-Serenity.patch
@@ -1,17 +1,17 @@
-From 72e43b83f27b9ea385a28c4f1e3f65ec3e442706 Mon Sep 17 00:00:00 2001
+From 317481d355bb08bcda3f91b141dba18a2acb8b57 Mon Sep 17 00:00:00 2001
 From: Brian Gianforcaro <b.gianfo@gmail.com>
 Date: Mon, 27 Dec 2021 23:47:22 -0800
-Subject: [PATCH 08/12] serenity: Make lsearch stressor a nop on Serenity
+Subject: [PATCH 08/14] serenity: Make lsearch stressor a nop on Serenity
 
 ---
  stress-lsearch.c | 9 +++++++++
  1 file changed, 9 insertions(+)
 
 diff --git a/stress-lsearch.c b/stress-lsearch.c
-index 60174a2..74a9ef9 100644
+index c712112..1072b86 100644
 --- a/stress-lsearch.c
 +++ b/stress-lsearch.c
-@@ -31,6 +31,8 @@ static const stress_help_t help[] = {
+@@ -30,6 +30,8 @@ static const stress_help_t help[] = {
  	{ NULL, NULL,		  NULL }
  };
  
@@ -21,7 +21,7 @@ index 60174a2..74a9ef9 100644
   *  stress_set_lsearch_size()
   *      set lsearch size from given option string
 @@ -129,3 +131,10 @@ stressor_info_t stress_lsearch_info = {
- 	.opt_set_funcs = opt_set_funcs,
+ 	.verify = VERIFY_OPTIONAL,
  	.help = help
  };
 +#else
@@ -32,5 +32,5 @@ index 60174a2..74a9ef9 100644
 +};
 +#endif
 -- 
-2.34.1
+2.32.0
 
diff --git a/Ports/stress-ng/patches/0009-serenity-Fake-O_SYNC-for-serenity-so-iomix-stressor-.patch b/Ports/stress-ng/patches/0009-serenity-Fake-O_SYNC-for-serenity-so-iomix-stressor-.patch
index 0722792b9a..e7220a5bf5 100644
--- a/Ports/stress-ng/patches/0009-serenity-Fake-O_SYNC-for-serenity-so-iomix-stressor-.patch
+++ b/Ports/stress-ng/patches/0009-serenity-Fake-O_SYNC-for-serenity-so-iomix-stressor-.patch
@@ -1,31 +1,30 @@
-From 060317ca43157cf27f7444932b032e1380c1c3a3 Mon Sep 17 00:00:00 2001
+From f332ec78663a2642c5ff93003dc806575cccfb54 Mon Sep 17 00:00:00 2001
 From: Brian Gianforcaro <b.gianfo@gmail.com>
 Date: Mon, 27 Dec 2021 23:47:45 -0800
-Subject: [PATCH 09/12] serenity: Fake O_SYNC for serenity so iomix stressor
+Subject: [PATCH 09/14] serenity: Fake O_SYNC for serenity so iomix stressor
  compiles
 
 Serenity doesn't yet support O_SYNC, so just make it compile.
 ---
- stress-iomix.c | 6 ++++++
- 1 file changed, 6 insertions(+)
+ stress-iomix.c | 5 +++++
+ 1 file changed, 5 insertions(+)
 
 diff --git a/stress-iomix.c b/stress-iomix.c
-index edf90f0..54176f8 100644
+index e99d262..8518e39 100644
 --- a/stress-iomix.c
 +++ b/stress-iomix.c
-@@ -25,6 +25,12 @@
-  */
- #include "stress-ng.h"
+@@ -31,6 +31,11 @@
+ #define MAX_IOMIX_BYTES		(MAX_FILE_LIMIT)
+ #define DEFAULT_IOMIX_BYTES	(1 * GB)
  
-+#ifdef __serenity__
++#if defined(__serenity__)
 +    /* Serenity doesn't yet support O_SYNC, so just make it compile */
 +    #define  O_SYNC (0)
 +#endif
 +
-+
  typedef void (*stress_iomix_func)(const stress_args_t *args, const int fd, const off_t iomix_bytes);
  
  static const stress_help_t help[] = {
 -- 
-2.34.1
+2.32.0
 
diff --git a/Ports/stress-ng/patches/0010-serenity-Disable-lrand48-zlib-stress-it-is-not-imple.patch b/Ports/stress-ng/patches/0010-serenity-Disable-lrand48-zlib-stress-it-is-not-imple.patch
index 38b0ab2a38..7ddaab2ac5 100644
--- a/Ports/stress-ng/patches/0010-serenity-Disable-lrand48-zlib-stress-it-is-not-imple.patch
+++ b/Ports/stress-ng/patches/0010-serenity-Disable-lrand48-zlib-stress-it-is-not-imple.patch
@@ -1,7 +1,7 @@
-From e19e4ca90d68afd1a246a173d3a573342305df5c Mon Sep 17 00:00:00 2001
+From 684f3f13ebc61278fd12de7261a759bf8af450a6 Mon Sep 17 00:00:00 2001
 From: Brian Gianforcaro <b.gianfo@gmail.com>
 Date: Mon, 27 Dec 2021 23:48:49 -0800
-Subject: [PATCH 10/12] serenity: Disable lrand48 zlib stress, it is not
+Subject: [PATCH 10/14] serenity: Disable lrand48 zlib stress, it is not
  implemented for Serenity
 
 ---
@@ -9,10 +9,10 @@ Subject: [PATCH 10/12] serenity: Disable lrand48 zlib stress, it is not
  1 file changed, 6 insertions(+)
 
 diff --git a/stress-zlib.c b/stress-zlib.c
-index dbe5758..95c65f5 100644
+index 68330bb..90b0c65 100644
 --- a/stress-zlib.c
 +++ b/stress-zlib.c
-@@ -696,6 +696,7 @@ static void stress_rand_data_lfsr32(
+@@ -691,6 +691,7 @@ static void stress_rand_data_lfsr32(
  	}
  }
  
@@ -20,7 +20,7 @@ index dbe5758..95c65f5 100644
  /*
   *  stress_rand_data_lrand48()
   *	fills buffer with random data from lrand48
-@@ -719,6 +720,7 @@ static void stress_rand_data_lrand48(
+@@ -714,6 +715,7 @@ static void stress_rand_data_lrand48(
  	while (ptr < end)
  		*(ptr++) = lrand48();
  }
@@ -28,7 +28,7 @@ index dbe5758..95c65f5 100644
  
  /*
   *  stress_rand_data_latin()
-@@ -883,7 +885,9 @@ static const stress_zlib_rand_data_func rand_data_funcs[] = {
+@@ -878,7 +880,9 @@ static const stress_zlib_rand_data_func rand_data_funcs[] = {
  	stress_rand_data_fixed,
  	stress_rand_data_gray,
  	stress_rand_data_latin,
@@ -38,7 +38,7 @@ index dbe5758..95c65f5 100644
  	stress_rand_data_nybble,
  	stress_rand_data_objcode,
  	stress_rand_data_parity,
-@@ -926,7 +930,9 @@ static const stress_zlib_rand_data_info_t zlib_rand_data_methods[] = {
+@@ -921,7 +925,9 @@ static const stress_zlib_rand_data_info_t zlib_rand_data_methods[] = {
  	{ "latin",	stress_rand_data_latin },
  	{ "logmap",	stress_rand_data_logmap },
  	{ "lfsr32",	stress_rand_data_lfsr32 },
@@ -49,5 +49,5 @@ index dbe5758..95c65f5 100644
  	{ "nybble",	stress_rand_data_nybble },
  	{ "objcode",	stress_rand_data_objcode },
 -- 
-2.34.1
+2.32.0
 
diff --git a/Ports/stress-ng/patches/0011-serenity-Add-bogus-O_NDELAY-just-to-allow-the-port-t.patch b/Ports/stress-ng/patches/0011-serenity-Add-bogus-O_NDELAY-just-to-allow-the-port-t.patch
new file mode 100644
index 0000000000..96e07a1ad1
--- /dev/null
+++ b/Ports/stress-ng/patches/0011-serenity-Add-bogus-O_NDELAY-just-to-allow-the-port-t.patch
@@ -0,0 +1,29 @@
+From 8b2129617d17617124a0cdffd2e4819086ba3473 Mon Sep 17 00:00:00 2001
+From: Brian Gianforcaro <b.gianfo@gmail.com>
+Date: Fri, 18 Mar 2022 02:35:30 -0700
+Subject: [PATCH 11/14] serenity: Add bogus O_NDELAY just to allow the port to
+ compile
+
+---
+ stress-dev.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/stress-dev.c b/stress-dev.c
+index 7772097..aa98b0a 100644
+--- a/stress-dev.c
++++ b/stress-dev.c
+@@ -117,6 +117,11 @@
+ #include <termio.h>
+ #endif
+ 
++#if defined(__serenity__)
++    /* Serenity doesn't yet support O_NDELAY, so just make it compile */
++    #define  O_NDELAY (0)
++#endif
++
+ /*
+  *  Device information is held in a linked list of dev_info_t objects. Each
+  *  nth element in the list also points to a unique device state which is
+-- 
+2.32.0
+
diff --git a/Ports/stress-ng/patches/0011-serenity-Fix-stress_get_prime64-variable-type-uint-u.patch b/Ports/stress-ng/patches/0011-serenity-Fix-stress_get_prime64-variable-type-uint-u.patch
deleted file mode 100644
index deaffc5537..0000000000
--- a/Ports/stress-ng/patches/0011-serenity-Fix-stress_get_prime64-variable-type-uint-u.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 556c1fcea9278f0147902334b16ec82f91ee3a2e Mon Sep 17 00:00:00 2001
-From: Brian Gianforcaro <b.gianfo@gmail.com>
-Date: Mon, 27 Dec 2021 23:49:39 -0800
-Subject: [PATCH 11/12] serenity: Fix stress_get_prime64 variable type, uint ->
- uint64_t
-
-Serenity doesn't have a definition for unit.
----
- core-helper.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/core-helper.c b/core-helper.c
-index 8215c56..bb2b018 100644
---- a/core-helper.c
-+++ b/core-helper.c
-@@ -1334,7 +1334,7 @@ bool stress_is_prime64(const uint64_t n)
-  */
- uint64_t stress_get_prime64(const uint64_t n)
- {
--	static uint p = 1009;
-+	static uint64_t p = 1009;
- 
- 	if (n != p)
- 		return p;
--- 
-2.34.1
-
diff --git a/Ports/stress-ng/patches/0012-serenity-Disable-nice-stress-workload-as-we-do-not-i.patch b/Ports/stress-ng/patches/0012-serenity-Disable-nice-stress-workload-as-we-do-not-i.patch
new file mode 100644
index 0000000000..cb80631654
--- /dev/null
+++ b/Ports/stress-ng/patches/0012-serenity-Disable-nice-stress-workload-as-we-do-not-i.patch
@@ -0,0 +1,44 @@
+From b874c0fbbb785423ed93ada0e1f7e5e1fe246ce8 Mon Sep 17 00:00:00 2001
+From: Brian Gianforcaro <b.gianfo@gmail.com>
+Date: Fri, 18 Mar 2022 02:36:17 -0700
+Subject: [PATCH 12/14] serenity: Disable nice() stress workload as we do not
+ implement it
+
+---
+ stress-syncload.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/stress-syncload.c b/stress-syncload.c
+index ca89124..7dd9e52 100644
+--- a/stress-syncload.c
++++ b/stress-syncload.c
+@@ -130,6 +130,7 @@ static void stress_syncload_loop(void)
+ 	}
+ }
+ 
++#if !defined(__serenity__)
+ static void stress_syncload_nice(void)
+ {
+ 	int niceness;
+@@ -137,6 +138,7 @@ static void stress_syncload_nice(void)
+ 	niceness = nice(0);
+ 	(void)niceness;
+ }
++#endif
+ 
+ static void stress_syncload_spinwrite(void)
+ {
+@@ -196,7 +198,10 @@ static const stress_syncload_op_t stress_syncload_ops[] = {
+ #if defined(HAVE_VECMATH)
+ 	stress_syncload_vecmath,
+ #endif
++
++#if !defined(__serenity__)
+ 	stress_syncload_nice,
++#endif
+ 	stress_syncload_spinwrite,
+ };
+ 
+-- 
+2.32.0
+
diff --git a/Ports/stress-ng/patches/0013-serenity-Disable-prctl-stressor-on-serenity.patch b/Ports/stress-ng/patches/0013-serenity-Disable-prctl-stressor-on-serenity.patch
new file mode 100644
index 0000000000..715f51a2f5
--- /dev/null
+++ b/Ports/stress-ng/patches/0013-serenity-Disable-prctl-stressor-on-serenity.patch
@@ -0,0 +1,26 @@
+From 94ad2d17986ad9c73efdc9f42a773a217af8ad38 Mon Sep 17 00:00:00 2001
+From: Brian Gianforcaro <b.gianfo@gmail.com>
+Date: Fri, 18 Mar 2022 02:36:55 -0700
+Subject: [PATCH 13/14] serenity: Disable prctl stressor on serenity
+
+---
+ stress-usersyscall.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/stress-usersyscall.c b/stress-usersyscall.c
+index 26732db..a4eb903 100644
+--- a/stress-usersyscall.c
++++ b/stress-usersyscall.c
+@@ -26,7 +26,8 @@ static const stress_help_t help[] = {
+ };
+ 
+ #if defined(SA_SIGINFO) &&	\
+-    defined(HAVE_SYS_PRCTL_H)
++    defined(HAVE_SYS_PRCTL_H) && \
++    !defined(__serenity__)
+ 
+ #include <sys/prctl.h>
+ 
+-- 
+2.32.0
+
diff --git a/Ports/stress-ng/patches/0012-Makefile-Install-to-usr-local.patch b/Ports/stress-ng/patches/0014-Makefile-Install-to-usr-local.patch
index 0476175f70..02d4fb024c 100644
--- a/Ports/stress-ng/patches/0012-Makefile-Install-to-usr-local.patch
+++ b/Ports/stress-ng/patches/0014-Makefile-Install-to-usr-local.patch
@@ -1,17 +1,17 @@
-From 598edcb699a2b45dbd8f413e580145b39e1baa69 Mon Sep 17 00:00:00 2001
+From 13d34247badfb4adcbf725c04dd6ee2af30e6995 Mon Sep 17 00:00:00 2001
 From: Ali Mohammad Pur <ali.mpfard@gmail.com>
 Date: Thu, 13 Jan 2022 16:13:02 +0330
-Subject: [PATCH 12/12] Makefile: Install to /usr/local
+Subject: [PATCH 14/14] Makefile: Install to /usr/local
 
 ---
  Makefile | 8 ++++----
  1 file changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/Makefile b/Makefile
-index 47534a3..6a768d1 100644
+index f8f71c5..1d90cd0 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -66,10 +66,10 @@ LDFLAGS += -static -z muldefs
+@@ -74,10 +74,10 @@ LDFLAGS += -static -z muldefs
  CFLAGS += -DBUILD_STATIC
  endif
  
@@ -27,5 +27,5 @@ index 47534a3..6a768d1 100644
  #
  #  Stressors
 -- 
-2.34.1
+2.32.0
 
diff --git a/Ports/stress-ng/patches/ReadMe.md b/Ports/stress-ng/patches/ReadMe.md
index 617afc11fb..89cbe05edb 100644
--- a/Ports/stress-ng/patches/ReadMe.md
+++ b/Ports/stress-ng/patches/ReadMe.md
@@ -57,13 +57,22 @@ Serenity doesn't yet support O_SYNC, so just make it compile.
 serenity: Disable lrand48 zlib stress, it is not implemented for Serenity
 
 
-## `0011-serenity-Fix-stress_get_prime64-variable-type-uint-u.patch`
+## `0011-serenity-Add-bogus-O_NDELAY-just-to-allow-the-port-t.patch`
 
-serenity: Fix stress_get_prime64 variable type, uint -> uint64_t
+serenity: Add bogus O_NDELAY just to allow the port to compile
 
-Serenity doesn't have a definition for unit.
 
-## `0012-Makefile-Install-to-usr-local.patch`
+## `0012-serenity-Disable-nice-stress-workload-as-we-do-not-i.patch`
+
+serenity: Disable nice() stress workload as we do not implement it
+
+
+## `0013-serenity-Disable-prctl-stressor-on-serenity.patch`
+
+serenity: Disable prctl stressor on serenity
+
+
+## `0014-Makefile-Install-to-usr-local.patch`
 
 Makefile: Install to /usr/local