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 3E9EB4CAF; Mon, 01 Dec 2025 19:04:06 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 993) id A469D4C9C; Mon, 01 Dec 2025 19:04:04 +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=1.4 required=3.0 tests=BODY_8BITS,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DMARC_PASS,FREEMAIL_FROM,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=4.0.1 Received: from mail-yx1-xb129.google.com (mail-yx1-xb129.google.com [IPv6:2607:f8b0:4864:20::b129]) by atuin.qyliss.net (Postfix) with ESMTPS id C365E4C9A for ; Mon, 01 Dec 2025 19:04:00 +0000 (UTC) Received: by mail-yx1-xb129.google.com with SMTP id 956f58d0204a3-640c9c85255so5776110d50.3 for ; Mon, 01 Dec 2025 11:03:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1764615838; x=1765220638; darn=spectrum-os.org; h=in-reply-to:autocrypt:content-language:references:to:from:subject :user-agent:mime-version:date:message-id:from:to:cc:subject:date :message-id:reply-to; bh=hoeOsW2tsGeyYYzyXRqCwtproIu7Bt7VMjXLn2z0FSQ=; b=mkwwBGa9FqvKvPRa/zEaSXTk2pe+W/dzGFwHkdyY0WJupz6sp6E2BGBe6cw7jWmGbN lrLf5DuY/IgPYvIkEL8tImPBYPHSFSGt0LthmBBtOemIbp8oXUTf9pyDzgIFRDrxGob1 Sd9tr/D07ocnGNjcCaRT5/kdyXany6fswtuecswEFFDx6bVPIhd825uvhxN6fEyiRFzv G7EFF4wxcNpWMtZqsoRSrCk6zAmiSiuY9XYv0ueGP8Dk5JwkHuqzTLMbQgRZLXbJtlpG PDxLiYDI1bBQ03uq5XU4OszWkOuTRs4CzcagvZb5gZtyxVwmga30lOYggk9HHLcZtUNC 0DpQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764615838; x=1765220638; h=in-reply-to:autocrypt:content-language:references:to:from:subject :user-agent:mime-version:date:message-id:x-gm-gg:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=hoeOsW2tsGeyYYzyXRqCwtproIu7Bt7VMjXLn2z0FSQ=; b=vfK2GAqWUwQMVblrPPLojHvqEDLzVFkfRnFcSRTUiy1f8B1OB4KBdQ3TOQdc99oWB6 MlLpX6i/q6rQfFHxJGHeH5TD/I5YYk4mN5BkR7jlqu6QJz6XL6J9jl6C7f8Tkvvj5fHV OZ2QIUv3r1TvhxU9bI7V83ekxDkbNRehR51geb1/AHFGWipZmsv+RjKoXi8ceP4JfNHh 9pYQcHFttQ5leGI3F3Qy1FPeXlvZ4kSsALtp/otVBi4f36u/ZNC+09u+2GCT0GU+Blq2 R0So+9RzTYpCzO9S/7gmjJHhv0mcBXUTFwBMiXq6suSI4r/m5rSFUw2mZwcHQSKXvb0a v6rg== X-Forwarded-Encrypted: i=1; AJvYcCWtO05y7c3dgCLVynewpkBd6vxprpBvqkTJmyfLOalJXAbf1LOe9/YsZyUAyXGpYmOfndVSxw==@spectrum-os.org X-Gm-Message-State: AOJu0Yze/NL8ctR0ob3gaMOuM7nOWHiN/UegpVxJWk8S3Vgq6xIC47FE wguY9T3LXiMRqZHy0f80qR5XtLDGHr9/UKOYZouvPw4m5NZGnZm4pf++ X-Gm-Gg: ASbGnctDzoj6/dKrtWX65VePZei3k5hI8yF7Wx+8PGIk/GE1bCMKFcMzKciqsCKc7Rn w2pdjQPqcYxzqXF8jDPt33It3wIhpTYIKRn8E/p6LivhZYG0MMQDiqWBrea4Dm+F1q178E4bm2S DWioamedQdLJ7FS/72Lh0nup5oFfOx9qitJrS+98CSqgePnpxXIW//xGAt10k9OYOSpFhYQ/+Uf A4G3pgsiEDXlHv3ADpcwWhNQ1Rh019GbI1AMZvXpezWN1n5fERJeqTz96X4/aghnUq2FpRBZ0od K5Jl7/Fq+f9xPvd2Qvfo6X62kvJVihsbeWvo3SgRU+2Bp6j868O4z3yHYafyPSUqJLG/y5YgEVo 8R5nVAFa9V0R6Rrg7CMCW8xDrrkLbNuqnw/RdewO0hkaf/BzsVCaq/U9SKH5LbWCpviOObEexDf nn+jaGAbeZuG3nXMuzJnccdOOPrj6UjhLhQ/h37w5Y0Sg+K6uECBIccoBf9CM1TRxcBiLWrVQoH MWw/d5mI5SJTQobK+UtqyReBRY= X-Google-Smtp-Source: AGHT+IHEcVcn5s/cwFNuDt8VB9IszAuplHzOR0FOjxWJaNZt7KhVkPeD2/bDvWyPRaYxfGKUMMeMNw== X-Received: by 2002:a05:690e:14cf:b0:640:d31d:6edb with SMTP id 956f58d0204a3-643293b921bmr18702216d50.53.1764615837477; Mon, 01 Dec 2025 11:03:57 -0800 (PST) Received: from [10.138.34.110] (h96-60-249-169.cncrtn.broadband.dynamic.tds.net. [96.60.249.169]) by smtp.gmail.com with ESMTPSA id 00721157ae682-78ad101115asm52654187b3.29.2025.12.01.11.03.56 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 01 Dec 2025 11:03:56 -0800 (PST) Message-ID: Date: Mon, 1 Dec 2025 14:03:53 -0500 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v5 4/6] tools/mount-flatpak: init From: Demi Marie Obenour To: Alyssa Ross , devel@spectrum-os.org References: <20251201170458.4186683-1-hi@alyssa.is> <20251201170458.4186683-7-hi@alyssa.is> <4e9be3c2-726d-444b-8c57-9aadeccd93b3@gmail.com> Content-Language: en-US Autocrypt: addr=demiobenour@gmail.com; keydata= xsFNBFp+A0oBEADffj6anl9/BHhUSxGTICeVl2tob7hPDdhHNgPR4C8xlYt5q49yB+l2nipd aq+4Gk6FZfqC825TKl7eRpUjMriwle4r3R0ydSIGcy4M6eb0IcxmuPYfbWpr/si88QKgyGSV Z7GeNW1UnzTdhYHuFlk8dBSmB1fzhEYEk0RcJqg4AKoq6/3/UorR+FaSuVwT7rqzGrTlscnT DlPWgRzrQ3jssesI7sZLm82E3pJSgaUoCdCOlL7MMPCJwI8JpPlBedRpe9tfVyfu3euTPLPx wcV3L/cfWPGSL4PofBtB8NUU6QwYiQ9Hzx4xOyn67zW73/G0Q2vPPRst8LBDqlxLjbtx/WLR 6h3nBc3eyuZ+q62HS1pJ5EvUT1vjyJ1ySrqtUXWQ4XlZyoEFUfpJxJoN0A9HCxmHGVckzTRl 5FMWo8TCniHynNXsBtDQbabt7aNEOaAJdE7to0AH3T/Bvwzcp0ZJtBk0EM6YeMLtotUut7h2 Bkg1b//r6bTBswMBXVJ5H44Qf0+eKeUg7whSC9qpYOzzrm7+0r9F5u3qF8ZTx55TJc2g656C 9a1P1MYVysLvkLvS4H+crmxA/i08Tc1h+x9RRvqba4lSzZ6/Tmt60DPM5Sc4R0nSm9BBff0N m0bSNRS8InXdO1Aq3362QKX2NOwcL5YaStwODNyZUqF7izjK4QARAQABzTxEZW1pIE1hcmll IE9iZW5vdXIgKGxvdmVyIG9mIGNvZGluZykgPGRlbWlvYmVub3VyQGdtYWlsLmNvbT7CwXgE EwECACIFAlp+A0oCGwMGCwkIBwMCBhUIAgkKCwQWAgMBAh4BAheAAAoJELKItV//nCLBhr8Q AK/xrb4wyi71xII2hkFBpT59ObLN+32FQT7R3lbZRjVFjc6yMUjOb1H/hJVxx+yo5gsSj5LS 9AwggioUSrcUKldfA/PKKai2mzTlUDxTcF3vKx6iMXKA6AqwAw4B57ZEJoMM6egm57TV19kz PMc879NV2nc6+elaKl+/kbVeD3qvBuEwsTe2Do3HAAdrfUG/j9erwIk6gha/Hp9yZlCnPTX+ VK+xifQqt8RtMqS5R/S8z0msJMI/ajNU03kFjOpqrYziv6OZLJ5cuKb3bZU5aoaRQRDzkFIR 6aqtFLTohTo20QywXwRa39uFaOT/0YMpNyel0kdOszFOykTEGI2u+kja35g9TkH90kkBTG+a EWttIht0Hy6YFmwjcAxisSakBuHnHuMSOiyRQLu43ej2+mDWgItLZ48Mu0C3IG1seeQDjEYP tqvyZ6bGkf2Vj+L6wLoLLIhRZxQOedqArIk/Sb2SzQYuxN44IDRt+3ZcDqsPppoKcxSyd1Ny 2tpvjYJXlfKmOYLhTWs8nwlAlSHX/c/jz/ywwf7eSvGknToo1Y0VpRtoxMaKW1nvH0OeCSVJ itfRP7YbiRVc2aNqWPCSgtqHAuVraBRbAFLKh9d2rKFB3BmynTUpc1BQLJP8+D5oNyb8Ts4x Xd3iV/uD8JLGJfYZIR7oGWFLP4uZ3tkneDfYzsFNBFp+A0oBEAC9ynZI9LU+uJkMeEJeJyQ/ 8VFkCJQPQZEsIGzOTlPnwvVna0AS86n2Z+rK7R/usYs5iJCZ55/JISWd8xD57ue0eB47bcJv VqGlObI2DEG8TwaW0O0duRhDgzMEL4t1KdRAepIESBEA/iPpI4gfUbVEIEQuqdqQyO4GAe+M kD0Hy5JH/0qgFmbaSegNTdQg5iqYjRZ3ttiswalql1/iSyv1WYeC1OAs+2BLOAT2NEggSiVO txEfgewsQtCWi8H1SoirakIfo45Hz0tk/Ad9ZWh2PvOGt97Ka85o4TLJxgJJqGEnqcFUZnJJ riwoaRIS8N2C8/nEM53jb1sH0gYddMU3QxY7dYNLIUrRKQeNkF30dK7V6JRH7pleRlf+wQcN fRAIUrNlatj9TxwivQrKnC9aIFFHEy/0mAgtrQShcMRmMgVlRoOA5B8RTulRLCmkafvwuhs6 dCxN0GNAORIVVFxjx9Vn7OqYPgwiofZ6SbEl0hgPyWBQvE85klFLZLoj7p+joDY1XNQztmfA rnJ9x+YV4igjWImINAZSlmEcYtd+xy3Li/8oeYDAqrsnrOjb+WvGhCykJk4urBog2LNtcyCj kTs7F+WeXGUo0NDhbd3Z6AyFfqeF7uJ3D5hlpX2nI9no/ugPrrTVoVZAgrrnNz0iZG2DVx46 x913pVKHl5mlYQARAQABwsFfBBgBAgAJBQJafgNKAhsMAAoJELKItV//nCLBwNIP/AiIHE8b oIqReFQyaMzxq6lE4YZCZNj65B/nkDOvodSiwfwjjVVE2V3iEzxMHbgyTCGA67+Bo/d5aQGj gn0TPtsGzelyQHipaUzEyrsceUGWYoKXYyVWKEfyh0cDfnd9diAm3VeNqchtcMpoehETH8fr RHnJdBcjf112PzQSdKC6kqU0Q196c4Vp5HDOQfNiDnTf7gZSj0BraHOByy9LEDCLhQiCmr+2 E0rW4tBtDAn2HkT9uf32ZGqJCn1O+2uVfFhGu6vPE5qkqrbSE8TG+03H8ecU2q50zgHWPdHM OBvy3EhzfAh2VmOSTcRK+tSUe/u3wdLRDPwv/DTzGI36Kgky9MsDC5gpIwNbOJP2G/q1wT1o Gkw4IXfWv2ufWiXqJ+k7HEi2N1sree7Dy9KBCqb+ca1vFhYPDJfhP75I/VnzHVssZ/rYZ9+5 1yDoUABoNdJNSGUYl+Yh9Pw9pE3Kt4EFzUlFZWbE4xKL/NPno+z4J9aWemLLszcYz/u3XnbO vUSQHSrmfOzX3cV4yfmjM5lewgSstoxGyTx2M8enslgdXhPthZlDnTnOT+C+OTsh8+m5tos8 HQjaPM01MKBiAqdPgksm1wu2DrrwUi6ChRVTUBcj6+/9IJ81H2P2gJk3Ls3AVIxIffLoY34E +MYSfkEjBz0E8CLOcAw7JIwAaeBT In-Reply-To: <4e9be3c2-726d-444b-8c57-9aadeccd93b3@gmail.com> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="------------8elteL4hvTi0D0NqVZfv9rUN" Message-ID-Hash: G7TKMDS42DII4PIIBU3LN2AZI7POQWEG X-Message-ID-Hash: G7TKMDS42DII4PIIBU3LN2AZI7POQWEG X-MailFrom: demiobenour@gmail.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; 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; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.9 Precedence: list List-Id: Patches and low-level development discussion Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --------------8elteL4hvTi0D0NqVZfv9rUN Content-Type: multipart/mixed; boundary="------------UdZiIKSU0IUfxMXqlKlITlY8"; protected-headers="v1" From: Demi Marie Obenour To: Alyssa Ross , devel@spectrum-os.org Message-ID: Subject: Re: [PATCH v5 4/6] tools/mount-flatpak: init References: <20251201170458.4186683-1-hi@alyssa.is> <20251201170458.4186683-7-hi@alyssa.is> <4e9be3c2-726d-444b-8c57-9aadeccd93b3@gmail.com> In-Reply-To: <4e9be3c2-726d-444b-8c57-9aadeccd93b3@gmail.com> Autocrypt-Gossip: addr=hi@alyssa.is; keydata= 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 wGxvGU7TX5ou --------------UdZiIKSU0IUfxMXqlKlITlY8 Content-Type: multipart/mixed; boundary="------------2j9xSqUmOdFKopsD60o3sW2P" --------------2j9xSqUmOdFKopsD60o3sW2P Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable On 12/1/25 14:00, Demi Marie Obenour wrote: > On 12/1/25 12:04, Alyssa Ross wrote: >> I tried to build this with Meson, but pathrs depends on thiserror, >> which tries to read OUT_DIR, and support for setting that isn't >> currently in a Meson release, and requires nightly Rust, so build with= >> Cargo for now and we can revisit that later. >> >> Link: https://github.com/mesonbuild/meson/pull/15148 >> Link: https://github.com/rust-lang/rust/issues/118372 >> Signed-off-by: Alyssa Ross >> --- >> v5: =E2=80=A2 Extract mount_commit() function >> =E2=80=A2 Expand safety comment. >> v4: https://spectrum-os.org/lists/archives/spectrum-devel/202512010445= 34.977524-5-hi@alyssa.is/ >> >> LICENSES/MPL-2.0.txt | 373 ++++++++++++++++++++++++= + >> pkgs/default.nix | 1 + >> tools/mount-flatpak/Cargo.lock | 238 ++++++++++++++++ >> tools/mount-flatpak/Cargo.lock.license | 2 + >> tools/mount-flatpak/Cargo.toml | 11 + >> tools/mount-flatpak/config | 7 + >> tools/mount-flatpak/default.nix | 25 ++ >> tools/mount-flatpak/src/keyfile.rs | 189 +++++++++++++ >> tools/mount-flatpak/src/main.rs | 288 +++++++++++++++++++ >> tools/mount-flatpak/src/metadata.rs | 19 ++ >> 10 files changed, 1153 insertions(+) >> create mode 100644 LICENSES/MPL-2.0.txt >> create mode 100644 tools/mount-flatpak/Cargo.lock >> create mode 100644 tools/mount-flatpak/Cargo.lock.license >> create mode 100644 tools/mount-flatpak/Cargo.toml >> create mode 100644 tools/mount-flatpak/config >> create mode 100644 tools/mount-flatpak/default.nix >> create mode 100644 tools/mount-flatpak/src/keyfile.rs >> create mode 100644 tools/mount-flatpak/src/main.rs >> create mode 100644 tools/mount-flatpak/src/metadata.rs >> >> diff --git a/LICENSES/MPL-2.0.txt b/LICENSES/MPL-2.0.txt >> new file mode 100644 >> index 0000000..d0a1fa1 >> --- /dev/null >> +++ b/LICENSES/MPL-2.0.txt >> @@ -0,0 +1,373 @@ >> +Mozilla Public License Version 2.0 >> +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D >> + >> +1. Definitions >> +-------------- >> + >> +1.1. "Contributor" >> + means each individual or legal entity that creates, contributes t= o >> + the creation of, or owns Covered Software. >> + >> +1.2. "Contributor Version" >> + means the combination of the Contributions of others (if any) use= d >> + by a Contributor and that particular Contributor's Contribution. >> + >> +1.3. "Contribution" >> + means Covered Software of a particular Contributor. >> + >> +1.4. "Covered Software" >> + means Source Code Form to which the initial Contributor has attac= hed >> + the notice in Exhibit A, the Executable Form of such Source Code >> + Form, and Modifications of such Source Code Form, in each case >> + including portions thereof. >> + >> +1.5. "Incompatible With Secondary Licenses" >> + means >> + >> + (a) that the initial Contributor has attached the notice describe= d >> + in Exhibit B to the Covered Software; or >> + >> + (b) that the Covered Software was made available under the terms = of >> + version 1.1 or earlier of the License, but not also under the= >> + terms of a Secondary License. >> + >> +1.6. "Executable Form" >> + means any form of the work other than Source Code Form. >> + >> +1.7. "Larger Work" >> + means a work that combines Covered Software with other material, = in >> + a separate file or files, that is not Covered Software. >> + >> +1.8. "License" >> + means this document. >> + >> +1.9. "Licensable" >> + means having the right to grant, to the maximum extent possible, >> + whether at the time of the initial grant or subsequently, any and= >> + all of the rights conveyed by this License. >> + >> +1.10. "Modifications" >> + means any of the following: >> + >> + (a) any file in Source Code Form that results from an addition to= , >> + deletion from, or modification of the contents of Covered >> + Software; or >> + >> + (b) any new file in Source Code Form that contains any Covered >> + Software. >> + >> +1.11. "Patent Claims" of a Contributor >> + means any patent claim(s), including without limitation, method, >> + process, and apparatus claims, in any patent Licensable by such >> + Contributor that would be infringed, but for the grant of the >> + License, by the making, using, selling, offering for sale, having= >> + made, import, or transfer of either its Contributions or its >> + Contributor Version. >> + >> +1.12. "Secondary License" >> + means either the GNU General Public License, Version 2.0, the GNU= >> + Lesser General Public License, Version 2.1, the GNU Affero Genera= l >> + Public License, Version 3.0, or any later versions of those >> + licenses. >> + >> +1.13. "Source Code Form" >> + means the form of the work preferred for making modifications. >> + >> +1.14. "You" (or "Your") >> + means an individual or a legal entity exercising rights under thi= s >> + License. For legal entities, "You" includes any entity that >> + controls, is controlled by, or is under common control with You. = For >> + purposes of this definition, "control" means (a) the power, direc= t >> + or indirect, to cause the direction or management of such entity,= >> + whether by contract or otherwise, or (b) ownership of more than >> + fifty percent (50%) of the outstanding shares or beneficial >> + ownership of such entity. >> + >> +2. License Grants and Conditions >> +-------------------------------- >> + >> +2.1. Grants >> + >> +Each Contributor hereby grants You a world-wide, royalty-free, >> +non-exclusive license: >> + >> +(a) under intellectual property rights (other than patent or trademar= k) >> + Licensable by such Contributor to use, reproduce, make available,= >> + modify, display, perform, distribute, and otherwise exploit its >> + Contributions, either on an unmodified basis, with Modifications,= or >> + as part of a Larger Work; and >> + >> +(b) under Patent Claims of such Contributor to make, use, sell, offer= >> + for sale, have made, import, and otherwise transfer either its >> + Contributions or its Contributor Version. >> + >> +2.2. Effective Date >> + >> +The licenses granted in Section 2.1 with respect to any Contribution >> +become effective for each Contribution on the date the Contributor fi= rst >> +distributes such Contribution. >> + >> +2.3. Limitations on Grant Scope >> + >> +The licenses granted in this Section 2 are the only rights granted un= der >> +this License. No additional rights or licenses will be implied from t= he >> +distribution or licensing of Covered Software under this License. >> +Notwithstanding Section 2.1(b) above, no patent license is granted by= a >> +Contributor: >> + >> +(a) for any code that a Contributor has removed from Covered Software= ; >> + or >> + >> +(b) for infringements caused by: (i) Your and any other third party's= >> + modifications of Covered Software, or (ii) the combination of its= >> + Contributions with other software (except as part of its Contribu= tor >> + Version); or >> + >> +(c) under Patent Claims infringed by Covered Software in the absence = of >> + its Contributions. >> + >> +This License does not grant any rights in the trademarks, service mar= ks, >> +or logos of any Contributor (except as may be necessary to comply wit= h >> +the notice requirements in Section 3.4). >> + >> +2.4. Subsequent Licenses >> + >> +No Contributor makes additional grants as a result of Your choice to >> +distribute the Covered Software under a subsequent version of this >> +License (see Section 10.2) or under the terms of a Secondary License = (if >> +permitted under the terms of Section 3.3). >> + >> +2.5. Representation >> + >> +Each Contributor represents that the Contributor believes its >> +Contributions are its original creation(s) or it has sufficient right= s >> +to grant the rights to its Contributions conveyed by this License. >> + >> +2.6. Fair Use >> + >> +This License is not intended to limit any rights You have under >> +applicable copyright doctrines of fair use, fair dealing, or other >> +equivalents. >> + >> +2.7. Conditions >> + >> +Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses grante= d >> +in Section 2.1. >> + >> +3. Responsibilities >> +------------------- >> + >> +3.1. Distribution of Source Form >> + >> +All distribution of Covered Software in Source Code Form, including a= ny >> +Modifications that You create or to which You contribute, must be und= er >> +the terms of this License. You must inform recipients that the Source= >> +Code Form of the Covered Software is governed by the terms of this >> +License, and how they can obtain a copy of this License. You may not >> +attempt to alter or restrict the recipients' rights in the Source Cod= e >> +Form. >> + >> +3.2. Distribution of Executable Form >> + >> +If You distribute Covered Software in Executable Form then: >> + >> +(a) such Covered Software must also be made available in Source Code >> + Form, as described in Section 3.1, and You must inform recipients= of >> + the Executable Form how they can obtain a copy of such Source Cod= e >> + Form by reasonable means in a timely manner, at a charge no more >> + than the cost of distribution to the recipient; and >> + >> +(b) You may distribute such Executable Form under the terms of this >> + License, or sublicense it under different terms, provided that th= e >> + license for the Executable Form does not attempt to limit or alte= r >> + the recipients' rights in the Source Code Form under this License= =2E >> + >> +3.3. Distribution of a Larger Work >> + >> +You may create and distribute a Larger Work under terms of Your choic= e, >> +provided that You also comply with the requirements of this License f= or >> +the Covered Software. If the Larger Work is a combination of Covered >> +Software with a work governed by one or more Secondary Licenses, and = the >> +Covered Software is not Incompatible With Secondary Licenses, this >> +License permits You to additionally distribute such Covered Software >> +under the terms of such Secondary License(s), so that the recipient o= f >> +the Larger Work may, at their option, further distribute the Covered >> +Software under the terms of either this License or such Secondary >> +License(s). >> + >> +3.4. Notices >> + >> +You may not remove or alter the substance of any license notices >> +(including copyright notices, patent notices, disclaimers of warranty= , >> +or limitations of liability) contained within the Source Code Form of= >> +the Covered Software, except that You may alter any license notices t= o >> +the extent required to remedy known factual inaccuracies. >> + >> +3.5. Application of Additional Terms >> + >> +You may choose to offer, and to charge a fee for, warranty, support, >> +indemnity or liability obligations to one or more recipients of Cover= ed >> +Software. However, You may do so only on Your own behalf, and not on >> +behalf of any Contributor. You must make it absolutely clear that any= >> +such warranty, support, indemnity, or liability obligation is offered= by >> +You alone, and You hereby agree to indemnify every Contributor for an= y >> +liability incurred by such Contributor as a result of warranty, suppo= rt, >> +indemnity or liability terms You offer. You may include additional >> +disclaimers of warranty and limitations of liability specific to any >> +jurisdiction. >> + >> +4. Inability to Comply Due to Statute or Regulation >> +--------------------------------------------------- >> + >> +If it is impossible for You to comply with any of the terms of this >> +License with respect to some or all of the Covered Software due to >> +statute, judicial order, or regulation then You must: (a) comply with= >> +the terms of this License to the maximum extent possible; and (b) >> +describe the limitations and the code they affect. Such description m= ust >> +be placed in a text file included with all distributions of the Cover= ed >> +Software under this License. Except to the extent prohibited by statu= te >> +or regulation, such description must be sufficiently detailed for a >> +recipient of ordinary skill to be able to understand it. >> + >> +5. Termination >> +-------------- >> + >> +5.1. The rights granted under this License will terminate automatical= ly >> +if You fail to comply with any of its terms. However, if You become >> +compliant, then the rights granted under this License from a particul= ar >> +Contributor are reinstated (a) provisionally, unless and until such >> +Contributor explicitly and finally terminates Your grants, and (b) on= an >> +ongoing basis, if such Contributor fails to notify You of the >> +non-compliance by some reasonable means prior to 60 days after You ha= ve >> +come back into compliance. Moreover, Your grants from a particular >> +Contributor are reinstated on an ongoing basis if such Contributor >> +notifies You of the non-compliance by some reasonable means, this is = the >> +first time You have received notice of non-compliance with this Licen= se >> +from such Contributor, and You become compliant prior to 30 days afte= r >> +Your receipt of the notice. >> + >> +5.2. If You initiate litigation against any entity by asserting a pat= ent >> +infringement claim (excluding declaratory judgment actions, >> +counter-claims, and cross-claims) alleging that a Contributor Version= >> +directly or indirectly infringes any patent, then the rights granted = to >> +You by any and all Contributors for the Covered Software under Sectio= n >> +2.1 of this License shall terminate. >> + >> +5.3. In the event of termination under Sections 5.1 or 5.2 above, all= >> +end user license agreements (excluding distributors and resellers) wh= ich >> +have been validly granted by You or Your distributors under this Lice= nse >> +prior to termination shall survive termination. >> + >> +*********************************************************************= *** >> +* = * >> +* 6. Disclaimer of Warranty = * >> +* ------------------------- = * >> +* = * >> +* Covered Software is provided under this License on an "as is" = * >> +* basis, without warranty of any kind, either expressed, implied, or= * >> +* statutory, including, without limitation, warranties that the = * >> +* Covered Software is free of defects, merchantable, fit for a = * >> +* particular purpose or non-infringing. The entire risk as to the = * >> +* quality and performance of the Covered Software is with You. = * >> +* Should any Covered Software prove defective in any respect, You = * >> +* (not any Contributor) assume the cost of any necessary servicing, = * >> +* repair, or correction. This disclaimer of warranty constitutes an = * >> +* essential part of this License. No use of any Covered Software is = * >> +* authorized under this License except under this disclaimer. = * >> +* = * >> +*********************************************************************= *** >> + >> +*********************************************************************= *** >> +* = * >> +* 7. Limitation of Liability = * >> +* -------------------------- = * >> +* = * >> +* Under no circumstances and under no legal theory, whether tort = * >> +* (including negligence), contract, or otherwise, shall any = * >> +* Contributor, or anyone who distributes Covered Software as = * >> +* permitted above, be liable to You for any direct, indirect, = * >> +* special, incidental, or consequential damages of any character = * >> +* including, without limitation, damages for lost profits, loss of = * >> +* goodwill, work stoppage, computer failure or malfunction, or any = * >> +* and all other commercial damages or losses, even if such party = * >> +* shall have been informed of the possibility of such damages. This = * >> +* limitation of liability shall not apply to liability for death or = * >> +* personal injury resulting from such party's negligence to the = * >> +* extent applicable law prohibits such limitation. Some = * >> +* jurisdictions do not allow the exclusion or limitation of = * >> +* incidental or consequential damages, so this exclusion and = * >> +* limitation may not apply to You. = * >> +* = * >> +*********************************************************************= *** >> + >> +8. Litigation >> +------------- >> + >> +Any litigation relating to this License may be brought only in the >> +courts of a jurisdiction where the defendant maintains its principal >> +place of business and such litigation shall be governed by laws of th= at >> +jurisdiction, without reference to its conflict-of-law provisions. >> +Nothing in this Section shall prevent a party's ability to bring >> +cross-claims or counter-claims. >> + >> +9. Miscellaneous >> +---------------- >> + >> +This License represents the complete agreement concerning the subject= >> +matter hereof. If any provision of this License is held to be >> +unenforceable, such provision shall be reformed only to the extent >> +necessary to make it enforceable. Any law or regulation which provide= s >> +that the language of a contract shall be construed against the drafte= r >> +shall not be used to construe this License against a Contributor. >> + >> +10. Versions of the License >> +--------------------------- >> + >> +10.1. New Versions >> + >> +Mozilla Foundation is the license steward. Except as provided in Sect= ion >> +10.3, no one other than the license steward has the right to modify o= r >> +publish new versions of this License. Each version will be given a >> +distinguishing version number. >> + >> +10.2. Effect of New Versions >> + >> +You may distribute the Covered Software under the terms of the versio= n >> +of the License under which You originally received the Covered Softwa= re, >> +or under the terms of any subsequent version published by the license= >> +steward. >> + >> +10.3. Modified Versions >> + >> +If you create software not governed by this License, and you want to >> +create a new license for such software, you may create and use a >> +modified version of this License if you rename the license and remove= >> +any references to the name of the license steward (except to note tha= t >> +such modified license differs from this License). >> + >> +10.4. Distributing Source Code Form that is Incompatible With Seconda= ry >> +Licenses >> + >> +If You choose to distribute Source Code Form that is Incompatible Wit= h >> +Secondary Licenses under the terms of this version of the License, th= e >> +notice described in Exhibit B of this License must be attached. >> + >> +Exhibit A - Source Code Form License Notice >> +------------------------------------------- >> + >> + This Source Code Form is subject to the terms of the Mozilla Public= >> + License, v. 2.0. If a copy of the MPL was not distributed with this= >> + file, You can obtain one at https://mozilla.org/MPL/2.0/. >> + >> +If it is not possible or desirable to put the notice in a particular >> +file, then You may include the notice in a location (such as a LICENS= E >> +file in a relevant directory) where a recipient would be likely to lo= ok >> +for such a notice. >> + >> +You may add additional accurate notices of copyright ownership. >> + >> +Exhibit B - "Incompatible With Secondary Licenses" Notice >> +--------------------------------------------------------- >> + >> + This Source Code Form is "Incompatible With Secondary Licenses", as= >> + defined by the Mozilla Public License, v. 2.0. >> diff --git a/pkgs/default.nix b/pkgs/default.nix >> index bc25420..29fefb4 100644 >> --- a/pkgs/default.nix >> +++ b/pkgs/default.nix >> @@ -36,6 +36,7 @@ let >> path: (import path { inherit (self) callPackage; }).override; >> =20 >> rootfs =3D self.callSpectrumPackage ../host/rootfs {}; >> + mount-flatpak =3D self.callSpectrumPackage ../tools/mount-flatpak= {}; >> spectrum-build-tools =3D self.callSpectrumPackage ../tools { >> appSupport =3D false; >> buildSupport =3D true; >> diff --git a/tools/mount-flatpak/Cargo.lock b/tools/mount-flatpak/Carg= o.lock >> new file mode 100644 >> index 0000000..8cb5663 >> --- /dev/null >> +++ b/tools/mount-flatpak/Cargo.lock >> @@ -0,0 +1,238 @@ >> +# This file is automatically @generated by Cargo. >> +# It is not intended for manual editing. >> +version =3D 4 >> + >> +[[package]] >> +name =3D "bitflags" >> +version =3D "2.10.0" >> +source =3D "registry+https://github.com/rust-lang/crates.io-index" >> +checksum =3D "812e12b5285cc515a9c72a5c1d3b6d46a19dac5acfef5265968c166= 106e31dd3" >> + >> +[[package]] >> +name =3D "cfg-if" >> +version =3D "1.0.4" >> +source =3D "registry+https://github.com/rust-lang/crates.io-index" >> +checksum =3D "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142= 615121801" >> + >> +[[package]] >> +name =3D "either" >> +version =3D "1.15.0" >> +source =3D "registry+https://github.com/rust-lang/crates.io-index" >> +checksum =3D "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576= da70b3719" >> + >> +[[package]] >> +name =3D "errno" >> +version =3D "0.3.14" >> +source =3D "registry+https://github.com/rust-lang/crates.io-index" >> +checksum =3D "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d0= 42b63efeb" >> +dependencies =3D [ >> + "libc", >> + "windows-sys", >> +] >> + >> +[[package]] >> +name =3D "fastrand" >> +version =3D "2.3.0" >> +source =3D "registry+https://github.com/rust-lang/crates.io-index" >> +checksum =3D "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c= 0355411be" >> + >> +[[package]] >> +name =3D "getrandom" >> +version =3D "0.3.4" >> +source =3D "registry+https://github.com/rust-lang/crates.io-index" >> +checksum =3D "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9c= ce2dd77fd" >> +dependencies =3D [ >> + "cfg-if", >> + "libc", >> + "r-efi", >> + "wasip2", >> +] >> + >> +[[package]] >> +name =3D "itertools" >> +version =3D "0.14.0" >> +source =3D "registry+https://github.com/rust-lang/crates.io-index" >> +checksum =3D "2b192c782037fadd9cfa75548310488aabdbf3d2da73885b31bd0ab= d03351285" >> +dependencies =3D [ >> + "either", >> +] >> + >> +[[package]] >> +name =3D "libc" >> +version =3D "0.2.177" >> +source =3D "registry+https://github.com/rust-lang/crates.io-index" >> +checksum =3D "2874a2af47a2325c2001a6e6fad9b16a53b802102b528163885171c= f92b15976" >> + >> +[[package]] >> +name =3D "linux-raw-sys" >> +version =3D "0.11.0" >> +source =3D "registry+https://github.com/rust-lang/crates.io-index" >> +checksum =3D "df1d3c3b53da64cf5760482273a98e575c651a67eec7f77df96b5b6= 42de8f039" >> + >> +[[package]] >> +name =3D "memchr" >> +version =3D "2.7.6" >> +source =3D "registry+https://github.com/rust-lang/crates.io-index" >> +checksum =3D "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6= bdc4cc273" >> + >> +[[package]] >> +name =3D "mount-flatpak" >> +version =3D "0.0.0" >> +dependencies =3D [ >> + "libc", >> + "pathrs", >> + "rustix", >> +] >> + >> +[[package]] >> +name =3D "once_cell" >> +version =3D "1.21.3" >> +source =3D "registry+https://github.com/rust-lang/crates.io-index" >> +checksum =3D "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b= 4e8393d2d" >> + >> +[[package]] >> +name =3D "pathrs" >> +version =3D "0.2.1" >> +source =3D "registry+https://github.com/rust-lang/crates.io-index" >> +checksum =3D "c63f58f2463b3eecc7d285eace144d8c4820631d018d927049f8569= be4b3b1a4" >> +dependencies =3D [ >> + "bitflags", >> + "itertools", >> + "libc", >> + "memchr", >> + "once_cell", >> + "rustix", >> + "rustversion", >> + "static_assertions", >> + "tempfile", >> + "thiserror", >> +] >> + >> +[[package]] >> +name =3D "proc-macro2" >> +version =3D "1.0.103" >> +source =3D "registry+https://github.com/rust-lang/crates.io-index" >> +checksum =3D "5ee95bc4ef87b8d5ba32e8b7714ccc834865276eab0aed5c9958d00= ec45f49e8" >> +dependencies =3D [ >> + "unicode-ident", >> +] >> + >> +[[package]] >> +name =3D "quote" >> +version =3D "1.0.42" >> +source =3D "registry+https://github.com/rust-lang/crates.io-index" >> +checksum =3D "a338cc41d27e6cc6dce6cefc13a0729dfbb81c262b1f519331575dd= 80ef3067f" >> +dependencies =3D [ >> + "proc-macro2", >> +] >> + >> +[[package]] >> +name =3D "r-efi" >> +version =3D "5.3.0" >> +source =3D "registry+https://github.com/rust-lang/crates.io-index" >> +checksum =3D "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f= 346754b0f" >> + >> +[[package]] >> +name =3D "rustix" >> +version =3D "1.1.2" >> +source =3D "registry+https://github.com/rust-lang/crates.io-index" >> +checksum =3D "cd15f8a2c5551a84d56efdc1cd049089e409ac19a3072d5037a17fd= 70719ff3e" >> +dependencies =3D [ >> + "bitflags", >> + "errno", >> + "libc", >> + "linux-raw-sys", >> + "windows-sys", >> +] >> + >> +[[package]] >> +name =3D "rustversion" >> +version =3D "1.0.22" >> +source =3D "registry+https://github.com/rust-lang/crates.io-index" >> +checksum =3D "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0= d2538d46d" >> + >> +[[package]] >> +name =3D "static_assertions" >> +version =3D "1.1.0" >> +source =3D "registry+https://github.com/rust-lang/crates.io-index" >> +checksum =3D "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c= 06b37543f" >> + >> +[[package]] >> +name =3D "syn" >> +version =3D "2.0.111" >> +source =3D "registry+https://github.com/rust-lang/crates.io-index" >> +checksum =3D "390cc9a294ab71bdb1aa2e99d13be9c753cd2d7bd6560c771185974= 10c4d2e87" >> +dependencies =3D [ >> + "proc-macro2", >> + "quote", >> + "unicode-ident", >> +] >> + >> +[[package]] >> +name =3D "tempfile" >> +version =3D "3.23.0" >> +source =3D "registry+https://github.com/rust-lang/crates.io-index" >> +checksum =3D "2d31c77bdf42a745371d260a26ca7163f1e0924b64afa0b688e61b5= a9fa02f16" >> +dependencies =3D [ >> + "fastrand", >> + "getrandom", >> + "once_cell", >> + "rustix", >> + "windows-sys", >> +] >> + >> +[[package]] >> +name =3D "thiserror" >> +version =3D "2.0.17" >> +source =3D "registry+https://github.com/rust-lang/crates.io-index" >> +checksum =3D "f63587ca0f12b72a0600bcba1d40081f830876000bb46dd2337a305= 1618f4fc8" >> +dependencies =3D [ >> + "thiserror-impl", >> +] >> + >> +[[package]] >> +name =3D "thiserror-impl" >> +version =3D "2.0.17" >> +source =3D "registry+https://github.com/rust-lang/crates.io-index" >> +checksum =3D "3ff15c8ecd7de3849db632e14d18d2571fa09dfc5ed93479bc4485c= 7a517c913" >> +dependencies =3D [ >> + "proc-macro2", >> + "quote", >> + "syn", >> +] >> + >> +[[package]] >> +name =3D "unicode-ident" >> +version =3D "1.0.22" >> +source =3D "registry+https://github.com/rust-lang/crates.io-index" >> +checksum =3D "9312f7c4f6ff9069b165498234ce8be658059c6728633667c526e27= dc2cf1df5" >> + >> +[[package]] >> +name =3D "wasip2" >> +version =3D "1.0.1+wasi-0.2.4" >> +source =3D "registry+https://github.com/rust-lang/crates.io-index" >> +checksum =3D "0562428422c63773dad2c345a1882263bbf4d65cf3f42e90921f787= ef5ad58e7" >> +dependencies =3D [ >> + "wit-bindgen", >> +] >> + >> +[[package]] >> +name =3D "windows-link" >> +version =3D "0.2.1" >> +source =3D "registry+https://github.com/rust-lang/crates.io-index" >> +checksum =3D "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e= 70d0a4fe5" >> + >> +[[package]] >> +name =3D "windows-sys" >> +version =3D "0.61.2" >> +source =3D "registry+https://github.com/rust-lang/crates.io-index" >> +checksum =3D "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb= 3921ff3fc" >> +dependencies =3D [ >> + "windows-link", >> +] >> + >> +[[package]] >> +name =3D "wit-bindgen" >> +version =3D "0.46.0" >> +source =3D "registry+https://github.com/rust-lang/crates.io-index" >> +checksum =3D "f17a85883d4e6d00e8a97c586de764dabcc06133f7f1d55dce5cdc0= 70ad7fe59" >> diff --git a/tools/mount-flatpak/Cargo.lock.license b/tools/mount-flat= pak/Cargo.lock.license >> new file mode 100644 >> index 0000000..d705e97 >> --- /dev/null >> +++ b/tools/mount-flatpak/Cargo.lock.license >> @@ -0,0 +1,2 @@ >> +SPDX-License-Identifier: CC0-1.0 >> +SPDX-FileCopyrightText: 2024 Alyssa Ross >> diff --git a/tools/mount-flatpak/Cargo.toml b/tools/mount-flatpak/Carg= o.toml >> new file mode 100644 >> index 0000000..670be2f >> --- /dev/null >> +++ b/tools/mount-flatpak/Cargo.toml >> @@ -0,0 +1,11 @@ >> +# SPDX-License-Identifier: CC0-1.0 >> +# SPDX-FileCopyrightText: 2025 Alyssa Ross >> + >> +[package] >> +name =3D "mount-flatpak" >> +edition =3D "2024" >> + >> +[dependencies] >> +libc =3D "0.2.177" >> +pathrs =3D "0.2.1" >> +rustix =3D "1.1.2" >> diff --git a/tools/mount-flatpak/config b/tools/mount-flatpak/config >> new file mode 100644 >> index 0000000..b3c2bee >> --- /dev/null >> +++ b/tools/mount-flatpak/config >> @@ -0,0 +1,7 @@ >> +# SPDX-License-Identifier: CC0-1.0 >> +# SPDX-FileCopyrightText: 2025 Alyssa Ross >> + >> +[core] >> +repo_version=3D1 >> +mode=3Dbare-user-only >> +min-free-space-size=3D500MB >> diff --git a/tools/mount-flatpak/default.nix b/tools/mount-flatpak/def= ault.nix >> new file mode 100644 >> index 0000000..f364fd7 >> --- /dev/null >> +++ b/tools/mount-flatpak/default.nix >> @@ -0,0 +1,25 @@ >> +# SPDX-FileCopyrightText: 2024-2025 Alyssa Ross >> +# SPDX-License-Identifier: MIT >> + >> +import ../../lib/call-package.nix ( >> +{ src, lib, rustPlatform }: >> + >> +rustPlatform.buildRustPackage { >> + name =3D "mount-flatpak"; >> + >> + src =3D lib.fileset.toSource { >> + root =3D ../..; >> + fileset =3D lib.fileset.intersection src ./.; >> + }; >> + sourceRoot =3D "source/tools/mount-flatpak"; >> + >> + cargoLock.lockFile =3D ./Cargo.lock; >> + >> + env =3D { >> + MOUNT_FLATPAK_CONFIG_PATH =3D "${placeholder "out"}/share/spectru= m/flatpak-config"; >> + }; >> + >> + postInstall =3D '' >> + install -Dm 0755 config $MOUNT_FLATPAK_CONFIG_PATH >> + ''; >> +}) (_: {}) >> diff --git a/tools/mount-flatpak/src/keyfile.rs b/tools/mount-flatpak/= src/keyfile.rs >> new file mode 100644 >> index 0000000..fa746b3 >> --- /dev/null >> +++ b/tools/mount-flatpak/src/keyfile.rs >> @@ -0,0 +1,189 @@ >> +// Copyright 2021 System76 >> +// SPDX-FileCopyrightText: 2025 Alyssa Ross >> +// SPDX-License-Identifier: MPL-2.0 >> + >> +// Adapted from freedesktop-desktop-entry 0.7.19. >> + >> +use std::collections::BTreeMap; >> +use std::fmt::{self, Display, Formatter}; >> + >> +type Group =3D BTreeMap; >> + >> +#[derive(Debug)] >> +pub enum DecodeError { >> + KeyValueWithoutAGroup, >> + InvalidKey, >> + InvalidValue, >> +} >> + >> +impl Display for DecodeError { >> + fn fmt(&self, f: &mut Formatter) -> fmt::Result { >> + match self { >> + Self::KeyValueWithoutAGroup =3D> write!(f, "key/value wit= hout a group"), >> + Self::InvalidKey =3D> write!(f, "invalid key"), >> + Self::InvalidValue =3D> write!(f, "invalid value"), >> + } >> + } >> +} >> + >> +pub fn parse(input: &str) -> Result, DecodeEr= ror> { >> + let mut groups =3D BTreeMap::default(); >> + let mut active_group: Option =3D None; >> + let mut active_keys: Option =3D None; >> + >> + for line in input.lines() { >> + process_line(line, &mut groups, &mut active_group, &mut activ= e_keys)?; >> + } >> + >> + if let Some(active_keys) =3D active_keys.take() { >> + match &mut active_group { >> + Some(active_group) =3D> { >> + active_group >> + .group >> + .insert(active_keys.key_name, active_keys.value);= >> + } >> + None =3D> return Err(DecodeError::KeyValueWithoutAGroup),= >> + } >> + } >> + >> + if let Some(mut group) =3D active_group.take() { >> + groups >> + .entry(group.group_name) >> + .or_default() >> + .append(&mut group.group); >> + } >> + >> + Ok(groups) >> +} >> + >> +struct ActiveGroup { >> + group_name: String, >> + group: Group, >> +} >> + >> +struct ActiveKeys { >> + key_name: String, >> + value: String, >> +} >> + >> +#[inline(never)] >> +fn process_line( >> + line: &str, >> + groups: &mut BTreeMap, >> + active_group: &mut Option, >> + active_keys: &mut Option, >> +) -> Result<(), DecodeError> { >> + if line.trim().is_empty() || line.starts_with('#') { >> + return Ok(()); >> + } >> + >> + let line_bytes =3D line.as_bytes(); >> + >> + // if group >> + if line_bytes[0] =3D=3D b'[' { >> + if let Some(end) =3D line_bytes[1..].iter().rposition(|&b| b = =3D=3D b']') { >> + let group_name =3D &line[1..end + 1]; >> + >> + if let Some(active_keys) =3D active_keys.take() { >> + match active_group { >> + Some(active_group) =3D> { >> + active_group >> + .group >> + .insert(active_keys.key_name, active_keys= =2Evalue); >> + } >> + None =3D> return Err(DecodeError::KeyValueWithout= AGroup), >> + } >> + } >> + >> + if let Some(mut group) =3D active_group.take() { >> + groups >> + .entry(group.group_name) >> + .or_default() >> + .append(&mut group.group); >> + } >> + >> + active_group.replace(ActiveGroup { >> + group_name: group_name.to_string(), >> + group: Group::default(), >> + }); >> + } >> + } >> + // else, if value >> + else if let Some(delimiter) =3D line_bytes.iter().position(|&b| b= =3D=3D b'=3D') { >> + let key =3D &line[..delimiter]; >> + let value =3D format_value(&line[delimiter + 1..])?; >> + >> + if key.is_empty() { >> + return Err(DecodeError::InvalidKey); >> + } >> + >> + if let Some(active_keys) =3D active_keys.take() { >> + match active_group { >> + Some(active_group) =3D> { >> + active_group >> + .group >> + .insert(active_keys.key_name, active_keys.val= ue); >> + } >> + None =3D> return Err(DecodeError::KeyValueWithoutAGro= up), >> + } >> + } >> + active_keys.replace(ActiveKeys { >> + key_name: key.trim().to_string(), >> + value, >> + }); >> + } >> + Ok(()) >> +} >> + >> +// https://specifications.freedesktop.org/desktop-entry-spec/latest/v= alue-types.html >> +#[inline] >> +fn format_value(input: &str) -> Result { >> + let input =3D if let Some(input) =3D input.strip_prefix(" ") { >> + input >> + } else { >> + input >> + }; >> + >> + let mut res =3D String::with_capacity(input.len()); >> + >> + let mut last: usize =3D 0; >> + >> + for (i, v) in input.as_bytes().iter().enumerate() { >> + if *v !=3D b'\\' { >> + continue; >> + } >> + >> + // edge case for // >> + if last > i { >> + continue; >> + } >> + >> + // when there is an \ at the end >> + if input.len() <=3D i + 1 { >> + return Err(DecodeError::InvalidValue); >> + } >> + >> + if last < i { >> + res.push_str(&input[last..i]); >> + } >> + >> + last =3D i + 2; >> + >> + match input.as_bytes()[i + 1] { >> + b's' =3D> res.push(' '), >> + b'n' =3D> res.push('\n'), >> + b't' =3D> res.push('\t'), >> + b'r' =3D> res.push('\r'), >> + b'\\' =3D> res.push('\\'), >> + _ =3D> { >> + return Err(DecodeError::InvalidValue); >> + } >> + } >> + } >> + >> + if last < input.len() { >> + res.push_str(&input[last..input.len()]); >> + } >> + >> + Ok(res) >> +} >> diff --git a/tools/mount-flatpak/src/main.rs b/tools/mount-flatpak/src= /main.rs >> new file mode 100644 >> index 0000000..6fc0556 >> --- /dev/null >> +++ b/tools/mount-flatpak/src/main.rs >> @@ -0,0 +1,288 @@ >> +// SPDX-FileCopyrightText: 2025 Alyssa Ross >> +// SPDX-License-Identifier: EUPL-1.2+ >> + >> +//! Flatpak installations look like this: >> +//! >> +//! ```text >> +//! flatpak/ >> +//! =E2=94=9C=E2=94=80=E2=94=80 app/ >> +//! =E2=94=82=C2=A0=C2=A0 =E2=94=94=E2=94=80=E2=94=80 org.gnome.TextE= ditor/ >> +//! =E2=94=82=C2=A0=C2=A0 =E2=94=9C=E2=94=80=E2=94=80 current -> = x86_64/stable >> +//! =E2=94=82=C2=A0=C2=A0 =E2=94=94=E2=94=80=E2=94=80 x86_64/ >> +//! =E2=94=82=C2=A0=C2=A0 =E2=94=94=E2=94=80=E2=94=80 stable/= >> +//! =E2=94=82=C2=A0=C2=A0 =E2=94=9C=E2=94=80=E2=94=80 002= 9140121b39f5b7cf4d44fd46b0708eee67f395b5e1291628612a0358fb909/ >> +//! =E2=94=82=C2=A0=C2=A0 =E2=94=82=C2=A0=C2=A0 =E2=94=94= =E2=94=80=E2=94=80 =E2=80=A6 >> +//! =E2=94=82=C2=A0=C2=A0 =E2=94=94=E2=94=80=E2=94=80 act= ive -> 0029140121b39f5b7cf4d44fd46b0708eee67f395b5e1291628612a0358fb909 >> +//! =E2=94=9C=E2=94=80=E2=94=80 db/ >> +//! =E2=94=9C=E2=94=80=E2=94=80 exports/ >> +//! =E2=94=82=C2=A0=C2=A0 =E2=94=94=E2=94=80=E2=94=80 =E2=80=A6 >> +//! =E2=94=9C=E2=94=80=E2=94=80 repo >> +//! =E2=94=82=C2=A0=C2=A0 =E2=94=9C=E2=94=80=E2=94=80 config >> +//! =E2=94=82=C2=A0=C2=A0 =E2=94=9C=E2=94=80=E2=94=80 objects >> +//! =E2=94=82=C2=A0=C2=A0 =E2=94=9C=E2=94=80=E2=94=80 tmp >> +//! =E2=94=82=C2=A0=C2=A0 =E2=94=82=C2=A0=C2=A0 =E2=94=94=E2=94=80=E2= =94=80 cache >> +//! =E2=94=82=C2=A0=C2=A0 =E2=94=82=C2=A0=C2=A0 =E2=94=94=E2=94=80= =E2=94=80 =E2=80=A6 >> +//! =E2=94=82=C2=A0=C2=A0 =E2=94=94=E2=94=80=E2=94=80 =E2=80=A6 >> +//! =E2=94=94=E2=94=80=E2=94=80 runtime >> +//! =E2=94=9C=E2=94=80=E2=94=80 org.gnome.Platform >> +//! =E2=94=82=C2=A0=C2=A0 =E2=94=94=E2=94=80=E2=94=80 x86_64 >> +//! =E2=94=82=C2=A0=C2=A0 =E2=94=94=E2=94=80=E2=94=80 49 >> +//! =E2=94=82=C2=A0=C2=A0 =E2=94=9C=E2=94=80=E2=94=80 act= ive -> bf6aa432cb310726f4ac0ec08cc88558619e1d4bd4b964e27e95187ecaad5400 >> +//! =E2=94=82=C2=A0=C2=A0 =E2=94=94=E2=94=80=E2=94=80 bf6= aa432cb310726f4ac0ec08cc88558619e1d4bd4b964e27e95187ecaad5400 >> +//! =E2=94=82=C2=A0=C2=A0 =E2=94=94=E2=94=80=E2=94=80= =E2=80=A6 >> +//! =E2=94=94=E2=94=80=E2=94=80 =E2=80=A6 >> +//! ``` >> +//! >> +//! The purpose of this program is to use bind mounts to construct a >> +//! Flatpak installation containing only a single application and >> +//! runtime, which can be passed through to a VM without exposing >> +//! other installed applications. >> + >> +mod keyfile; >> +mod metadata; >> + >> +use std::borrow::Cow; >> +use std::env::{ArgsOs, args_os}; >> +use std::ffi::OsStr; >> +use std::io; >> +use std::os::unix::prelude::*; >> +use std::path::{Path, PathBuf}; >> +use std::process::exit; >> + >> +use pathrs::Root; >> +use pathrs::flags::{OpenFlags, ResolverFlags}; >> +use rustix::fs::{CWD, FileType, fstat}; >> +use rustix::mount::{MoveMountFlags, OpenTreeFlags, move_mount, open_t= ree}; >> + >> +use metadata::extract_runtime; >> + >> +fn ex_usage() -> ! { >> + eprintln!("Usage: mount-flatpak userdata installation app"); >> + exit(1); >> +} >> + >> +fn mount_commit( >> + source_commit: &dyn AsFd, >> + target_installation: &Root, >> + path: &Path, >> +) -> Result<(), String> { >> + let source_commit_tree =3D open_tree( >> + source_commit, >> + "", >> + OpenTreeFlags::AT_EMPTY_PATH >> + | OpenTreeFlags::OPEN_TREE_CLONE >> + | OpenTreeFlags::OPEN_TREE_CLOEXEC >> + | OpenTreeFlags::AT_RECURSIVE, >> + ) >> + .map_err(|e| format!("cloning source commit tree: {e}"))?; >> + let target_commit_dir =3D target_installation >> + .mkdir_all(path, &PermissionsExt::from_mode(0o700)) >> + .map_err(|e| format!("creating target commit directory: {e}")= )?; >=20 > Does this check for path being absolute? I don't know how Rust > handles joining a relative path to an absolute one. >=20 >> + move_mount( >> + source_commit_tree, >> + "", >> + target_commit_dir, >> + "", >> + MoveMountFlags::MOVE_MOUNT_F_EMPTY_PATH | MoveMountFlags::MOV= E_MOUNT_T_EMPTY_PATH, >> + ) >> + .map_err(|e| format!("mounting commit: {e}")) >> +} >> + >> +fn run(mut args: ArgsOs) -> Result<(), String> { >> + let Some(user_data_path) =3D args.next().map(PathBuf::from) else = { >> + ex_usage(); >> + }; >> + let Some(installation_path) =3D args.next().map(PathBuf::from) el= se { >> + ex_usage(); >> + }; >> + let Some(app) =3D args.next() else { >> + ex_usage(); >> + }; >> + if args.next().is_some() { >> + ex_usage(); >> + } >> + >> + let mut user_data =3D >> + Root::open(&user_data_path).map_err(|e| format!("opening user= data partition: {e}"))?; >> + user_data.set_resolver_flags(ResolverFlags::NO_SYMLINKS); >> + >> + let mut source_installation_dir =3D user_data >> + .open_subpath(&installation_path, OpenFlags::O_PATH) >> + .map(Root::from_fd) >> + .map_err(|e| format!("opening source flatpak installation: {e= }"))?; >> + source_installation_dir.set_resolver_flags(ResolverFlags::NO_SYML= INKS); >> + >> + std::fs::create_dir("flatpak") >> + .map_err(|e| format!("creating target flatpak installation: {= e}"))?; >> + >> + let target_installation_dir =3D open_tree( >> + CWD, >> + "flatpak", >> + OpenTreeFlags::OPEN_TREE_CLONE >> + | OpenTreeFlags::OPEN_TREE_CLOEXEC >> + | OpenTreeFlags::AT_RECURSIVE >> + | OpenTreeFlags::AT_SYMLINK_NOFOLLOW, >> + ) >> + .map_err(|e| format!("opening target flatpak installation: {e}"))= ?; >> + let mut target_installation_dir =3D Root::from_fd(target_installa= tion_dir); >> + target_installation_dir.set_resolver_flags(ResolverFlags::NO_SYML= INKS); >> + >> + let mut full_app_path =3D installation_path.join("app"); >> + full_app_path.push(&app); >> + full_app_path.push("current"); >> + let arch_and_branch =3D source_installation_dir >> + .readlink(&full_app_path) >> + .map_err(|e| format!("reading current app arch and branch: {e= }"))?; >> + let mut components =3D arch_and_branch.components(); >> + let arch =3D components.next().unwrap().as_os_str(); >=20 > Still panics if there is no next component. >=20 >> + let branch =3D components.as_path().as_os_str(); >> + if branch.is_empty() { >> + return Err("can't infer branch from \"current\" link".to_stri= ng()); >> + } >> + >> + full_app_path.pop(); >> + full_app_path.push(&arch_and_branch); >> + full_app_path.push("active"); >> + let commit =3D source_installation_dir >> + .readlink(&full_app_path) >> + .map_err(|e| format!("reading active app commit: {e}"))? >> + .into_os_string(); >=20 > This can (and should) be moved into mount_commit(). >=20 >> + full_app_path.pop(); >> + full_app_path.push(&commit); >=20 > I strongly recommend validating the commit here. This avoids Rust=E2=80= =99s > stdlib path functions potentially mishandling absolute paths, ".", > or ".." (by popping off the last components). I don=E2=80=99t know if > they *do* mishandle it, but validation is obviously correct, and not > validating isn=E2=80=99t. >=20 >> + let source_app_dir =3D source_installation_dir >> + .resolve(&full_app_path) >> + .map_err(|e| format!("opening source app directory: {e}"))?; >> + >> + let metadata =3D source_installation_dir >> + .resolve(full_app_path.join("metadata")) >> + .map_err(|e| format!("resolving app metadata: {e}"))?; >> + >> + let metadata_stat =3D >> + fstat(&metadata).map_err(|e| format!("checking app metadata i= s a regular file: {e}"))?; >> + let metadata_type =3D FileType::from_raw_mode(metadata_stat.st_mo= de); >> + if !metadata_type.is_file() { >> + let e =3D format!("type of app metadata is {metadata_type:?},= not RegularFile"); >> + return Err(e); >> + } >> + let metadata =3D metadata >> + .reopen(OpenFlags::O_RDONLY) >> + .map_err(|e| format!("opening app metadata: {e}"))?; >> + >> + let runtime =3D >> + extract_runtime(metadata).map_err(|e| format!("reading runtim= e from metadata: {e}"))?; >> + >> + let mut full_runtime_path =3D installation_path.join("runtime"); >> + full_runtime_path.push(runtime); >> + full_runtime_path.push("active"); >> + let runtime_commit =3D source_installation_dir >> + .readlink(&full_runtime_path) >> + .map_err(|e| format!("reading active runtime commit: {e}"))? >> + .into_os_string(); >> + >> + full_runtime_path.pop(); >> + full_runtime_path.push(&runtime_commit); >> + let source_runtime_dir =3D source_installation_dir >> + .resolve(&full_runtime_path) >> + .map_err(|e| format!("opening source runtime directory: {e}")= )?; >=20 > Same comments as above. Also, does the error contain the path name? > I'm guessing it doesn=E2=80=99t, but it would be best to check that. >=20 >> + mount_commit(&source_app_dir, &target_installation_dir, &full_app= _path)?; >> + mount_commit( >> + &source_runtime_dir, >> + &target_installation_dir, >> + &full_runtime_path, >> + )?; >> + >> + target_installation_dir >> + .mkdir_all("repo/objects", &PermissionsExt::from_mode(0o700))= >> + .map_err(|e| format!("creating repo/objects: {e}"))?; >> + target_installation_dir >> + .mkdir_all("repo/tmp/cache", &PermissionsExt::from_mode(0o700= )) >> + .map_err(|e| format!("creating repo/tmp/cache: {e}"))?; >> + let config_target =3D target_installation_dir >> + .create_file( >> + "repo/config", >> + OpenFlags::O_WRONLY | OpenFlags::O_CLOEXEC, >> + &PermissionsExt::from_mode(0o700), >> + ) >> + .map_err(|e| format!("creating repo/config: {e}"))?; >> + let config_source_path =3D env!("MOUNT_FLATPAK_CONFIG_PATH"); >> + let config_source =3D open_tree( >> + CWD, >> + config_source_path, >> + OpenTreeFlags::OPEN_TREE_CLONE | OpenTreeFlags::OPEN_TREE_CLO= EXEC, >> + ) >> + .map_err(|e| format!("opening {config_source_path}: {e}"))?; >> + move_mount( >> + config_source, >> + "", >> + config_target, >> + "", >> + MoveMountFlags::MOVE_MOUNT_F_EMPTY_PATH | MoveMountFlags::MOV= E_MOUNT_T_EMPTY_PATH, >> + ) >> + .map_err(|e| format!("mounting config: {e}"))?; >> + >> + let mut attr =3D libc::mount_attr { >> + attr_clr: libc::MOUNT_ATTR_NOSYMFOLLOW, >> + attr_set: libc::MOUNT_ATTR_RDONLY | libc::MOUNT_ATTR_NODEV, >> + propagation: libc::MS_SLAVE, >> + userns_fd: 0, >> + }; >> + let empty =3D b"\0"; >> + // SAFETY: we pass a valid FD, valid C string, and a valid mutabl= e pointer with the >> + // correct size. >> + unsafe { >> + let r =3D libc::syscall( >> + libc::SYS_mount_setattr, >> + target_installation_dir.as_fd().as_raw_fd() as libc::c_lo= ng, >> + empty.as_ptr() as *const libc::c_char, >> + (libc::AT_EMPTY_PATH | libc::AT_RECURSIVE) as libc::c_lon= g, >> + &mut attr as *mut libc::mount_attr, >> + size_of::() as libc::c_long, >> + ); >> + if r =3D=3D -1 { >> + return Err(format!( >> + "setting target mount attributes: {}", >> + io::Error::last_os_error() >> + )); >> + } >> + } >> + move_mount( >> + target_installation_dir, >> + "", >> + CWD, >> + "flatpak", >> + MoveMountFlags::MOVE_MOUNT_F_EMPTY_PATH, >> + ) >> + .map_err(|e| format!("mounting target installation dir: {e}"))?; >> + >> + std::fs::create_dir("params").map_err(|e| format!("creating param= s directory: {e}"))?; >> + std::fs::write("params/id", app.as_bytes()).map_err(|e| format!("= writing params/id: {e}"))?; >> + std::fs::write("params/commit", commit.as_bytes()) >> + .map_err(|e| format!("writing params/commit: {e}"))?; >> + std::fs::write("params/arch", arch.as_bytes()) >> + .map_err(|e| format!("writing params/arch: {e}"))?; >> + std::fs::write("params/branch", branch.as_bytes()) >> + .map_err(|e| format!("writing params/branch: {e}"))?; >> + std::fs::write("params/runtime-commit", runtime_commit.as_bytes()= ) >> + .map_err(|e| format!("writing params/runtime-commit: {e}"))?;= >> + >> + Ok(()) >> +} >> + >> +fn main() { >> + let mut args =3D args_os(); >> + >> + let prog_name =3D args >> + .next() >> + .as_ref() >> + .map(Path::new) >> + .and_then(Path::file_name) >> + .map_or(Cow::Borrowed("mount-flatpak"), OsStr::to_string_loss= y) >> + .into_owned(); >> + >> + if let Err(e) =3D run(args) { >> + eprintln!("{prog_name}: {e}"); >> + exit(1); >> + } >> +} >> diff --git a/tools/mount-flatpak/src/metadata.rs b/tools/mount-flatpak= /src/metadata.rs >> new file mode 100644 >> index 0000000..dfc05b1 >> --- /dev/null >> +++ b/tools/mount-flatpak/src/metadata.rs >> @@ -0,0 +1,19 @@ >> +// SPDX-License-Identifier: EUPL-1.2+ >> +// SPDX-FileCopyrightText: 2025 Alyssa Ross >> + >> +use std::fs::File; >> +use std::io::read_to_string; >> + >> +use crate::keyfile::parse; >> + >> +pub fn extract_runtime(mut metadata: File) -> Result = { >> + let metadata =3D read_to_string(&mut metadata).map_err(|e| e.to_s= tring())?; >=20 > Is this going to be in the VM's cgroup? >=20 >> + let group =3D parse(&metadata).map_err(|e| e.to_string())?; >> + let application =3D group >> + .get("Application") >> + .ok_or_else(|| "Application group missing".to_string())?; >> + Ok(application >> + .get("runtime") >> + .ok_or_else(|| "runtime property missing".to_string())? >> + .clone()) >> +} Nevermind, I didn't read your previous email before sending this. Ignore= it. https://spectrum-os.org/lists/archives/spectrum-devel/87y0nmv2v4.fsf@alys= sa.is/T/#u addresses all of the comments. --=20 Sincerely, Demi Marie Obenour (she/her/hers) --------------2j9xSqUmOdFKopsD60o3sW2P Content-Type: application/pgp-keys; name="OpenPGP_0xB288B55FFF9C22C1.asc" Content-Disposition: attachment; filename="OpenPGP_0xB288B55FFF9C22C1.asc" Content-Description: OpenPGP public key Content-Transfer-Encoding: quoted-printable -----BEGIN PGP PUBLIC KEY BLOCK----- xsFNBFp+A0oBEADffj6anl9/BHhUSxGTICeVl2tob7hPDdhHNgPR4C8xlYt5q49y B+l2nipdaq+4Gk6FZfqC825TKl7eRpUjMriwle4r3R0ydSIGcy4M6eb0IcxmuPYf bWpr/si88QKgyGSVZ7GeNW1UnzTdhYHuFlk8dBSmB1fzhEYEk0RcJqg4AKoq6/3/ UorR+FaSuVwT7rqzGrTlscnTDlPWgRzrQ3jssesI7sZLm82E3pJSgaUoCdCOlL7M MPCJwI8JpPlBedRpe9tfVyfu3euTPLPxwcV3L/cfWPGSL4PofBtB8NUU6QwYiQ9H zx4xOyn67zW73/G0Q2vPPRst8LBDqlxLjbtx/WLR6h3nBc3eyuZ+q62HS1pJ5EvU T1vjyJ1ySrqtUXWQ4XlZyoEFUfpJxJoN0A9HCxmHGVckzTRl5FMWo8TCniHynNXs BtDQbabt7aNEOaAJdE7to0AH3T/Bvwzcp0ZJtBk0EM6YeMLtotUut7h2Bkg1b//r 6bTBswMBXVJ5H44Qf0+eKeUg7whSC9qpYOzzrm7+0r9F5u3qF8ZTx55TJc2g656C 9a1P1MYVysLvkLvS4H+crmxA/i08Tc1h+x9RRvqba4lSzZ6/Tmt60DPM5Sc4R0nS m9BBff0Nm0bSNRS8InXdO1Aq3362QKX2NOwcL5YaStwODNyZUqF7izjK4QARAQAB zTxEZW1pIE9iZW5vdXIgKElUTCBFbWFpbCBLZXkpIDxhdGhlbmFAaW52aXNpYmxl dGhpbmdzbGFiLmNvbT7CwY4EEwEIADgWIQR2h02fEza6IlkHHHGyiLVf/5wiwQUC X6YJvQIbAwULCQgHAgYVCgkICwIEFgIDAQIeAQIXgAAKCRCyiLVf/5wiwWRhD/0Y R+YYC5Kduv/2LBgQJIygMsFiRHbR4+tWXuTFqgrxxFSlMktZ6gQrQCWe38WnOXkB oY6n/5lSJdfnuGd2UagZ/9dkaGMUkqt+5WshLFly4BnP7pSsWReKgMP7etRTwn3S zk1OwFx2lzY1EnnconPLfPBc6rWG2moA6l0WX+3WNR1B1ndqpl2hPSjT2jUCBWDV rGOUSX7r5f1WgtBeNYnEXPBCUUM51pFGESmfHIXQrqFDA7nBNiIVFDJTmQzuEqIy Jl67pKNgooij5mKzRhFKHfjLRAH4mmWZlB9UjDStAfFBAoDFHwd1HL5VQCNQdqEc /9lZDApqWuCPadZN+pGouqLysesIYsNxUhJ7dtWOWHl0vs7/3qkWmWun/2uOJMQh ra2u8nA9g91FbOobWqjrDd6x3ZJoGQf4zLqjmn/P514gb697788e573WN/MpQ5XI Fl7aM2d6/GJiq6LC9T2gSUW4rbPBiqOCeiUx7Kd/sVm41p9TOA7fEG4bYddCfDsN xaQJH6VRK3NOuBUGeL+iQEVF5Xs6Yp+U+jwvv2M5Lel3EqAYo5xXTx4ls0xaxDCu fudcAh8CMMqx3fguSb7Mi31WlnZpk0fDuWQVNKyDP7lYpwc4nCCGNKCj622ZSocH AcQmX28L8pJdLYacv9pU3jPy4fHcQYvmTavTqowGnM08RGVtaSBNYXJpZSBPYmVu b3VyIChsb3ZlciBvZiBjb2RpbmcpIDxkZW1pb2Jlbm91ckBnbWFpbC5jb20+wsF4 BBMBAgAiBQJafgNKAhsDBgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAKCRCyiLVf /5wiwYa/EACv8a2+MMou9cSCNoZBQaU+fTmyzft9hUE+0d5W2UY1RY3OsjFIzm9R /4SVccfsqOYLEo+S0vQMIIIqFEq3FCpXXwPzyimotps05VA8U3Bd7yseojFygOgK sAMOAee2RCaDDOnoJue01dfZMzzHPO/TVdp3OvnpWipfv5G1Xg96rwbhMLE3tg6N xwAHa31Bv4/Xq8CJOoIWvx6fcmZQpz01/lSvsYn0KrfEbTKkuUf0vM9JrCTCP2oz VNN5BYzqaq2M4r+jmSyeXLim922VOWqGkUEQ85BSEemqrRS06IU6NtEMsF8EWt/b hWjk/9GDKTcnpdJHTrMxTspExBiNrvpI2t+YPU5B/dJJAUxvmhFrbSIbdB8umBZs I3AMYrEmpAbh5x7jEjoskUC7uN3o9vpg1oCLS2ePDLtAtyBtbHnkA4xGD7ar8mem xpH9lY/i+sC6CyyIUWcUDnnagKyJP0m9ks0GLsTeOCA0bft2XA6rD6aaCnMUsndT ctrab42CV5XypjmC4U1rPJ8JQJUh1/3P48/8sMH+3krxpJ06KNWNFaUbaMTGiltZ 7x9DngklSYrX0T+2G4kVXNmjaljwkoLahwLla2gUWwBSyofXdqyhQdwZsp01KXNQ UCyT/Pg+aDcm/E7OMV3d4lf7g/CSxiX2GSEe6BlhSz+Lmd7ZJ3g32M1ARGVtaSBN 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 EtJuZYM5blWncBOJCoWMnBEcTEo/viU3GgcVRw=3D=3D =3Dx94R -----END PGP PUBLIC KEY BLOCK----- --------------2j9xSqUmOdFKopsD60o3sW2P-- --------------UdZiIKSU0IUfxMXqlKlITlY8-- --------------8elteL4hvTi0D0NqVZfv9rUN Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEEopQtqVJW1aeuo9/sszaHOrMp8lMFAmkt5poACgkQszaHOrMp 8lOFFg/9HBunPvy3e/ltmw1RFBB/gTik/2lJGKWOM1gCA1DbDonJdDzGuhVHBpsg sss0zsr6d6Q9kOWzfbCgjp88fyF9CHUaSC/kgVluNB/Y9cgvlop+9MdKC/z3V8sr UvgbCDxhTlXOFmiNgNBdnI9ulqUhC2lHczLyfvYC6gYbiLvHZHzub8Vwnrn5jXg5 wjPT/WrwZDdJCmkyNDeOSMKm/s0VO+0mpKHOI2XdPAyifVHIShV2nra8aZzi/ZGX ySCgbrDQ0k9GsrRfQ8j28NrlWR40eJPszKZWR5uIZSi5cuUm+iF+JOobkpG7gWni tJmg4+nbj3Hd4d+47++b+Slsf0LkaE0C6uahqV3yZLyyOykTpmN9FytI1zOzxYf1 ufH/lp3pH4RVbWnKKxzV6vYIZdxz0JX0N5eCxCffuphVRgQLo3PF74VsM5gAuxeE tNdAmQgTUC6biSmT6FrgOYskq12jeoeekUQtFPRNjTth/48qko56JGoGE0F3N2J/ HONLyr/iYRbqLymu797eoWUZ9BwIpNHtspLSmrT17tYiz9EEahJZhbDcnW715p8C F1oUUKygKGF1bv18voSxzRRD+SOHdUO+rwosUpQ1j8u6rkhAO64uVjSqbn9q2mOV g7WB64Qp+v17A3dZjoVZgvTkfLA1r17AsL18PnhpDepsIolDMes= =pYzB -----END PGP SIGNATURE----- --------------8elteL4hvTi0D0NqVZfv9rUN--