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 F23C4F5FF; Wed, 01 Oct 2025 17:45:18 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 993) id BA385F5FA; Wed, 01 Oct 2025 17:45:17 +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-yw1-x112f.google.com (mail-yw1-x112f.google.com [IPv6:2607:f8b0:4864:20::112f]) by atuin.qyliss.net (Postfix) with ESMTPS id E9BB9F5F8 for ; Wed, 01 Oct 2025 17:45:16 +0000 (UTC) Received: by mail-yw1-x112f.google.com with SMTP id 00721157ae682-72e565bf2feso1866547b3.3 for ; Wed, 01 Oct 2025 10:45:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1759340715; x=1759945515; darn=spectrum-os.org; h=in-reply-to:autocrypt:from:content-language:references:to:subject :user-agent:mime-version:date:message-id:from:to:cc:subject:date :message-id:reply-to; bh=cXqTy5clYPWmDVmyEyVfEQE0EZLtNiTFJhHCkpl7/i0=; b=hQCtjLlbAwJMlnw/awr94gcIBqJJddQAqeMqhGf9zQ9qiYFeYexJK4NkDhAR0cXd/5 dW2Uutc3yrCNrJPcmBuG28CUeHUe3RRl56Lts87taiw4ZbQ2Gd2fl1NktE39e1Am3IsO x7vNpsgrQ5ehHXm1+SBH1j7CgrXSwf0xtHck6u66OyySchwxoaGZfWH2kZEAherYwPXd NbodSop0w9tVLY5LoTyHEaqfNzFL2ndyfoHrM+WkKhrdgDomTfRpmHbeQHpf+eipyTSe 8wdvbLfd+p11pWvQZNAVJWvJ1EuqpPaCYKzBagfwvWT6c21Y2L/KzOjr4+l+g+eEKdzA V6qg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759340715; x=1759945515; h=in-reply-to:autocrypt:from:content-language:references:to:subject :user-agent:mime-version:date:message-id:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=cXqTy5clYPWmDVmyEyVfEQE0EZLtNiTFJhHCkpl7/i0=; b=fqe5QCiiTnTQTcjbBvOQBKwPvh5+42yw209aCGWIPXiu40A/I3HID30+6t1mw0sS41 zZByyD9YEjI6+d/HQyyMo06LU44YnAZoD0RZR6ZcBr2ztRGx7xJV+4UiyVZmZ5NUfSNU TBOyVk+dgm3N6DB/UwYaF0OThB49MoRT3e5LWrwGmKGmnx+10fCgUcO+GPlAIs3a6h5y 3YWdiuMTBv5HsnP71yEoyBW0eeD9ORA8hoo5TOvvewG+BzwL43ykByIDtLN5g3EYh9Wl K6ltP43JyA4cDQH9FCpG18AzqJ+HqfAJJ32prwgcGGoHPFtgwC5ag6NB04gN97KTwz6W LMeQ== X-Forwarded-Encrypted: i=1; AJvYcCURctqGrtpZgYUNgHdIKVU601WDPCbDxAHxkzrkFzpiIb2HfsP+6kWOaWSo6e3K/TVeuWePEA==@spectrum-os.org X-Gm-Message-State: AOJu0YzAPwsoPjShJYLVl15c+5HQMroykGSk++LoGxPct3gU5yuyQ7Z3 hn2fREFMDED3dq05y1VsvOwBeK1rqanp/Hp0M4V5s44PCu5xBNc9VwNV X-Gm-Gg: ASbGncsxdQq9fMJ7q2BkrQ9llqfQBkdXRuwvSbJDE3tUwk3UaNN61pBo8uKvOHSCQ8N V2uofI65YZxF1phZfILYfjrZfWgznDibj2H9WaTZGNtV+EWNz4KXr9lmKm1XIH49uNLh5y5W9KJ Ow56zAjhl52+4BNoKj0nmGlyZ/vjxTdgEo++9VjLx8zmf3frXgXSz4DC4MDaPdr3lRN12CCJ3DR 5kCrSeXWs/WLqQuq1akA8gnTHh5qQzlnU4b3bkcZsNlu7J0PKnTKQmE9IYTX9CmHIQiVfNlSJc8 NS/Sm1KlQoxbdNRayTbrGPs2+DtuJhFNYXnppQ+ou9jmYy+KWMf6DKYpIXhV1ZExO/eFfeK/cKp VnOJfQwBkvziojhxt3jnZzlazsEEeldfv86LL6ygoZfNenNQI3A1bwTB0706oha0vSWciORcD2+ 27Bw9nlhUO3wLw3gsfIY+pNYKGnjsW/v0rNiLybAY35AYqYRoTrK/06Ys/G2c= X-Google-Smtp-Source: AGHT+IHYYkbRdMVQOD33b2PKQ2Ivlj0OU/vYPCGxkgZAuF/D82/TPOhbGa9ExjUjSqJ3EKGhc/lrig== X-Received: by 2002:a05:690c:9985:b0:77f:73a1:c346 with SMTP id 00721157ae682-77f73a1c6e2mr38154187b3.4.1759340714383; Wed, 01 Oct 2025 10:45:14 -0700 (PDT) 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 956f58d0204a3-63b84570ea1sm29370d50.4.2025.10.01.10.45.13 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 01 Oct 2025 10:45:13 -0700 (PDT) Message-ID: <0234f9af-a92b-4a43-ae7e-12c48f3795c4@gmail.com> Date: Wed, 1 Oct 2025 13:45:09 -0400 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH 1/2] scripts: format with shfmt To: Alyssa Ross , devel@spectrum-os.org References: <20251001102838.7086-1-hi@alyssa.is> <20251001102838.7086-2-hi@alyssa.is> Content-Language: en-US From: Demi Marie Obenour Autocrypt: addr=demiobenour@gmail.com; keydata= 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 +MYSfkEjBz0E8CLOcAw7JIwAaeBT In-Reply-To: <20251001102838.7086-2-hi@alyssa.is> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="------------8JPF1UByrP8DClBS0VMlkLv9" Message-ID-Hash: D23ZB7I2BSSWVLWF5VAWY6WCASGBA36T X-Message-ID-Hash: D23ZB7I2BSSWVLWF5VAWY6WCASGBA36T 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) --------------8JPF1UByrP8DClBS0VMlkLv9 Content-Type: multipart/mixed; boundary="------------6L8wbp9M9SzbqLMGpd6ICiyg"; protected-headers="v1" From: Demi Marie Obenour To: Alyssa Ross , devel@spectrum-os.org Message-ID: <0234f9af-a92b-4a43-ae7e-12c48f3795c4@gmail.com> Subject: Re: [PATCH 1/2] scripts: format with shfmt References: <20251001102838.7086-1-hi@alyssa.is> <20251001102838.7086-2-hi@alyssa.is> In-Reply-To: <20251001102838.7086-2-hi@alyssa.is> Autocrypt-Gossip: addr=hi@alyssa.is; keydata= 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 k2wOTWzl7wFH --------------6L8wbp9M9SzbqLMGpd6ICiyg Content-Type: multipart/mixed; boundary="------------Y844oRVMsjaDBuUSSMU5yEX6" --------------Y844oRVMsjaDBuUSSMU5yEX6 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable On 10/1/25 06:27, Alyssa Ross wrote: > This is actually a treewide shfmt run, but I guess nothing outside of > scripts/ has any formatting issues. >=20 > Signed-off-by: Alyssa Ross > --- > scripts/dist-cloud-hypervisor.sh | 4 +- > scripts/format-uuid.sh | 2 +- > scripts/make-erofs.sh | 8 +-- > scripts/run-qemu.sh | 109 ++++++++++++++++---------------= > scripts/update-nixpkgs.sh | 4 +- > 5 files changed, 64 insertions(+), 63 deletions(-) >=20 > diff --git a/scripts/dist-cloud-hypervisor.sh b/scripts/dist-cloud-hype= rvisor.sh > index 603c2df..22bcbaa 100755 > --- a/scripts/dist-cloud-hypervisor.sh > +++ b/scripts/dist-cloud-hypervisor.sh > @@ -16,6 +16,6 @@ trap 'rm -rf -- "$dir"' EXIT > mkdir -p -- "$dir/$name/LICENSES" > cp -- LICENSES/Apache-2.0.txt LICENSES/LicenseRef-BSD-3-Clause-Google.= txt \ > "$dir/$name/LICENSES" > -cat pkgs/cloud-hypervisor/*.patch > "$dir/$name/cloud-hypervisor.patch= " > -cat pkgs/cloud-hypervisor/vhost/*.patch > "$dir/$name/vhost.patch" > +cat pkgs/cloud-hypervisor/*.patch >"$dir/$name/cloud-hypervisor.patch"= > +cat pkgs/cloud-hypervisor/vhost/*.patch >"$dir/$name/vhost.patch" > tar -C "$dir" -czf "$name.tar.gz" -- "$name" > diff --git a/scripts/format-uuid.sh b/scripts/format-uuid.sh > index 497a5f2..3b38278 100755 > --- a/scripts/format-uuid.sh > +++ b/scripts/format-uuid.sh > @@ -4,7 +4,7 @@ > # SPDX-FileCopyrightText: 2022 Unikie > # SPDX-License-Identifier: EUPL-1.2+ > =20 > -substr () { > +substr() { > str=3D$1 > beg=3D$2 > end=3D$3 > diff --git a/scripts/make-erofs.sh b/scripts/make-erofs.sh > index ad04844..7e46847 100755 > --- a/scripts/make-erofs.sh > +++ b/scripts/make-erofs.sh > @@ -35,8 +35,8 @@ while read -r arg1; do > # a subset of all paths, but this subset includes all of > # the ones passed in practice other than /. > case $arg2 in > - (*/*) parent=3D${arg2%/*};; > - (*) parent=3D.;; > + */*) parent=3D${arg2%/*} ;; > + *) parent=3D. ;; > esac I *really* don't like introducing mismatched parentheses, as it breaks parentheses matching in editors. Editors know about quoting, but probably not about case statements. Also, at least some shells misparse the form without the extra parentheses when inside $(...). > # Ensure any existing directories we want to write into are writable.= > @@ -50,8 +50,8 @@ while read -r arg1; do > =20 > # shellcheck disable=3DSC2030 # shadowed on purpose > case "$parent" in > - */*) parent=3D"${parent%/*}" ;; > - *) break ;; > + */*) parent=3D"${parent%/*}" ;; > + *) break ;; > esac > done > =20 > diff --git a/scripts/run-qemu.sh b/scripts/run-qemu.sh > index 64fd292..75ecef4 100755 > --- a/scripts/run-qemu.sh > +++ b/scripts/run-qemu.sh > @@ -6,14 +6,14 @@ > # which can't be handled portably in Make language. > =20 > case "${ARCH:=3D"$(uname -m)"}" in > - aarch64) > - machine=3Dvirt,accel=3Dkvm:tcg,gic-version=3D3,iommu=3Dsmmuv3 > - ;; > - x86_64) > - append=3D"console=3DttyS0${append:+ $append}" > - iommu=3Dintel-iommu,intremap=3Don > - machine=3Dq35,accel=3Dkvm:tcg,kernel-irqchip=3Dsplit > - ;; > +aarch64) > + machine=3Dvirt,accel=3Dkvm:tcg,gic-version=3D3,iommu=3Dsmmuv3 > + ;; > +x86_64) > + append=3D"console=3DttyS0${append:+ $append}" > + iommu=3Dintel-iommu,intremap=3Don > + machine=3Dq35,accel=3Dkvm:tcg,kernel-irqchip=3Dsplit > + ;; > esac > =20 > i=3D0 > @@ -22,49 +22,50 @@ while [ $i -lt $# ]; do > shift > =20 > case "$arg" in > - -append) > - set -- "$@" -append "${append:+$append }$1" > - i=3D$((i + 2)) > - shift > - continue > - ;; > - -device) > - IFS=3D, > - for opt in $1; do > - case "$opt" in > - *-iommu) > - unset iommu > - ;; > + -append) > + set -- "$@" -append "${append:+$append }$1" > + i=3D$((i + 2)) > + shift > + continue > + ;; > + -device) > + IFS=3D, > + for opt in $1; do > + case "$opt" in > + *-iommu) > + unset iommu > + ;; > + esac > + break > + done > + unset IFS > + ;; > + -machine) > + set -- "$@" "$arg" > + i=3D$((i + 1)) > + arg=3D > + > + IFS=3D, > + for opt in $1; do > + case "$opt" in > + virtualization=3Don) > + case "$ARCH" in > + aarch64) > + opt=3D"$opt,accel=3Dtcg" > + ;; > + *) > + continue > + ;; > esac > - break > - done > - unset IFS > - ;; > - -machine) > - set -- "$@" "$arg" > - i=3D$((i + 1)) > - arg=3D > + ;; > + esac > =20 > - IFS=3D, > - for opt in $1; do > - case "$opt" in > - virtualization=3Don) > - case "$ARCH" in > - aarch64) > - opt=3D"$opt,accel=3Dtcg" > - ;; > - *) > - continue > - ;; > - esac > - ;; > - esac > + arg=3D"$arg${arg:+,}$opt" > + done > + unset IFS > =20 > - arg=3D"$arg${arg:+,}$opt" > - done > - unset IFS > - > - shift > + shift > + ;; > esac > =20 > set -- "$@" "$arg" > @@ -74,12 +75,12 @@ done > =20 > for arg; do > case "$arg" in > - -append) > - append=3D > - ;; > - -kernel) > - kernel=3D1 > - ;; > + -append) > + append=3D > + ;; > + -kernel) > + kernel=3D1 > + ;; > esac > done > =20 > diff --git a/scripts/update-nixpkgs.sh b/scripts/update-nixpkgs.sh > index dd1b7de..e481eb0 100755 > --- a/scripts/update-nixpkgs.sh > +++ b/scripts/update-nixpkgs.sh > @@ -12,11 +12,11 @@ set -ueo pipefail > root=3D"$(dirname "$0")/.." > out=3D"$(mktemp -p "$root/lib" -t nixpkgs.default.nix.XXXXXXXXXX)" > =20 > -exec > "$out" > +exec >"$out" > =20 > rev=3D"$( > curl -fsLS "https://api.github.com/repos/NixOS/nixpkgs/branches/${1-n= ixos-unstable}" | > - jq -r .commit.sha > + jq -r .commit.sha This seems to be pointless extra indentation. > )" > url=3D"https://github.com/NixOS/nixpkgs/archive/$rev.tar.gz" > =20 --=20 Sincerely, Demi Marie Obenour (she/her/hers) --------------Y844oRVMsjaDBuUSSMU5yEX6 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----- --------------Y844oRVMsjaDBuUSSMU5yEX6-- --------------6L8wbp9M9SzbqLMGpd6ICiyg-- --------------8JPF1UByrP8DClBS0VMlkLv9 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/sszaHOrMp8lMFAmjdaKYACgkQszaHOrMp 8lOLGBAAhg/04c1yb+5A+b9ZGKaCTnxMw7qIoFirVbqBOsb5H7yKknN/KFb4/Vwu wkq88lFPDEigOo5zp/Wmetxs4ULMsh/KIKyvvtm1zYopFjJutZ+Q7O2hHaN4BomX kfR1omgGXuzRm6NNwOUTYkM8HHZIMp70/AH7YzcGkUyIoxrn8znwrRBiTyTbusH5 1+c6x2A4813VqVIlb6DA/miKpyPEN3PKVAZoVqgph5OPMNF58RqbB+wKQLIxDtVT OTNcODAlGU9W8BYRwrx1ZQzODeICh/hRmsKdvsQmhqxk4gw3Xjr21HgMqTY7vSG4 xUpUikeNwym1YTrkEThZqfBJ5vHuXR3PLMEDTtKi7o6V1GY/lmuI40EkW/jZw7Uo BBMO5Zw9owrlFUXwwSt9ORk/t6JYCd2KaPhpW3t4AfRuIdMfKhnrcvSOzkXhgmHI OnaZeQph1hnImqAcOi3zTmtkk6HJuXSFc6nsLAviF23YSgLf1lPVh60hlksdcN1+ rHQw1Srh1Q6cusoVaUdUf4NbvcmIBNsJ78L9jLGGVLuPRTnlIYiEjNvPuIvxDWYy xvxCNt8l4k21jYyxKETgtpQR1MPi6GRekbAsXehYxPtpxDgTkm4Xn5/4Itui2dr2 x+m/f4Vt4k4xXBVnWmPTB8SPGzT18RdcUeoevmxkCfsGESfazWY= =TIWy -----END PGP SIGNATURE----- --------------8JPF1UByrP8DClBS0VMlkLv9--