[Dbix-class] Patch roundup time, again.

[Jens Gassmann]

SGksCgo+IEFueSBvdXRzdGFuZGluZyBwYXRjaGVzLCBwbGVhc2Ugc2VuZCB0byB0aGlzIHRocmVh
ZC4gQ2FuIHNvbWVib2R5IGFsc28KPiBnbyB0aHJvdWdoIHJ0LmNwYW4ub3JnIGFuZCB3b3JrIG91
dCBpZiB0aGVyZSdzIGFueXRoaW5nIG9uIHRoZXJlIHdlIG5lZWQKPiB0byBhcHBseSBhcyB3ZWxs
PwoKYXR0YWNoZWQgdGhlIHRlc3QgYW5kIHBhdGNoIGZvciBEQkl4OjpDbGFzczo6SW5mbGF0ZUNv
bHVtbjo6RGF0ZXRpbWUKClRoZSByZWNyZWF0aW9uIG9mIHRoZSB0ZXN0LXNjaGVtYSBnZW5lcmF0
ZXMgbWFueSBjaGFuZ2VzIC0gbWFueSBtb3JlIAp0aGVuIG15IDotKAoKamVucwoKCi0tLS0tLS0t
LS0tLS0tIG5leHQgcGFydCAtLS0tLS0tLS0tLS0tLQpJbmRleDogdC84OWluZmxhdGVfZGF0ZXRp
bWUudAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09Ci0tLSB0Lzg5aW5mbGF0ZV9kYXRldGltZS50CShSZXZpc2lvbiA0ODg3
KQorKysgdC84OWluZmxhdGVfZGF0ZXRpbWUudAkoQXJiZWl0c2tvcGllKQpAQCAtMTAsNyArMTAs
NyBAQAogZXZhbCB7IHJlcXVpcmUgRGF0ZVRpbWU6OkZvcm1hdDo6TXlTUUwgfTsKIHBsYW4gc2tp
cF9hbGwgPT4gIk5lZWQgRGF0ZVRpbWU6OkZvcm1hdDo6TXlTUUwgZm9yIGluZmxhdGlvbiB0ZXN0
cyIgaWYgJEA7CiAKLXBsYW4gdGVzdHMgPT4gMjE7CitwbGFuIHRlc3RzID0+IDI1OwogCiAjIGlu
ZmxhdGlvbiB0ZXN0CiBteSAkZXZlbnQgPSAkc2NoZW1hLT5yZXN1bHRzZXQoIkV2ZW50IiktPmZp
bmQoMSk7CkBAIC05MiwzICs5MiwyNiBAQAogICAgIGxpa2UoICRALCBxci9pbnZhbGlkIGRhdGUg
Zm9ybWF0L2ksICJJbnZhbGlkIGRhdGUgZm9ybWF0IGV4Y2VwdGlvbiIpOwogfQogCitteSAkZGF0
ZXRpbWVfdGltZXpvbmVfaW52YWxpZCA9ICRzY2hlbWEtPnJlc3VsdHNldCgnRXZlbnQnKS0+Y3Jl
YXRlKCB7CisKKyAgIHN0YXJ0c19hdCAgPT4gRGF0ZVRpbWUtPm5ldyh5ZWFyPT4yMDA3LCBtb250
aD0+MTIsIGRheT0+MzEsIHRpbWVfem9uZSA9PiAiQW1lcmljYS9DaGljYWdvIiApLAorICAgY3Jl
YXRlZF9vbiA9PiBEYXRlVGltZS0+bmV3KHllYXI9PjIwMDYsIG1vbnRoPT4xLCBkYXk9PjMxLCBo
b3VyID0+IDEzLCBtaW51dGUgPT4gMzQsIHNlY29uZCA9PiA1NiwgdGltZV96b25lID0+ICJBbWVy
aWNhL05ld19Zb3JrIiApLAorICAgZW5kc19hdCAgID0+ICIiLAorfSk7CisKK2lzKCAkZGF0ZXRp
bWVfdGltZXpvbmVfaW52YWxpZC0+ZW5kc19hdCwgdW5kZWYsICJJbmZsYXRlIHRvIHVuZGVmIik7
CisKKyRkYXRldGltZV90aW1lem9uZV9pbnZhbGlkLT51cGRhdGUoeyBlbmRzX2F0ID0+IHVuZGVm
IH0gKTsKKworaXMoICRkYXRldGltZV90aW1lem9uZV9pbnZhbGlkLT5lbmRzX2F0LCB1bmRlZiwg
IkluZmxhdGUgdG8gdW5kZWYiKTsKKworbXkgJGRhdGV0aW1lX3RpbWV6b25lX3ZhbGlkID0gJHNj
aGVtYS0+cmVzdWx0c2V0KCdFdmVudCcpLT5jcmVhdGUoIHsKKworICAgc3RhcnRzX2F0ICA9PiBE
YXRlVGltZS0+bmV3KHllYXI9PjIwMDcsIG1vbnRoPT4xMiwgZGF5PT4zMSwgdGltZV96b25lID0+
ICJBbWVyaWNhL0NoaWNhZ28iICksCisgICBjcmVhdGVkX29uID0+IERhdGVUaW1lLT5uZXcoeWVh
cj0+MjAwNiwgbW9udGg9PjEsICBkYXk9PjMxLCBob3VyID0+IDEzLCBtaW51dGUgPT4gMzQsIHNl
Y29uZCA9PiA1NiwgdGltZV96b25lID0+ICJBbWVyaWNhL05ld19Zb3JrIiApLAorICAgZW5kc19h
dCAgICA9PiBEYXRlVGltZS0+bmV3KHllYXI9PjIwMDgsIG1vbnRoPT4xLCAgZGF5PT4xLCBob3Vy
ID0+IDEsIG1pbnV0ZSA9PiAwLCBzZWNvbmQgPT4gMCwgdGltZV96b25lID0+ICJFdXJvcGUvQmVy
bGluIiApICwKK30pOworCitpc2Ffb2soICRkYXRldGltZV90aW1lem9uZV92YWxpZC0+ZW5kc19h
dCwnRGF0ZVRpbWUnLCAiSW5mbGF0ZSB0byBEYXRlVGltZSIpOworaXMoICRkYXRldGltZV90aW1l
em9uZV92YWxpZC0+ZW5kc19hdC0+dGltZV96b25lLT5uYW1lLCAnVVRDJywgIlRpbWV6b25lIGlz
IFVUQyIgKTsKKwpJbmRleDogdC9saWIvc3FsaXRlLnNxbAo9PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSB0L2xpYi9z
cWxpdGUuc3FsCShSZXZpc2lvbiA0ODg3KQorKysgdC9saWIvc3FsaXRlLnNxbAkoQXJiZWl0c2tv
cGllKQpAQCAtMSw4OCArMSw0MCBAQAogLS0gCiAtLSBDcmVhdGVkIGJ5IFNRTDo6VHJhbnNsYXRv
cjo6UHJvZHVjZXI6OlNRTGl0ZQotLS0gQ3JlYXRlZCBvbiBUdWUgQXVnICA4IDAxOjUzOjIwIDIw
MDYKKy0tIENyZWF0ZWQgb24gTW9uIE9jdCAgNiAwMDowMjoyMSAyMDA4CiAtLSAKIEJFR0lOIFRS
QU5TQUNUSU9OOwogCiAtLQotLS0gVGFibGU6IGVtcGxveWVlCi0tLQotQ1JFQVRFIFRBQkxFIGVt
cGxveWVlICgKLSAgZW1wbG95ZWVfaWQgSU5URUdFUiBQUklNQVJZIEtFWSBOT1QgTlVMTCwKLSAg
cG9zaXRpb24gaW50ZWdlciBOT1QgTlVMTCwKLSAgZ3JvdXBfaWQgaW50ZWdlciwKLSAgZ3JvdXBf
aWRfMiBpbnRlZ2VyLCAgCi0gIG5hbWUgdmFyY2hhcigxMDApCi0pOwotCi0tLQotLS0gVGFibGU6
IHNlcmlhbGl6ZWQKLS0tCi1DUkVBVEUgVEFCTEUgc2VyaWFsaXplZCAoCi0gIGlkIElOVEVHRVIg
UFJJTUFSWSBLRVkgTk9UIE5VTEwsCi0gIHNlcmlhbGl6ZWQgdGV4dCBOT1QgTlVMTAotKTsKLQot
LS0KLS0tIFRhYmxlOiBsaW5lcl9ub3RlcwotLS0KLUNSRUFURSBUQUJMRSBsaW5lcl9ub3RlcyAo
Ci0gIGxpbmVyX2lkIElOVEVHRVIgUFJJTUFSWSBLRVkgTk9UIE5VTEwsCi0gIG5vdGVzIHZhcmNo
YXIoMTAwKSBOT1QgTlVMTAotKTsKLQotLS0KLS0tIFRhYmxlOiBjZF90b19wcm9kdWNlcgotLS0K
LUNSRUFURSBUQUJMRSBjZF90b19wcm9kdWNlciAoCi0gIGNkIGludGVnZXIgTk9UIE5VTEwsCi0g
IHByb2R1Y2VyIGludGVnZXIgTk9UIE5VTEwsCi0gIFBSSU1BUlkgS0VZIChjZCwgcHJvZHVjZXIp
Ci0pOwotCi0tLQogLS0gVGFibGU6IGFydGlzdAogLS0KIENSRUFURSBUQUJMRSBhcnRpc3QgKAog
ICBhcnRpc3RpZCBJTlRFR0VSIFBSSU1BUlkgS0VZIE5PVCBOVUxMLAogICBuYW1lIHZhcmNoYXIo
MTAwKQogKTsKLQogLS0KLS0tIFRhYmxlOiB0d29rZXl0cmVlbGlrZQorLS0gVGFibGU6IGFydGlz
dF91bmRpcmVjdGVkX21hcAogLS0KLUNSRUFURSBUQUJMRSB0d29rZXl0cmVlbGlrZSAoCitDUkVB
VEUgVEFCTEUgYXJ0aXN0X3VuZGlyZWN0ZWRfbWFwICgKICAgaWQxIGludGVnZXIgTk9UIE5VTEws
CiAgIGlkMiBpbnRlZ2VyIE5PVCBOVUxMLAotICBwYXJlbnQxIGludGVnZXIgTk9UIE5VTEwsCi0g
IHBhcmVudDIgaW50ZWdlciBOT1QgTlVMTCwKLSAgbmFtZSB2YXJjaGFyKDEwMCkgTk9UIE5VTEws
CiAgIFBSSU1BUlkgS0VZIChpZDEsIGlkMikKICk7Ci0KLS0tCi0tLSBUYWJsZTogZm91cmtleXNf
dG9fdHdva2V5cworQ1JFQVRFIElOREVYIGFydGlzdF91bmRpcmVjdGVkX21hcF9pZHhfaWQxXyBP
TiBhcnRpc3RfdW5kaXJlY3RlZF9tYXAgKGlkMSk7Q1JFQVRFIElOREVYIGFydGlzdF91bmRpcmVj
dGVkX21hcF9pZHhfaWQyXyBPTiBhcnRpc3RfdW5kaXJlY3RlZF9tYXAgKGlkMik7LS0KKy0tIFRh
YmxlOiBib29rbWFyawogLS0KLUNSRUFURSBUQUJMRSBmb3Vya2V5c190b190d29rZXlzICgKLSAg
Zl9mb28gaW50ZWdlciBOT1QgTlVMTCwKLSAgZl9iYXIgaW50ZWdlciBOT1QgTlVMTCwKLSAgZl9o
ZWxsbyBpbnRlZ2VyIE5PVCBOVUxMLAotICBmX2dvb2RieWUgaW50ZWdlciBOT1QgTlVMTCwKLSAg
dF9hcnRpc3QgaW50ZWdlciBOT1QgTlVMTCwKLSAgdF9jZCBpbnRlZ2VyIE5PVCBOVUxMLAotICBh
dXRvcGlsb3QgY2hhcmFjdGVyIE5PVCBOVUxMLAotICBQUklNQVJZIEtFWSAoZl9mb28sIGZfYmFy
LCBmX2hlbGxvLCBmX2dvb2RieWUsIHRfYXJ0aXN0LCB0X2NkKQorQ1JFQVRFIFRBQkxFIGJvb2tt
YXJrICgKKyAgaWQgSU5URUdFUiBQUklNQVJZIEtFWSBOT1QgTlVMTCwKKyAgbGluayBpbnRlZ2Vy
IE5PVCBOVUxMCiApOwotCi0tLQotLS0gVGFibGU6IHNlbGZfcmVmX2FsaWFzCitDUkVBVEUgSU5E
RVggYm9va21hcmtfaWR4X2xpbmtfYm9va21hcmsgT04gYm9va21hcmsgKGxpbmspOy0tCistLSBU
YWJsZTogYm9va3MKIC0tCi1DUkVBVEUgVEFCTEUgc2VsZl9yZWZfYWxpYXMgKAotICBzZWxmX3Jl
ZiBpbnRlZ2VyIE5PVCBOVUxMLAotICBhbGlhcyBpbnRlZ2VyIE5PVCBOVUxMLAotICBQUklNQVJZ
IEtFWSAoc2VsZl9yZWYsIGFsaWFzKQorQ1JFQVRFIFRBQkxFIGJvb2tzICgKKyAgaWQgSU5URUdF
UiBQUklNQVJZIEtFWSBOT1QgTlVMTCwKKyAgc291cmNlIHZhcmNoYXIoMTAwKSBOT1QgTlVMTCwK
KyAgb3duZXIgaW50ZWdlciBOT1QgTlVMTCwKKyAgdGl0bGUgdmFyY2hhcigxMDApIE5PVCBOVUxM
CiApOwotCiAtLQogLS0gVGFibGU6IGNkCiAtLQpAQCAtOTMsOTUgKzQ1LDEwOSBAQAogICB5ZWFy
IHZhcmNoYXIoMTAwKSBOT1QgTlVMTCwKICAgZ2VucmVpZCBpbnRlZ2VyCiApOwotCitDUkVBVEUg
SU5ERVggY2RfaWR4X2FydGlzdF9jZCBPTiBjZCAoYXJ0aXN0KTtDUkVBVEUgSU5ERVggY2RfaWR4
X2dlbnJlaWRfY2QgT04gY2QgKGdlbnJlaWQpO0NSRUFURSBVTklRVUUgSU5ERVggY2RfYXJ0aXN0
X3RpdGxlX2NkIE9OIGNkIChhcnRpc3QsIHRpdGxlKTstLQorLS0gVGFibGU6IGNkX3RvX3Byb2R1
Y2VyCiAtLQotLS0gVGFibGU6IGdlbnJlCitDUkVBVEUgVEFCTEUgY2RfdG9fcHJvZHVjZXIgKAor
ICBjZCBpbnRlZ2VyIE5PVCBOVUxMLAorICBwcm9kdWNlciBpbnRlZ2VyIE5PVCBOVUxMLAorICBQ
UklNQVJZIEtFWSAoY2QsIHByb2R1Y2VyKQorKTsKK0NSRUFURSBJTkRFWCBjZF90b19wcm9kdWNl
cl9pZHhfY2RfY2RfdG9fcHIgT04gY2RfdG9fcHJvZHVjZXIgKGNkKTtDUkVBVEUgSU5ERVggY2Rf
dG9fcHJvZHVjZXJfaWR4X3Byb2R1Y2VyX2NkIE9OIGNkX3RvX3Byb2R1Y2VyIChwcm9kdWNlcik7
LS0KKy0tIFRhYmxlOiBjb2xsZWN0aW9uCiAtLQotQ1JFQVRFIFRBQkxFIGdlbnJlICgKLSAgZ2Vu
cmVpZCBJTlRFR0VSIFBSSU1BUlkgS0VZIE5PVCBOVUxMLAorQ1JFQVRFIFRBQkxFIGNvbGxlY3Rp
b24gKAorICBjb2xsZWN0aW9uaWQgSU5URUdFUiBQUklNQVJZIEtFWSBOT1QgTlVMTCwKICAgbmFt
ZSB2YXJjaGFyKDEwMCkgTk9UIE5VTEwKICk7Ci0KIC0tCi0tLSBUYWJsZTogYm9va21hcmsKKy0t
IFRhYmxlOiBjb2xsZWN0aW9uX29iamVjdAogLS0KLUNSRUFURSBUQUJMRSBib29rbWFyayAoCi0g
IGlkIElOVEVHRVIgUFJJTUFSWSBLRVkgTk9UIE5VTEwsCi0gIGxpbmsgaW50ZWdlciBOT1QgTlVM
TAorQ1JFQVRFIFRBQkxFIGNvbGxlY3Rpb25fb2JqZWN0ICgKKyAgY29sbGVjdGlvbiBpbnRlZ2Vy
IE5PVCBOVUxMLAorICBvYmplY3QgaW50ZWdlciBOT1QgTlVMTCwKKyAgUFJJTUFSWSBLRVkgKGNv
bGxlY3Rpb24sIG9iamVjdCkKICk7Ci0KLS0tCi0tLSBUYWJsZTogdHJhY2sKK0NSRUFURSBJTkRF
WCBjb2xsZWN0aW9uX29iamVjdF9pZHhfY29sbGVjdGlvbl9jb2xsZWN0aW9uX29iaiBPTiBjb2xs
ZWN0aW9uX29iamVjdCAoY29sbGVjdGlvbik7Q1JFQVRFIElOREVYIGNvbGxlY3Rpb25fb2JqZWN0
X2lkeF9vYmplY3RfYyBPTiBjb2xsZWN0aW9uX29iamVjdCAob2JqZWN0KTstLQorLS0gVGFibGU6
IGVtcGxveWVlCiAtLQotQ1JFQVRFIFRBQkxFIHRyYWNrICgKLSAgdHJhY2tpZCBJTlRFR0VSIFBS
SU1BUlkgS0VZIE5PVCBOVUxMLAotICBjZCBpbnRlZ2VyIE5PVCBOVUxMLAorQ1JFQVRFIFRBQkxF
IGVtcGxveWVlICgKKyAgZW1wbG95ZWVfaWQgSU5URUdFUiBQUklNQVJZIEtFWSBOT1QgTlVMTCwK
ICAgcG9zaXRpb24gaW50ZWdlciBOT1QgTlVMTCwKLSAgdGl0bGUgdmFyY2hhcigxMDApIE5PVCBO
VUxMLAotICBsYXN0X3VwZGF0ZWRfb24gZGF0ZXRpbWUgTlVMTAotKTsKLQotLS0KLS0tIFRhYmxl
OiBzZWxmX3JlZgotLS0KLUNSRUFURSBUQUJMRSBzZWxmX3JlZiAoCi0gIGlkIElOVEVHRVIgUFJJ
TUFSWSBLRVkgTk9UIE5VTEwsCi0gIG5hbWUgdmFyY2hhcigxMDApIE5PVCBOVUxMCisgIGdyb3Vw
X2lkIGludGVnZXIsCisgIGdyb3VwX2lkXzIgaW50ZWdlciwKKyAgbmFtZSB2YXJjaGFyKDEwMCkK
ICk7Ci0KIC0tCi0tLSBUYWJsZTogbGluaworLS0gVGFibGU6IGV2ZW50CiAtLQotQ1JFQVRFIFRB
QkxFIGxpbmsgKAorQ1JFQVRFIFRBQkxFIGV2ZW50ICgKICAgaWQgSU5URUdFUiBQUklNQVJZIEtF
WSBOT1QgTlVMTCwKLSAgdXJsIHZhcmNoYXIoMTAwKSwKLSAgdGl0bGUgdmFyY2hhcigxMDApCisg
IHN0YXJ0c19hdCBkYXRldGltZSBOT1QgTlVMTCwKKyAgY3JlYXRlZF9vbiB0aW1lc3RhbXAgTk9U
IE5VTEwsCisgIGVuZHNfYXQgZGF0ZXRpbWUgTk9UIE5VTEwKICk7Ci0KIC0tCiAtLSBUYWJsZTog
ZmlsZV9jb2x1bW5zCiAtLQogQ1JFQVRFIFRBQkxFIGZpbGVfY29sdW1ucyAoCiAgIGlkIElOVEVH
RVIgUFJJTUFSWSBLRVkgTk9UIE5VTEwsCi0gIGZpbGUgdmFyY2hhcigyNTUpCisgIGZpbGUgdmFy
Y2hhcigyNTUpIE5PVCBOVUxMCiApOwotCiAtLQotLS0gVGFibGU6IHRhZ3MKKy0tIFRhYmxlOiBm
b3JjZWZvcmVpZ24KIC0tCi1DUkVBVEUgVEFCTEUgdGFncyAoCi0gIHRhZ2lkIElOVEVHRVIgUFJJ
TUFSWSBLRVkgTk9UIE5VTEwsCi0gIGNkIGludGVnZXIgTk9UIE5VTEwsCi0gIHRhZyB2YXJjaGFy
KDEwMCkgTk9UIE5VTEwKK0NSRUFURSBUQUJMRSBmb3JjZWZvcmVpZ24gKAorICBhcnRpc3QgSU5U
RUdFUiBQUklNQVJZIEtFWSBOT1QgTlVMTCwKKyAgY2QgaW50ZWdlciBOT1QgTlVMTAogKTsKLQor
Q1JFQVRFIElOREVYIGZvcmNlZm9yZWlnbl9pZHhfYXJ0aXN0X2ZvcmNlZiBPTiBmb3JjZWZvcmVp
Z24gKGFydGlzdCk7LS0KKy0tIFRhYmxlOiBmb3Vya2V5cwogLS0KLS0tIFRhYmxlOiB0cmVlbGlr
ZQorQ1JFQVRFIFRBQkxFIGZvdXJrZXlzICgKKyAgZm9vIGludGVnZXIgTk9UIE5VTEwsCisgIGJh
ciBpbnRlZ2VyIE5PVCBOVUxMLAorICBoZWxsbyBpbnRlZ2VyIE5PVCBOVUxMLAorICBnb29kYnll
IGludGVnZXIgTk9UIE5VTEwsCisgIHNlbnNvcnMgY2hhcmFjdGVyIE5PVCBOVUxMLAorICBQUklN
QVJZIEtFWSAoZm9vLCBiYXIsIGhlbGxvLCBnb29kYnllKQorKTsKIC0tCi1DUkVBVEUgVEFCTEUg
dHJlZWxpa2UgKAotICBpZCBJTlRFR0VSIFBSSU1BUlkgS0VZIE5PVCBOVUxMLAotICBwYXJlbnQg
aW50ZWdlciBOVUxMLAotICBuYW1lIHZhcmNoYXIoMTAwKSBOT1QgTlVMTAorLS0gVGFibGU6IGZv
dXJrZXlzX3RvX3R3b2tleXMKKy0tCitDUkVBVEUgVEFCTEUgZm91cmtleXNfdG9fdHdva2V5cyAo
CisgIGZfZm9vIGludGVnZXIgTk9UIE5VTEwsCisgIGZfYmFyIGludGVnZXIgTk9UIE5VTEwsCisg
IGZfaGVsbG8gaW50ZWdlciBOT1QgTlVMTCwKKyAgZl9nb29kYnllIGludGVnZXIgTk9UIE5VTEws
CisgIHRfYXJ0aXN0IGludGVnZXIgTk9UIE5VTEwsCisgIHRfY2QgaW50ZWdlciBOT1QgTlVMTCwK
KyAgYXV0b3BpbG90IGNoYXJhY3RlciBOT1QgTlVMTCwKKyAgUFJJTUFSWSBLRVkgKGZfZm9vLCBm
X2JhciwgZl9oZWxsbywgZl9nb29kYnllLCB0X2FydGlzdCwgdF9jZCkKICk7Ci0KK0NSRUFURSBJ
TkRFWCBmb3Vya2V5c190b190d29rZXlzX2lkeF9mX2Zvb19mX2Jhcl9mX2hlbGxvX2ZfZ29vZGJ5
ZV8gT04gZm91cmtleXNfdG9fdHdva2V5cyAoZl9mb28sIGZfYmFyLCBmX2hlbGxvLCBmX2dvb2Ri
eWUpO0NSRUFURSBJTkRFWCBmb3Vya2V5c190b190d29rZXlzX2lkeF90X2FydGlzdF90X2NkX2Zv
dXJrZXlzX3RvIE9OIGZvdXJrZXlzX3RvX3R3b2tleXMgKHRfYXJ0aXN0LCB0X2NkKTstLQorLS0g
VGFibGU6IGdlbnJlCiAtLQotLS0gVGFibGU6IGV2ZW50CitDUkVBVEUgVEFCTEUgZ2VucmUgKAor
ICBnZW5yZWlkICBOT1QgTlVMTCwKKyAgbmFtZSAgTk9UIE5VTEwsCisgIFBSSU1BUlkgS0VZIChn
ZW5yZWlkKQorKTsKIC0tCi1DUkVBVEUgVEFCTEUgZXZlbnQgKAotICBpZCBJTlRFR0VSIFBSSU1B
UlkgS0VZIE5PVCBOVUxMLAotICBzdGFydHNfYXQgZGF0ZXRpbWUgTk9UIE5VTEwsCi0gIGNyZWF0
ZWRfb24gdGltZXN0YW1wIE5PVCBOVUxMCistLSBUYWJsZTogbGluZXJfbm90ZXMKKy0tCitDUkVB
VEUgVEFCTEUgbGluZXJfbm90ZXMgKAorICBsaW5lcl9pZCBJTlRFR0VSIFBSSU1BUlkgS0VZIE5P
VCBOVUxMLAorICBub3RlcyB2YXJjaGFyKDEwMCkgTk9UIE5VTEwKICk7Ci0KIC0tCi0tLSBUYWJs
ZTogdHdva2V5cworLS0gVGFibGU6IGxpbmsKIC0tCi1DUkVBVEUgVEFCTEUgdHdva2V5cyAoCi0g
IGFydGlzdCBpbnRlZ2VyIE5PVCBOVUxMLAotICBjZCBpbnRlZ2VyIE5PVCBOVUxMLAotICBQUklN
QVJZIEtFWSAoYXJ0aXN0LCBjZCkKK0NSRUFURSBUQUJMRSBsaW5rICgKKyAgaWQgSU5URUdFUiBQ
UklNQVJZIEtFWSBOT1QgTlVMTCwKKyAgdXJsIHZhcmNoYXIoMTAwKSwKKyAgdGl0bGUgdmFyY2hh
cigxMDApCiApOwotCiAtLQogLS0gVGFibGU6IG5vcHJpbWFyeWtleQogLS0KQEAgLTE5MCwyOCAr
MTU2LDIxIEBACiAgIGJhciBpbnRlZ2VyIE5PVCBOVUxMLAogICBiYXogaW50ZWdlciBOT1QgTlVM
TAogKTsKLQotLS0KLS0tIFRhYmxlOiBmb3Vya2V5cworQ1JFQVRFIFVOSVFVRSBJTkRFWCBmb29f
YmFyX25vcHJpbWFyeWtleSBPTiBub3ByaW1hcnlrZXkgKGZvbywgYmFyKTstLQorLS0gVGFibGU6
IG9uZWtleQogLS0KLUNSRUFURSBUQUJMRSBmb3Vya2V5cyAoCi0gIGZvbyBpbnRlZ2VyIE5PVCBO
VUxMLAotICBiYXIgaW50ZWdlciBOT1QgTlVMTCwKLSAgaGVsbG8gaW50ZWdlciBOT1QgTlVMTCwK
LSAgZ29vZGJ5ZSBpbnRlZ2VyIE5PVCBOVUxMLAotICBzZW5zb3JzIGNoYXJhY3RlciBOT1QgTlVM
TCwKLSAgUFJJTUFSWSBLRVkgKGZvbywgYmFyLCBoZWxsbywgZ29vZGJ5ZSkKK0NSRUFURSBUQUJM
RSBvbmVrZXkgKAorICBpZCBJTlRFR0VSIFBSSU1BUlkgS0VZIE5PVCBOVUxMLAorICBhcnRpc3Qg
aW50ZWdlciBOT1QgTlVMTCwKKyAgY2QgaW50ZWdlciBOT1QgTlVMTAogKTsKLQogLS0KLS0tIFRh
YmxlOiBhcnRpc3RfdW5kaXJlY3RlZF9tYXAKKy0tIFRhYmxlOiBvd25lcnMKIC0tCi1DUkVBVEUg
VEFCTEUgYXJ0aXN0X3VuZGlyZWN0ZWRfbWFwICgKLSAgaWQxIGludGVnZXIgTk9UIE5VTEwsCi0g
IGlkMiBpbnRlZ2VyIE5PVCBOVUxMLAotICBQUklNQVJZIEtFWSAoaWQxLCBpZDIpCitDUkVBVEUg
VEFCTEUgb3duZXJzICgKKyAgb3duZXJpZCBJTlRFR0VSIFBSSU1BUlkgS0VZIE5PVCBOVUxMLAor
ICBuYW1lIHZhcmNoYXIoMTAwKSBOT1QgTlVMTAogKTsKLQogLS0KIC0tIFRhYmxlOiBwcm9kdWNl
cgogLS0KQEAgLTIxOSw2NCArMTc4LDg5IEBACiAgIHByb2R1Y2VyaWQgSU5URUdFUiBQUklNQVJZ
IEtFWSBOT1QgTlVMTCwKICAgbmFtZSB2YXJjaGFyKDEwMCkgTk9UIE5VTEwKICk7Ci0KLS0tCi0t
LSBUYWJsZTogb25la2V5CitDUkVBVEUgVU5JUVVFIElOREVYIHByb2RfbmFtZV9wcm9kdWNlciBP
TiBwcm9kdWNlciAobmFtZSk7LS0KKy0tIFRhYmxlOiBzZWxmX3JlZgogLS0KLUNSRUFURSBUQUJM
RSBvbmVrZXkgKAorQ1JFQVRFIFRBQkxFIHNlbGZfcmVmICgKICAgaWQgSU5URUdFUiBQUklNQVJZ
IEtFWSBOT1QgTlVMTCwKLSAgYXJ0aXN0IGludGVnZXIgTk9UIE5VTEwsCi0gIGNkIGludGVnZXIg
Tk9UIE5VTEwKKyAgbmFtZSB2YXJjaGFyKDEwMCkgTk9UIE5VTEwKICk7Ci0KIC0tCi0tLSBUYWJs
ZTogdHlwZWRfb2JqZWN0CistLSBUYWJsZTogc2VsZl9yZWZfYWxpYXMKIC0tCi1DUkVBVEUgVEFC
TEUgdHlwZWRfb2JqZWN0ICgKLSAgb2JqZWN0aWQgSU5URUdFUiBQUklNQVJZIEtFWSBOT1QgTlVM
TCwKLSAgdHlwZSBWQVJDSEFSKDEwMCkgTk9UIE5VTEwsCi0gIHZhbHVlIFZBUkNIQVIoMTAwKQor
Q1JFQVRFIFRBQkxFIHNlbGZfcmVmX2FsaWFzICgKKyAgc2VsZl9yZWYgaW50ZWdlciBOT1QgTlVM
TCwKKyAgYWxpYXMgaW50ZWdlciBOT1QgTlVMTCwKKyAgUFJJTUFSWSBLRVkgKHNlbGZfcmVmLCBh
bGlhcykKICk7Ci0KLS0tCi0tLSBUYWJsZTogY29sbGVjdGlvbgorQ1JFQVRFIElOREVYIHNlbGZf
cmVmX2FsaWFzX2lkeF9hbGlhc19zZWxmXyBPTiBzZWxmX3JlZl9hbGlhcyAoYWxpYXMpO0NSRUFU
RSBJTkRFWCBzZWxmX3JlZl9hbGlhc19pZHhfc2VsZl9yZWZfc2UgT04gc2VsZl9yZWZfYWxpYXMg
KHNlbGZfcmVmKTstLQorLS0gVGFibGU6IHNlcXVlbmNlX3Rlc3QKIC0tCi1DUkVBVEUgVEFCTEUg
Y29sbGVjdGlvbiAoCi0gIGNvbGxlY3Rpb25pZCBJTlRFR0VSIFBSSU1BUlkgS0VZIE5PVCBOVUxM
LAotICBuYW1lIFZBUkNIQVIoMTAwKQorQ1JFQVRFIFRBQkxFIHNlcXVlbmNlX3Rlc3QgKAorICBw
a2lkMSBpbnRlZ2VyIE5PVCBOVUxMLAorICBwa2lkMiBpbnRlZ2VyIE5PVCBOVUxMLAorICBub25w
a2lkIGludGVnZXIgTk9UIE5VTEwsCisgIG5hbWUgdmFyY2hhcigxMDApLAorICBQUklNQVJZIEtF
WSAocGtpZDEsIHBraWQyKQogKTsKLQogLS0KLS0tIFRhYmxlOiBjb2xsZWN0aW9uX29iamVjdAor
LS0gVGFibGU6IHNlcmlhbGl6ZWQKIC0tCi1DUkVBVEUgVEFCTEUgY29sbGVjdGlvbl9vYmplY3Qg
KAotICBjb2xsZWN0aW9uIElOVEVHRVIgTk9UIE5VTEwsCi0gIG9iamVjdCBJTlRFR0VSIE5PVCBO
VUxMCitDUkVBVEUgVEFCTEUgc2VyaWFsaXplZCAoCisgIGlkIElOVEVHRVIgUFJJTUFSWSBLRVkg
Tk9UIE5VTEwsCisgIHNlcmlhbGl6ZWQgdGV4dCBOT1QgTlVMTAogKTsKLQogLS0KLS0tIFRhYmxl
OiBvd25lcnMKKy0tIFRhYmxlOiB0YWdzCiAtLQotQ1JFQVRFIFRBQkxFIG93bmVycyAoCi0gIG93
bmVyaWQgSU5URUdFUiBQUklNQVJZIEtFWSBOT1QgTlVMTCwKLSAgbmFtZSB2YXJjaGFyKDEwMCkK
K0NSRUFURSBUQUJMRSB0YWdzICgKKyAgdGFnaWQgSU5URUdFUiBQUklNQVJZIEtFWSBOT1QgTlVM
TCwKKyAgY2QgaW50ZWdlciBOT1QgTlVMTCwKKyAgdGFnIHZhcmNoYXIoMTAwKSBOT1QgTlVMTAog
KTsKLQorQ1JFQVRFIElOREVYIHRhZ3NfaWR4X2NkX3RhZ3MgT04gdGFncyAoY2QpOy0tCistLSBU
YWJsZTogdHJhY2sKIC0tCi0tLSBUYWJsZTogYm9va3MKK0NSRUFURSBUQUJMRSB0cmFjayAoCisg
IHRyYWNraWQgSU5URUdFUiBQUklNQVJZIEtFWSBOT1QgTlVMTCwKKyAgY2QgaW50ZWdlciBOT1Qg
TlVMTCwKKyAgcG9zaXRpb24gaW50ZWdlciBOT1QgTlVMTCwKKyAgdGl0bGUgdmFyY2hhcigxMDAp
IE5PVCBOVUxMLAorICBsYXN0X3VwZGF0ZWRfb24gZGF0ZXRpbWUKKyk7CitDUkVBVEUgSU5ERVgg
dHJhY2tfaWR4X2NkX3RyYWNrIE9OIHRyYWNrIChjZCk7Q1JFQVRFIFVOSVFVRSBJTkRFWCB0cmFj
a19jZF9wb3NpdGlvbl90cmFjayBPTiB0cmFjayAoY2QsIHBvc2l0aW9uKTtDUkVBVEUgVU5JUVVF
IElOREVYIHRyYWNrX2NkX3RpdGxlX3RyYWNrIE9OIHRyYWNrIChjZCwgdGl0bGUpOy0tCistLSBU
YWJsZTogdHJlZWxpa2UKIC0tCi1DUkVBVEUgVEFCTEUgYm9va3MgKAorQ1JFQVRFIFRBQkxFIHRy
ZWVsaWtlICgKICAgaWQgSU5URUdFUiBQUklNQVJZIEtFWSBOT1QgTlVMTCwKLSAgb3duZXIgSU5U
RUdFUiwKLSAgc291cmNlIHZhcmNoYXIoMTAwKSwKLSAgdGl0bGUgdmFyY2hhcigxMDApCisgIHBh
cmVudCBpbnRlZ2VyLAorICBuYW1lIHZhcmNoYXIoMTAwKSBOT1QgTlVMTAorKTsKK0NSRUFURSBJ
TkRFWCB0cmVlbGlrZV9pZHhfcGFyZW50X3RyZWVsaWtlIE9OIHRyZWVsaWtlIChwYXJlbnQpOy0t
CistLSBUYWJsZTogdHdva2V5dHJlZWxpa2UKKy0tCitDUkVBVEUgVEFCTEUgdHdva2V5dHJlZWxp
a2UgKAorICBpZDEgaW50ZWdlciBOT1QgTlVMTCwKKyAgaWQyIGludGVnZXIgTk9UIE5VTEwsCisg
IHBhcmVudDEgaW50ZWdlciBOT1QgTlVMTCwKKyAgcGFyZW50MiBpbnRlZ2VyIE5PVCBOVUxMLAor
ICBuYW1lIHZhcmNoYXIoMTAwKSBOT1QgTlVMTCwKKyAgUFJJTUFSWSBLRVkgKGlkMSwgaWQyKQor
KTsKK0NSRUFURSBJTkRFWCB0d29rZXl0cmVlbGlrZV9pZHhfcGFyZW50MV9wYXJlbnQyX3R3b2tl
eXRyZSBPTiB0d29rZXl0cmVlbGlrZSAocGFyZW50MSwgcGFyZW50Mik7Q1JFQVRFIFVOSVFVRSBJ
TkRFWCB0a3RsbmFtZXVuaXF1ZV90d29rZXl0cmVlbGlrZSBPTiB0d29rZXl0cmVlbGlrZSAobmFt
ZSk7LS0KKy0tIFRhYmxlOiB0d29rZXlzCistLQorQ1JFQVRFIFRBQkxFIHR3b2tleXMgKAorICBh
cnRpc3QgaW50ZWdlciBOT1QgTlVMTCwKKyAgY2QgaW50ZWdlciBOT1QgTlVMTCwKKyAgUFJJTUFS
WSBLRVkgKGFydGlzdCwgY2QpCispOworQ1JFQVRFIElOREVYIHR3b2tleXNfaWR4X2FydGlzdF90
d29rZXlzIE9OIHR3b2tleXMgKGFydGlzdCk7LS0KKy0tIFRhYmxlOiB0eXBlZF9vYmplY3QKKy0t
CitDUkVBVEUgVEFCTEUgdHlwZWRfb2JqZWN0ICgKKyAgb2JqZWN0aWQgSU5URUdFUiBQUklNQVJZ
IEtFWSBOT1QgTlVMTCwKKyAgdHlwZSB2YXJjaGFyKDEwMCkgTk9UIE5VTEwsCisgIHZhbHVlIHZh
cmNoYXIoMTAwKSBOT1QgTlVMTAogKTsKLQotCi1DUkVBVEUgVU5JUVVFIElOREVYIHRrdGxuYW1l
dW5pcXVlX3R3b2tleXRyZWVsaWtlIG9uIHR3b2tleXRyZWVsaWtlIChuYW1lKTsKLUNSRUFURSBV
TklRVUUgSU5ERVggY2RfYXJ0aXN0X3RpdGxlX2NkIG9uIGNkIChhcnRpc3QsIHRpdGxlKTsKLUNS
RUFURSBVTklRVUUgSU5ERVggdHJhY2tfY2RfcG9zaXRpb25fdHJhY2sgb24gdHJhY2sgKGNkLCBw
b3NpdGlvbik7Ci1DUkVBVEUgVU5JUVVFIElOREVYIHRyYWNrX2NkX3RpdGxlX3RyYWNrIG9uIHRy
YWNrIChjZCwgdGl0bGUpOwotQ1JFQVRFIFVOSVFVRSBJTkRFWCBmb29fYmFyX25vcHJpbWFyeWtl
eSBvbiBub3ByaW1hcnlrZXkgKGZvbywgYmFyKTsKLUNSRUFURSBVTklRVUUgSU5ERVggcHJvZF9u
YW1lX3Byb2R1Y2VyIG9uIHByb2R1Y2VyIChuYW1lKTsKIENPTU1JVDsKSW5kZXg6IHQvbGliL0RC
SUNUZXN0L1NjaGVtYS9FdmVudC5wbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSB0L2xpYi9EQklDVGVzdC9TY2hl
bWEvRXZlbnQucG0JKFJldmlzaW9uIDQ4ODcpCisrKyB0L2xpYi9EQklDVGVzdC9TY2hlbWEvRXZl
bnQucG0JKEFyYmVpdHNrb3BpZSkKQEAgLTExLDcgKzExLDggQEAKIF9fUEFDS0FHRV9fLT5hZGRf
Y29sdW1ucygKICAgaWQgPT4geyBkYXRhX3R5cGUgPT4gJ2ludGVnZXInLCBpc19hdXRvX2luY3Jl
bWVudCA9PiAxIH0sCiAgIHN0YXJ0c19hdCA9PiB7IGRhdGFfdHlwZSA9PiAnZGF0ZXRpbWUnLCBk
YXRldGltZV91bmRlZl9pZl9pbnZhbGlkID0+IDEgfSwKLSAgY3JlYXRlZF9vbiA9PiB7IGRhdGFf
dHlwZSA9PiAndGltZXN0YW1wJyB9CisgIGNyZWF0ZWRfb24gPT4geyBkYXRhX3R5cGUgPT4gJ3Rp
bWVzdGFtcCcgfSwKKyAgZW5kc19hdCAgICA9PiB7IGRhdGFfdHlwZSA9PiAnZGF0ZXRpbWUnLCBk
YXRldGltZV91bmRlZl9pZl9pbnZhbGlkID0+IDEsIGV4dHJhID0+IHsgdGltZXpvbmUgPT4gJ1VU
QycgfX0KICk7CiAKIF9fUEFDS0FHRV9fLT5zZXRfcHJpbWFyeV9rZXkoJ2lkJyk7CkluZGV4OiBs
aWIvREJJeC9DbGFzcy9JbmZsYXRlQ29sdW1uL0RhdGVUaW1lLnBtCj09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIGxp
Yi9EQkl4L0NsYXNzL0luZmxhdGVDb2x1bW4vRGF0ZVRpbWUucG0JKFJldmlzaW9uIDQ4ODcpCisr
KyBsaWIvREJJeC9DbGFzcy9JbmZsYXRlQ29sdW1uL0RhdGVUaW1lLnBtCShBcmJlaXRza29waWUp
CkBAIC05MCw3ICs5MCw3IEBACiAgICAgICAgICAgICBteSAkZHQgPSBldmFsIHsgJG9iai0+X2Rh
dGV0aW1lX3BhcnNlci0+JHBhcnNlKCR2YWx1ZSk7IH07CiAgICAgICAgICAgICBkaWUgIkVycm9y
IHdoaWxlIGluZmxhdGluZyAke3ZhbHVlfSBmb3IgJHtjb2x1bW59IG9uICR7c2VsZn06ICRAIgog
ICAgICAgICAgICAgICBpZiAkQCBhbmQgbm90ICR1bmRlZl9pZl9pbnZhbGlkOwotICAgICAgICAg
ICAgJGR0LT5zZXRfdGltZV96b25lKCR0aW1lem9uZSkgaWYgJHRpbWV6b25lOworICAgICAgICAg
ICAgJGR0LT5zZXRfdGltZV96b25lKCR0aW1lem9uZSkgaWYgJHRpbWV6b25lIGFuZCAkZHQ7CiAg
ICAgICAgICAgICByZXR1cm4gJGR0OwogICAgICAgICAgIH0sCiAgICAgICAgICAgZGVmbGF0ZSA9
PiBzdWIgewo=