MIME-Version: 1.0
From: Dave Page <dpage@pgadmin.org>
Date: Mon, 1 Feb 2021 16:21:45 +0000
Message-ID: 
 <CA+OCxoz0JKkgw5tkiqK1FemLhB3O4FuXu7MOBF0B=6EYyvBqQA@mail.gmail.com>
Subject: UBI based container patch
To: pgadmin-hackers <pgadmin-hackers@postgresql.org>
Content-Type: multipart/mixed; boundary="000000000000a9265d05ba48c069"
Precedence: bulk

--000000000000a9265d05ba48c069
Content-Type: multipart/alternative; boundary="000000000000a9265a05ba48c067"

--000000000000a9265a05ba48c067
Content-Type: text/plain; charset="UTF-8"

* Do not commit this! *

The dev team have discussed moving the pgAdmin container to be based on
Redhat's UBI instead of Alpine Linux. I got some time today to work on
that, and a patch is attached for interest/archives.

Whilst the build process is arguably cleaner with this patch, plus it
would be easier to maintain the versions of the PostgreSQL tools that are
included, unfortunately using UBI takes the size of the container from
~278MB to ~462MB.

So... unless someone finds a huge error in the patch that causes this
bloat, I think we have no choice but to stick with Alpine Linux.

Any thoughts/comments?

-- 
Dave Page
Blog: http://pgsnake.blogspot.com
Twitter: @pgsnake

EDB: http://www.enterprisedb.com

--000000000000a9265a05ba48c067
Content-Type: text/html; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

<div dir=3D"ltr">* Do not commit this! *<div><br></div><div>The dev team ha=
ve discussed moving the pgAdmin container to be based on Redhat&#39;s=C2=A0=
UBI instead of Alpine Linux. I got some time today to work on that, and a p=
atch is attached for interest/archives.</div><div><br></div><div>Whilst the=
 build process is arguably cleaner with this patch, plus it would=C2=A0be e=
asier to maintain the versions of the PostgreSQL tools that are included, u=
nfortunately using UBI takes the size of the container from ~278MB to ~462M=
B.=C2=A0</div><div><br></div><div>So... unless someone finds a huge error i=
n the patch that causes this bloat, I think we have no choice but to stick =
with Alpine Linux.</div><div><br></div><div>Any thoughts/comments?<br clear=
=3D"all"><div><br></div>-- <br><div dir=3D"ltr" class=3D"gmail_signature" d=
ata-smartmail=3D"gmail_signature"><div dir=3D"ltr">Dave Page<br>Blog: <a hr=
ef=3D"http://pgsnake.blogspot.com" target=3D"_blank">http://pgsnake.blogspo=
t.com</a><br>Twitter: @pgsnake<br><br>EDB: <a href=3D"http://www.enterprise=
db.com" target=3D"_blank">http://www.enterprisedb.com</a><br><br></div></di=
v></div></div>

--000000000000a9265a05ba48c067--

--000000000000a9265d05ba48c069
Content-Type: application/octet-stream; name="ubi-container.diff"
Content-Disposition: attachment; filename="ubi-container.diff"
Content-Transfer-Encoding: base64
Content-ID: <f_kkms4evc0>
X-Attachment-Id: f_kkms4evc0

ZGlmZiAtLWdpdCBhLy5kb2NrZXJpZ25vcmUgYi8uZG9ja2VyaWdub3JlCmluZGV4IDRjM2Q4YjBh
Yi4uNWZlYjJiYWU2IDEwMDY0NAotLS0gYS8uZG9ja2VyaWdub3JlCisrKyBiLy5kb2NrZXJpZ25v
cmUKQEAgLTEsNCArMSw2IEBACiAuZ2l0Citkb2NzL2VuX1VTL19idWlsZC9odG1sL19zb3VyY2Vz
Citkb2NzL2VuX1VTL19idWlsZC9odG1sL19zdGF0aWMvKi5wbmcKIHdlYi9ub2RlX21vZHVsZXMK
IHdlYi8qLmxvZwogd2ViL3JlZ3Jlc3Npb24KZGlmZiAtLWdpdCBhL0RvY2tlcmZpbGUgYi9Eb2Nr
ZXJmaWxlCmluZGV4IGFiMDQ2NzFkOC4uNzRhYzdlNjgwIDEwMDY0NAotLS0gYS9Eb2NrZXJmaWxl
CisrKyBiL0RvY2tlcmZpbGUKQEAgLTEyLDIwICsxMiwxMiBAQAogIyBhbmQgY2xlYW4gdXAgdGhl
IHdlYi8gc291cmNlIGNvZGUKICMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMj
IyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMKIAotRlJPTSBub2RlOjE0LWFscGlu
ZTMuMTIgQVMgYXBwLWJ1aWxkZXIKLQotUlVOIGFwayBhZGQgLS1uby1jYWNoZSBcCi0gICAgYXV0
b2NvbmYgXAotICAgIGF1dG9tYWtlIFwKLSAgICBiYXNoIFwKLSAgICBnKysgXAotICAgIGxpYmM2
LWNvbXBhdCBcCi0gICAgbGlianBlZy10dXJiby1kZXYgXAotICAgIGxpYnBuZy1kZXYgXAotICAg
IG1ha2UgXAotICAgIG5hc20gXAotICAgIGdpdCBcCi0gICAgemxpYi1kZXYKK0ZST00gcmVnaXN0
cnkucmVkaGF0LmlvL3ViaTgvdWJpLW1pbmltYWwgQVMgYXBwLWJ1aWxkZXIKKworIyBJbnN0YWxs
IGRlcGVuZGVuY2llcworUlVOIGVjaG8gLWUgIltub2RlanNdXG5uYW1lPW5vZGVqc1xuc3RyZWFt
PTE0XG5wcm9maWxlcz1cbnN0YXRlPWVuYWJsZWRcbiIgPiAvZXRjL2RuZi9tb2R1bGVzLmQvbm9k
ZWpzLm1vZHVsZQorUlVOIG1pY3JvZG5mIGluc3RhbGwgLXkgbm9kZWpzIGdpdAorUlVOIG5wbSBp
bnN0YWxsIC0tZ2xvYmFsIHlhcm4KIAogIyBDcmVhdGUgdGhlIC9wZ2FkbWluNCBkaXJlY3Rvcnkg
YW5kIGNvcHkgdGhlIHNvdXJjZSBpbnRvIGl0LiBFeHBsaWNpdGx5CiAjIHJlbW92ZSB0aGUgbm9k
ZV9tb2R1bGVzIGRpcmVjdG9yeSBhcyB3ZSdsbCByZWNyZWF0ZSBhIGNsZWFuIHZlcnNpb24sIGFz
IHdlbGwKQEAgLTYwLDEzNiArNTIsNjUgQEAgUlVOIG5wbSBpbnN0YWxsICYmIFwKICAgICAgICAg
ICAga2FybWEuY29uZi5qcyBcCiAgICAgICAgICAgIC4vcGdhZG1pbi9zdGF0aWMvanMvZ2VuZXJh
dGVkLy5jYWNoZQogCi0jIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMj
IyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjCi0jIE5vdywgY3JlYXRlIGEgZG9jdW1lbnRh
dGlvbiBidWlsZCBjb250YWluZXIgZm9yIHRoZSBTcGhpbnggZG9jcwotIyMjIyMjIyMjIyMjIyMj
IyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMj
IworIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMj
IyMjIyMjIyMjIyMjIyMjIyMjIyMKKyMjIE5vdywgY3JlYXRlIHRoZSB2aXJ0dWFsIGVudmlyb25t
ZW50CisjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMj
IyMjIyMjIyMjIyMjIyMjIyMjIyMjIwogCi1GUk9NIHB5dGhvbjozLjktYWxwaW5lMy4xMiBhcyBk
b2NzLWJ1aWxkZXIKK0ZST00gcmVnaXN0cnkucmVkaGF0LmlvL3ViaTgvdWJpLW1pbmltYWwgQVMg
ZW52LWJ1aWxkZXIKIAogIyBJbnN0YWxsIGRlcGVuZGVuY2llcworUlVOIG1pY3JvZG5mIGluc3Rh
bGwgLXkgZ2NjIG1ha2UgcHl0aG9uMy1kZXZlbCBweXRob24zLXBpcCBwb3N0Z3Jlc3FsLWRldmVs
IGtyYjUtZGV2ZWwKKwogQ09QWSByZXF1aXJlbWVudHMudHh0IC8KLVJVTiBhcGsgYWRkIC0tbm8t
Y2FjaGUgXAotICAgICAgICBtYWtlIFwKLSAgICAgICAgYnVpbGQtYmFzZSBcCi0gICAgICAgIG9w
ZW5zc2wtZGV2IFwKLSAgICAgICAgbGliZmZpLWRldiBcCi0gICAgICAgIHBvc3RncmVzcWwtZGV2
IFwKLSAgICAgICAga3JiNS1kZXYgJiYgXAotICAgIHBpcCBpbnN0YWxsIC0tbm8tY2FjaGUtZGly
IFwKLSAgICAgICAgc3BoaW54ICYmIFwKLSAgICBwaXAgaW5zdGFsbCAtLW5vLWNhY2hlLWRpciAt
ciByZXF1aXJlbWVudHMudHh0CitSVU4gcHl0aG9uMyAtbSB2ZW52IC92ZW52CitSVU4gL3ZlbnYv
YmluL3BpcDMgaW5zdGFsbCAtLXVwZ3JhZGUgcGlwCitSVU4gL3ZlbnYvYmluL3BpcDMgaW5zdGFs
bCAtciByZXF1aXJlbWVudHMudHh0CitSVU4gL3ZlbnYvYmluL3BpcDMgaW5zdGFsbCBndW5pY29y
bgorCisjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMj
IyMjIyMjIyMjIyMjIyMjIyMjIyMjIworIyMgTm93LCBjcmVhdGUgYSBkb2N1bWVudGF0aW9uIGJ1
aWxkIGNvbnRhaW5lciBmb3IgdGhlIFNwaGlueCBkb2NzCisjIyMjIyMjIyMjIyMjIyMjIyMjIyMj
IyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIworCitG
Uk9NIHJlZ2lzdHJ5LnJlZGhhdC5pby91Ymk4L3ViaS1taW5pbWFsIEFTIGRvYy1idWlsZGVyCisK
KyMgSW5zdGFsbCBkZXBlbmRlbmNpZXMKK1JVTiBtaWNyb2RuZiBpbnN0YWxsIC15IG1ha2UgcHl0
aG9uMworQ09QWSAtLWZyb209ZW52LWJ1aWxkZXIgL3ZlbnYgL3ZlbnYKK1JVTiAvdmVudi9iaW4v
cGlwMyBpbnN0YWxsIHNwaGlueAogCiAjIENvcHkgdGhlIGRvY3MgZnJvbSB0aGUgbG9jYWwgdHJl
ZS4gRXhwbGljaXRseSByZW1vdmUgYW55IGV4aXN0aW5nIGJ1aWxkcyB0aGF0Ci0jIG1heSBiZSBw
cmVzZW50CisjIG1heSBiZSBwcmVzZW50LiBXZSBkb24ndCB1c2UgdGhlIC5kb2NrZXJpZ25vcmUg
Zm9yIHRoaXMgYXMgd2UgbmVlZCB0byBjb3B5CisjIHRoZSBfYnVpbGQgZGlyZWN0b3J5IGxhdGVy
CiBDT1BZIGRvY3MgL3BnYWRtaW40L2RvY3MKIENPUFkgd2ViIC9wZ2FkbWluNC93ZWIKIFJVTiBy
bSAtcmYgL3BnYWRtaW40L2RvY3MvZW5fVVMvX2J1aWxkCiAKICMgQnVpbGQgdGhlIGRvY3MKLVJV
TiBMQ19BTEw9ZW5fVVMuVVRGLTggTEFORz1lbl9VUy5VVEYtOCBtYWtlIC1DIC9wZ2FkbWluNC9k
b2NzL2VuX1VTIC1mIE1ha2VmaWxlLnNwaGlueCBodG1sCi0KLSMjIyMjIyMjIyMjIyMjIyMjIyMj
IyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMKLSMg
Q3JlYXRlIGFkZGl0aW9uYWwgYnVpbGRlcnMgdG8gZ2V0IGFsbCBvZiB0aGUgUG9zdGdyZVNRTCB1
dGlsaXRpZXMKLSMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMj
IyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMKLQotRlJPTSBwb3N0Z3Jlczo5LjUtYWxwaW5lIGFz
IHBnOTUtYnVpbGRlcgotRlJPTSBwb3N0Z3Jlczo5LjYtYWxwaW5lIGFzIHBnOTYtYnVpbGRlcgot
RlJPTSBwb3N0Z3JlczoxMC1hbHBpbmUgYXMgcGcxMC1idWlsZGVyCi1GUk9NIHBvc3RncmVzOjEx
LWFscGluZSBhcyBwZzExLWJ1aWxkZXIKLUZST00gcG9zdGdyZXM6MTItYWxwaW5lIGFzIHBnMTIt
YnVpbGRlcgotRlJPTSBwb3N0Z3JlczoxMy1hbHBpbmUgYXMgcGcxMy1idWlsZGVyCi0KLUZST00g
YWxwaW5lOjMuMTEgYXMgdG9vbC1idWlsZGVyCi0KLSMgQ29weSB0aGUgUEcgYmluYXJpZXMKLUNP
UFkgLS1mcm9tPXBnOTUtYnVpbGRlciAvdXNyL2xvY2FsL2Jpbi9wZ19kdW1wIC91c3IvbG9jYWwv
cGdzcWwvcGdzcWwtOS41LwotQ09QWSAtLWZyb209cGc5NS1idWlsZGVyIC91c3IvbG9jYWwvYmlu
L3BnX2R1bXBhbGwgL3Vzci9sb2NhbC9wZ3NxbC9wZ3NxbC05LjUvCi1DT1BZIC0tZnJvbT1wZzk1
LWJ1aWxkZXIgL3Vzci9sb2NhbC9iaW4vcGdfcmVzdG9yZSAvdXNyL2xvY2FsL3Bnc3FsL3Bnc3Fs
LTkuNS8KLUNPUFkgLS1mcm9tPXBnOTUtYnVpbGRlciAvdXNyL2xvY2FsL2Jpbi9wc3FsIC91c3Iv
bG9jYWwvcGdzcWwvcGdzcWwtOS41LwotCi1DT1BZIC0tZnJvbT1wZzk2LWJ1aWxkZXIgL3Vzci9s
b2NhbC9iaW4vcGdfZHVtcCAvdXNyL2xvY2FsL3Bnc3FsL3Bnc3FsLTkuNi8KLUNPUFkgLS1mcm9t
PXBnOTYtYnVpbGRlciAvdXNyL2xvY2FsL2Jpbi9wZ19kdW1wYWxsIC91c3IvbG9jYWwvcGdzcWwv
cGdzcWwtOS42LwotQ09QWSAtLWZyb209cGc5Ni1idWlsZGVyIC91c3IvbG9jYWwvYmluL3BnX3Jl
c3RvcmUgL3Vzci9sb2NhbC9wZ3NxbC9wZ3NxbC05LjYvCi1DT1BZIC0tZnJvbT1wZzk2LWJ1aWxk
ZXIgL3Vzci9sb2NhbC9iaW4vcHNxbCAvdXNyL2xvY2FsL3Bnc3FsL3Bnc3FsLTkuNi8KLQotQ09Q
WSAtLWZyb209cGcxMC1idWlsZGVyIC91c3IvbG9jYWwvYmluL3BnX2R1bXAgL3Vzci9sb2NhbC9w
Z3NxbC9wZ3NxbC0xMC8KLUNPUFkgLS1mcm9tPXBnMTAtYnVpbGRlciAvdXNyL2xvY2FsL2Jpbi9w
Z19kdW1wYWxsIC91c3IvbG9jYWwvcGdzcWwvcGdzcWwtMTAvCi1DT1BZIC0tZnJvbT1wZzEwLWJ1
aWxkZXIgL3Vzci9sb2NhbC9iaW4vcGdfcmVzdG9yZSAvdXNyL2xvY2FsL3Bnc3FsL3Bnc3FsLTEw
LwotQ09QWSAtLWZyb209cGcxMC1idWlsZGVyIC91c3IvbG9jYWwvYmluL3BzcWwgL3Vzci9sb2Nh
bC9wZ3NxbC9wZ3NxbC0xMC8KLQotQ09QWSAtLWZyb209cGcxMS1idWlsZGVyIC91c3IvbG9jYWwv
YmluL3BnX2R1bXAgL3Vzci9sb2NhbC9wZ3NxbC9wZ3NxbC0xMS8KLUNPUFkgLS1mcm9tPXBnMTEt
YnVpbGRlciAvdXNyL2xvY2FsL2Jpbi9wZ19kdW1wYWxsIC91c3IvbG9jYWwvcGdzcWwvcGdzcWwt
MTEvCi1DT1BZIC0tZnJvbT1wZzExLWJ1aWxkZXIgL3Vzci9sb2NhbC9iaW4vcGdfcmVzdG9yZSAv
dXNyL2xvY2FsL3Bnc3FsL3Bnc3FsLTExLwotQ09QWSAtLWZyb209cGcxMS1idWlsZGVyIC91c3Iv
bG9jYWwvYmluL3BzcWwgL3Vzci9sb2NhbC9wZ3NxbC9wZ3NxbC0xMS8KLQotQ09QWSAtLWZyb209
cGcxMi1idWlsZGVyIC91c3IvbG9jYWwvYmluL3BnX2R1bXAgL3Vzci9sb2NhbC9wZ3NxbC9wZ3Nx
bC0xMi8KLUNPUFkgLS1mcm9tPXBnMTItYnVpbGRlciAvdXNyL2xvY2FsL2Jpbi9wZ19kdW1wYWxs
IC91c3IvbG9jYWwvcGdzcWwvcGdzcWwtMTIvCi1DT1BZIC0tZnJvbT1wZzEyLWJ1aWxkZXIgL3Vz
ci9sb2NhbC9iaW4vcGdfcmVzdG9yZSAvdXNyL2xvY2FsL3Bnc3FsL3Bnc3FsLTEyLwotQ09QWSAt
LWZyb209cGcxMi1idWlsZGVyIC91c3IvbG9jYWwvYmluL3BzcWwgL3Vzci9sb2NhbC9wZ3NxbC9w
Z3NxbC0xMi8KLQotQ09QWSAtLWZyb209cGcxMy1idWlsZGVyIC91c3IvbG9jYWwvYmluL3BnX2R1
bXAgL3Vzci9sb2NhbC9wZ3NxbC9wZ3NxbC0xMy8KLUNPUFkgLS1mcm9tPXBnMTMtYnVpbGRlciAv
dXNyL2xvY2FsL2Jpbi9wZ19kdW1wYWxsIC91c3IvbG9jYWwvcGdzcWwvcGdzcWwtMTMvCi1DT1BZ
IC0tZnJvbT1wZzEzLWJ1aWxkZXIgL3Vzci9sb2NhbC9iaW4vcGdfcmVzdG9yZSAvdXNyL2xvY2Fs
L3Bnc3FsL3Bnc3FsLTEzLwotQ09QWSAtLWZyb209cGcxMy1idWlsZGVyIC91c3IvbG9jYWwvYmlu
L3BzcWwgL3Vzci9sb2NhbC9wZ3NxbC9wZ3NxbC0xMy8KK1JVTiBzb3VyY2UgL3ZlbnYvYmluL2Fj
dGl2YXRlICYmIFwKKyAgICBMQ19BTEw9ZW5fVVMuVVRGLTggTEFORz1lbl9VUy5VVEYtOCBtYWtl
IC1DIC9wZ2FkbWluNC9kb2NzL2VuX1VTIC1mIE1ha2VmaWxlLnNwaGlueCBodG1sCiAKICMjIyMj
IyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMj
IyMjIyMjIyMjIyMKICMgQXNzZW1ibGUgZXZlcnl0aGluZyBpbnRvIHRoZSBmaW5hbCBjb250YWlu
ZXIuCiAjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMj
IyMjIyMjIyMjIyMjIyMjIyMjIyMjCiAKLUZST00gcHl0aG9uOjMuOS1hbHBpbmUzLjEyCi0KLUNP
UFkgLS1mcm9tPXRvb2wtYnVpbGRlciAvdXNyL2xvY2FsL3Bnc3FsIC91c3IvbG9jYWwvCitGUk9N
IHJlZ2lzdHJ5LnJlZGhhdC5pby91Ymk4L3ViaS1taW5pbWFsCiAKIFdPUktESVIgL3BnYWRtaW40
CiBFTlYgUFlUSE9OUEFUSD0vcGdhZG1pbjQKIAogIyBDb3B5IGluIHRoZSBjb2RlIGFuZCBkb2Nz
CiBDT1BZIC0tZnJvbT1hcHAtYnVpbGRlciAvcGdhZG1pbjQvd2ViIC9wZ2FkbWluNAotQ09QWSAt
LWZyb209ZG9jcy1idWlsZGVyIC9wZ2FkbWluNC9kb2NzL2VuX1VTL19idWlsZC9odG1sLyAvcGdh
ZG1pbjQvZG9jcwotQ09QWSByZXF1aXJlbWVudHMudHh0IC9wZ2FkbWluNC9yZXF1aXJlbWVudHMu
dHh0Ci0KLSMgTGljZW5zZSBmaWxlcwotQ09QWSBMSUNFTlNFIC9wZ2FkbWluNC9MSUNFTlNFCi1D
T1BZIERFUEVOREVOQ0lFUyAvcGdhZG1pbjQvREVQRU5ERU5DSUVTCi0KLSMgSW5zdGFsbCBidWls
ZC1kZXBlbmRlbmNpZXMsIGJ1aWxkICYgaW5zdGFsbCBDIGV4dGVuc2lvbnMgYW5kIHB1cmdlIGRl
cHMgaW4KLSMgb25lIFJVTiBzdGVwCi1SVU4gYXBrIGFkZCAtLW5vLWNhY2hlIC0tdmlydHVhbCBc
Ci0gICAgICAgIGJ1aWxkLWRlcHMgXAotICAgICAgICBidWlsZC1iYXNlIFwKLSAgICAgICAgcG9z
dGdyZXNxbC1kZXYgXAotICAgICAgICBsaWJmZmktZGV2IFwKLSAgICAgICAga3JiNS1kZXYgXAot
ICAgICAgICBlMmZzcHJvZ3MtZGV2IFwKLSAgICAgICAga3JiNS1zZXJ2ZXItbGRhcCBcCi0gICAg
ICAgIGxpbnV4LWhlYWRlcnMgJiYgXAotICAgIGFwayBhZGQgXAotICAgICAgICBwb3N0Zml4IFwK
LSAgICAgICAgcG9zdGdyZXNxbC1jbGllbnQgXAotICAgICAgICBwb3N0Z3Jlc3FsLWxpYnMgXAot
ICAgICAgICBrcmI1LWxpYnMgXAotICAgICAgICBzaGFkb3cgXAotICAgICAgICBzdWRvIFwKLSAg
ICAgICAgbGliY2FwICYmIFwKLSAgICBwaXAgaW5zdGFsbCAtLXVwZ3JhZGUgcGlwICYmIFwKLSAg
ICBwaXAgaW5zdGFsbCAtLW5vLWNhY2hlLWRpciAtciByZXF1aXJlbWVudHMudHh0ICYmIFwKLSAg
ICBwaXAgaW5zdGFsbCAtLW5vLWNhY2hlLWRpciBndW5pY29ybj09MTkuOS4wICYmIFwKLSAgICBh
cGsgZGVsIC0tbm8tY2FjaGUgYnVpbGQtZGVwcyAmJiBcCi0gICAgZWNobyAicGdhZG1pbiBBTEwg
PSBOT1BBU1NXRDogL3Vzci9zYmluL3Bvc3RmaXggc3RhcnQiID4gL2V0Yy9zdWRvZXJzLmQvcG9z
dGZpeAotCi0jIFdlIG5lZWQgdGhlIHYxMyBsaWJwcQotQ09QWSAtLWZyb209cGcxMy1idWlsZGVy
IC91c3IvbG9jYWwvbGliL2xpYnBxLnNvLjUuMTMgL3Vzci9saWIvCi1SVU4gbG4gLXNmIC91c3Iv
bGliL2xpYnBxLnNvLjUuMTMgL3Vzci9saWIvbGlicHEuc28uNQotCi0jIENvcHkgdGhlIHJ1bm5l
ciBzY3JpcHQKK0NPUFkgLS1mcm9tPWRvYy1idWlsZGVyIC9wZ2FkbWluNC9kb2NzL2VuX1VTL19i
dWlsZC9odG1sLyAvcGdhZG1pbjQvZG9jcworQ09QWSAtLWZyb209ZW52LWJ1aWxkZXIgL3ZlbnYg
L3ZlbnYKIENPUFkgcGtnL2RvY2tlci9ydW5fcGdhZG1pbi5weSAvcGdhZG1pbjQKIENPUFkgcGtn
L2RvY2tlci9ndW5pY29ybl9jb25maWcucHkgL3BnYWRtaW40CiBDT1BZIHBrZy9kb2NrZXIvZW50
cnlwb2ludC5zaCAvZW50cnlwb2ludC5zaAogCi0jIFByZWNvbXBpbGUgYW5kIG9wdGltaXplIHB5
dGhvbiBjb2RlIHRvIHNhdmUgdGltZSBhbmQgc3BhY2Ugb24gc3RhcnR1cAotUlVOIHB5dGhvbiAt
TyAtbSBjb21waWxlYWxsIC14IG5vZGVfbW9kdWxlcyAvcGdhZG1pbjQKLQotUlVOIGdyb3VwYWRk
IC1nIDUwNTAgcGdhZG1pbiAmJiBcCisjIFBlcmZvcm0gYWxsIHRoZSBPUy1sZXZlbCBzZXR1cC4g
RG8gdGhpcyBpbiBvbmUgUlVOIGNvbW1hbmQgdG8gbWluaW1pc2UgdGhlCisjIG51bWJlciBvZiBs
YXllcnMKK1JVTiBycG0gLWkgaHR0cHM6Ly9kb3dubG9hZC5wb3N0Z3Jlc3FsLm9yZy9wdWIvcmVw
b3MveXVtL3JlcG9ycG1zL0VMLTgteDg2XzY0L3BnZGctcmVkaGF0LXJlcG8tbGF0ZXN0Lm5vYXJj
aC5ycG0gJiYgXAorICAgIG1pY3JvZG5mIGluc3RhbGwgLXkgcG9zdGdyZXNxbDEzIHBvc3RncmVz
cWwxMiBwb3N0Z3Jlc3FsMTEgcG9zdGdyZXNxbDEwIHBvc3RncmVzcWw5NiBwb3N0Zml4IHB5dGhv
bjMgc3VkbyAmJiBcCisgICAgZ3JvdXBhZGQgLWcgNTA1MCBwZ2FkbWluICYmIFwKICAgICB1c2Vy
YWRkIC1yIC11IDUwNTAgLWcgcGdhZG1pbiBwZ2FkbWluICYmIFwKICAgICBta2RpciAtcCAvdmFy
L2xpYi9wZ2FkbWluICYmIFwKICAgICBjaG93biBwZ2FkbWluOnBnYWRtaW4gL3Zhci9saWIvcGdh
ZG1pbiAmJiBcCkBAIC0xOTcsMTEgKzExOCwxNCBAQCBSVU4gZ3JvdXBhZGQgLWcgNTA1MCBwZ2Fk
bWluICYmIFwKICAgICBjaG93biBwZ2FkbWluOnBnYWRtaW4gL3Zhci9sb2cvcGdhZG1pbiAmJiBc
CiAgICAgdG91Y2ggL3BnYWRtaW40L2NvbmZpZ19kaXN0cm8ucHkgJiYgXAogICAgIGNob3duIHBn
YWRtaW46cGdhZG1pbiAvcGdhZG1pbjQvY29uZmlnX2Rpc3Ryby5weSAmJiBcCi0gICAgc2V0Y2Fw
IENBUF9ORVRfQklORF9TRVJWSUNFPStlaXAgL3Vzci9sb2NhbC9iaW4vcHl0aG9uMy45CisgICAg
c2V0Y2FwIENBUF9ORVRfQklORF9TRVJWSUNFPStlaXAgL3Vzci9saWJleGVjL3BsYXRmb3JtLXB5
dGhvbjMuNiAmJiBcCisgICAgc2VkIC1pICdzL2luZXRfcHJvdG9jb2xzID0gLiovaW5ldF9wcm90
b2NvbHMgPSBpcHY0L2cnIC9ldGMvcG9zdGZpeC9tYWluLmNmICYmIFwKKyAgICBlY2hvICJwZ2Fk
bWluIEFMTCA9IE5PUEFTU1dEOiAvdXNyL3NiaW4vcG9zdGZpeCBzdGFydCIgPiAvZXRjL3N1ZG9l
cnMuZC9wb3N0Zml4ICYmIFwKKyAgICBtaWNyb2RuZiBjbGVhbiBhbGwKIFVTRVIgcGdhZG1pbgog
CiAjIEZpbmlzaCB1cAogVk9MVU1FIC92YXIvbGliL3BnYWRtaW4KIEVYUE9TRSA4MCA0NDMKIAot
RU5UUllQT0lOVCBbIi9lbnRyeXBvaW50LnNoIl0KK0VOVFJZUE9JTlQgWyIvZW50cnlwb2ludC5z
aCJdClwgTm8gbmV3bGluZSBhdCBlbmQgb2YgZmlsZQpkaWZmIC0tZ2l0IGEvcGtnL2RvY2tlci9l
bnRyeXBvaW50LnNoIGIvcGtnL2RvY2tlci9lbnRyeXBvaW50LnNoCmluZGV4IDJiMzNiY2ZhYi4u
ODdkMDc0N2U4IDEwMDc1NQotLS0gYS9wa2cvZG9ja2VyL2VudHJ5cG9pbnQuc2gKKysrIGIvcGtn
L2RvY2tlci9lbnRyeXBvaW50LnNoCkBAIC0zMiw3ICszMiw3IEBAIGlmIFsgISAtZiAvdmFyL2xp
Yi9wZ2FkbWluL3BnYWRtaW40LmRiIF07IHRoZW4KIAogICAgICMgSW5pdGlhbGl6ZSBEQiBiZWZv
cmUgc3RhcnRpbmcgR3VuaWNvcm4KICAgICAjIEltcG9ydGluZyBwZ2FkbWluNCAoZnJvbSB0aGlz
IHNjcmlwdCkgaXMgZW5vdWdoCi0gICAgcHl0aG9uIHJ1bl9wZ2FkbWluLnB5CisgICAgL3ZlbnYv
YmluL3B5dGhvbiBydW5fcGdhZG1pbi5weQogCiAgICAgZXhwb3J0IFBHQURNSU5fU0VSVkVSX0pT
T05fRklMRT0ke1BHQURNSU5fU0VSVkVSX0pTT05fRklMRTotL3BnYWRtaW40L3NlcnZlcnMuanNv
bn0KICAgICAjIFByZS1sb2FkIGFueSByZXF1aXJlZCBzZXJ2ZXJzCkBAIC00MCw5ICs0MCw5IEBA
IGlmIFsgISAtZiAvdmFyL2xpYi9wZ2FkbWluL3BnYWRtaW40LmRiIF07IHRoZW4KICAgICAgICAg
IyBXaGVuIHJ1bm5pbmcgaW4gRGVza3RvcCBtb2RlLCBubyB1c2VyIGlzIGNyZWF0ZWQKICAgICAg
ICAgIyBzbyB3ZSBoYXZlIHRvIGltcG9ydCBzZXJ2ZXJzIGFub255bW91c2x5CiAgICAgICAgIGlm
IFsgIiR7UEdBRE1JTl9DT05GSUdfU0VSVkVSX01PREV9IiA9ICJGYWxzZSIgXTsgdGhlbgotICAg
ICAgICAgICAgL3Vzci9sb2NhbC9iaW4vcHl0aG9uIC9wZ2FkbWluNC9zZXR1cC5weSAtLWxvYWQt
c2VydmVycyAiJHtQR0FETUlOX1NFUlZFUl9KU09OX0ZJTEV9IgorICAgICAgICAgICAgL3ZlbnYv
YmluL3B5dGhvbiAvcGdhZG1pbjQvc2V0dXAucHkgLS1sb2FkLXNlcnZlcnMgIiR7UEdBRE1JTl9T
RVJWRVJfSlNPTl9GSUxFfSIKICAgICAgICAgZWxzZQotICAgICAgICAgICAgL3Vzci9sb2NhbC9i
aW4vcHl0aG9uIC9wZ2FkbWluNC9zZXR1cC5weSAtLWxvYWQtc2VydmVycyAiJHtQR0FETUlOX1NF
UlZFUl9KU09OX0ZJTEV9IiAtLXVzZXIgJHtQR0FETUlOX0RFRkFVTFRfRU1BSUx9CisgICAgICAg
ICAgICAvdmVudi9iaW4vcHl0aG9uIC9wZ2FkbWluNC9zZXR1cC5weSAtLWxvYWQtc2VydmVycyAi
JHtQR0FETUlOX1NFUlZFUl9KU09OX0ZJTEV9IiAtLXVzZXIgJHtQR0FETUlOX0RFRkFVTFRfRU1B
SUx9CiAgICAgICAgIGZpCiAgICAgZmkKIGZpCkBAIC01NCwxMyArNTQsMTMgQEAgZmkKIAogIyBH
ZXQgdGhlIHNlc3Npb24gdGltZW91dCBmcm9tIHRoZSBwZ0FkbWluIGNvbmZpZy4gV2UnbGwgdXNl
IHRoaXMgKGluIHNlY29uZHMpCiAjIHRvIGRlZmluZSB0aGUgR3VuaWNvcm4gd29ya2VyIHRpbWVv
dXQKLVRJTUVPVVQ9JChjZCAvcGdhZG1pbjQgJiYgcHl0aG9uIC1jICdpbXBvcnQgY29uZmlnOyBw
cmludChjb25maWcuU0VTU0lPTl9FWFBJUkFUSU9OX1RJTUUgKiA2MCAqIDYwICogMjQpJykKK1RJ
TUVPVVQ9JChjZCAvcGdhZG1pbjQgJiYgL3ZlbnYvYmluL3B5dGhvbiAtYyAnaW1wb3J0IGNvbmZp
ZzsgcHJpbnQoY29uZmlnLlNFU1NJT05fRVhQSVJBVElPTl9USU1FICogNjAgKiA2MCAqIDI0KScp
CiAKICMgTk9URTogY3VycmVudGx5IHBnYWRtaW4gY2FuIHJ1biBvbmx5IHdpdGggMSB3b3JrZXIg
ZHVlIHRvIHNlc3Npb25zIGltcGxlbWVudGF0aW9uCiAjIFVzaW5nIC0tdGhyZWFkcyB0byBoYXZl
IG11bHRpLXRocmVhZGVkIHNpbmdsZS1wcm9jZXNzIHdvcmtlcgogCiBpZiBbICEgLXogJHtQR0FE
TUlOX0VOQUJMRV9UTFN9IF07IHRoZW4KLSAgICBleGVjIGd1bmljb3JuIC0tdGltZW91dCAke1RJ
TUVPVVR9IC0tYmluZCAke1BHQURNSU5fTElTVEVOX0FERFJFU1M6LVs6Ol19OiR7UEdBRE1JTl9M
SVNURU5fUE9SVDotNDQzfSAtdyAxIC0tdGhyZWFkcyAke0dVTklDT1JOX1RIUkVBRFM6LTI1fSAt
LWFjY2Vzcy1sb2dmaWxlICR7R1VOSUNPUk5fQUNDRVNTX0xPR0ZJTEU6LS19IC0ta2V5ZmlsZSAv
Y2VydHMvc2VydmVyLmtleSAtLWNlcnRmaWxlIC9jZXJ0cy9zZXJ2ZXIuY2VydCAtYyBndW5pY29y
bl9jb25maWcucHkgcnVuX3BnYWRtaW46YXBwCisgICAgZXhlYyAvdmVudi9iaW4vZ3VuaWNvcm4g
LS10aW1lb3V0ICR7VElNRU9VVH0gLS1iaW5kICR7UEdBRE1JTl9MSVNURU5fQUREUkVTUzotWzo6
XX06JHtQR0FETUlOX0xJU1RFTl9QT1JUOi00NDN9IC13IDEgLS10aHJlYWRzICR7R1VOSUNPUk5f
VEhSRUFEUzotMjV9IC0tYWNjZXNzLWxvZ2ZpbGUgJHtHVU5JQ09STl9BQ0NFU1NfTE9HRklMRTot
LX0gLS1rZXlmaWxlIC9jZXJ0cy9zZXJ2ZXIua2V5IC0tY2VydGZpbGUgL2NlcnRzL3NlcnZlci5j
ZXJ0IC1jIGd1bmljb3JuX2NvbmZpZy5weSBydW5fcGdhZG1pbjphcHAKIGVsc2UKLSAgICBleGVj
IGd1bmljb3JuIC0tdGltZW91dCAke1RJTUVPVVR9IC0tYmluZCAke1BHQURNSU5fTElTVEVOX0FE
RFJFU1M6LVs6Ol19OiR7UEdBRE1JTl9MSVNURU5fUE9SVDotODB9IC13IDEgLS10aHJlYWRzICR7
R1VOSUNPUk5fVEhSRUFEUzotMjV9IC0tYWNjZXNzLWxvZ2ZpbGUgJHtHVU5JQ09STl9BQ0NFU1Nf
TE9HRklMRTotLX0gLWMgZ3VuaWNvcm5fY29uZmlnLnB5IHJ1bl9wZ2FkbWluOmFwcAorICAgIGV4
ZWMgL3ZlbnYvYmluL2d1bmljb3JuIC0tdGltZW91dCAke1RJTUVPVVR9IC0tYmluZCAke1BHQURN
SU5fTElTVEVOX0FERFJFU1M6LVs6Ol19OiR7UEdBRE1JTl9MSVNURU5fUE9SVDotODB9IC13IDEg
LS10aHJlYWRzICR7R1VOSUNPUk5fVEhSRUFEUzotMjV9IC0tYWNjZXNzLWxvZ2ZpbGUgJHtHVU5J
Q09STl9BQ0NFU1NfTE9HRklMRTotLX0gLWMgZ3VuaWNvcm5fY29uZmlnLnB5IHJ1bl9wZ2FkbWlu
OmFwcAogZmkKZGlmZiAtLWdpdCBhL3dlYi9jb25maWcucHkgYi93ZWIvY29uZmlnLnB5CmluZGV4
IDhmZDhiMDM5MS4uODQ3OTJmNThjIDEwMDY0NAotLS0gYS93ZWIvY29uZmlnLnB5CisrKyBiL3dl
Yi9jb25maWcucHkKQEAgLTM1MCw3ICszNTAsNyBAQCBTRVNTSU9OX0NPT0tJRV9OQU1FID0gJ3Bn
YTRfc2Vzc2lvbicKICMgVGhlc2Ugc2V0dGluZ3MgYXJlIHVzZWQgd2hlbiBydW5uaW5nIGluIHdl
YiBzZXJ2ZXIgbW9kZSBmb3IgY29uZmlybWluZwogIyBhbmQgcmVzZXR0aW5nIHBhc3N3b3JkcyBl
dGMuCiAjIFNlZTogaHR0cDovL3B5dGhvbmhvc3RlZC5vcmcvRmxhc2stTWFpbC8gZm9yIG1vcmUg
aW5mbwotTUFJTF9TRVJWRVIgPSAnbG9jYWxob3N0JworTUFJTF9TRVJWRVIgPSAnMTI3LjAuMC4x
JwogTUFJTF9QT1JUID0gMjUKIE1BSUxfVVNFX1NTTCA9IEZhbHNlCiBNQUlMX1VTRV9UTFMgPSBG
YWxzZQo=
--000000000000a9265d05ba48c069--