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 6DE2B527A; Thu, 20 Nov 2025 19:43:01 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 993) id 0F6F45259; Thu, 20 Nov 2025 19:42:58 +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.1 required=3.0 tests=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-xb12b.google.com (mail-yx1-xb12b.google.com [IPv6:2607:f8b0:4864:20::b12b]) by atuin.qyliss.net (Postfix) with ESMTPS id 3EE235257 for ; Thu, 20 Nov 2025 19:42:56 +0000 (UTC) Received: by mail-yx1-xb12b.google.com with SMTP id 956f58d0204a3-641e942242cso1030137d50.1 for ; Thu, 20 Nov 2025 11:42:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1763667774; x=1764272574; darn=spectrum-os.org; h=in-reply-to:autocrypt:from:content-language:references:cc:to :subject:user-agent:mime-version:date:message-id:from:to:cc:subject :date:message-id:reply-to; bh=LlIojUHyL32tSBpE5WTAFroGbaA0O6QFUABS+FGo9ng=; b=c6LN+91eLgeTr5pBu1T4t+zFlSyHZ+8DtCInTk45tvMAfmFgdqk1o4FBGUuJvPqcQJ zdmPvGxgyeQOjgpRdgxFsUVTY7fWu8l/IVHn47tQHgb9tVeiwM/I4pgBGvwhUFveL5Kq c3Nzc0y/mIg6h84pCKL5zZuDl6cegwMdPHedxGl/xJnTjarTEIkcPPwozv//6rTO0jG4 X+AdgIonvsojqX22TQmjvWnj6sYG4Q66oWhzlSIcDkF5RGPVLAudLL4jOBsoon0+w1Dr wkiP2tM+pK1Cc/aeuiJr0eec2Zl9EG8A/JNl5dFPzrPTC+FGGCL1op5F1z/Z187slERh vzKg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763667774; x=1764272574; h=in-reply-to:autocrypt:from:content-language:references:cc:to :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=LlIojUHyL32tSBpE5WTAFroGbaA0O6QFUABS+FGo9ng=; b=jIO2bkR/I55yoOAsowMhdubFVVv+7V1hxP6Owj2n3rmxdy059JA7adLxu1CBSFlvCA l0Gt+9nOlGaVY1rGqZhRcfhsUJt9E2yKLaa8j2ycsBY9rZSKehB+VN8GKf8y0tBy0Cet Ii8LtIzJzfI+PaFKOEWfRk77t9uK43np3bIPURhlFArrOyhljeacvJYvK7PPIWAmwqLW uTeB3fNnCCTmUFc3J+LnfcNwY4mQzf/3RNpziTVfUEGTqw/IrSaefJ5pXtNbn8IxkIgo Fl9tTsthG1Z5cv9ld07bRLN25rVsMDrYbYDAW8XeHVmB6/t7vQibYJKx4Qe8apZU4A9t khJQ== X-Gm-Message-State: AOJu0Yw/ZO5vtNvqCZZ6KUEuepP2QBdIXrFE1kRrQwcD4wdz8CEi/+3F CnIG2FKRIU3doUkido4w+YT5q+k2K5u0+VA7RFC4ow4L5lmPFHjGWXxCcxq5kNOM X-Gm-Gg: ASbGncv6qDsP/DEkzDu2EGmCsSUlb2a5Ml0S4NTYY1xgsidkFE2uESB4/VfoN0aXiic YmixYe9BD6nR1PeGTLo/JoZH4Oe9Ri1FGngHTQjKoUINLaGHP13BPMZH76GYuN0aeIQOs+M4s1R iYqXK8IXPBdpugt7PoMk4kaPL9bVH63J1yYzOTUTybsbWrXW6reMgsagjpdAUTnZYyll8tRUqP0 tSOQc1c3NhvBnX5hXV+MkocnR8/BiBhG6YHCuHGb0CP+HVYiyWAvFEQ5WzX3MOMbAoYd/wd2KIZ aI5Y1SSMp8c5o6mEhwEn9M4cAC4tB6QI2rkCVxMiTVLv5q+VDkKof+2tdi/5IEBMdFATNtXqID/ If3Z7VlXYU+kZ73jO7oSveoPyTXVk/ratt25wGpGK8yQ/fVdduX+WOINDFfkO3flwUsf36FarhM YLn1pK9D2EBAiU8FbpTpW766Duy6CiZhUPJ1pgQd/tPVR8HBaf57CbM2muGxPE77Qg79hcLOpi3 GuD774EjLMARFYJWMKM/czGqmQ= X-Google-Smtp-Source: AGHT+IGMBmzliICGUuYekMwKxRTA+mMqckD3GYPgo/z5iYYhuu1LZEemgAc8HzdwLIYIL8A6PtFqXQ== X-Received: by 2002:a05:690e:1909:b0:63f:a46e:72e5 with SMTP id 956f58d0204a3-642f77bc50emr3414073d50.20.1763667773226; Thu, 20 Nov 2025 11:42:53 -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-78a7987f5efsm9926597b3.9.2025.11.20.11.42.52 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 20 Nov 2025 11:42:52 -0800 (PST) Message-ID: Date: Thu, 20 Nov 2025 14:42:37 -0500 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v2 6/8] Support updates via systemd-sysupdate To: Alyssa Ross References: <20251112-updates-v2-0-88d96bf81b79@gmail.com> <20251112-updates-v2-6-88d96bf81b79@gmail.com> <87tsyxc26t.fsf@alyssa.is> <154426ab-f42b-4c5e-9f0e-8a91abbe7596@gmail.com> <877bvslskd.fsf@alyssa.is> <2ade0084-7ce6-4be5-abc1-86e7a91f9dfa@gmail.com> <878qg04usr.fsf@alyssa.is> Content-Language: en-US From: Demi Marie Obenour Autocrypt: addr=demiobenour@gmail.com; keydata= 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 +MYSfkEjBz0E8CLOcAw7JIwAaeBT In-Reply-To: <878qg04usr.fsf@alyssa.is> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="------------CpWG7ChO66dqTRe8vvdgGTrw" Message-ID-Hash: S72SNOJOXAUJ4IMWAGRWNXVHNAISQ6FW X-Message-ID-Hash: S72SNOJOXAUJ4IMWAGRWNXVHNAISQ6FW 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 CC: Spectrum OS Development 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) --------------CpWG7ChO66dqTRe8vvdgGTrw Content-Type: multipart/mixed; boundary="------------YWUA8ZqjXUkYv6rUIgLZF0y7"; protected-headers="v1" From: Demi Marie Obenour To: Alyssa Ross Cc: Spectrum OS Development Message-ID: Subject: Re: [PATCH v2 6/8] Support updates via systemd-sysupdate References: <20251112-updates-v2-0-88d96bf81b79@gmail.com> <20251112-updates-v2-6-88d96bf81b79@gmail.com> <87tsyxc26t.fsf@alyssa.is> <154426ab-f42b-4c5e-9f0e-8a91abbe7596@gmail.com> <877bvslskd.fsf@alyssa.is> <2ade0084-7ce6-4be5-abc1-86e7a91f9dfa@gmail.com> <878qg04usr.fsf@alyssa.is> In-Reply-To: <878qg04usr.fsf@alyssa.is> Autocrypt-Gossip: addr=hi@alyssa.is; keydata= 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 wGxvGU7TX5ou --------------YWUA8ZqjXUkYv6rUIgLZF0y7 Content-Type: multipart/mixed; boundary="------------geLAu5opKVgNX1T1TxZRmh99" --------------geLAu5opKVgNX1T1TxZRmh99 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable On 11/20/25 09:56, Alyssa Ross wrote: > Demi Marie Obenour writes: >=20 >> On 11/14/25 07:14, Alyssa Ross wrote: >>> Demi Marie Obenour writes: >>> >>>> On 11/13/25 11:44, Alyssa Ross wrote: >>>>> Demi Marie Obenour writes: >>>>> >>>>>> + >>>>>> + backtick -E update_vm_id_ { >>>>>> + backtick -E id_path { readlink /run/vm/by-name/sys.appvm-upda= tes } >>>>>> + basename -- $id_path >>>>>> + } >>>>>> + >>>>>> + multisubstitute { >>>>>> + define fsdir /run/vm/by-id/${update_vm_id_}/fs >>>>>> + define update_vm_id ${update_vm_id_} >>>>> >>>>> Why? >>>> >>>> Avoiding serial substitution. >>> >>> But this is serial substitution. You're substituting update_vm_id_, = and >>> then you're doing another substitution of update_vm_id without the >>> underscore. Why? Why not the following? >>> >>> backtick update_vm_id { ... } >>> multisubstitute { >>> define fsdir ... >>> importas -Siu update_vm_id >>> } >> >> "serial substitution" means that one substitutes into a string >> that has already been substituted into. See the multisubstitute >> documentation for why this is bad. I avoided the route you describe >> because I wanted to define fsdir and update_vm_id in the same call >> to multisubstitute. >=20 > Right =E2=80=94 I now understand. I think going forward we might want = to > consider having to substitute more than once as an indication that the > script is too complicated for execline, which I'm sure you'll be happy > to here. But we can do this way for now and do a full audit of our > execline scripts later when we get a chance. That seems like a good idea. The multisubstitute command is there for a reason, though :). >>>>>> + } >>>>>> + >>>>>> + # $fsdir is read-only to the guest, but read-write to the host.= >>>>>> + # Directories bind-mounted into it are read-write to the guest.= >>>>>> + # See etc/s6-linux-init/run-image/service/vhost-user-fs/templat= e/run >>>>>> + # for details. >>>>>> + >>>>>> + # Set up /etc with what the VM needs. The VM will overlay this= >>>>>> + # on its own /etc. >>>>>> + if { rm -rf -- ${fsdir}/etc } >>>>>> + if { umask 022 mkdir -p -- ${fsdir}/updates ${fsdir}/etc/system= d } >>>>>> + if { cp -R -- /etc/updatevm/sysupdate.d /etc/updatevm/url-env $= {fsdir}/etc } >>>>>> + if { cp -- /etc/systemd/import-pubring.gpg ${fsdir}/etc/systemd= } >>>>> >>>>> Why copy rather than bind mount? >>>> >>>> Target does not exist and I didn't want to bind-mount all of /etc/sy= stemd. >>> >>> You can touch a file and then bind mount, and still save a copy. >> >> This is a tiny file. I suspect the extra exec is more expensive than >> the copy. >=20 > My concern is the tmpfs space utilization =E2=80=94 I know it's small b= ut I'd > like to avoid files being stored on tmpfs at all unless there's a good > reason. >=20 >>>>>> @@ -17,5 +18,11 @@ let >>>>>> callConfig =3D config: if builtins.typeOf config =3D=3D "lambda= " then config { >>>>>> inherit default; >>>>>> } else config; >>>>>> + finalConfig =3D default // callConfig config; >>>>>> in >>>>>> - default // callConfig config; >>>>>> + finalConfig // { >>>>>> + update-signing-key =3D builtins.path { >>>>>> + name =3D "signing-key"; >>>>>> + path =3D finalConfig.update-signing-key; >>>>>> + }; >>>>>> + } >>>>> >>>>> What does this do? >>>> >>>> This ensures that the Nix store path doesn't depend on the name of >>>> the update signing key, only its contents. >>> >>> Interesting. Does that matter, though? It ends up being called >>> /etc/systemd/import-pubring.gpg in the image regardless. >> >> Otherwise renaming it would cause a pointless rebuild of a bunchof stu= ff. >=20 > Okay. Can we do this at the point of use? I'd rather not have a > special override for this one config value =E2=80=94 it's another place= to have > to remember to read to understand how config works. >=20 >>>>>> diff --git a/vm/app/updates.nix b/vm/app/updates.nix >>>>>> new file mode 100644 >>>>>> index 0000000000000000000000000000000000000000..d2c1e5fcb35b37c7ed= 8a173f19b97894a36a7f0c >>>>>> --- /dev/null >>>>>> +++ b/vm/app/updates.nix >>>>>> @@ -0,0 +1,37 @@ >>>>>> +# SPDX-License-Identifier: MIT >>>>>> +# SPDX-FileCopyrightText: 2023 Alyssa Ross >>>>>> +# SPDX-FileCopyrightText: 2025 Demi Marie Obenour >>>>>> + >>>>>> +import ../../lib/call-package.nix ( >>>>>> +{ callSpectrumPackage, config, curl, lib, src >>>>>> +, runCommand, systemd, writeScript >>>>>> +}: >>>>>> + >>>>>> +let >>>>>> + update-url =3D config.update-url; >>>>>> + mountpoint =3D "/run/virtiofs/virtiofs0"; >>>>>> + sysupdate-path =3D "${systemd}/lib/systemd/systemd-sysupdate"; >>>>>> + runner =3D writeScript "update-run-script" >>>>>> + '' >>>>>> + #!/usr/bin/execlineb -P >>>>>> + if { mount -toverlay -olowerdir=3D${mountpoint}/etc:/etc -- o= verlay /etc } >>>>>> + envfile ${mountpoint}/etc/url-env >>>>> >>>>> Seems like overkill to use an envfile for a single URL? >>>> >>>> It is indeed overkill, but I'm not aware of a simpler option. >>>> There is backtick + cat but that's two programs rather than one. >>> >>> I think the canonical way would be redirfd + withstdinas, but that's >>> also two programs, so if you want to avoid that, perhaps s6-envdir? >>> Reading it isn't any simpler but writing it at least doesn't require = a >>> special tool. >> >> We need sed to generate the .transfer files anyway. >=20 > What does sed have to do with envfile/s6-envdir/etc? The envfile and the .transfer files were both generated with sed, so using an envfile didn't require any extra tools. However, v3 doesn't use an envfile anymore, so this is moot. >>>>>> + importas -i update_url UPDATE_URL >>>>>> + if { ${sysupdate-path} update } >>>>>> + if { ${curl}/bin/curl -L --proto =3Dhttp,https >>>>>> + -o ${mountpoint}/updates/SHA256SUMS.gpg ''${update_url}/SH= A256SUMS.gpg } >>>>>> + # systemd-sysupdate recently went from needing SHA256SUMS.gpg= to SHA256SUMS.sha256.asc. >>>>>> + # I (Demi) have no need if this is intentional or a bug. I a= lso have no idea if this >>>>>> + # behavior will stay unchanged in the future. Therefore, cre= ate both files and let >>>>>> + # systemd-sysupdate ignore the one it isn't interested in. >>>>>> + if { ln -f ${mountpoint}/updates/SHA256SUMS.gpg ${mountpoint}= /updates/SHA256SUMS.sha256.asc } >>>>> >>>>> Would be good to figure out why that happened. If we add a comment= like >>>>> this it's very unlikely to ever get cleaned up. >>>> >>>> https://github.com/systemd/systemd/issues/39273 >>> >>> "hwdb: drop trailing whitespace"? >> >> https://github.com/systemd/systemd/issues/39723 >> ("systemd-sysupdate checks for SHA256SUMS.sha256.asc when fetching fro= m file:///"), >> which was fixed in >> >> ("pull: fix SHA256SUMS fallback for file:// URLs"). >> systemd v258.1 should have the fix. Does Spectrum use an older nixpkg= s? >=20 > Yes, we're still on 258. I expect an update before this series is > applied though, because then we'll also pick up the systemd musl fix. That's good, thanks! v3 switches to SHA256SUMS.sha256.asc, as it seems to be the "proper" filename. --=20 Sincerely, Demi Marie Obenour (she/her/hers) --------------geLAu5opKVgNX1T1TxZRmh99 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----- --------------geLAu5opKVgNX1T1TxZRmh99-- --------------YWUA8ZqjXUkYv6rUIgLZF0y7-- --------------CpWG7ChO66dqTRe8vvdgGTrw 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/sszaHOrMp8lMFAmkfbzYACgkQszaHOrMp 8lMBpg/6AqucL5hRQIfBBZIT9CUEi0BcxORenlKLHI0ERo0XoRbSG7X+KD1BCqjx xWktmx3TCj2AI1xGdNdkczj600rYF4QVwb8DrIz+cp4K3XysUgqMihVUq5fEmcRX RHcp2p8dYRo6UXBJIKfUb/F7oDtM6xggEswxFLg0Enluww7GM+eTWOF2ngsYZuwY 4rdOKfkQOTKyGrjxa6sOhXwEMPlYzsfMsi3M3RTICdHFLkvMxLQoyuY/ND5EFokp rQ95uv7mgZVbGFOflpU/Hlr+JnQy/WzuaUL0oNReWE0OHuRV882ZUcoJSO0JOqZr sj3Zcj4nhnt6tDrhd1iDCFsOOwmoplwCoKIMoJFbBtuef8C85GqCpjDqU0xnEUFQ vusVcMb27xA1ccTHMC7iSO5VUCKJZZj+sVuPQCm1PdsV8WRMYc7Gg8uVEO44qvi9 Of4KR18sZpoF4pUl9QqoSLFAu315hMGYL71LF0TJkfsJLdSa64qUMdHHuzVwyLSu p+QKoAqNbdPVoWrGM5FH+vRftAGh6pTjAt/xPFB+fvkSLklSIZ9eW8fRHQC5gD8P sizEyJFKSK2naJYWCT8LKrReTQZGDbv+HrclcIOL2uuaX1GR9nWlazwr2DC75RKv bdTmtxyDeolRUG7jyKLJxjUy3GaUb+wUAFZaDRVX6GETWrplWjo= =IrZE -----END PGP SIGNATURE----- --------------CpWG7ChO66dqTRe8vvdgGTrw--