[PATCH 3/8] pkgs/skaware: vendor backported patches

[colbyt <colby@colbyt.com>]

Two skaware backports were fetched from cgit patch endpoints.  Those
endpoints are not stable enough for package inputs: the same URL can
return an unrelated patch, breaking the build before the VM can start.

Keep the small upstream diffs in-tree instead.  The package still
applies the same s6 and mdevd fixes, and the comments next to each patch
record the upstream commit IDs.

Signed-off-by: colbyt <colby@colbyt.com>
---
 ...d-don-t-chmod-device-nodes-for-lines.patch | 10 ++++++++
 ...limit-add-p-option-for-rlimit-rtprio.patch | 25 +++++++++++++++++++
 pkgs/skaware-packages/default.nix             | 12 +++------
 3 files changed, 39 insertions(+), 8 deletions(-)
 create mode 100644 pkgs/skaware-packages/0001-mdevd-don-t-chmod-device-nodes-for-lines.patch
 create mode 100644 pkgs/skaware-packages/0001-s6-softlimit-add-p-option-for-rlimit-rtprio.patch

diff --git a/pkgs/skaware-packages/0001-mdevd-don-t-chmod-device-nodes-for-lines.patch b/pkgs/skaware-packages/0001-mdevd-don-t-chmod-device-nodes-for-lines.patch
new file mode 100644
index 0000000..919f412
--- /dev/null
+++ b/pkgs/skaware-packages/0001-mdevd-don-t-chmod-device-nodes-for-lines.patch
@@ -0,0 +1,10 @@
+SPDX-FileCopyrightText: 2025 Alyssa Ross <hi@alyssa.is>
+SPDX-License-Identifier: ISC
+
+diff --git a/src/mdevd/mdevd.c b/src/mdevd/mdevd.c
+index 3040ba6..aecd5a7 100644
+--- a/src/mdevd/mdevd.c
++++ b/src/mdevd/mdevd.c
+@@ -643 +643 @@ static inline int run_scriptelem (struct uevent_s const *event, scriptelem const
+-  if (nodelen && ud->action == ACTION_ADD && ud->mmaj >= 0)
++  if (elem->movetype != MOVEINFO_NOCREATE && nodelen && ud->action == ACTION_ADD && ud->mmaj >= 0)
diff --git a/pkgs/skaware-packages/0001-s6-softlimit-add-p-option-for-rlimit-rtprio.patch b/pkgs/skaware-packages/0001-s6-softlimit-add-p-option-for-rlimit-rtprio.patch
new file mode 100644
index 0000000..b1aa586
--- /dev/null
+++ b/pkgs/skaware-packages/0001-s6-softlimit-add-p-option-for-rlimit-rtprio.patch
@@ -0,0 +1,25 @@
+SPDX-FileCopyrightText: 2025 Alyssa Ross <hi@alyssa.is>
+SPDX-License-Identifier: ISC
+
+diff --git a/doc/s6-softlimit.html b/doc/s6-softlimit.html
+index 05701ce..49a5b40 100644
+--- a/doc/s6-softlimit.html
++++ b/doc/s6-softlimit.html
+@@ -28 +28 @@ s6-softlimit changes its process limits, then executes into another program.
+-     s6-softlimit [ -H | -h ] [ -a <em>allmem</em> ] [ -c <em>core</em> ] [ -d <em>data</em> ] [ -f <em>fsize</em> ] [ -l <em>lock</em> ] [ -m <em>mem</em> ] [ -o <em>ofiles</em> ] [ -p <em>proc</em> ] [ -r <em>res</em> ] [ -s <em>stack</em> ] [ -t <em>cpusecs</em> ] <em>prog...</em>
++     s6-softlimit [ -H | -h ] [ -a <em>allmem</em> ] [ -c <em>core</em> ] [ -d <em>data</em> ] [ -f <em>fsize</em> ] [ -l <em>lock</em> ] [ -m <em>mem</em> ] [ -o <em>ofiles</em> ] [ -P <em>prio</em> ] [ -p <em>proc</em> ] [ -r <em>res</em> ] [ -s <em>stack</em> ] [ -t <em>cpusecs</em> ] <em>prog...</em>
+@@ -60,0 +61 @@ and s6-softlimit will die. There is virtually no reason to ever use this. </li>
++ <li> <tt>-P&nbsp;<em>prio</em></tt>&nbsp;: limit the real-time priority to <em>prio</em>. </li>
+diff --git a/src/daemontools-extras/s6-softlimit.c b/src/daemontools-extras/s6-softlimit.c
+index d6112b2..beb7325 100644
+--- a/src/daemontools-extras/s6-softlimit.c
++++ b/src/daemontools-extras/s6-softlimit.c
+@@ -44 +44 @@ int main (int argc, char const *const *argv)
+-    int opt = subgetopt_r(argc, argv, "hHa:c:d:f:l:m:o:p:r:s:t:", &l) ;
++    int opt = subgetopt_r(argc, argv, "hHa:c:d:f:l:m:o:P:p:r:s:t:", &l) ;
+@@ -105,0 +106,5 @@ int main (int argc, char const *const *argv)
++#endif
++        break ;
++      case 'P' :
++#ifdef RLIMIT_RTPRIO
++        doit(RLIMIT_RTPRIO, l.arg) ;
diff --git a/pkgs/skaware-packages/default.nix b/pkgs/skaware-packages/default.nix
index e248201..1489317 100644
--- a/pkgs/skaware-packages/default.nix
+++ b/pkgs/skaware-packages/default.nix
@@ -6,19 +6,15 @@ import ../../lib/overlay-package.nix [ "skawarePackages" ] ({ final, super }:
 super.skawarePackages.overrideScope (_: prev: {
   s6 = prev.s6.overrideAttrs ({ patches ? [], ... }: {
     patches = patches ++ [
-      (final.fetchpatch {
-        url = "https://git.skarnet.org/cgi-bin/cgit.cgi/s6/patch/?id=c3a8ef7034fb2bc02f35381a8970ac026822a810";
-        hash = "sha256-lgCoPbEYru6/a2bpVpLsZ2Rq2OHhNVs0lDgFO/df1Aw=";
-      })
+      # Upstream c3a8ef70; vendored because cgit patch URLs are unstable.
+      ./0001-s6-softlimit-add-p-option-for-rlimit-rtprio.patch
     ];
   });
 
   mdevd = prev.mdevd.overrideAttrs ({ patches ? [], ... }: {
     patches = patches ++ [
-      (final.fetchpatch {
-        url = "https://git.skarnet.org/cgi-bin/cgit.cgi/mdevd/patch/?id=252f241e425bf09ddfb4a824e40403f40da0da1e";
-        hash = "sha256-0tEC+yJGyPapsxBqzBXPztF3bl7OwjVAGjhNXtwZQ0g=";
-      })
+      # Upstream 252f241e; vendored because cgit patch URLs are unstable.
+      ./0001-mdevd-don-t-chmod-device-nodes-for-lines.patch
     ];
   });
 }))
-- 
2.54.0