178206 2017-10-12 03:19:38 -0700 [GStreamer][GTK][WPE] update-webkit-libs-jhbuild fails to detect changes in included moduleset files 2017-10-24 17:37:02 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 nael.ouedp nael.ouedp achristensen aperez bugs-noreply calvaris clopez commit-queue dbates eocanha lforschler mcatanzaro ossy simon.fraser webkit-bug-importer zan oldest_to_newest 1359568 0 nael.ouedp 2017-10-12 03:19:38 -0700 [GStreamer][GTK][WPE] update-webkit-libs-jhbuild fails to detect changes in included moduleset files. For instance, it cannot detect modification of gstreamer/jhbuild.modules when updating dependencies of WebKitGtk. 1359575 1 mcatanzaro 2017-10-12 04:53:05 -0700 This regressed when we split GStreamer stuff into a separate moduleset file (that update-webkit-libs-jhbuild does not know about). 1359612 2 323529 aperez 2017-10-12 09:11:39 -0700 Created attachment 323529 Patch Tentative patch. Note that my Perl-fu is close to non-existant. (But at least this did not seem to break anything locally for me.) 1359618 3 nael.ouedp 2017-10-12 10:03:03 -0700 I discussed with Michael on this by email and he told me that we don't want to have to modify the perl script every time we add a new moduleset file. So maybe we should find another fix. In the meantime I prepared a patch that parses jhbuild.modules to determine if other jhbuild.modules are included. If any, it computes MD5 sum for each included jhbuild.modules file. If you think it is a good way to fix this bug, I can upload the patch. 1359622 4 aperez 2017-10-12 10:15:13 -0700 (In reply to Nael Ouedraogo from comment #3) > I discussed with Michael on this by email and he told me that we don't want > to have to modify the perl script every time we add a new moduleset file. So > maybe we should find another fix. Well, not having to touch the Perl is certainly nicer. > In the meantime I prepared a patch that parses jhbuild.modules to determine > if other jhbuild.modules are included. If any, it computes MD5 sum for each > included jhbuild.modules file. If you think it is a good way to fix this > bug, I can upload the patch. That sounds certainly *much better* than the patch I have posted earlier. Thanks a lot for working on it! 1359624 5 323529 aperez 2017-10-12 10:16:08 -0700 Comment on attachment 323529 Patch Marking my patch as obsolete, as Nael's solution will be much better. 1359636 6 323535 nael.ouedp 2017-10-12 11:01:57 -0700 Created attachment 323535 Patch 1360687 7 calvaris 2017-10-16 00:19:13 -0700 I'd prefer somebody with better Perl-fu could review this but the main ideas lgtm. 1360710 8 323535 clopez 2017-10-16 03:06:29 -0700 Comment on attachment 323535 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=323535&action=review > Tools/Scripts/webkitdirs.pm:49 > +use XML::LibXML; This is a new runtime dependency. It should be added to the scripts Tools/gtk/install-dependencies and Tools/wpe/install-dependencies. The name of the package in Debian is libxml-libxml-perl I will be installing it on the bots so the EWS don't fail anymore due to this 1360737 9 aperez 2017-10-16 04:22:29 -0700 (In reply to Carlos Alberto Lopez Perez from comment #8) > Comment on attachment 323535 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=323535&action=review > > > Tools/Scripts/webkitdirs.pm:49 > > +use XML::LibXML; > > This is a new runtime dependency. It should be added to the scripts > Tools/gtk/install-dependencies and Tools/wpe/install-dependencies. > The name of the package in Debian is libxml-libxml-perl > I will be installing it on the bots so the EWS don't fail anymore due to this For Arch Linux the package is “perl-xml-libxml”: https://www.archlinux.org/packages/extra/x86_64/perl-xml-libxml/ 1360882 10 323535 mcatanzaro 2017-10-16 12:11:55 -0700 Comment on attachment 323535 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=323535&action=review r=me if you also update the two install-dependencies scripts. Thanks! >>> Tools/Scripts/webkitdirs.pm:49 >>> +use XML::LibXML; >> >> This is a new runtime dependency. It should be added to the scripts Tools/gtk/install-dependencies and Tools/wpe/install-dependencies. >> The name of the package in Debian is libxml-libxml-perl >> I will be installing it on the bots so the EWS don't fail anymore due to this > > For Arch Linux the package is “perl-xml-libxml”: > > https://www.archlinux.org/packages/extra/x86_64/perl-xml-libxml/ The package name variations for this on the different distros are incredible... I believe the correct Fedora package is "perl-libxml-perl". > Tools/Scripts/webkitdirs.pm:1888 > +sub getJhbuildIncludedFilePath I think this should be called "getJhbuildIncludedFilePaths" since it returns multiple paths. 1360883 11 mcatanzaro 2017-10-16 12:12:39 -0700 (In reply to Michael Catanzaro from comment #10) > The package name variations for this on the different distros are > incredible... I believe the correct Fedora package is "perl-libxml-perl". Not to be confused with Debian's libxml-libxml-perl and Arch's perl-xml-libxml.... 1361204 12 324009 nael.ouedp 2017-10-17 03:24:10 -0700 Created attachment 324009 Patch 1361205 13 nael.ouedp 2017-10-17 03:32:35 -0700 Thanks for all reviews and for helping me to find the good lib names for each distribution. In uploaded patch, I moved getJhbuildIncludedFilePaths sub from webkitdirs.pm to update-webkit-libs-jhbuild script to avoid issues when other ports (win port) use webkitdir.pm and perl-libXML is not installed. I also updated install-dependencies. 1361228 14 324009 commit-queue 2017-10-17 06:54:59 -0700 Comment on attachment 324009 Patch Clearing flags on attachment: 324009 Committed r223536: <https://trac.webkit.org/changeset/223536> 1361229 15 commit-queue 2017-10-17 06:55:01 -0700 All reviewed patches have been landed. Closing bug. 1361230 16 webkit-bug-importer 2017-10-17 06:55:51 -0700 <rdar://problem/35028586> 1364037 17 mcatanzaro 2017-10-24 17:32:18 -0700 (In reply to Michael Catanzaro from comment #10) > The package name variations for this on the different distros are > incredible... I believe the correct Fedora package is "perl-libxml-perl". Wrong... it is perl-XML-LibXML. I don't pretend to understand 1364040 18 mcatanzaro 2017-10-24 17:37:02 -0700 Committed r223943: <https://trac.webkit.org/changeset/223943> 323529 2017-10-12 09:11:39 -0700 2017-10-12 10:16:08 -0700 Patch bug-178206-20171012191137.patch text/plain 2617 aperez U3VidmVyc2lvbiBSZXZpc2lvbjogMjIzMjM4CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMWY3NGE4OGY1ZDU0ODIxODZkY2M1MGY1OWZmMGExZGMy NTE1Y2ZmNy4uNWQyNmY5MmE4MjZkNDdiM2M0NTQxNDhkYzdiOTE1OGQzNzUyMDhhZCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3 IEBACisyMDE3LTEwLTEyICBBZHJpYW4gUGVyZXogZGUgQ2FzdHJvICA8YXBlcmV6QGlnYWxpYS5j b20+CisKKyAgICAgICAgW0dTdHJlYW1lcl1bR1RLXVtXUEVdIHVwZGF0ZS13ZWJraXQtbGlicy1q aGJ1aWxkIGZhaWxzIHRvIGRldGVjdCBjaGFuZ2VzIGluIGluY2x1ZGVkIG1vZHVsZXNldCBmaWxl cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTc4MjA2 CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSGFuZGxl IGNoZWNraW5nIGFuZCB1cGRhdGluZyBNRDUgY2hlY2tzdW1zIGZvciAiVG9vbHMvZ3N0cmVhbWVy L21vZHVsZXMuamhidWlsZCIuCisKKyAgICAgICAgKiBTY3JpcHRzL3VwZGF0ZS13ZWJraXQtbGli cy1qaGJ1aWxkOgorICAgICAgICAoamhidWlsZENvbmZpZ3VyYXRpb25DaGFuZ2VkKTogQWxzbyB2 YWxpZGF0ZSBjaGVja3N1bSBmb3IgdGhlIEdTdHJlYW1lciBtb2R1bGVzZXQuCisgICAgICAgIChz YXZlSmhidWlsZE1kNSk6IEFsc28gd3JpdGUgY2hlY2tzdW0gZm9yIHRoZSBHU3RyZWFtZXIgbW9k dWxlc2V0LgorICAgICAgICAoZGVsZXRlSmhidWlsZE1kNSk6IEFsc28gZGVsZXRlIGNoZWNrc3Vt IGZvciB0aGUgR1N0cmVhbWVyIG1vZHVsZXNldC4KKwogMjAxNy0xMC0xMSAgU2FtIFdlaW5pZyAg PHNhbUB3ZWJraXQub3JnPgogCiAgICAgICAgIFJlbW92ZSBvdXQtcGFyYW1ldGVyIHZhcmlhbnRz IG9mIGNvcHlUb1ZlY3RvcgpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy91cGRhdGUtd2Via2l0 LWxpYnMtamhidWlsZCBiL1Rvb2xzL1NjcmlwdHMvdXBkYXRlLXdlYmtpdC1saWJzLWpoYnVpbGQK aW5kZXggMTA3OWE5ZThhYjVmYmUzZTY0MGZlZjI2OGNkYjZmMzY4ZDZlNjQ3Yy4uZWNmMmQ2Njlk MTc4MjUyNWNhYjQwNmJlYmVjYzgwMmY5ZTM0NThhNSAxMDA3NTUKLS0tIGEvVG9vbHMvU2NyaXB0 cy91cGRhdGUtd2Via2l0LWxpYnMtamhidWlsZAorKysgYi9Ub29scy9TY3JpcHRzL3VwZGF0ZS13 ZWJraXQtbGlicy1qaGJ1aWxkCkBAIC03NSw2ICs3NSwyMyBAQCBzdWIgamhidWlsZENvbmZpZ3Vy YXRpb25DaGFuZ2VkKCkKICAgICAgICAgICAgIHJldHVybiAxOwogICAgICAgICB9CiAgICAgfQor CisgICAgIyBBbHNvIHRha2UgaW50byBhY2NvdW50IHRoZSBzZXBhcmF0ZSBHU3RyZWFtZXIgbW9k dWxlc2V0LgorICAgIG15ICRwYXRoID0gam9pbignLycsIGdldEpoYnVpbGRQYXRoKCksICJnc3Ry ZWFtZXIuamhidWlsZC5tb2R1bGVzLm1kNXN1bSIpOworICAgIGlmICghIC1lICRwYXRoKSB7Cisg ICAgICAgIHJldHVybiAxOworICAgIH0KKworICAgIG15ICRhY3R1YWxGaWxlID0gam9pbignLycs IHNvdXJjZURpcigpLCAnVG9vbHMnLCAnZ3N0cmVhbWVyJywgJ2poYnVpbGQubW9kdWxlcycpOwor ICAgIG15ICRjdXJyZW50U3VtID0gZ2V0TUQ1SGFzaEZvckZpbGUoJGFjdHVhbEZpbGUpOworCisg ICAgb3BlbihQUkVWSU9VU19NRDUsICRwYXRoKTsKKyAgICBjaG9tcChteSAkcHJldmlvdXNTdW0g PSA8UFJFVklPVVNfTUQ1Pik7CisgICAgY2xvc2UoUFJFVklPVVNfTUQ1KTsKKworICAgIGlmICgk cHJldmlvdXNTdW0gbmUgJGN1cnJlbnRTdW0pIHsKKyAgICAgICAgcmV0dXJuIDE7CisgICAgfQog fQogCiBzdWIgc2F2ZUpoYnVpbGRNZDUoKSB7CkBAIC04OCw2ICsxMDUsMTEgQEAgc3ViIHNhdmVK aGJ1aWxkTWQ1KCkgewogICAgICAgICBwcmludCBTVU0gZ2V0TUQ1SGFzaEZvckZpbGUoJHNvdXJj ZSk7CiAgICAgICAgIGNsb3NlKFNVTSk7CiAgICAgfQorICAgIG15ICRzb3VyY2UgPSBqb2luKCcv Jywgc291cmNlRGlyKCksICdUb29scycsICdnc3RyZWFtZXInLCAnamhidWlsZC5tb2R1bGVzJyk7 CisgICAgbXkgJGRlc3RpbmF0aW9uID0gam9pbignLycsICRqaGJ1aWxkUGF0aCwgJ2dzdHJlYW1l ci5qaGJ1aWxkLm1vZHVsZXMubWQ1c3VtJyk7CisgICAgb3BlbihTVU0sICI+JGRlc3RpbmF0aW9u Iik7CisgICAgcHJpbnQgU1VNIGdldE1ENUhhc2hGb3JGaWxlKCRzb3VyY2UpOworICAgIGNsb3Nl KFNVTSk7CiB9CiAKIHN1YiBkZWxldGVKaGJ1aWxkTWQ1KCkgewpAQCAtOTksNiArMTIxLDggQEAg c3ViIGRlbGV0ZUpoYnVpbGRNZDUoKSB7CiAgICAgICAgIG15ICRtZDVGaWxlID0gam9pbignLycs ICRqaGJ1aWxkUGF0aCwgJGZpbGUpIC4gIi5tZDVzdW0iOwogICAgICAgICB1bmxpbmsoJG1kNUZp bGUpIGlmIC1lICRtZDVGaWxlOwogICAgIH0KKyAgICBteSAkbWQ1RmlsZSA9IGpvaW4oJy8nLCAk amhidWlsZFBhdGgsICdnc3RyZWFtZXIuamhidWlsZC5tb2R1bGVzLm1kNXN1bScpOworICAgIHVu bGluaygkbWQ1RmlsZSkgaWYgLWUgJG1kNUZpbGU7CiB9CiAKIHN1YiBydW5KaGJ1aWxkCg== 323535 2017-10-12 11:01:57 -0700 2017-10-17 03:24:06 -0700 Patch bug-178206-20171012200156.patch text/plain 6279 nael.ouedp U3VidmVyc2lvbiBSZXZpc2lvbjogMjIzMjQwCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNTg4OWI1ZGU0ODA5ZDRlYjQyNTc5ZTgzOTc0M2NlOWNj NTExZDNiNS4uOTA1YWI4NDZjN2Q0ZjEyOTJhNmM5MGFlYTUwNDFiNWQ3MjUyNGY4NCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0 IEBACisyMDE3LTEwLTEyICBOYWVsIE91ZWRyYW9nbyAgPG5hZWwub3VlZHJhb2dvQGNyZi5jYW5v bi5mcj4KKworICAgICAgICBbR1N0cmVhbWVyXVtHVEtdW1dQRV0gdXBkYXRlLXdlYmtpdC1saWJz LWpoYnVpbGQgZmFpbHMgdG8gZGV0ZWN0IGNoYW5nZXMgaW4gaW5jbHVkZWQgbW9kdWxlc2V0IGZp bGVzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzgy MDYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGUg dXBkYXRlLXdlYmtpdC1saWJzLWpoYnVpbGQgc2NyaXB0cyBjb21wdXRlcyBNRDUgc3VtIG9mIEdU Sy9XUEUgamhidWlsZCBjb25maWd1cmF0aW9uIGZpbGVzIHRvIGNoZWNrIGlmIGl0CisgICAgICAg IG5lZWRzIHRvIHJlYnVpbGQgdGhlIGRlcGVuZGVuY2llcyBsaWJyYXJpZXMuIFRoaXMgcGF0Y2gg Zml4ZXMgYSBidWcgd2hlbiBtYWluIEdUSy9XUEUgamhidWlsZCBtb2R1bGVzCisgICAgICAgIGNv bmZpZ3VyYXRpb24gZmlsZSBpbmNsdWRlcyBhZGRpdGlvbmFsIGZpbGVzIChmb3IgZXhhbXBsZSBH U3RyZWFtZXIgbW9kdWxlKS4gSXQgcGFyc2VzIGpoYnVpbGQubW9kdWxlcyBmaWxlIHRvCisgICAg ICAgIGNoZWNrIGlmIGFkZGl0aW9uYWwgZmlsZXMgYXJlIGluY2x1ZGVkLiBJZiBhbnksIGl0IGNv bXB1dGVzIE1ENSBzdW0gZm9yIGVhY2ggb2YgdGhlc2UgaW5jbHVkZWQgZmlsZXMuCisKKyAgICAg ICAgKiBTY3JpcHRzL3VwZGF0ZS13ZWJraXQtbGlicy1qaGJ1aWxkOgorICAgICAgICAoamhidWls ZENvbmZpZ3VyYXRpb25DaGVja0ZpbGUpOiBOZXcgZnVuY3Rpb24gdG8gY2hlY2sgaWYgTUQ1IHN1 bSBmaWxlIGNoYW5nZXMuCisgICAgICAgIChqaGJ1aWxkQ29uZmlndXJhdGlvbkNoYW5nZWQpOiBB ZGQgTUQ1IHN1bSBjaGVjayBmb3IgaW5jbHVkZWQgZmlsZXMuCisgICAgICAgIChzYXZlTWQ1Rmls ZSk6IE5ldyBmdW5jdGlvbiB0byBzYXZlIE1ENSBzdW0gb2YgYSBmaWxlLgorICAgICAgICAoc2F2 ZUpoYnVpbGRNZDUpOiBBZGQgc2F2aW5nIGluY2x1ZGVkIGZpbGVzIE1ENSBzdW0uCisgICAgICAg IChkZWxldGVKaGJ1aWxkTWQ1KTogRGVsZXRlIGluY2x1ZGVkIGZpbGVzIE1ENSBzdW0KKyAgICAg ICAgKiBTY3JpcHRzL3dlYmtpdGRpcnMucG06CisgICAgICAgIChnZXRKaGJ1aWxkSW5jbHVkZWRG aWxlUGF0aCk6IE5ldyBmdW5jdGlvbiB0aGF0IHJldHVybnMgaW5jbHVkZWQgZmlsZXMgaW4gamhi dWlsZC5tb2R1bGVzCisKIDIwMTctMDktMjkgIEZpbGlwIFBpemxvICA8ZnBpemxvQGFwcGxlLmNv bT4KIAogICAgICAgICBFbmFibGUgZ2lnYWNhZ2Ugb24gaU9TCmRpZmYgLS1naXQgYS9Ub29scy9T Y3JpcHRzL3VwZGF0ZS13ZWJraXQtbGlicy1qaGJ1aWxkIGIvVG9vbHMvU2NyaXB0cy91cGRhdGUt d2Via2l0LWxpYnMtamhidWlsZAppbmRleCAxMDc5YTllOGFiNWZiZTNlNjQwZmVmMjY4Y2RiNmYz NjhkNmU2NDdjLi41YTlkOGNjYjNhZDFlZmU2YWYxNjY5YjkxN2U4NmZmZTg3NmY5Yzc1IDEwMDc1 NQotLS0gYS9Ub29scy9TY3JpcHRzL3VwZGF0ZS13ZWJraXQtbGlicy1qaGJ1aWxkCisrKyBiL1Rv b2xzL1NjcmlwdHMvdXBkYXRlLXdlYmtpdC1saWJzLWpoYnVpbGQKQEAgLTU0LDM5ICs1NCw2NSBA QCBzdWIgZ2V0TUQ1SGFzaEZvckZpbGUoJCkKICAgICByZXR1cm4gbWQ1X2hleCgkY29udGVudHMp OwogfQogCi1zdWIgamhidWlsZENvbmZpZ3VyYXRpb25DaGFuZ2VkKCkKK3N1YiBqaGJ1aWxkQ29u ZmlndXJhdGlvbkNoZWNrRmlsZQogewotICAgIGZvcmVhY2ggbXkgJGZpbGUgKHF3KGpoYnVpbGRy YyBqaGJ1aWxkLm1vZHVsZXMpKSB7Ci0gICAgICAgIG15ICRwYXRoID0gam9pbignLycsIGdldEpo YnVpbGRQYXRoKCksICRmaWxlIC4gJy5tZDVzdW0nKTsKLSAgICAgICAgaWYgKCEgLWUgJHBhdGgp IHsKLSAgICAgICAgICAgIHJldHVybiAxOwotICAgICAgICB9CisgICAgbXkgJGZpbGUgPSBzaGlm dDsKKyAgICBteSAkcGF0aCA9IGpvaW4oJy8nLCBnZXRKaGJ1aWxkUGF0aCgpLCAkcGxhdGZvcm0s ICRmaWxlIC4gJy5tZDVzdW0nKTsKKyAgICBpZiAoISAtZSAkcGF0aCkgeworICAgICAgICByZXR1 cm4gMTsKKyAgICB9CiAKLSAgICAgICAgIyBHZXQgdGhlIG1kNSBzdW0gb2YgdGhlIGZpbGUgd2Un cmUgdGVzdGluZywgbG9vayBpbiB0aGUgcmlnaHQgcGxhdGZvcm0gZGlyZWN0b3J5LgotICAgICAg ICBteSAkYWN0dWFsRmlsZSA9IGpvaW4oJy8nLCBzb3VyY2VEaXIoKSwgJ1Rvb2xzJywgJHBsYXRm b3JtLCAkZmlsZSk7Ci0gICAgICAgIG15ICRjdXJyZW50U3VtID0gZ2V0TUQ1SGFzaEZvckZpbGUo JGFjdHVhbEZpbGUpOworICAgICMgR2V0IHRoZSBtZDUgc3VtIG9mIHRoZSBmaWxlIHdlJ3JlIHRl c3RpbmcsIGxvb2sgaW4gdGhlIHJpZ2h0IHBsYXRmb3JtIGRpcmVjdG9yeS4KKyAgICBteSAkYWN0 dWFsRmlsZSA9IGpvaW4oJy8nLCBzb3VyY2VEaXIoKSwgJ1Rvb2xzJywgJHBsYXRmb3JtLCAkZmls ZSk7CisgICAgbXkgJGN1cnJlbnRTdW0gPSBnZXRNRDVIYXNoRm9yRmlsZSgkYWN0dWFsRmlsZSk7 CisKKyAgICAjIEdldCBvdXIgcHJldmlvdXMgcmVjb3JkLgorICAgIG9wZW4oUFJFVklPVVNfTUQ1 LCAkcGF0aCk7CisgICAgY2hvbXAobXkgJHByZXZpb3VzU3VtID0gPFBSRVZJT1VTX01ENT4pOwor ICAgIGNsb3NlKFBSRVZJT1VTX01ENSk7CisKKyAgICBpZiAoJHByZXZpb3VzU3VtIG5lICRjdXJy ZW50U3VtKSB7CisgICAgICAgIHJldHVybiAxOworICAgIH0KK30KIAotICAgICAgICAjIEdldCBv dXIgcHJldmlvdXMgcmVjb3JkLgotICAgICAgICBvcGVuKFBSRVZJT1VTX01ENSwgJHBhdGgpOwot ICAgICAgICBjaG9tcChteSAkcHJldmlvdXNTdW0gPSA8UFJFVklPVVNfTUQ1Pik7Ci0gICAgICAg IGNsb3NlKFBSRVZJT1VTX01ENSk7CitzdWIgamhidWlsZENvbmZpZ3VyYXRpb25DaGFuZ2VkKCkK K3sKKyAgICBteSAkamhidWlsZE1haW4gPSBqb2luKCcvJywgc291cmNlRGlyKCksICdUb29scycs ICRwbGF0Zm9ybSwgJ2poYnVpbGQubW9kdWxlcycpOworICAgIG15IEBqaGJ1aWxkRmlsZXMgPSBx dyhqaGJ1aWxkcmMgamhidWlsZC5tb2R1bGVzKTsKKyAgICBwdXNoKEBqaGJ1aWxkRmlsZXMsIGdl dEpoYnVpbGRJbmNsdWRlZEZpbGVQYXRoKCRqaGJ1aWxkTWFpbikpOwogCi0gICAgICAgIGlmICgk cHJldmlvdXNTdW0gbmUgJGN1cnJlbnRTdW0pIHsKKyAgICBmb3JlYWNoIG15ICRmaWxlIChAamhi dWlsZEZpbGVzKSB7CisgICAgICAgIGlmIChqaGJ1aWxkQ29uZmlndXJhdGlvbkNoZWNrRmlsZSgk ZmlsZSkpIHsKICAgICAgICAgICAgIHJldHVybiAxOwogICAgICAgICB9CiAgICAgfQogfQogCitz dWIgc2F2ZU1kNUZpbGUKK3sKKyAgICBteSAkZmlsZSA9IHNoaWZ0OworICAgIG15ICRwYXRoID0g cmVhbHBhdGgoZGlybmFtZShqb2luKCcvJywgZ2V0SmhidWlsZFBhdGgoKSwgJHBsYXRmb3JtLCAk ZmlsZSkpKTsKKyAgICAoLWQgJHBhdGgpIHx8IG1rcGF0aCAkcGF0aDsKKworICAgICRwYXRoID0g am9pbignLycsIGdldEpoYnVpbGRQYXRoKCksICRwbGF0Zm9ybSk7CisgICAgbXkgJHNvdXJjZSA9 IGpvaW4oJy8nLCBzb3VyY2VEaXIoKSwgIlRvb2xzIiwgJHBsYXRmb3JtLCAkZmlsZSk7CisgICAg bXkgJGRlc3RpbmF0aW9uID0gam9pbignLycsICRwYXRoLCAkZmlsZSk7CisgICAgb3BlbihTVU0s ICI+JGRlc3RpbmF0aW9uIiAuICIubWQ1c3VtIik7CisgICAgcHJpbnQgU1VNIGdldE1ENUhhc2hG b3JGaWxlKCRzb3VyY2UpOworICAgIGNsb3NlKFNVTSk7Cit9CisKIHN1YiBzYXZlSmhidWlsZE1k NSgpIHsKICAgICAjIFNhdmUgbWQ1c3VtIGZvciBqaGJ1aWxkLXJlbGF0ZWQgZmlsZXMuc2F2ZUpo YnVpbGRNZDUoKTsKICAgICBteSAkamhidWlsZFBhdGggPSBnZXRKaGJ1aWxkUGF0aCgpOworICAg IG15ICRqaGJ1aWxkTWFpbiA9IGpvaW4oJy8nLCBzb3VyY2VEaXIoKSwgJ1Rvb2xzJywgJHBsYXRm b3JtLCAnamhidWlsZC5tb2R1bGVzJyk7CisgICAgbXkgQGpoYnVpbGRGaWxlcyA9IHF3KGpoYnVp bGRyYyBqaGJ1aWxkLm1vZHVsZXMpOworICAgIHB1c2goQGpoYnVpbGRGaWxlcywgZ2V0SmhidWls ZEluY2x1ZGVkRmlsZVBhdGgoJGpoYnVpbGRNYWluKSk7CisKICAgICAoLWQgJGpoYnVpbGRQYXRo KSB8fCBta3BhdGggJGpoYnVpbGRQYXRoOwotICAgIGZvcmVhY2ggbXkgJGZpbGUgKHF3KGpoYnVp bGRyYyBqaGJ1aWxkLm1vZHVsZXMpKSB7Ci0gICAgICAgIG15ICRzb3VyY2UgPSBqb2luKCcvJywg c291cmNlRGlyKCksICJUb29scyIsICRwbGF0Zm9ybSwgJGZpbGUpOwotICAgICAgICBteSAkZGVz dGluYXRpb24gPSBqb2luKCcvJywgJGpoYnVpbGRQYXRoLCAkZmlsZSk7Ci0gICAgICAgIG9wZW4o U1VNLCAiPiRkZXN0aW5hdGlvbiIgLiAiLm1kNXN1bSIpOwotICAgICAgICBwcmludCBTVU0gZ2V0 TUQ1SGFzaEZvckZpbGUoJHNvdXJjZSk7Ci0gICAgICAgIGNsb3NlKFNVTSk7CisgICAgZm9yZWFj aCBteSAkZmlsZSAoQGpoYnVpbGRGaWxlcykgeworICAgICAgICBzYXZlTWQ1RmlsZSgkZmlsZSk7 CiAgICAgfQogfQogCkBAIC05NSw4ICsxMjEsMTMgQEAgc3ViIGRlbGV0ZUpoYnVpbGRNZDUoKSB7 CiAgICAgaWYgKCEtZCAkamhidWlsZFBhdGgpIHsKICAgICAgICAgcmV0dXJuOwogICAgIH0KLSAg ICBmb3JlYWNoIG15ICRmaWxlIChxdyhqaGJ1aWxkcmMgamhidWlsZC5tb2R1bGVzKSkgewotICAg ICAgICBteSAkbWQ1RmlsZSA9IGpvaW4oJy8nLCAkamhidWlsZFBhdGgsICRmaWxlKSAuICIubWQ1 c3VtIjsKKworICAgIG15ICRqaGJ1aWxkTWFpbiA9IGpvaW4oJy8nLCBzb3VyY2VEaXIoKSwgJ1Rv b2xzJywgJHBsYXRmb3JtLCAnamhidWlsZC5tb2R1bGVzJyk7CisgICAgbXkgQGpoYnVpbGRGaWxl cyA9IHF3KGpoYnVpbGRyYyBqaGJ1aWxkLm1vZHVsZXMpOworICAgIHB1c2goQGpoYnVpbGRGaWxl cywgZ2V0SmhidWlsZEluY2x1ZGVkRmlsZVBhdGgoJGpoYnVpbGRNYWluKSk7CisKKyAgICBmb3Jl YWNoIG15ICRmaWxlIChAamhidWlsZEZpbGVzKSB7CisgICAgICAgIG15ICRtZDVGaWxlID0gam9p bignLycsICRqaGJ1aWxkUGF0aCwgJHBsYXRmb3JtLCAkZmlsZSkgLiAiLm1kNXN1bSI7CiAgICAg ICAgIHVubGluaygkbWQ1RmlsZSkgaWYgLWUgJG1kNUZpbGU7CiAgICAgfQogfQpkaWZmIC0tZ2l0 IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRkaXJzLnBtIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRkaXJz LnBtCmluZGV4IDBlYTQwYTQwMmZlZjcxYmIzNGQxOGQwMWM5OGQ5ZGYxMjcwOWNlMjguLjExN2Rl YjM5OWUzNGNjMWI3OTRiYzljOTEyYTEzZGVmZDk1MGI0NTEgMTAwNzU1Ci0tLSBhL1Rvb2xzL1Nj cmlwdHMvd2Via2l0ZGlycy5wbQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0KQEAg LTQ2LDYgKzQ2LDcgQEAgdXNlIExpc3Q6OlV0aWw7CiB1c2UgUE9TSVg7CiB1c2UgVGltZTo6SGlS ZXMgcXcodXNsZWVwKTsKIHVzZSBWQ1NVdGlsczsKK3VzZSBYTUw6OkxpYlhNTDsKIAogQkVHSU4g ewogICAgdXNlIEV4cG9ydGVyICAgKCk7CkBAIC0xODg0LDYgKzE4ODUsMTggQEAgc3ViIGdldEpo YnVpbGRQYXRoKCkKICAgICByZXR1cm4gRmlsZTo6U3BlYy0+Y2F0ZGlyKEBqaGJ1aWxkUGF0aCk7 CiB9CiAKK3N1YiBnZXRKaGJ1aWxkSW5jbHVkZWRGaWxlUGF0aAoreworICAgIG15ICRqaGJ1aWxk RmlsZSA9IHNoaWZ0OworICAgIG15ICRkb20gPSBYTUw6OkxpYlhNTC0+bG9hZF94bWwobG9jYXRp b24gPT4gJGpoYnVpbGRGaWxlKTsKKyAgICBteSBAaW5jbHVkZXM7CisKKyAgICBmb3JlYWNoIG15 ICRpbmNsdWRlRmlsZSAoJGRvbS0+ZmluZG5vZGVzKCcvbW9kdWxlc2V0L2luY2x1ZGUvQGhyZWYn KSkgeworICAgICAgICBwdXNoKEBpbmNsdWRlcywgJGluY2x1ZGVGaWxlLT50b19saXRlcmFsKCkp OworICAgIH0KKyAgICByZXR1cm4gQGluY2x1ZGVzOworfQorCiBzdWIgaXNDYWNoZWRBcmd1bWVu dGZpbGVPdXRPZkRhdGUoJEApCiB7CiAgICAgbXkgKCRmaWxlbmFtZSwgJGN1cnJlbnRDb250ZW50 cykgPSBAXzsK 324009 2017-10-17 03:24:10 -0700 2017-10-17 06:54:59 -0700 Patch bug-178206-20171017122409.patch text/plain 8390 nael.ouedp U3VidmVyc2lvbiBSZXZpc2lvbjogMjIzNDc3CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMTVjMDg1YmEzYWMxYjYxNTczYWE0NmQzNzY1YjdlYThm NDM2NDZjYi4uMWE0NTU1MDQ1NmE4ODE4OTFhZTdjNzVkOTBlZTE5YjMyYjczMWNkYyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1 IEBACisyMDE3LTEwLTE3ICBOYWVsIE91ZWRyYW9nbyAgPG5hZWwub3VlZHJhb2dvQGNyZi5jYW5v bi5mcj4KKworICAgICAgICBbR1N0cmVhbWVyXVtHVEtdW1dQRV0gdXBkYXRlLXdlYmtpdC1saWJz LWpoYnVpbGQgZmFpbHMgdG8gZGV0ZWN0IGNoYW5nZXMgaW4gaW5jbHVkZWQgbW9kdWxlc2V0IGZp bGVzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzgy MDYKKworICAgICAgICBSZXZpZXdlZCBieSBNaWNoYWVsIENhdGFuemFyby4KKworICAgICAgICBU aGUgdXBkYXRlLXdlYmtpdC1saWJzLWpoYnVpbGQgc2NyaXB0cyBjb21wdXRlcyBNRDUgc3VtIG9m IEdUSy9XUEUgamhidWlsZCBjb25maWd1cmF0aW9uIGZpbGVzIHRvIGNoZWNrIGlmIGl0CisgICAg ICAgIG5lZWRzIHRvIHJlYnVpbGQgdGhlIGRlcGVuZGVuY2llcyBsaWJyYXJpZXMuIFRoaXMgcGF0 Y2ggZml4ZXMgYSBidWcgd2hlbiBtYWluIEdUSy9XUEUgamhidWlsZCBtb2R1bGVzCisgICAgICAg IGNvbmZpZ3VyYXRpb24gZmlsZSBpbmNsdWRlcyBhZGRpdGlvbmFsIGZpbGVzIChmb3IgZXhhbXBs ZSBHU3RyZWFtZXIgbW9kdWxlKS4gSXQgcGFyc2VzIGpoYnVpbGQubW9kdWxlcyBmaWxlIHRvCisg ICAgICAgIGNoZWNrIGlmIGFkZGl0aW9uYWwgZmlsZXMgYXJlIGluY2x1ZGVkLiBJZiBhbnksIGl0 IGNvbXB1dGVzIE1ENSBzdW0gZm9yIGVhY2ggb2YgdGhlc2UgaW5jbHVkZWQgZmlsZXMuCisKKyAg ICAgICAgKiBTY3JpcHRzL3VwZGF0ZS13ZWJraXQtbGlicy1qaGJ1aWxkOgorICAgICAgICAoZ2V0 SmhidWlsZEluY2x1ZGVkRmlsZVBhdGhzKTogTmV3IGZ1bmN0aW9uIHRoYXQgcmV0dXJucyBpbmNs dWRlZCBmaWxlcyBpbiBqaGJ1aWxkLm1vZHVsZXMKKyAgICAgICAgKGpoYnVpbGRDb25maWd1cmF0 aW9uQ2hlY2tGaWxlKTogTmV3IGZ1bmN0aW9uIHRvIGNoZWNrIGlmIE1ENSBzdW0gZmlsZSBjaGFu Z2VzLgorICAgICAgICAoamhidWlsZENvbmZpZ3VyYXRpb25DaGFuZ2VkKTogQWRkIE1ENSBzdW0g Y2hlY2sgZm9yIGluY2x1ZGVkIGZpbGVzLgorICAgICAgICAoc2F2ZU1kNUZpbGUpOiBOZXcgZnVu Y3Rpb24gdG8gc2F2ZSBNRDUgc3VtIG9mIGEgZmlsZS4KKyAgICAgICAgKHNhdmVKaGJ1aWxkTWQ1 KTogQWRkIHNhdmluZyBpbmNsdWRlZCBmaWxlcyBNRDUgc3VtLgorICAgICAgICAoZGVsZXRlSmhi dWlsZE1kNSk6IERlbGV0ZSBpbmNsdWRlZCBmaWxlcyBNRDUgc3VtCisgICAgICAgICogZ3RrL2lu c3RhbGwtZGVwZW5kZW5jaWVzOiBBZGQgcGVybC1saWJYTUwgbGliIHRoYXQgaXMgdXNlZCB0byBw YXJzZSBqaGJ1aWxkIGZpbGUuCisgICAgICAgICogd3BlL2luc3RhbGwtZGVwZW5kZW5jaWVzOiBE aXR0by4KKwogMjAxNy0xMC0xNyAgS2VpdGggTWlsbGVyICA8a2VpdGhfbWlsbGVyQGFwcGxlLmNv bT4KIAogICAgICAgICBDaGFuZ2UgV2ViQ29yZSBzb3VyY2VzIHRvIHdvcmsgd2l0aCB1bmlmaWVk IHNvdXJjZSBidWlsZHMKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvdXBkYXRlLXdlYmtpdC1s aWJzLWpoYnVpbGQgYi9Ub29scy9TY3JpcHRzL3VwZGF0ZS13ZWJraXQtbGlicy1qaGJ1aWxkCmlu ZGV4IGVjMjMzY2FlNWMzNzMwZGE2YjE4NDc0ZGUwMzdkYTY5NzY1MWI2ODkuLjcxNjgxOTkxOGY4 ZjZhMzA2Mjc3ODQ3NWJhYWFlZTBmZWY5NWJhOGMgMTAwNzU1Ci0tLSBhL1Rvb2xzL1NjcmlwdHMv dXBkYXRlLXdlYmtpdC1saWJzLWpoYnVpbGQKKysrIGIvVG9vbHMvU2NyaXB0cy91cGRhdGUtd2Vi a2l0LWxpYnMtamhidWlsZApAQCAtMiw2ICsyLDcgQEAKICMgQ29weXJpZ2h0IChDKSAyMDExIEln YWxpYSBTLkwuCiAjIENvcHlyaWdodCAoQykgMjAxMiBJbnRlbCBDb3Jwb3JhdGlvbgogIyBDb3B5 cmlnaHQgKEMpIDIwMTMgTm9raWEgQ29ycG9yYXRpb24gYW5kL29yIGl0cyBzdWJzaWRpYXJ5KC1p ZXMpLgorIyBDb3B5cmlnaHQgKEMpIDIwMTYgQ2Fub24gSW5jLgogIwogIyBUaGlzIGxpYnJhcnkg aXMgZnJlZSBzb2Z0d2FyZTsgeW91IGNhbiByZWRpc3RyaWJ1dGUgaXQgYW5kL29yCiAjIG1vZGlm eSBpdCB1bmRlciB0aGUgdGVybXMgb2YgdGhlIEdOVSBMZXNzZXIgR2VuZXJhbCBQdWJsaWMKQEAg LTIxLDYgKzIyLDcgQEAgdXNlIEZpbmRCaW47CiB1c2UgbGliICRGaW5kQmluOjpCaW47CiB1c2Ug d2Via2l0ZGlyczsKIHVzZSBHZXRvcHQ6OkxvbmcgcXcoOmNvbmZpZyBwYXNzX3Rocm91Z2gpOwor dXNlIFhNTDo6TGliWE1MOwogCiBteSAkcGxhdGZvcm0gPSAiIjsKICRwbGF0Zm9ybSA9ICJndGsi IGlmIGlzR3RrKCk7CkBAIC0zOCw2ICs0MCwxOCBAQCBHZXRPcHRpb25zKAogICAgICdmb3JjZScg PT4gXCRmb3JjZQogKTsKIAorc3ViIGdldEpoYnVpbGRJbmNsdWRlZEZpbGVQYXRocworeworICAg IG15ICRqaGJ1aWxkRmlsZSA9IHNoaWZ0OworICAgIG15ICRkb20gPSBYTUw6OkxpYlhNTC0+bG9h ZF94bWwobG9jYXRpb24gPT4gJGpoYnVpbGRGaWxlKTsKKyAgICBteSBAaW5jbHVkZXM7CisKKyAg ICBmb3JlYWNoIG15ICRpbmNsdWRlRmlsZSAoJGRvbS0+ZmluZG5vZGVzKCcvbW9kdWxlc2V0L2lu Y2x1ZGUvQGhyZWYnKSkgeworICAgICAgICBwdXNoKEBpbmNsdWRlcywgJGluY2x1ZGVGaWxlLT50 b19saXRlcmFsKCkpOworICAgIH0KKyAgICByZXR1cm4gQGluY2x1ZGVzOworfQorCiBzdWIgZ2V0 TUQ1SGFzaEZvckZpbGUoJCkKIHsKICAgICBteSAkZmlsZSA9IHNoaWZ0OwpAQCAtNTQsMzkgKzY4 LDY1IEBAIHN1YiBnZXRNRDVIYXNoRm9yRmlsZSgkKQogICAgIHJldHVybiBtZDVfaGV4KCRjb250 ZW50cyk7CiB9CiAKLXN1YiBqaGJ1aWxkQ29uZmlndXJhdGlvbkNoYW5nZWQoKQorc3ViIGpoYnVp bGRDb25maWd1cmF0aW9uQ2hlY2tGaWxlCiB7Ci0gICAgZm9yZWFjaCBteSAkZmlsZSAocXcoamhi dWlsZHJjIGpoYnVpbGQubW9kdWxlcykpIHsKLSAgICAgICAgbXkgJHBhdGggPSBqb2luKCcvJywg Z2V0SmhidWlsZFBhdGgoKSwgJGZpbGUgLiAnLm1kNXN1bScpOwotICAgICAgICBpZiAoISAtZSAk cGF0aCkgewotICAgICAgICAgICAgcmV0dXJuIDE7Ci0gICAgICAgIH0KKyAgICBteSAkZmlsZSA9 IHNoaWZ0OworICAgIG15ICRwYXRoID0gam9pbignLycsIGdldEpoYnVpbGRQYXRoKCksICRwbGF0 Zm9ybSwgJGZpbGUgLiAnLm1kNXN1bScpOworICAgIGlmICghIC1lICRwYXRoKSB7CisgICAgICAg IHJldHVybiAxOworICAgIH0KIAotICAgICAgICAjIEdldCB0aGUgbWQ1IHN1bSBvZiB0aGUgZmls ZSB3ZSdyZSB0ZXN0aW5nLCBsb29rIGluIHRoZSByaWdodCBwbGF0Zm9ybSBkaXJlY3RvcnkuCi0g ICAgICAgIG15ICRhY3R1YWxGaWxlID0gam9pbignLycsIHNvdXJjZURpcigpLCAnVG9vbHMnLCAk cGxhdGZvcm0sICRmaWxlKTsKLSAgICAgICAgbXkgJGN1cnJlbnRTdW0gPSBnZXRNRDVIYXNoRm9y RmlsZSgkYWN0dWFsRmlsZSk7CisgICAgIyBHZXQgdGhlIG1kNSBzdW0gb2YgdGhlIGZpbGUgd2Un cmUgdGVzdGluZywgbG9vayBpbiB0aGUgcmlnaHQgcGxhdGZvcm0gZGlyZWN0b3J5LgorICAgIG15 ICRhY3R1YWxGaWxlID0gam9pbignLycsIHNvdXJjZURpcigpLCAnVG9vbHMnLCAkcGxhdGZvcm0s ICRmaWxlKTsKKyAgICBteSAkY3VycmVudFN1bSA9IGdldE1ENUhhc2hGb3JGaWxlKCRhY3R1YWxG aWxlKTsKIAotICAgICAgICAjIEdldCBvdXIgcHJldmlvdXMgcmVjb3JkLgotICAgICAgICBvcGVu KFBSRVZJT1VTX01ENSwgJHBhdGgpOwotICAgICAgICBjaG9tcChteSAkcHJldmlvdXNTdW0gPSA8 UFJFVklPVVNfTUQ1Pik7Ci0gICAgICAgIGNsb3NlKFBSRVZJT1VTX01ENSk7CisgICAgIyBHZXQg b3VyIHByZXZpb3VzIHJlY29yZC4KKyAgICBvcGVuKFBSRVZJT1VTX01ENSwgJHBhdGgpOworICAg IGNob21wKG15ICRwcmV2aW91c1N1bSA9IDxQUkVWSU9VU19NRDU+KTsKKyAgICBjbG9zZShQUkVW SU9VU19NRDUpOwogCi0gICAgICAgIGlmICgkcHJldmlvdXNTdW0gbmUgJGN1cnJlbnRTdW0pIHsK KyAgICBpZiAoJHByZXZpb3VzU3VtIG5lICRjdXJyZW50U3VtKSB7CisgICAgICAgIHJldHVybiAx OworICAgIH0KK30KKworc3ViIGpoYnVpbGRDb25maWd1cmF0aW9uQ2hhbmdlZCgpCit7CisgICAg bXkgJGpoYnVpbGRNYWluID0gam9pbignLycsIHNvdXJjZURpcigpLCAnVG9vbHMnLCAkcGxhdGZv cm0sICdqaGJ1aWxkLm1vZHVsZXMnKTsKKyAgICBteSBAamhidWlsZEZpbGVzID0gcXcoamhidWls ZHJjIGpoYnVpbGQubW9kdWxlcyk7CisgICAgcHVzaChAamhidWlsZEZpbGVzLCBnZXRKaGJ1aWxk SW5jbHVkZWRGaWxlUGF0aHMoJGpoYnVpbGRNYWluKSk7CisKKyAgICBmb3JlYWNoIG15ICRmaWxl IChAamhidWlsZEZpbGVzKSB7CisgICAgICAgIGlmIChqaGJ1aWxkQ29uZmlndXJhdGlvbkNoZWNr RmlsZSgkZmlsZSkpIHsKICAgICAgICAgICAgIHJldHVybiAxOwogICAgICAgICB9CiAgICAgfQog fQogCitzdWIgc2F2ZU1kNUZpbGUKK3sKKyAgICBteSAkZmlsZSA9IHNoaWZ0OworICAgIG15ICRw YXRoID0gcmVhbHBhdGgoZGlybmFtZShqb2luKCcvJywgZ2V0SmhidWlsZFBhdGgoKSwgJHBsYXRm b3JtLCAkZmlsZSkpKTsKKyAgICAoLWQgJHBhdGgpIHx8IG1rcGF0aCAkcGF0aDsKKworICAgICRw YXRoID0gam9pbignLycsIGdldEpoYnVpbGRQYXRoKCksICRwbGF0Zm9ybSk7CisgICAgbXkgJHNv dXJjZSA9IGpvaW4oJy8nLCBzb3VyY2VEaXIoKSwgIlRvb2xzIiwgJHBsYXRmb3JtLCAkZmlsZSk7 CisgICAgbXkgJGRlc3RpbmF0aW9uID0gam9pbignLycsICRwYXRoLCAkZmlsZSk7CisgICAgb3Bl bihTVU0sICI+JGRlc3RpbmF0aW9uIiAuICIubWQ1c3VtIik7CisgICAgcHJpbnQgU1VNIGdldE1E NUhhc2hGb3JGaWxlKCRzb3VyY2UpOworICAgIGNsb3NlKFNVTSk7Cit9CisKIHN1YiBzYXZlSmhi dWlsZE1kNSgpIHsKICAgICAjIFNhdmUgbWQ1c3VtIGZvciBqaGJ1aWxkLXJlbGF0ZWQgZmlsZXMu c2F2ZUpoYnVpbGRNZDUoKTsKICAgICBteSAkamhidWlsZFBhdGggPSBnZXRKaGJ1aWxkUGF0aCgp OworICAgIG15ICRqaGJ1aWxkTWFpbiA9IGpvaW4oJy8nLCBzb3VyY2VEaXIoKSwgJ1Rvb2xzJywg JHBsYXRmb3JtLCAnamhidWlsZC5tb2R1bGVzJyk7CisgICAgbXkgQGpoYnVpbGRGaWxlcyA9IHF3 KGpoYnVpbGRyYyBqaGJ1aWxkLm1vZHVsZXMpOworICAgIHB1c2goQGpoYnVpbGRGaWxlcywgZ2V0 SmhidWlsZEluY2x1ZGVkRmlsZVBhdGhzKCRqaGJ1aWxkTWFpbikpOworCiAgICAgKC1kICRqaGJ1 aWxkUGF0aCkgfHwgbWtwYXRoICRqaGJ1aWxkUGF0aDsKLSAgICBmb3JlYWNoIG15ICRmaWxlIChx dyhqaGJ1aWxkcmMgamhidWlsZC5tb2R1bGVzKSkgewotICAgICAgICBteSAkc291cmNlID0gam9p bignLycsIHNvdXJjZURpcigpLCAiVG9vbHMiLCAkcGxhdGZvcm0sICRmaWxlKTsKLSAgICAgICAg bXkgJGRlc3RpbmF0aW9uID0gam9pbignLycsICRqaGJ1aWxkUGF0aCwgJGZpbGUpOwotICAgICAg ICBvcGVuKFNVTSwgIj4kZGVzdGluYXRpb24iIC4gIi5tZDVzdW0iKTsKLSAgICAgICAgcHJpbnQg U1VNIGdldE1ENUhhc2hGb3JGaWxlKCRzb3VyY2UpOwotICAgICAgICBjbG9zZShTVU0pOworICAg IGZvcmVhY2ggbXkgJGZpbGUgKEBqaGJ1aWxkRmlsZXMpIHsKKyAgICAgICAgc2F2ZU1kNUZpbGUo JGZpbGUpOwogICAgIH0KIH0KIApAQCAtOTUsOCArMTM1LDEzIEBAIHN1YiBkZWxldGVKaGJ1aWxk TWQ1KCkgewogICAgIGlmICghLWQgJGpoYnVpbGRQYXRoKSB7CiAgICAgICAgIHJldHVybjsKICAg ICB9Ci0gICAgZm9yZWFjaCBteSAkZmlsZSAocXcoamhidWlsZHJjIGpoYnVpbGQubW9kdWxlcykp IHsKLSAgICAgICAgbXkgJG1kNUZpbGUgPSBqb2luKCcvJywgJGpoYnVpbGRQYXRoLCAkZmlsZSkg LiAiLm1kNXN1bSI7CisKKyAgICBteSAkamhidWlsZE1haW4gPSBqb2luKCcvJywgc291cmNlRGly KCksICdUb29scycsICRwbGF0Zm9ybSwgJ2poYnVpbGQubW9kdWxlcycpOworICAgIG15IEBqaGJ1 aWxkRmlsZXMgPSBxdyhqaGJ1aWxkcmMgamhidWlsZC5tb2R1bGVzKTsKKyAgICBwdXNoKEBqaGJ1 aWxkRmlsZXMsIGdldEpoYnVpbGRJbmNsdWRlZEZpbGVQYXRocygkamhidWlsZE1haW4pKTsKKwor ICAgIGZvcmVhY2ggbXkgJGZpbGUgKEBqaGJ1aWxkRmlsZXMpIHsKKyAgICAgICAgbXkgJG1kNUZp bGUgPSBqb2luKCcvJywgJGpoYnVpbGRQYXRoLCAkcGxhdGZvcm0sICRmaWxlKSAuICIubWQ1c3Vt IjsKICAgICAgICAgdW5saW5rKCRtZDVGaWxlKSBpZiAtZSAkbWQ1RmlsZTsKICAgICB9CiB9CmRp ZmYgLS1naXQgYS9Ub29scy9ndGsvaW5zdGFsbC1kZXBlbmRlbmNpZXMgYi9Ub29scy9ndGsvaW5z dGFsbC1kZXBlbmRlbmNpZXMKaW5kZXggZDg1M2I0NzhlMDE2M2YzYzFjM2QyMmVjMDJhOTc4Yjhm ODhkMzYwNC4uNTM2NDRjYjEwNzQzYjkyMTY2NmI1YjRlYTU4YTEzYjAwYjc2OWE3ZiAxMDA3NTUK LS0tIGEvVG9vbHMvZ3RrL2luc3RhbGwtZGVwZW5kZW5jaWVzCisrKyBiL1Rvb2xzL2d0ay9pbnN0 YWxsLWRlcGVuZGVuY2llcwpAQCAtMjAzLDYgKzIwMyw3IEBAIGZ1bmN0aW9uIGluc3RhbGxEZXBl bmRlbmNpZXNXaXRoQXB0IHsKICAgICAgICAgbGlieGtiY29tbW9uLXgxMS1kZXYgXAogICAgICAg ICBsaWJ0b29sLWJpbiBcCiAgICAgICAgIGxpYnVkZXYtZGV2IFwKKyAgICAgICAgbGlieG1sLWxp YnhtbC1wZXJsIFwKICAgICAgICAgcHl0aG9uLWRldiBcCiAgICAgICAgIHJhZ2VsIFwKICAgICAg ICAgeDExcHJvdG8tYmlncmVxcy1kZXYgXApAQCAtMzUxLDYgKzM1Miw3IEBAIGZ1bmN0aW9uIGlu c3RhbGxEZXBlbmRlbmNpZXNXaXRoUGFjbWFuIHsKICAgICAgICAgbGlieGtiY29tbW9uLXgxMSBc CiAgICAgICAgIG10ZGV2IFwKICAgICAgICAgb3JjIFwKKyAgICAgICAgcGVybC14bWwtbGlieG1s XAogICAgICAgICBweXRob24yIFwKICAgICAgICAgcHl0aG9uMi1seG1sIFwKICAgICAgICAgcmFn ZWwgXApAQCAtNDk0LDYgKzQ5Niw3IEBAIGZ1bmN0aW9uIGluc3RhbGxEZXBlbmRlbmNpZXNXaXRo RG5mIHsKICAgICAgICAgbWVzYS1saWJFR0wtZGV2ZWwgXAogICAgICAgICBtdGRldi1kZXZlbCBc CiAgICAgICAgIG9yYy1kZXZlbCBcCisgICAgICAgIHBlcmwtbGlieG1sLXBlcmwgXAogICAgICAg ICByYWdlbCBcCiAgICAgICAgIHN5c3RlbWQtZGV2ZWwgXAogICAgICAgICB4b3JnLXgxMS1mb250 LXV0aWxzIFwKZGlmZiAtLWdpdCBhL1Rvb2xzL3dwZS9pbnN0YWxsLWRlcGVuZGVuY2llcyBiL1Rv b2xzL3dwZS9pbnN0YWxsLWRlcGVuZGVuY2llcwppbmRleCBhNWNiMTRhZjI2MGFmMmRmNDgyODI4 ZGZlYzBkODJlYTA1ZDRiNzkwLi5jOWVmODFkNjJlNmNhY2U4NjcwZjcxMmM3MTYwNGFmOGEyNmFl NWRlIDEwMDc1NQotLS0gYS9Ub29scy93cGUvaW5zdGFsbC1kZXBlbmRlbmNpZXMKKysrIGIvVG9v bHMvd3BlL2luc3RhbGwtZGVwZW5kZW5jaWVzCkBAIC0xMjAsNiArMTIwLDcgQEAgZnVuY3Rpb24g aW5zdGFsbERlcGVuZGVuY2llc1dpdGhBcHQgewogICAgICAgICBsaWJ2b3JiaXMtZGV2IFwKICAg ICAgICAgbGlidnB4LWRldiBcCiAgICAgICAgIGxpYnhjYi14a2ItZGV2IFwKKyAgICAgICAgbGli eG1sLWxpYnhtbC1wZXJsIFwKICAgICAgICAgbHVhaml0IgogCiAgICAgIyBUaGVzZSBhcmUgZGVw ZW5kZW5jaWVzIG5lY2Vzc2FyeSBmb3IgdXNpbmcgd2Via2l0LXBhdGNoCkBAIC0yMDcsNiArMjA4 LDcgQEAgZnVuY3Rpb24gaW5zdGFsbERlcGVuZGVuY2llc1dpdGhQYWNtYW4gewogICAgICAgICBt ZXNhLWxpYmdsIFwKICAgICAgICAgb3B1cyBcCiAgICAgICAgIG9yYyBcCisgICAgICAgIHBlcmwt eG1sLWxpYnhtbFwKICAgICAgICAgdjRsLXV0aWxzIgogCiAgICAgIyBUaGVzZSBhcmUgZGVwZW5k ZW5jaWVzIG5lY2Vzc2FyeSBmb3IgdXNpbmcgd2Via2l0LXBhdGNoCkBAIC0yODQsNiArMjg2LDcg QEAgZnVuY3Rpb24gaW5zdGFsbERlcGVuZGVuY2llc1dpdGhEbmYgewogICAgICAgICBtZXNhLWxp YkdMRVMtZGV2ZWwgXAogICAgICAgICBvcHVzLWRldmVsIFwKICAgICAgICAgb3JjLWRldmVsIFwK KyAgICAgICAgcGVybC1saWJ4bWwtcGVybCBcCiAgICAgICAgIHB1bHNlYXVkaW8tbGlicy1kZXZl bCIKIAogICAgICMgVGhlc2UgYXJlIGRlcGVuZGVuY2llcyBuZWNlc3NhcnkgZm9yIHVzaW5nIHdl YmtpdC1wYXRjaAo=