From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from atuin.qyliss.net (localhost [IPv6:::1]) by atuin.qyliss.net (Postfix) with ESMTP id 2C371AEA9; Fri, 26 Jun 2026 18:55:29 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 993) id 12C7FAE1A; Fri, 26 Jun 2026 18:55:25 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on atuin.qyliss.net X-Spam-Level: X-Spam-Status: No, score=-0.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DMARC_PASS,RCVD_IN_DNSWL_LOW,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=4.0.1 Received: from mail-106111.protonmail.ch (mail-106111.protonmail.ch [79.135.106.111]) by atuin.qyliss.net (Postfix) with ESMTPS id 91D75AD7C for ; Fri, 26 Jun 2026 18:55:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=colbyt.com; s=protonmail; t=1782500122; x=1782759322; bh=1Z7lOf9RjAtcqKoMvJO8qduoa9ilomCDM4LOMASxXWE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References:From:To: Cc:Date:Subject:Reply-To:Feedback-ID:Message-ID:BIMI-Selector; b=N839C68Ija4wj+jZC5Tr8cBvNv7lszJBX4CTdnKbCNhQhNFWKlSjRNyE2fYytKgbn 9ZrsYFDF6vxsmu6LgIJSr/cbg4GhxpS6jKhkCxyB2jGFN23vID7XtYl2wSB0Bp2D5F r69zYvX9vNVxAk0b9SgJ+GITPapTVVNULC03w6L4P9+xSQOFlA/UF0MC4FVVzqssL3 gaZT5hMOiTDVR4qYloHLDLQ3NTl7SddRBepHK63+Zf0ZWGPYORJjdXCpL0Ueqz1KWm 4rQGGBR1Gkm2s9sSrgwdai37xwGOXu/Pz+x4AlI5gQNTFyyd7dhUEioZqtTsoG4lfV FCSTRWcsbgq8w== X-Pm-Submission-Id: 4gn4cS50zKz2Sd39 From: colbyt To: devel@spectrum-os.org Subject: [PATCH 3/8] pkgs/skaware: vendor backported patches Date: Fri, 26 Jun 2026 11:55:03 -0700 Message-ID: <20260626185509.3715326-4-colby@colbyt.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260626185509.3715326-1-colby@colbyt.com> References: <20260626185509.3715326-1-colby@colbyt.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID-Hash: RVMLJG2OGPKNMCQAXH3WTB2SBJG6UFNS X-Message-ID-Hash: RVMLJG2OGPKNMCQAXH3WTB2SBJG6UFNS X-MailFrom: colby@colbyt.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-devel.spectrum-os.org-0; header-match-devel.spectrum-os.org-1; header-match-devel.spectrum-os.org-2; header-match-devel.spectrum-os.org-3; header-match-devel.spectrum-os.org-4; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: colbyt X-Mailman-Version: 3.3.10 Precedence: list List-Id: Patches and low-level development discussion Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: 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 --- ...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 +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 +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 allmem ] [ -c core ] [ -d data ] [ -f fsize ] [ -l lock ] [ -m mem ] [ -o ofiles ] [ -p proc ] [ -r res ] [ -s stack ] [ -t cpusecs ] prog... ++ s6-softlimit [ -H | -h ] [ -a allmem ] [ -c core ] [ -d data ] [ -f fsize ] [ -l lock ] [ -m mem ] [ -o ofiles ] [ -P prio ] [ -p proc ] [ -r res ] [ -s stack ] [ -t cpusecs ] prog... +@@ -60,0 +61 @@ and s6-softlimit will die. There is virtually no reason to ever use this. ++
  • -P prio : limit the real-time priority to prio.
    • +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