From mboxrd@z Thu Jan 1 00:00:00 1970 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on atuin.qyliss.net X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_LOW,RCVD_IN_MSPIKE_H2, SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from atuin.qyliss.net (localhost [IPv6:::1]) by atuin.qyliss.net (Postfix) with ESMTP id C459971C27; Fri, 30 Sep 2022 19:48:58 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 496) id 9D28B71B4A; Fri, 30 Sep 2022 19:48:53 +0000 (UTC) Received: from wout1-smtp.messagingengine.com (wout1-smtp.messagingengine.com [64.147.123.24]) by atuin.qyliss.net (Postfix) with ESMTPS id 930B371B3D for ; Fri, 30 Sep 2022 19:48:50 +0000 (UTC) Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailout.west.internal (Postfix) with ESMTP id 2D09D3200AD2; Fri, 30 Sep 2022 15:48:49 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute2.internal (MEProxy); Fri, 30 Sep 2022 15:48:49 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=puckipedia.com; h=cc:cc:content-transfer-encoding:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to; s=fm3; t=1664567328; x= 1664653728; bh=/xVEoqmsitzuS54tNj3AYVfbhupIURU1cGGoGB6TOtE=; b=f Qq3/DKa0n9jq5tG4g/nHfUzdLgmrWxhLjYAatw+6tmKHs2O0peTjFOKA5cEGv1GH Bk177PvILM3Ct4ULVF4EtBNScOuLB0LmkTqJ0Abd3THFcJRrlUVCAGKwUT3J6MHm H3yeDlF/1xY6sjQS/jsjRHeVnRt5oZnomAM/DvkTbXnQW1bUsHtASFVqM5pxZdqm RMOJvDEWTwoyc81sCEx6JeFVvy03p1FtHDvA4VuGLvGd2kMUiu4BK+EssBgiWwOl DRjLD4IcW7EiA9F/9sGgNHpsDbCq+EQC5qxbYIKE2n+EUwlkOJON/ncBlpMmT/Cr Ol5/F5lTpwCFtC7dnEjsA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding:date:date :feedback-id:feedback-id:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:sender:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm2; t=1664567328; x=1664653728; bh=/xVEoqmsitzuS 54tNj3AYVfbhupIURU1cGGoGB6TOtE=; b=q73l2s7mmUQ1z60CsnPBCXvRMQtVC WHEsOWgp14vmowBoqcX0TxqAZclgRmTuY8jLHx/2obgaFO9C6W9Wj+EeP9r1IT6x rQXLhpFOuQ6kiyJXw9YNKNhgooEeIYaCAWqQcuq9z23S7G89L37IH0iBbYEPeo1w SRIpGfL8PLzASbuV4PgU9H0yC6iHjHm1w5tcDP99dnn9pZPXG3ydjx7aKwvBxAIN R+HZI6buyI7Zzl3n1u6p9CGhZPPJzMf3UNcxSluESM6AqBYGss5BVS/Ci0oOGmO7 d3F3TfOF7cbB+YKHeIr/yyeKTmiKWkUpVlmq3dPd9oTxTAtBuY0WRaV8g== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvfedrfeehvddgudegvdcutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecunecujfgurhephffvvefufffkofgjfhgggfestd ekredtredttdenucfhrhhomheprfhutghkucfovggvrhgsuhhrghcuoehpuhgtkhesphhu tghkihhpvgguihgrrdgtohhmqeenucggtffrrghtthgvrhhnpeeihfejffegvdegkedvhf efueeuvdejjeehhffgteeitdehgfdthffhvdfhueduheenucffohhmrghinhepghhoohhg lhgvshhouhhrtggvrdgtohhmpdhpuhgtkhdrmhhovgenucevlhhushhtvghrufhiiigvpe dtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehpuhgtkhesphhutghkihhpvgguihgrrdgt ohhm X-ME-Proxy: Feedback-ID: ie69944d9:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Fri, 30 Sep 2022 15:48:48 -0400 (EDT) From: Puck Meerburg To: devel@spectrum-os.org Subject: [RFC PATCH nixpkgs 4/4] crosvm: apply security-context patches Date: Fri, 30 Sep 2022 19:46:00 +0000 Message-Id: <20220930194600.1033126-5-puck@puckipedia.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220930194600.1033126-1-puck@puckipedia.com> References: <20220930194600.1033126-1-puck@puckipedia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID-Hash: DMHB2JHKZPKNPCKFSPAV3OVEZOUESJG7 X-Message-ID-Hash: DMHB2JHKZPKNPCKFSPAV3OVEZOUESJG7 X-MailFrom: puck@puckipedia.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-devel.spectrum-os.org-0; header-match-devel.spectrum-os.org-1; header-match-devel.spectrum-os.org-2; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: Puck Meerburg X-Mailman-Version: 3.3.5 Precedence: list List-Id: Patches and low-level development discussion Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: These patches are available as a separate repo, as buildRustPackage does not like patching entirely new modules into the source tree. Signed-off-by: Puck Meerburg --- pkgs/applications/virtualization/crosvm/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/virtualization/crosvm/default.nix b/pkgs/applications/virtualization/crosvm/default.nix index 40e30dcd819..3660413a281 100644 --- a/pkgs/applications/virtualization/crosvm/default.nix +++ b/pkgs/applications/virtualization/crosvm/default.nix @@ -5,12 +5,12 @@ rustPlatform.buildRustPackage rec { pname = "crosvm"; - version = "106.2"; + version = "106.2-security-context"; src = fetchgit { - url = "https://chromium.googlesource.com/chromiumos/platform/crosvm"; - rev = "d58d398581724e81ce57a8dfaeef62c175c06552"; - sha256 = "huZELmB1oH5RyasmpEXIcJ/mB4fi6fMofj1N01COeI8="; + url = "https://puck.moe/git/crosvm"; + rev = "eb1a080dd8432ea7ad400816388d67a5d64081e4"; + sha256 = "sha256-iExgWO1/PBCWvzV+5Z6UrKxOsHaFED9GcGQGc4rVJw0="; fetchSubmodules = true; }; @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { ./devices-vhost_user-loosen-expected-message-order.patch ]; - cargoSha256 = "18mj0zc6yfwyrw6v1vl089dhh04kv2pzb99bygnn8nymdlx4fjqa"; + cargoSha256 = "1fasy7l8ia53739wzz4cgbphn7h4gv1rfz0syqbl4kfl6hy0p1vb"; nativeBuildInputs = [ minijail-tools pkg-config protobuf wayland-scanner ]; -- 2.35.1