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 B17DB6611; Sun, 21 Sep 2025 16:51:42 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 993) id E0DD06604; Sun, 21 Sep 2025 16:51:39 +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-x112e.google.com (mail-yw1-x112e.google.com [IPv6:2607:f8b0:4864:20::112e]) by atuin.qyliss.net (Postfix) with ESMTPS id AF2A46603 for ; Sun, 21 Sep 2025 16:51:38 +0000 (UTC) Received: by mail-yw1-x112e.google.com with SMTP id 00721157ae682-74ea5d32022so1966407b3.1 for ; Sun, 21 Sep 2025 09:51:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1758473497; x=1759078297; 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=3Zf94fP0ps/bBELIFWEZX9aIQR0e3ceSxLukMBMA/C4=; b=k6AbsU7OJykEpM5M67VH07ZOlplXx2p+9mlrrE+fk4ayRBjWv9odIsu4vV/LP1Ud1V 8se+tXhQk0J6vMkJSuhMYs4lLkqxdWhX6k9FlqOBCsAfhwtdJ84QyoKGo+FGtir1FbEC V1kf2OsZE4CpMxy7ke0zrL+Ig+Z7KnfcIJydhyZIMWFD78IiqvXZGJPf1vDIizIt7zqi VUDTIo5zgKPR5sBy22Ix39ceQM0qGPPEzkrr1FHIowafgCs1rNNqSTsRqxqd0CMe+Rhw HePCa/7dX+aC3GtfmK+S0b15WZZ+W1vjmGshakfAy/NoEdcND096bNqwYYfAeQVQxweI fu5g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1758473497; x=1759078297; h=in-reply-to:autocrypt:from:content-language:references:cc:to :subject:user-agent:mime-version:date:message-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=3Zf94fP0ps/bBELIFWEZX9aIQR0e3ceSxLukMBMA/C4=; b=XK4A7HYiL8x7+qGQJY8cy4BEBgMgFIXxKbd2ygRr36KlHpVAwlQGGOJyjiz0hmzJui rGTnvW+1K2m1BjNslkGLJD+4PFBxcaXHQTcQW9UFnwAqKUcEpwjzSaQ4KCpyNJulai7S OUxbGLxjDraNsmBE1Qc7aALLIBwJEwLWZIg/uhkeUKFrIT+dymEjn7y+7VvaHfkZ2fBF jlJMxOhgeIt+gF8T6+HIVSQzTebmPF0qjkKVJN9CJ4a7q2wa6zD6ewMCYL+pntMoGyIT C2CtnVW1YSPSh70sbWz8ZhVc0lrfin9BTqlRSYb7oZtbjZZz4l1gKdb3xCQJqoMjB2Q7 s9qg== X-Gm-Message-State: AOJu0YzaABRSiGhtrz+/oLrL6Gzo063g2NvlHV1Y6WZhDUXcdaz6uBFn 51LN4Tngt0Bqc8Hz8XFFkMJ3R7zp9WyIpSUjvY5EUCYT3sbTNZhtEmjDqQmekQ== X-Gm-Gg: ASbGncvxVMzTXK0aSwIAcKsnnL5ZIjF2tw0u9HjjISvcrZqpku57NkK//hgenJMizPM SEYpmQ2zbRyyZCK8J6C0nfqVnXB9hcT2KFpOXGR10XD/G51pR7YU/ZGcPHMa3zrueuVIpkihweQ /3L/dUS6NM0cEhnuURCdB1wur3AvPM2WkD7VuS7vvsc3tTPwPsmKASeKQGLf1BK/PnAjXHR20qb +V00/kOpy6qBnqBmyCt+upsPCl1zlI0p/Ic1WMGMEjJIrHZJhJ7cRcwMuaOAzQnwsgoask3bMJO 0RboI2WQIxC3N52ln1vsAwt6V/2cvT4YzGkXZqD9w/blh7eDQzfEIF2UNig2qUBrjtnKDVs5avF Akp4qG1n0bx3oFKxVS+eXsfJStSlEp60GpHxnA8knqMJpK5Ah286Q1sRVUS+NOtND4+88RCu5QT U5C529YIlDRsrexFXCPDsMvxCuSTNvy6o1AW0= X-Google-Smtp-Source: AGHT+IGRbRlaSQVOWuR2/mbuELRxarSYdUPWLTACbE7I/YNtVkU9Kg14wKc+rORTsHLZimSjt6SQjA== X-Received: by 2002:a05:690c:3507:b0:739:7377:fdcf with SMTP id 00721157ae682-73d39c800famr93012057b3.27.1758473496880; Sun, 21 Sep 2025 09:51:36 -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 00721157ae682-739716bf784sm28328067b3.5.2025.09.21.09.51.35 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 21 Sep 2025 09:51:36 -0700 (PDT) Message-ID: Date: Sun, 21 Sep 2025 12:51:31 -0400 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v3] Generate file lists from a script To: Alyssa Ross References: <20250910-genfiles-v2-0-37ebe07a3cdc@gmail.com> <20250920-genfiles-v3-1-d6c2b6767b42@gmail.com> <87bjn4b39h.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: <87bjn4b39h.fsf@alyssa.is> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="------------WuiMTtrq6MEFW0YxnL3QASJa" Message-ID-Hash: YB7AEYAAKZX7T24EUGCBX6JT7RSAXXOD X-Message-ID-Hash: YB7AEYAAKZX7T24EUGCBX6JT7RSAXXOD 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) --------------WuiMTtrq6MEFW0YxnL3QASJa Content-Type: multipart/mixed; boundary="------------W81ev7vNLqLOgLaH26NmGkKy"; protected-headers="v1" From: Demi Marie Obenour To: Alyssa Ross Cc: Spectrum OS Development Message-ID: Subject: Re: [PATCH v3] Generate file lists from a script References: <20250910-genfiles-v2-0-37ebe07a3cdc@gmail.com> <20250920-genfiles-v3-1-d6c2b6767b42@gmail.com> <87bjn4b39h.fsf@alyssa.is> In-Reply-To: <87bjn4b39h.fsf@alyssa.is> Autocrypt-Gossip: addr=hi@alyssa.is; keydata= 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 k2wOTWzl7wFH --------------W81ev7vNLqLOgLaH26NmGkKy Content-Type: multipart/mixed; boundary="------------bMX1dAIK0XvD7vVFooDtv60Z" --------------bMX1dAIK0XvD7vVFooDtv60Z Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable On 9/21/25 04:47, Alyssa Ross wrote: > Demi Marie Obenour writes: >=20 >> Right now, the makefiles in host/rootfs, vm/sys/net, and img/app have >> manually-maintained lists of files and symlinks. These duplicate the >> information in the git repository and can easily get out of sync or >> cause unnecessary merge conflicts. Fix all of these issues by having >> the git repository be the source of truth, and using a script to >> generate the file lists. Developers can regenerate the lists before >> every commit, or even add a git hook to do that. >> >> Signed-off-by: Demi Marie Obenour >> --- >=20 > I like where this is going. :) Yay! >> Changes in v3: >> - Only include the file list generator. Move the rest to separate pat= ch >> series. >> - Remove the update-file-list make targets from img/app/Makefile and >> vm/sys/net/Makefile. >> - Link to v2: https://lore.kernel.org/r/20250910-genfiles-v2-0-37ebe07= a3cdc@gmail.com >> >> Changes in v2: >> - Drop the last patch (switching to /etc/s6-rc/compiled) as it is >> controversial and should be reviewed separately. >> - Add missing copyright notices. >> - Use a wrapper shell script to make the awk code easier to read. >> - Improve documentation. >> - Add helper scripts for use in git hooks and rebasing. >> - Link to v1: https://spectrum-os.org/lists/archives/spectrum-devel/20= 250903-genfiles-v1-0-cc993fcb1e4c@gmail.com/ >> --- >> Documentation/development/built-in-vms.adoc | 17 ++++ >> host/rootfs/Makefile | 102 +------------------= ---- >> host/rootfs/file-list.mk | 99 +++++++++++++++++++= ++++ >> img/app/Makefile | 80 +++----------------= >> img/app/file-list.mk | 65 +++++++++++++++ >> lib/common.mk | 1 + >> scripts/genfiles.awk | 120 +++++++++++++++++++= +++++++++ >> scripts/genfiles.sh | 29 +++++++ >> scripts/git-rebase | 17 ++++ >> scripts/pre-commit.sh | 11 +++ >=20 > Let's take git-rebase and pre-commit.sh out of this patch, and focus on= > the generated file lists first. Will change. >> vm/sys/net/Makefile | 50 ++---------- >> vm/sys/net/file-list.mk | 42 ++++++++++ >> 12 files changed, 422 insertions(+), 211 deletions(-) >> >> diff --git a/Documentation/development/built-in-vms.adoc b/Documentati= on/development/built-in-vms.adoc >> index e90009ee5a3c2c254a7ae11e36121576b819eee7..0addc7d1a2fd322fa12918= 656baa3d169478504d 100644 >> --- a/Documentation/development/built-in-vms.adoc >> +++ b/Documentation/development/built-in-vms.adoc >=20 > Copyright header please! Will fix. Also, in the future you have permission to fix missing copyrig= ht headers when you commit. It's fine if you aren't comfortable doing that.= >> @@ -44,6 +44,23 @@ NOTE: As a special convenience, it's not necessary = to run `make clean` >> if the only change to the Nix files is modifying the packages >> installed in the VM. >> =20 >> +The list of files used for the VM image is stored in a separate file,= >> +`file-lists.mk`. To update it, run `scripts/genfiles.sh` >=20 > Typo: file-list*s*.mk. Also, so far we haven't used code syntax for > file names. >=20 > Maybe "used for images" would be better, since this also applies to > host/rootfs. (Obviously the ideal would be if this documentation wasn'= t > only written for VM images but that's out of scope. We'll get to it.) Will fix. >> +which will regenerate it from the output of `git ls-files`. Any >> +changes you made will be lost. This script uses uses Git's index to >=20 > I think "Any changes you made will be lost." is a bit scary, because > it's not clear it only means changes to those files. The sentence coul= d > probably just be dropped altogether =E2=80=94 I think it's implied by "= regenerate". Will fix. >> +generate the list, so you need to use `git add`, `git rm`, and `git m= v` >> +to ensure that Git knows about your changes. It is not necessary to >> +commit the changes. >=20 > "so only staged changes will be reflected"? All the extra stuff has > potential for confusion I think =E2=80=94 for example "It is not necess= ary to > commit the changes." could be read as "when you make a commit, do not > include changes to file-list.mk". Will fix. >> diff --git a/lib/common.mk b/lib/common.mk >> index 277c3544036d9a9057f8ba4ad37fe2207548cc59..0a03ff440cc671264d2b85= 9a2ae048db9252d047 100644 >> --- a/lib/common.mk >> +++ b/lib/common.mk >> @@ -1,5 +1,6 @@ >> # SPDX-License-Identifier: EUPL-1.2+ >> # SPDX-FileCopyrightText: 2021, 2023, 2025 Alyssa Ross = >> +# SPDX-FileCopyrightText: 2025 Demi Marie Obenour >> =20 >> BACKGROUND =3D background >> CPIO =3D cpio >=20 > Accident? Yes. >> diff --git a/scripts/genfiles.awk b/scripts/genfiles.awk >> new file mode 100644 >> index 0000000000000000000000000000000000000000..6fe327fd0a314d226dbce2= 3854aa8f119e9c8f34 >> --- /dev/null >> +++ b/scripts/genfiles.awk >> @@ -0,0 +1,120 @@ >> +#!/usr/bin/env -S LC_ALL=3DC LANGUAGE=3DC awk -E >> +# SPDX-License-Identifier: EUPL-1.2+ >> +# SPDX-FileCopyrightText: 2025 Demi Marie Obenour >> +BEGIN { >> + RS =3D "\n"; >> + FS =3D "\t"; >> + file_count =3D 0; >> + symlink_count =3D 0; >> + rc_count =3D 0; >> + is_rc =3D 0; >> + exit_code =3D 0; >> + done =3D 0; >=20 > awk variables are implicitly initialized to 0 when you try to do > arithmetic on an undefined variable, so no need for these. GNU Awk can lint against that. I used its lint mode because it also warns against non-portable constructs. Also, an undefined awk variable used as an array subscript is treated as the empty string, not 0, which could lead to confusion. >> + modes["120000"] =3D "symlink"; >> + modes["040755"] =3D "directory"; >> + modes["100644"] =3D "regular"; >> + modes["100755"] =3D "regular"; >> +} >> + >> +function fail(msg, status) { >> + if (status ~ /^([1-9][0-9]?|1[0-9]{2}|2[0-4][1-9]|25[1-5])$/) { >> + exit_code =3D status; >> + } else { >> + exit_code =3D 1; >> + status =3D 1; >> + } >> + print ("FATAL: " msg) > "/dev/stderr"; >> + exit status; >=20 > Do we ever want to exit something other than 1 from this function? Nope. >> +} >> +done { fail("Junk after DONE", 1); } >> +/^DONE$/ { >> + done =3D 1 >> + next >> +} >> + >> +# Make sure git produced valid output. >> +!/^[0-7]{6}\t[ -~]+$/ { >> + fail("git ls-files produced invalid output", 1); >> +} >> + >=20 > This is very unlikely to happen, and if it does, it will be obvious fro= m > the diff. Will drop. >> +# Extract data from built-in variables. >> +{ >> + filename =3D $2; >> + raw_mode =3D $1; >> + # awk autocreates empty string entries if the key is invalid, >> + # but the code exits in this case so that is okay. >> + mode =3D modes[raw_mode]; >> +} >> + >> +# Another check for a git bug. >> +filename ~ /^\/|((^|\/)\.{0,2}($|\/))/ { >> + fail("git ls-files output non-canonical or absolute path '" filename= "'", 1); >> +} >> + >=20 > If there are git bugs, we will notice and report them. We do not need > to be the test suite for git here. Okay, fair! >> +filename ~ /[^[:alnum:]_.+@/-]/ { >> + fail("filename '" filename "' has forbidden characters", 1); >> +} >> + >> +/\.license$/ { >> + if (raw_mode !=3D "100644") { >> + fail("License file '" filename "' is executable or not regular file= ", 1); >> + } >> + next; >> +} >=20 > This is also not really in scope for a script that does not care about > license files. Fair. I will leave that to the reuse check. >> + >> +mode =3D=3D "directory" { next } >=20 > Getting a directory from git ls-files would be sufficiently unexpected > that I don't think we should treat it any differently from an > unrecognized mode. Will fix. >> + >> +filename ~ /^image\/etc\/s6-rc\// { >> + if (mode !=3D "regular") { >> + fail("s6-rc-compile input '" filename "' isn't a regular file"); >> + } >> + rc_count +=3D 1; >> + rc_files[rc_count] =3D filename; >=20 > rc_files[rc_count++] >=20 > (will make it 0-indexed though so update the loops too) I think this might break without explicit variable initialization. >> + next; >> +} >> + >> +mode =3D=3D "symlink" { >> + symlink_count +=3D 1; >> + symlinks[symlink_count] =3D filename; >> + next; >> +} >> + >> +mode =3D=3D "regular" { >> + file_count +=3D 1; >> + files[file_count] =3D filename; >> + next; >> +} >> + >> +{ fail("File '" filename "' is not regular file, directory, or symlin= k (mode " raw_mode ")"); } >> + >> +END { >> + if (exit_code) { >> + exit exit_code; >> + } >> + if (!done) { >> + fail("Did not receive DONE line", 1); >> + } >> + printf ("# SPDX-License-Identifier: CC0-1.0\n" \ >> + "# SPDX-FileCopyrightText: 2025 Demi Marie Obenour \n" \ >=20 > Okay, so, it's silly that this needs to have a copyright header on it a= t > all, but since we have to have one to make reuse happy, I think it > should be mine from 2021, because the comment about links is the closes= t > thing to creative expression in here. Will fix. >> + "# Generated by scripts/genfile.sh. Any changes will be over= written.\n" \ >> + "FILES ::=3D") > out_file; >=20 > I note the change to ::=3D. Do you think we should do that across the > board in our Makefiles? POSIX specifies ::=3D and it has better semantics in most cases, but I do= n't know if the BSD makes implement it. ::=3D causes the RHS to be expanded = immediately, so subsequent changes in variables referenced by it do not affect the LHS= =2E >> + for (array_index =3D 1; array_index <=3D file_count; array_index +=3D= 1) { >> + printf " \\\n\t%s", files[array_index] > out_file; >> + } >> + printf ("\n\n" \ >> +"# These are separate because they need to be included, but putting\n= " \ >> +"# them as make dependencies would confuse make.\n" \ >> +"LINKS ::=3D") > out_file; >> + for (array_index =3D 1; array_index <=3D symlink_count; array_index = +=3D 1) { >> + printf " \\\n\t%s", symlinks[array_index] > out_file; >> + } >> + printf "\n\nS6_RC_FILES ::=3D" > out_file; >> + for (array_index =3D 1; array_index <=3D rc_count; array_index +=3D = 1) { >> + printf " \\\n\t%s", rc_files[array_index] > out_file; >> + } >> + printf "\n" > out_file; >> + if (close(out_file)) { >> + print ("Cannot close output file: " ERRNO "\n") > "/dev/stderr"; >> + exit 1; >> + } >> +} >> diff --git a/scripts/genfiles.sh b/scripts/genfiles.sh >> new file mode 100755 >> index 0000000000000000000000000000000000000000..77a8d95e88b6851be94476= 98556efe4f1eab174b >> --- /dev/null >> +++ b/scripts/genfiles.sh >> @@ -0,0 +1,29 @@ >> +#!/usr/bin/env -S LC_ALL=3DC LANGUAGE=3DC bash -- >=20 > env -S is not portable, and I don't think anything here needs bash > specifically. $'\t' doesn't work with all shells, though I believe it is either part of the current POSIX standard or will be added. I'll use /usr/bin/env bash, which breaks if the script is renamed to something starting with '-'. > We can set the locale variables after the script starts, > because I don't think this wrapper script is going to do anything > locale-specific. (And shouldn't they be C.UTF-8?) The C locale is actually what I intended. The script does not rely on support for non-ASCII characters, and it does use the fact that negated character classes match all bytes. Admittedly, this will only be needed if there is a git bug. >> +set -euo pipefail >> +unset output_file astatus >=20 > This is a bit overly defensive IMO. Both of these variables are > assigned before use, and if they weren't, the person making those > changes would be very unlikely to not notice because they had those > variables defined in their environment. Fair! >> +case $0 in >> +(/*) cd "${0%/*}/..";; >> +(*/*) cd "./${0%/*}/..";; >> +(*) cd ..;; >> +esac >=20 > Perhaps we could use git rev-parse --show-toplevel? git ls-files doesn't have that option. >> +for i in host/rootfs img/app vm/sys/net; do >> + output_file=3D$i/file-list.mk >> + { >> + git -C "$i" -c core.quotePath=3Dtrue ls-files $'--format=3D%(objectm= ode)\t%(path)' -- image | >> + sort -t $'\t' -k 2 >=20 > TIL sort -t and -k! =F0=9F=A4=AF >=20 >> + echo DONE >=20 > Why do we need this? To avoid producing any output file if the input is truncated. >> + } | >> + gawk -v "out_file=3D$output_file.tmp" -E scripts/genfiles.awk >=20 > Why not stdout? The output file is created by awk so that it is only created if nothing went wrong. > And why gawk? I didn't immediately notice anything > non-POSIX, and as usual would prefer to stick to it. POSIX does not specify -E. I can use -f instead, though. >> + if [ -f "$output_file" ]; then >> + # Avoid changing output file if it is up to date, as that >> + # would cause unnecessary rebuilds. >> + if cmp -s -- "$output_file.tmp" "$output_file"; then >> + rm -- "$output_file.tmp" >> + continue >> + else >> + astatus=3D$? >> + if [ "$astatus" !=3D 1 ]; then exit "$astatus"; fi >=20 > Could avoid the need for the variable and multiple ifs. Up to you > whether you prefer it: >=20 > set +e > cmp -s -- "$output_file.tmp" "$output_file" > set -e > case $? in > 0) > rm -- "$output_file.tmp" > continue > ;; > 1) > ;; > *) > exit $? > ;; > esac This might set $? to the return value of 'set -e' (0). Whether or not it actually does is at least not obvious from reading the code. >> + fi >> + fi >> + mv -- "$output_file.tmp" "$output_file" >> +done --=20 Sincerely, Demi Marie Obenour (she/her/hers) --------------bMX1dAIK0XvD7vVFooDtv60Z 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----- --------------bMX1dAIK0XvD7vVFooDtv60Z-- --------------W81ev7vNLqLOgLaH26NmGkKy-- --------------WuiMTtrq6MEFW0YxnL3QASJa 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/sszaHOrMp8lMFAmjQLRQACgkQszaHOrMp 8lOfhg/9E+ffrJUHGKpQUl5lALGegtpEADiI3V1L320it+4Y9+k5dXkAzoakw3mL xYsyRURZch9oQ4uktlTm5pZAYhpe2PTjOCNJojJAy41Tsqtkh281ugxUC8lMcguH Qx9GoZ6mgCaGgdSb1DiH7e6w7ECG8I02S7h7ZaB10Ta+3v1jbRHB8eaToHH1yEyN WOpKxB+OcTxeODkHdE9n/E507qKbEJA+1VnQr9y3oknfQFaMXHVaGFJzUdnosHC+ TvfZsj+xMIcaRrWGW4nHd7rp4DGSBA9g8WvdoAZz9auz8GYXAL2kUH94ZiL1FNho BX9tycpPmjBIArqi7N2Buvetudd2lpaC+tLpMpPc78VkcAcTY/kMn/CUx2vj9Vp5 aICdfvAe1Pc57pSzlqauCvPRsbXvHBYHyAgRsqxPl9h8S2T2q7c1GZUPLxulZc5M lWe6e67KwvGaWc49lpVM10G5ldnv15ML4/uJNqRaRUIIhIKOjvhiOsXoP11qMLYR HbqVg8v4mx8JGNO/srLGSfunT3CuFxttp5WI9VeOEUBXN9+6m0kB/d5+QALZesYj GxiWkV3OKksm/K+YVjIeJBiTT63RBUhOwwZ0qVkWDZodmRQAP+nly+QoICZ5OvO3 nJ6/7CD55XlWy2qQIPwEYdI2O4UPDx3q/zMJTXzAgeKrGkeCQek= =OxOu -----END PGP SIGNATURE----- --------------WuiMTtrq6MEFW0YxnL3QASJa--