36578 2010-03-24 22:07:22 -0700 [chromium] update chromium DEPS for upstream compile 2010-04-14 17:13:33 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 37424 35902 1 tony webkit-unassigned abarth dglazkov eric fishd tkent webkit.review.bot oldest_to_newest 203791 0 tony 2010-03-24 22:07:22 -0700 update chromium DEPS for upstream compile 203792 1 51594 tony 2010-03-24 22:08:29 -0700 Created attachment 51594 Patch 203794 2 tony 2010-03-24 22:09:29 -0700 (In reply to comment #1) > Created an attachment (id=51594) [details] > Patch This doesn't build webkit/glue, it just brings in all the dependencies so we could build it. Currently, no targets are using it, so it's just a bunch of extra files being pulled. 203798 3 abarth 2010-03-24 22:22:50 -0700 This looks complicated. Would you like an actual review or just a rubber stamp? 203801 4 tony 2010-03-24 22:24:23 -0700 (In reply to comment #3) > This looks complicated. Would you like an actual review or just a rubber > stamp? There's no hurry to get this committed, so waiting on an actual review from dglazkov or fishd is fine. 203805 5 51594 fishd 2010-03-24 22:28:31 -0700 Comment on attachment 51594 Patch > +++ b/WebKit/chromium/DEPS > + 'third_party/wtl': > + Var('chromium_svn')+'/third_party/wtl@'+Var('chromium_rev'), can we avoid the wtl dependencies? would it be possible for some of these dependencies to be expressed through a GYP variable that is defined within the chromium repository? it seems like it would be very nice if chromium/DEPS only mentioned the things that are directly used by WebKit. then, if we could somehow infer the dependencies that those things require, we could greatly minimize what gets hard coded into chromium/DEPS. That would help minimize the cost associated with changing the set of dependencies. R=me all the same 203811 6 tony 2010-03-24 22:44:35 -0700 (In reply to comment #5) > can we avoid the wtl dependencies? This is only needed by webkit/default_plugin/plugin_impl_win.h, which inherits from app/win/window_impl.h to pop up the dialog about installing plugins. I'm not sure how much effort it would be to re-write this or to make a stub implementation since we don't actually need it for DRT. > would it be possible for some of these dependencies to be expressed > through a GYP variable that is defined within the chromium repository? > > it seems like it would be very nice if chromium/DEPS only mentioned > the things that are directly used by WebKit. then, if we could > somehow infer the dependencies that those things require, we could > greatly minimize what gets hard coded into chromium/DEPS. That > would help minimize the cost associated with changing the set of > dependencies. fishd just reminded me on chat that gclient supports "From" to include version from other DEPS files. I'm going to try to rewrite the DEPS file using "From" 204477 7 51594 tony 2010-03-26 02:29:13 -0700 Comment on attachment 51594 Patch My current plan is to do the following: 1) Modify gclient to allow checking out a single file. The syntax will be like: chromium_deps: File("svn://..../DEPS") 2) Modify gclient's From syntax so we can pull revisions that map to different directories. E.g., net: From("chromium_deps", "src/net") This would pull the svn revision specific for 'src/net' in the chromium DEPS file into our local checkout. 3) Rewrite WebKit/chromium/DEPS with these values. 204854 8 fishd 2010-03-26 16:19:17 -0700 (In reply to comment #7) > (From update of attachment 51594 [details]) > My current plan is to do the following: > 1) Modify gclient to allow checking out a single file. The syntax will be > like: > chromium_deps: File("svn://..../DEPS") > > 2) Modify gclient's From syntax so we can pull revisions that map to different > directories. E.g., > net: From("chromium_deps", "src/net") > This would pull the svn revision specific for 'src/net' in the chromium DEPS > file into our local checkout. > > 3) Rewrite WebKit/chromium/DEPS with these values. This sounds great. For the chromium_deps item, you probably want to specify DEPS@REVISION. I assume this is what you had in mind. 210542 9 52931 tony 2010-04-08 19:16:40 -0700 Created attachment 52931 Patch 211465 10 tony 2010-04-11 17:50:00 -0700 Committed r57460: <http://trac.webkit.org/changeset/57460> 211466 11 webkit.review.bot 2010-04-11 17:57:52 -0700 http://trac.webkit.org/changeset/57460 might have broken Chromium Linux Release 211471 12 tony 2010-04-11 18:05:41 -0700 Broke all three chromium bots, analysis and some fixes coming up. 211472 13 53122 tony 2010-04-11 18:10:20 -0700 Created attachment 53122 Patch 211476 14 tony 2010-04-11 18:17:02 -0700 (In reply to comment #13) > Created an attachment (id=53122) [details] > Patch This patch fixes compile on linux by adding third_party/yasm/source/patched-yasm and third_party/ffmpeg/source/patched-ffmpeg-mt to the checkout. Mac broke because it the new gclient File() syntax uses svn checkout --depth which is available in svn 1.5+. It looks like OSX 10.5 comes with svn 1.4.4. Windows broke because we need to rm -rf third_party/ffmpeg before updating (we're checkout out some files there, but a subdirectory already has files checkout there). Linux and Windows should be fixable, but I'm not sure about Mac. I don't want to require new subversion to be installed. I will talk with MA and maybe we can get a newer subversion included in depot tools on mac. 212199 15 tony 2010-04-13 21:02:09 -0700 Ok, I fixed gclient to work with svn1.4 so mac should now be safe to land too. I'm going to try to land this with coordination from yaar (who can access the windows slave and clobber a directory for me). 212663 16 tony 2010-04-14 17:13:33 -0700 Committed r57620: <http://trac.webkit.org/changeset/57620> 51594 2010-03-24 22:08:29 -0700 2010-03-26 02:29:13 -0700 Patch bug-36578-20100325140827.patch text/plain 3378 tony ZGlmZiAtLWdpdCBhL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cgYi9XZWJLaXQvY2hyb21pdW0v Q2hhbmdlTG9nCmluZGV4IGM1NjhkMTUuLmM4MzFmYWYgMTAwNjQ0Ci0tLSBhL1dlYktpdC9jaHJv bWl1bS9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwpAQCAtMSwzICsx LDEyIEBACisyMDEwLTAzLTI0ICBUb255IENoYW5nICA8dG9ueUBjaHJvbWl1bS5vcmc+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgdXBkYXRlIGNocm9t aXVtIERFUFMgZm9yIHVwc3RyZWFtIGNvbXBpbGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTM2NTc4CisKKyAgICAgICAgKiBERVBTOiBBZGQgYWxsIHRo ZSBuZWNlc3NhcnkgcmVwb3NpdG9yaWVzIHNvIHdlIGNhbiBjb21waWxlIHdlYmtpdC9nbHVlIGZy b20gYSB3ZWJraXQgY2hlY2tvdXQuCisKIDIwMTAtMDMtMjQgIERtaXRyeSBUaXRvdiAgPGRpbWlj aEBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgTm8gcmV2aWV3LCByb2xsaW5nIG91dCByNTY0NTMu CmRpZmYgLS1naXQgYS9XZWJLaXQvY2hyb21pdW0vREVQUyBiL1dlYktpdC9jaHJvbWl1bS9ERVBT CmluZGV4IGM3MjMwNTIuLjk3OWMyNWEgMTAwNjQ0Ci0tLSBhL1dlYktpdC9jaHJvbWl1bS9ERVBT CisrKyBiL1dlYktpdC9jaHJvbWl1bS9ERVBTCkBAIC0zNSw3ICszNSw3IEBAIHZhcnMgPSB7CiAg ICdjaHJvbWl1bV9kZXBzX3N2bic6ICdodHRwOi8vc3JjLmNocm9taXVtLm9yZy9zdm4vdHJ1bmsv ZGVwcy90aGlyZF9wYXJ0eScsCiAKICAgIyBEZXBlbmRlbmNpZXMnIHJldmlzaW9ucyB0byB1c2U6 Ci0gICdjaHJvbWl1bV9yZXYnOiAnNDE4NjcnLAorICAnY2hyb21pdW1fcmV2JzogJzQyNTc5JywK ICAgJ2dvb2dsZS11cmxfcmV2JzogJzEyNScsCiAgICdndGVzdF9yZXYnOiAnMzU5JywKICAgJ2d5 cF9yZXYnOiAnNzk0JywKQEAgLTQ3LDEwICs0NywxMCBAQCB2YXJzID0gewogCiAgICMgV2luZG93 czoKICAgJ2N5Z3dpbl9yZXYnOiAnMTE5ODQnLAotICAnZmZtcGVnX2lhMzJfcmV2JzogJzM0Mjk3 JywKKyAgJ2ZmbXBlZ19yZXYnOiAnNDIzMTQnLAogICAncHRocmVhZHMtd2luMzJfcmV2JzogJzI2 NzE2JywKICAgJ3B5dGhvbl8yNF9yZXYnOiAnMjI5NjcnLAotICAnbnNzX3Jldic6ICczNjg3MScs CisgICduc3NfcmV2JzogJzM5NjEyJywKIH0KIAogZGVwcyA9IHsKQEAgLTk0LDYgKzk0LDI1IEBA IGRlcHMgPSB7CiAgICdnb29nbGV1cmwnOgogICAgICdodHRwOi8vZ29vZ2xlLXVybC5nb29nbGVj b2RlLmNvbS9zdm4vdHJ1bmtAJytWYXIoJ2dvb2dsZS11cmxfcmV2JyksCiAKKyAgIyB3ZWJraXQg ZGVwZW5kZW5jaXMKKyAgJ3dlYmtpdCc6IFZhcignY2hyb21pdW1fc3ZuJykrJy93ZWJraXRAJytW YXIoJ2Nocm9taXVtX3JldicpLAorCisgICdhcHAnOiBWYXIoJ2Nocm9taXVtX3N2bicpKycvYXBw QCcrVmFyKCdjaHJvbWl1bV9yZXYnKSwgIyBuZWVkZWQgYnkgYXBwY2FjaGUKKyAgJ2dwdSc6IFZh cignY2hyb21pdW1fc3ZuJykrJy9ncHVAJytWYXIoJ2Nocm9taXVtX3JldicpLAorICAnbWVkaWEn OiBWYXIoJ2Nocm9taXVtX3N2bicpKycvbWVkaWFAJytWYXIoJ2Nocm9taXVtX3JldicpLAorICAn dGhpcmRfcGFydHkvZ2xldyc6ICAjIHdlYmdsIHJlbGF0ZWQKKyAgICBWYXIoJ2Nocm9taXVtX3N2 bicpKycvdGhpcmRfcGFydHkvZ2xld0AnK1ZhcignY2hyb21pdW1fcmV2JyksCisgICd0aGlyZF9w YXJ0eS9mZm1wZWcnOiAjIG5lZWRlZCBieSB3ZWJraXQvbWVkaWEKKyAgICBWYXIoJ2Nocm9taXVt X3N2bicpKycvdGhpcmRfcGFydHkvZmZtcGVnQCcrVmFyKCdjaHJvbWl1bV9yZXYnKSwKKyAgJ3Ro aXJkX3BhcnR5L3lhc20nOiAjIG5lZWRlZCBieSBmZm1wZWcKKyAgICBWYXIoJ2Nocm9taXVtX3N2 bicpKycvdGhpcmRfcGFydHkveWFzbUAnK1ZhcignY2hyb21pdW1fcmV2JyksCisgICd0aGlyZF9w YXJ0eS9vcGVubWF4JzogIyBuZWVkZWQgYnkgd2Via2l0L21lZGlhCisgICAgVmFyKCdjaHJvbWl1 bV9zdm4nKSsnL3RoaXJkX3BhcnR5L29wZW5tYXhAJytWYXIoJ2Nocm9taXVtX3JldicpLAorICAn dG9vbHMvZ3JpdCc6CisgICAgVmFyKCdjaHJvbWl1bV9zdm4nKSsnL3Rvb2xzL2dyaXRAJytWYXIo J2Nocm9taXVtX3JldicpLAorICAndG9vbHMvZ2VuZXJhdGVfc3R1YnMnOgorICAgIFZhcignY2hy b21pdW1fc3ZuJykrJy90b29scy9nZW5lcmF0ZV9zdHVic0AnK1ZhcignY2hyb21pdW1fcmV2Jyks CisKICAgIyBvdGhlciB0aGlyZCBwYXJ0eQogICAndGhpcmRfcGFydHkvaWN1JzoKICAgICBWYXIo J2Nocm9taXVtX2RlcHNfc3ZuJykrJy9pY3U0MkAnK1ZhcignaWN1X3JldicpLApAQCAtMTQ0LDcg KzE2Myw3IEBAIGRlcHNfb3MgPSB7CiAgICAgICBWYXIoJ2Nocm9taXVtX2RlcHNfc3ZuJykrJy9w eXRob25fMjRAJytWYXIoJ3B5dGhvbl8yNF9yZXYnKSwKIAogICAgICd0aGlyZF9wYXJ0eS9mZm1w ZWcvYmluYXJpZXMvY2hyb21pdW0vd2luL2lhMzInOgotICAgICAgVmFyKCdjaHJvbWl1bV9kZXBz X3N2bicpKycvZmZtcGVnL2JpbmFyaWVzL3dpbkAnK1ZhcignZmZtcGVnX2lhMzJfcmV2JyksCisg ICAgICBWYXIoJ2Nocm9taXVtX2RlcHNfc3ZuJykrJy9mZm1wZWcvYmluYXJpZXMvd2luQCcrVmFy KCdmZm1wZWdfcmV2JyksCiAKICAgICAndGhpcmRfcGFydHkvcHRocmVhZHMtd2luMzInOgogICAg ICAgVmFyKCdjaHJvbWl1bV9kZXBzX3N2bicpKycvcHRocmVhZHMtd2luMzJAJytWYXIoJ3B0aHJl YWRzLXdpbjMyX3JldicpLApAQCAtMTUyLDYgKzE3MSwxNiBAQCBkZXBzX29zID0gewogICAgIyBi YXNlLmd5cGkgZGVwZW5kcyBvbiBuc3Mgb24gV2luZG93cwogICAgJ3RoaXJkX3BhcnR5L25zcyc6 CiAgICAgICBWYXIoJ2Nocm9taXVtX2RlcHNfc3ZuJykrJy9uc3NAJytWYXIoJ25zc19yZXYnKSwK KworICAgJ3RoaXJkX3BhcnR5L3d0bCc6CisgICAgIFZhcignY2hyb21pdW1fc3ZuJykrJy90aGly ZF9wYXJ0eS93dGxAJytWYXIoJ2Nocm9taXVtX3JldicpLAorICB9LAorICAnbWFjJzogeworICAg ICMgbmVlZGVkIGJ5IGZmbXBlZworICAgICd0aGlyZF9wYXJ0eS95YXNtL3NvdXJjZS9wYXRjaGVk LXlhc20nOgorICAgICAgVmFyKCdjaHJvbWl1bV9kZXBzX3N2bicpKycveWFzbS9wYXRjaGVkLXlh c21AMjk5MzcnLAorICAgICd0aGlyZF9wYXJ0eS9mZm1wZWcvc291cmNlL3BhdGNoZWQtZmZtcGVn LW10JzoKKyAgICAgIFZhcignY2hyb21pdW1fZGVwc19zdm4nKSsnL2ZmbXBlZy9wYXRjaGVkLWZm bXBlZy1tdEAnK1ZhcignZmZtcGVnX3JldicpLAogICB9LAogICAndW5peCc6IHsKICAgICAjIExp bnV4LCBhY3R1YWxseS4K 52931 2010-04-08 19:16:40 -0700 2010-04-11 18:10:12 -0700 Patch bug-36578-20100409111638.patch text/plain 8060 tony ZGlmZiAtLWdpdCBhL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cgYi9XZWJLaXQvY2hyb21pdW0v Q2hhbmdlTG9nCmluZGV4IGUzODdmNzIuLjM5MTQwMDYgMTAwNjQ0Ci0tLSBhL1dlYktpdC9jaHJv bWl1bS9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwpAQCAtMSwzICsx LDEzIEBACisyMDEwLTA0LTA4ICBUb255IENoYW5nICA8dG9ueUBjaHJvbWl1bS5vcmc+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW2Nocm9taXVtXSB1 cGRhdGUgY2hyb21pdW0gREVQUyBmb3IgdXBzdHJlYW0gY29tcGlsZQorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzY1NzgKKworICAgICAgICAqIERFUFM6 CisgICAgICAgICogZ3lwX3dlYmtpdDogQWRkIER1bXBSZW5kZXJUcmVlLmd5cCBzbyB3ZSBnZW5l cmF0ZSB4Y29kZSBwcm9qZWN0cyBmb3IgRFJULgorCiAyMDEwLTA0LTA3ICBQYXZlbCBGZWxkbWFu ICA8cGZlbGRtYW5AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IFl1cnkgU2Vt aWtoYXRza3kuCmRpZmYgLS1naXQgYS9XZWJLaXQvY2hyb21pdW0vREVQUyBiL1dlYktpdC9jaHJv bWl1bS9ERVBTCmluZGV4IDNkYzFjZDQuLjc3NzM4YjQgMTAwNjQ0Ci0tLSBhL1dlYktpdC9jaHJv bWl1bS9ERVBTCisrKyBiL1dlYktpdC9jaHJvbWl1bS9ERVBTCkBAIC0zMiwzMyArMzIsMjAgQEAK IAogdmFycyA9IHsKICAgJ2Nocm9taXVtX3N2bic6ICdodHRwOi8vc3JjLmNocm9taXVtLm9yZy9z dm4vdHJ1bmsvc3JjJywKLSAgJ2Nocm9taXVtX2RlcHNfc3ZuJzogJ2h0dHA6Ly9zcmMuY2hyb21p dW0ub3JnL3N2bi90cnVuay9kZXBzL3RoaXJkX3BhcnR5JywKLQotICAjIERlcGVuZGVuY2llcycg cmV2aXNpb25zIHRvIHVzZToKICAgJ2Nocm9taXVtX3Jldic6ICc0MzcxNScsCi0gICdnb29nbGUt dXJsX3Jldic6ICcxMjcnLAotICAnZ3Rlc3RfcmV2JzogJzQwOCcsCi0gICdneXBfcmV2JzogJzgx MCcsCi0gICdpY3VfcmV2JzogJzQzMTM5JywKLSAgJ29wZW52Y2RpZmZfcmV2JzogJzI4JywKLSAg J290c19yZXYnOiAnMjYnLAotICAnc2tpYV9yZXYnOiAnNTA0JywKLSAgJ3Y4X3Jldic6ICc0MzM1 JywKLQotICAjIFdpbmRvd3M6Ci0gICdjeWd3aW5fcmV2JzogJzExOTg0JywKLSAgJ2ZmbXBlZ19p YTMyX3Jldic6ICc0MjcyNicsCisKICAgJ3B0aHJlYWRzLXdpbjMyX3Jldic6ICcyNjcxNicsCi0g ICdweXRob25fMjRfcmV2JzogJzIyOTY3JywKLSAgJ25zc19yZXYnOiAnMzk2MTInLAogfQogCiBk ZXBzID0geworICAnY2hyb21pdW1fZGVwcyc6CisgICAgRmlsZShWYXIoJ2Nocm9taXVtX3N2bicp KycvREVQU0AnK1ZhcignY2hyb21pdW1fcmV2JykpLAorCiAgICMgYnVpbGQgdG9vbHMKICAgJ2J1 aWxkJzoKICAgICBWYXIoJ2Nocm9taXVtX3N2bicpKycvYnVpbGRAJytWYXIoJ2Nocm9taXVtX3Jl dicpLAogICAndG9vbHMvZ3lwJzoKLSAgICAnaHR0cDovL2d5cC5nb29nbGVjb2RlLmNvbS9zdm4v dHJ1bmtAJytWYXIoJ2d5cF9yZXYnKSwKKyAgICBGcm9tKCdjaHJvbWl1bV9kZXBzJywgJ3NyYy90 b29scy9neXAnKSwKIAogICAjIEJhc2ljIHRvb2xzCiAgICdiYXNlJzoKQEAgLTY5LDIwICs1Niwx OSBAQCBkZXBzID0gewogICAjIHNraWEgZGVwZW5kZW5jaWVzCiAgICdza2lhJzoKICAgICBWYXIo J2Nocm9taXVtX3N2bicpKycvc2tpYUAnK1ZhcignY2hyb21pdW1fcmV2JyksCi0gICd0aGlyZF9w YXJ0eS9za2lhJzoKLSAgICAnaHR0cDovL3NraWEuZ29vZ2xlY29kZS5jb20vc3ZuL3RydW5rQCcr VmFyKCdza2lhX3JldicpLAorICAndGhpcmRfcGFydHkvc2tpYS9zcmMnOgorICAgIEZyb20oJ2No cm9taXVtX2RlcHMnLCAnc3JjL3RoaXJkX3BhcnR5L3NraWEvc3JjJyksCisgICd0aGlyZF9wYXJ0 eS9za2lhL2luY2x1ZGUnOgorICAgIEZyb20oJ2Nocm9taXVtX2RlcHMnLCAnc3JjL3RoaXJkX3Bh cnR5L3NraWEvaW5jbHVkZScpLAogCiAgICMgdGVzdGluZwogICAndGVzdGluZyc6CiAgICAgVmFy KCdjaHJvbWl1bV9zdm4nKSsnL3Rlc3RpbmdAJytWYXIoJ2Nocm9taXVtX3JldicpLAogICAndGVz dGluZy9ndGVzdCc6Ci0gICAgJ2h0dHA6Ly9nb29nbGV0ZXN0Lmdvb2dsZWNvZGUuY29tL3N2bi90 cnVua0AnK1ZhcignZ3Rlc3RfcmV2JyksCisgICAgRnJvbSgnY2hyb21pdW1fZGVwcycsICdzcmMv dGVzdGluZy9ndGVzdCcpLAogCiAgICMgdjggamF2YXNjcmlwdCBlbmdpbmUKLSAgJ3Y4JzoKLSAg ICAnaHR0cDovL3Y4Lmdvb2dsZWNvZGUuY29tL3N2bi90cnVua0AnK1ZhcigndjhfcmV2JyksCi0g ICd0ZXN0aW5nL2d0ZXN0JzoKLSAgICAnaHR0cDovL2dvb2dsZXRlc3QuZ29vZ2xlY29kZS5jb20v c3ZuL3RydW5rQCcrVmFyKCdndGVzdF9yZXYnKSwKKyAgJ3Y4JzogRnJvbSgnY2hyb21pdW1fZGVw cycsICdzcmMvdjgnKSwKIAogICAjIG5ldCBkZXBlbmRlbmNpZXMKICAgJ25ldCc6CkBAIC05MCwx MyArNzYsMzUgQEAgZGVwcyA9IHsKICAgJ3NkY2gnOgogICAgIFZhcignY2hyb21pdW1fc3ZuJykr Jy9zZGNoQCcrVmFyKCdjaHJvbWl1bV9yZXYnKSwKICAgJ3NkY2gvb3Blbi12Y2RpZmYnOgotICAg ICdodHRwOi8vb3Blbi12Y2RpZmYuZ29vZ2xlY29kZS5jb20vc3ZuL3RydW5rQCcrVmFyKCdvcGVu dmNkaWZmX3JldicpLAorICAgIEZyb20oJ2Nocm9taXVtX2RlcHMnLCAnc3JjL3NkY2gvb3Blbi12 Y2RpZmYnKSwKICAgJ2dvb2dsZXVybCc6Ci0gICAgJ2h0dHA6Ly9nb29nbGUtdXJsLmdvb2dsZWNv ZGUuY29tL3N2bi90cnVua0AnK1ZhcignZ29vZ2xlLXVybF9yZXYnKSwKKyAgICBGcm9tKCdjaHJv bWl1bV9kZXBzJywgJ3NyYy9nb29nbGV1cmwnKSwKKworICAjIHdlYmtpdCBkZXBlbmRlbmNpcwor ICAnd2Via2l0JzogVmFyKCdjaHJvbWl1bV9zdm4nKSsnL3dlYmtpdEAnK1ZhcignY2hyb21pdW1f cmV2JyksCisKKyAgJ2FwcCc6CisgICAgVmFyKCdjaHJvbWl1bV9zdm4nKSsnL2FwcEAnK1Zhcign Y2hyb21pdW1fcmV2JyksICMgbmVlZGVkIGJ5IGFwcGNhY2hlCisgICdncHUnOgorICAgIFZhcign Y2hyb21pdW1fc3ZuJykrJy9ncHVAJytWYXIoJ2Nocm9taXVtX3JldicpLAorICAnbWVkaWEnOgor ICAgIFZhcignY2hyb21pdW1fc3ZuJykrJy9tZWRpYUAnK1ZhcignY2hyb21pdW1fcmV2JyksCisg ICd0aGlyZF9wYXJ0eS9nbGV3JzogICMgd2ViZ2wgcmVsYXRlZAorICAgIFZhcignY2hyb21pdW1f c3ZuJykrJy90aGlyZF9wYXJ0eS9nbGV3QCcrVmFyKCdjaHJvbWl1bV9yZXYnKSwKKyAgJ3RoaXJk X3BhcnR5L2ZmbXBlZyc6ICMgbmVlZGVkIGJ5IHdlYmtpdC9tZWRpYQorICAgIFZhcignY2hyb21p dW1fc3ZuJykrJy90aGlyZF9wYXJ0eS9mZm1wZWdAJytWYXIoJ2Nocm9taXVtX3JldicpLAorICAn dGhpcmRfcGFydHkveWFzbSc6ICMgbmVlZGVkIGJ5IGZmbXBlZworICAgIFZhcignY2hyb21pdW1f c3ZuJykrJy90aGlyZF9wYXJ0eS95YXNtQCcrVmFyKCdjaHJvbWl1bV9yZXYnKSwKKyAgJ3RoaXJk X3BhcnR5L29wZW5tYXgnOiAjIG5lZWRlZCBieSB3ZWJraXQvbWVkaWEKKyAgICBWYXIoJ2Nocm9t aXVtX3N2bicpKycvdGhpcmRfcGFydHkvb3Blbm1heEAnK1ZhcignY2hyb21pdW1fcmV2JyksCisg ICd0b29scy9ncml0JzoKKyAgICBWYXIoJ2Nocm9taXVtX3N2bicpKycvdG9vbHMvZ3JpdEAnK1Zh cignY2hyb21pdW1fcmV2JyksCisgICd0b29scy9nZW5lcmF0ZV9zdHVicyc6CisgICAgVmFyKCdj aHJvbWl1bV9zdm4nKSsnL3Rvb2xzL2dlbmVyYXRlX3N0dWJzQCcrVmFyKCdjaHJvbWl1bV9yZXYn KSwKIAogICAjIG90aGVyIHRoaXJkIHBhcnR5CiAgICd0aGlyZF9wYXJ0eS9pY3UnOgotICAgIFZh cignY2hyb21pdW1fZGVwc19zdm4nKSsnL2ljdTQyQCcrVmFyKCdpY3VfcmV2JyksCisgICAgRnJv bSgnY2hyb21pdW1fZGVwcycsICdzcmMvdGhpcmRfcGFydHkvaWN1JyksCiAKICAgJ3RoaXJkX3Bh cnR5L2J6aXAyJzoKICAgICBWYXIoJ2Nocm9taXVtX3N2bicpKycvdGhpcmRfcGFydHkvYnppcDJA JytWYXIoJ2Nocm9taXVtX3JldicpLApAQCAtMTIzLDcgKzEzMSw3IEBAIGRlcHMgPSB7CiAgICAg VmFyKCdjaHJvbWl1bV9zdm4nKSsnL3RoaXJkX3BhcnR5L25wYXBpQCcrVmFyKCdjaHJvbWl1bV9y ZXYnKSwKIAogICAndGhpcmRfcGFydHkvb3RzJzoKLSAgICAnaHR0cDovL290cy5nb29nbGVjb2Rl LmNvbS9zdm4vdHJ1bmtAJytWYXIoJ290c19yZXYnKSwKKyAgICBGcm9tKCdjaHJvbWl1bV9kZXBz JywgJ3NyYy90aGlyZF9wYXJ0eS9vdHMnKSwKIAogICAndGhpcmRfcGFydHkvc3FsaXRlJzoKICAg ICBWYXIoJ2Nocm9taXVtX3N2bicpKycvdGhpcmRfcGFydHkvc3FsaXRlQCcrVmFyKCdjaHJvbWl1 bV9yZXYnKSwKQEAgLTEzOCwyNiArMTQ2LDMwIEBAIGRlcHMgPSB7CiBkZXBzX29zID0gewogICAn d2luJzogewogICAgICd0aGlyZF9wYXJ0eS9jeWd3aW4nOgotICAgICAgVmFyKCdjaHJvbWl1bV9k ZXBzX3N2bicpKycvY3lnd2luQCcrVmFyKCdjeWd3aW5fcmV2JyksCi0KKyAgICAgIEZyb20oJ2No cm9taXVtX2RlcHMnLCAnc3JjL3RoaXJkX3BhcnR5L2N5Z3dpbicpLAogICAgICd0aGlyZF9wYXJ0 eS9weXRob25fMjQnOgotICAgICAgVmFyKCdjaHJvbWl1bV9kZXBzX3N2bicpKycvcHl0aG9uXzI0 QCcrVmFyKCdweXRob25fMjRfcmV2JyksCi0KKyAgICAgIEZyb20oJ2Nocm9taXVtX2RlcHMnLCAn c3JjL3RoaXJkX3BhcnR5L3B5dGhvbl8yNCcpLAogICAgICd0aGlyZF9wYXJ0eS9mZm1wZWcvYmlu YXJpZXMvY2hyb21pdW0vd2luL2lhMzInOgotICAgICAgVmFyKCdjaHJvbWl1bV9kZXBzX3N2bicp KycvZmZtcGVnL2JpbmFyaWVzL3dpbkAnK1ZhcignZmZtcGVnX2lhMzJfcmV2JyksCi0KKyAgICAg IEZyb20oJ2Nocm9taXVtX2RlcHMnLCAnc3JjL3RoaXJkX3BhcnR5L2ZmbXBlZy9iaW5hcmllcy9j aHJvbWl1bS93aW4vaWEzMicpLAogICAgICd0aGlyZF9wYXJ0eS9wdGhyZWFkcy13aW4zMic6Ci0g ICAgICBWYXIoJ2Nocm9taXVtX2RlcHNfc3ZuJykrJy9wdGhyZWFkcy13aW4zMkAnK1ZhcigncHRo cmVhZHMtd2luMzJfcmV2JyksCi0KLSAgICMgYmFzZS5neXBpIGRlcGVuZHMgb24gbnNzIG9uIFdp bmRvd3MKLSAgICd0aGlyZF9wYXJ0eS9uc3MnOgotICAgICAgVmFyKCdjaHJvbWl1bV9kZXBzX3N2 bicpKycvbnNzQCcrVmFyKCduc3NfcmV2JyksCisgICAgICAnaHR0cDovL3NyYy5jaHJvbWl1bS5v cmcvc3ZuL3RydW5rL2RlcHMvdGhpcmRfcGFydHkvcHRocmVhZHMtd2luMzJAJytWYXIoJ3B0aHJl YWRzLXdpbjMyX3JldicpLAorICAgICMgYmFzZS5neXBpIGRlcGVuZHMgb24gbnNzIG9uIFdpbmRv d3MKKyAgICAndGhpcmRfcGFydHkvbnNzJzoKKyAgICAgIEZyb20oJ2Nocm9taXVtX2RlcHMnLCAn c3JjL3RoaXJkX3BhcnR5L25zcycpLAorICAgICd0aGlyZF9wYXJ0eS93dGwnOgorICAgICAgVmFy KCdjaHJvbWl1bV9zdm4nKSsnL3RoaXJkX3BhcnR5L3d0bEAnK1ZhcignY2hyb21pdW1fcmV2Jyks CisgIH0sCisgICdtYWMnOiB7CisgICAgIyBuZWVkZWQgYnkgZmZtcGVnCisgICAgJ3RoaXJkX3Bh cnR5L3lhc20vc291cmNlL3BhdGNoZWQteWFzbSc6CisgICAgICBGcm9tKCdjaHJvbWl1bV9kZXBz JywgJ3NyYy90aGlyZF9wYXJ0eS95YXNtL3NvdXJjZS9wYXRjaGVkLXlhc20nKSwKKyAgICAndGhp cmRfcGFydHkvZmZtcGVnL3NvdXJjZS9wYXRjaGVkLWZmbXBlZy1tdCc6CisgICAgICBGcm9tKCdj aHJvbWl1bV9kZXBzJywgJ3NyYy90aGlyZF9wYXJ0eS9mZm1wZWcvc291cmNlL3BhdGNoZWQtZmZt cGVnLW10JyksCiAgIH0sCiAgICd1bml4JzogewogICAgICMgTGludXgsIGFjdHVhbGx5LgogICAg ICd0aGlyZF9wYXJ0eS9oYXJmYnV6eic6CiAgICAgICBWYXIoJ2Nocm9taXVtX3N2bicpKycvdGhp cmRfcGFydHkvaGFyZmJ1enpAJytWYXIoJ2Nocm9taXVtX3JldicpLAotCiAgICAgJ3Rvb2xzL3hk aXNwbGF5Y2hlY2snOgogICAgICAgVmFyKCdjaHJvbWl1bV9zdm4nKSsnL3Rvb2xzL3hkaXNwbGF5 Y2hlY2tAJytWYXIoJ2Nocm9taXVtX3JldicpLAogICB9LApkaWZmIC0tZ2l0IGEvV2ViS2l0L2No cm9taXVtL2d5cF93ZWJraXQgYi9XZWJLaXQvY2hyb21pdW0vZ3lwX3dlYmtpdAppbmRleCBlZjE4 MjM5Li4xNTg4YTFjIDEwMDY0NAotLS0gYS9XZWJLaXQvY2hyb21pdW0vZ3lwX3dlYmtpdAorKysg Yi9XZWJLaXQvY2hyb21pdW0vZ3lwX3dlYmtpdApAQCAtOTEsOCArOTEsOSBAQCBpZiBfX25hbWVf XyA9PSAnX19tYWluX18nOgogICAgICAgICAgICAgICAgIyBneXAgaGFjazogb3RoZXJ3aXNlIGd5 cCBhc3N1bWVzIGl0cyBpbiBjaHJvbWl1bSdzIHNyYy8gZGlyLgogICAgICAgICAgICAgICAgJy0t ZGVwdGg9Li8nLAogCi0gICAgICAgICAgICAgICAjIGd5cCBmaWxlIHRvIGV4ZWN1dGUuCi0gICAg ICAgICAgICAgICAnV2ViS2l0Lmd5cCddKQorICAgICAgICAgICAgICAgIyBneXAgZmlsZXMgdG8g ZXhlY3V0ZS4KKyAgICAgICAgICAgICAgICdXZWJLaXQuZ3lwJywKKyAgICAgICAgICAgICAgICcu Li8uLi9XZWJLaXRUb29scy9EdW1wUmVuZGVyVHJlZS9EdW1wUmVuZGVyVHJlZS5neXAvRHVtcFJl bmRlclRyZWUuZ3lwJ10pCiAKICAgcHJpbnQgJ1VwZGF0aW5nIHdlYmtpdCBwcm9qZWN0cyBmcm9t IGd5cCBmaWxlcy4uLicKICAgc3lzLnN0ZG91dC5mbHVzaCgpCmRpZmYgLS1naXQgYS9XZWJLaXRU b29scy9DaGFuZ2VMb2cgYi9XZWJLaXRUb29scy9DaGFuZ2VMb2cKaW5kZXggNmQwYjFkYS4uYTVi ZTQ5YSAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCisrKyBiL1dlYktpdFRvb2xz L0NoYW5nZUxvZwpAQCAtMSwzICsxLDEzIEBACisyMDEwLTA0LTA4ICBUb255IENoYW5nICA8dG9u eUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgW2Nocm9taXVtXSB1cGRhdGUgY2hyb21pdW0gREVQUyBmb3IgdXBzdHJlYW0gY29t cGlsZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzY1 NzgKKworICAgICAgICAqIER1bXBSZW5kZXJUcmVlL0R1bXBSZW5kZXJUcmVlLmd5cC9EdW1wUmVu ZGVyVHJlZS5neXA6IFNtYWxsIGZpeCB0byBhdm9pZCBhIGNpcmN1bGFyIGRlcGVuZGVuY3kgYmV0 d2VlbgorICAgICAgICAgIFdlYktpdC5neXAgYW5kIHdlYmtpdC5neXAuCisKIDIwMTAtMDQtMDgg IFNhbSBXZWluaWcgIDxzYW1Ad2Via2l0Lm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBEYXJp biBBZGxlci4KZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL0R1bXBSZW5k ZXJUcmVlLmd5cC9EdW1wUmVuZGVyVHJlZS5neXAgYi9XZWJLaXRUb29scy9EdW1wUmVuZGVyVHJl ZS9EdW1wUmVuZGVyVHJlZS5neXAvRHVtcFJlbmRlclRyZWUuZ3lwCmluZGV4IDJmZTk1YzAuLjVj ODRjNmYgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL0R1bXBSZW5kZXJU cmVlLmd5cC9EdW1wUmVuZGVyVHJlZS5neXAKKysrIGIvV2ViS2l0VG9vbHMvRHVtcFJlbmRlclRy ZWUvRHVtcFJlbmRlclRyZWUuZ3lwL0R1bXBSZW5kZXJUcmVlLmd5cApAQCAtNTcsNyArNTcsNyBA QAogICAgICAgICAgICAgICAgICc8KHdlYmtpdF9hcGlfZGlyKS9XZWJLaXQuZ3lwOndlYmtpdCcs CiAgICAgICAgICAgICAgICAgJzwoY2hyb21pdW1fc3JjX2RpcikvdGhpcmRfcGFydHkvbnBhcGkv bnBhcGkuZ3lwOm5wYXBpJywKICAgICAgICAgICAgICAgICAnPChjaHJvbWl1bV9zcmNfZGlyKS9z a2lhL3NraWEuZ3lwOnNraWEnLAotICAgICAgICAgICAgICAgICc8KGNocm9taXVtX3NyY19kaXIp L3dlYmtpdC93ZWJraXQuZ3lwOndlYmtpdF9zdXBwb3J0JywKKyAgICAgICAgICAgICAgICAnPChj aHJvbWl1bV9zcmNfZGlyKS93ZWJraXQvc3VwcG9ydC93ZWJraXRfc3VwcG9ydC5neXA6d2Via2l0 X3N1cHBvcnQnLAogICAgICAgICAgICAgXSwKICAgICAgICAgICAgICdpbmNsdWRlX2RpcnMnOiBb CiAgICAgICAgICAgICAgICAgJy4nLAo= 53122 2010-04-11 18:10:20 -0700 2010-04-13 21:22:03 -0700 Patch bug-36578-20100412101018.patch text/plain 8302 tony ZGlmZiAtLWdpdCBhL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cgYi9XZWJLaXQvY2hyb21pdW0v Q2hhbmdlTG9nCmluZGV4IGI1ZTQ2MDYuLjYzYzMxNzAgMTAwNjQ0Ci0tLSBhL1dlYktpdC9jaHJv bWl1bS9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwpAQCAtMSwzICsx LDEzIEBACisyMDEwLTA0LTExICBUb255IENoYW5nICA8dG9ueUBjaHJvbWl1bS5vcmc+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgRGFyaW4gRmlzaGVyLgorCisgICAgICAgIFtjaHJvbWl1bV0gdXBk YXRlIGNocm9taXVtIERFUFMgZm9yIHVwc3RyZWFtIGNvbXBpbGUKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM2NTc4CisKKyAgICAgICAgKiBERVBTOgor ICAgICAgICAqIGd5cF93ZWJraXQ6IEFkZCBEdW1wUmVuZGVyVHJlZS5neXAgc28gd2UgZ2VuZXJh dGUgeGNvZGUgcHJvamVjdHMgZm9yIERSVC4KKwogMjAxMC0wNC0xMSAgU2hlcmlmZiBCb3QgIDx3 ZWJraXQucmV2aWV3LmJvdEBnbWFpbC5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgcm9sbGlu ZyBvdXQgcjU3NDYwLgpkaWZmIC0tZ2l0IGEvV2ViS2l0L2Nocm9taXVtL0RFUFMgYi9XZWJLaXQv Y2hyb21pdW0vREVQUwppbmRleCAzZGMxY2Q0Li44MmU2ODFiIDEwMDY0NAotLS0gYS9XZWJLaXQv Y2hyb21pdW0vREVQUworKysgYi9XZWJLaXQvY2hyb21pdW0vREVQUwpAQCAtMzIsMzMgKzMyLDIw IEBACiAKIHZhcnMgPSB7CiAgICdjaHJvbWl1bV9zdm4nOiAnaHR0cDovL3NyYy5jaHJvbWl1bS5v cmcvc3ZuL3RydW5rL3NyYycsCi0gICdjaHJvbWl1bV9kZXBzX3N2bic6ICdodHRwOi8vc3JjLmNo cm9taXVtLm9yZy9zdm4vdHJ1bmsvZGVwcy90aGlyZF9wYXJ0eScsCi0KLSAgIyBEZXBlbmRlbmNp ZXMnIHJldmlzaW9ucyB0byB1c2U6CiAgICdjaHJvbWl1bV9yZXYnOiAnNDM3MTUnLAotICAnZ29v Z2xlLXVybF9yZXYnOiAnMTI3JywKLSAgJ2d0ZXN0X3Jldic6ICc0MDgnLAotICAnZ3lwX3Jldic6 ICc4MTAnLAotICAnaWN1X3Jldic6ICc0MzEzOScsCi0gICdvcGVudmNkaWZmX3Jldic6ICcyOCcs Ci0gICdvdHNfcmV2JzogJzI2JywKLSAgJ3NraWFfcmV2JzogJzUwNCcsCi0gICd2OF9yZXYnOiAn NDMzNScsCi0KLSAgIyBXaW5kb3dzOgotICAnY3lnd2luX3Jldic6ICcxMTk4NCcsCi0gICdmZm1w ZWdfaWEzMl9yZXYnOiAnNDI3MjYnLAorCiAgICdwdGhyZWFkcy13aW4zMl9yZXYnOiAnMjY3MTYn LAotICAncHl0aG9uXzI0X3Jldic6ICcyMjk2NycsCi0gICduc3NfcmV2JzogJzM5NjEyJywKIH0K IAogZGVwcyA9IHsKKyAgJ2Nocm9taXVtX2RlcHMnOgorICAgIEZpbGUoVmFyKCdjaHJvbWl1bV9z dm4nKSsnL0RFUFNAJytWYXIoJ2Nocm9taXVtX3JldicpKSwKKwogICAjIGJ1aWxkIHRvb2xzCiAg ICdidWlsZCc6CiAgICAgVmFyKCdjaHJvbWl1bV9zdm4nKSsnL2J1aWxkQCcrVmFyKCdjaHJvbWl1 bV9yZXYnKSwKICAgJ3Rvb2xzL2d5cCc6Ci0gICAgJ2h0dHA6Ly9neXAuZ29vZ2xlY29kZS5jb20v c3ZuL3RydW5rQCcrVmFyKCdneXBfcmV2JyksCisgICAgRnJvbSgnY2hyb21pdW1fZGVwcycsICdz cmMvdG9vbHMvZ3lwJyksCiAKICAgIyBCYXNpYyB0b29scwogICAnYmFzZSc6CkBAIC02OSwyMCAr NTYsMTkgQEAgZGVwcyA9IHsKICAgIyBza2lhIGRlcGVuZGVuY2llcwogICAnc2tpYSc6CiAgICAg VmFyKCdjaHJvbWl1bV9zdm4nKSsnL3NraWFAJytWYXIoJ2Nocm9taXVtX3JldicpLAotICAndGhp cmRfcGFydHkvc2tpYSc6Ci0gICAgJ2h0dHA6Ly9za2lhLmdvb2dsZWNvZGUuY29tL3N2bi90cnVu a0AnK1Zhcignc2tpYV9yZXYnKSwKKyAgJ3RoaXJkX3BhcnR5L3NraWEvc3JjJzoKKyAgICBGcm9t KCdjaHJvbWl1bV9kZXBzJywgJ3NyYy90aGlyZF9wYXJ0eS9za2lhL3NyYycpLAorICAndGhpcmRf cGFydHkvc2tpYS9pbmNsdWRlJzoKKyAgICBGcm9tKCdjaHJvbWl1bV9kZXBzJywgJ3NyYy90aGly ZF9wYXJ0eS9za2lhL2luY2x1ZGUnKSwKIAogICAjIHRlc3RpbmcKICAgJ3Rlc3RpbmcnOgogICAg IFZhcignY2hyb21pdW1fc3ZuJykrJy90ZXN0aW5nQCcrVmFyKCdjaHJvbWl1bV9yZXYnKSwKICAg J3Rlc3RpbmcvZ3Rlc3QnOgotICAgICdodHRwOi8vZ29vZ2xldGVzdC5nb29nbGVjb2RlLmNvbS9z dm4vdHJ1bmtAJytWYXIoJ2d0ZXN0X3JldicpLAorICAgIEZyb20oJ2Nocm9taXVtX2RlcHMnLCAn c3JjL3Rlc3RpbmcvZ3Rlc3QnKSwKIAogICAjIHY4IGphdmFzY3JpcHQgZW5naW5lCi0gICd2OCc6 Ci0gICAgJ2h0dHA6Ly92OC5nb29nbGVjb2RlLmNvbS9zdm4vdHJ1bmtAJytWYXIoJ3Y4X3Jldicp LAotICAndGVzdGluZy9ndGVzdCc6Ci0gICAgJ2h0dHA6Ly9nb29nbGV0ZXN0Lmdvb2dsZWNvZGUu Y29tL3N2bi90cnVua0AnK1ZhcignZ3Rlc3RfcmV2JyksCisgICd2OCc6IEZyb20oJ2Nocm9taXVt X2RlcHMnLCAnc3JjL3Y4JyksCiAKICAgIyBuZXQgZGVwZW5kZW5jaWVzCiAgICduZXQnOgpAQCAt OTAsMTMgKzc2LDM1IEBAIGRlcHMgPSB7CiAgICdzZGNoJzoKICAgICBWYXIoJ2Nocm9taXVtX3N2 bicpKycvc2RjaEAnK1ZhcignY2hyb21pdW1fcmV2JyksCiAgICdzZGNoL29wZW4tdmNkaWZmJzoK LSAgICAnaHR0cDovL29wZW4tdmNkaWZmLmdvb2dsZWNvZGUuY29tL3N2bi90cnVua0AnK1Zhcign b3BlbnZjZGlmZl9yZXYnKSwKKyAgICBGcm9tKCdjaHJvbWl1bV9kZXBzJywgJ3NyYy9zZGNoL29w ZW4tdmNkaWZmJyksCiAgICdnb29nbGV1cmwnOgotICAgICdodHRwOi8vZ29vZ2xlLXVybC5nb29n bGVjb2RlLmNvbS9zdm4vdHJ1bmtAJytWYXIoJ2dvb2dsZS11cmxfcmV2JyksCisgICAgRnJvbSgn Y2hyb21pdW1fZGVwcycsICdzcmMvZ29vZ2xldXJsJyksCisKKyAgIyB3ZWJraXQgZGVwZW5kZW5j aXMKKyAgJ3dlYmtpdCc6IFZhcignY2hyb21pdW1fc3ZuJykrJy93ZWJraXRAJytWYXIoJ2Nocm9t aXVtX3JldicpLAorCisgICdhcHAnOgorICAgIFZhcignY2hyb21pdW1fc3ZuJykrJy9hcHBAJytW YXIoJ2Nocm9taXVtX3JldicpLCAjIG5lZWRlZCBieSBhcHBjYWNoZQorICAnZ3B1JzoKKyAgICBW YXIoJ2Nocm9taXVtX3N2bicpKycvZ3B1QCcrVmFyKCdjaHJvbWl1bV9yZXYnKSwKKyAgJ21lZGlh JzoKKyAgICBWYXIoJ2Nocm9taXVtX3N2bicpKycvbWVkaWFAJytWYXIoJ2Nocm9taXVtX3Jldicp LAorICAndGhpcmRfcGFydHkvZ2xldyc6ICAjIHdlYmdsIHJlbGF0ZWQKKyAgICBWYXIoJ2Nocm9t aXVtX3N2bicpKycvdGhpcmRfcGFydHkvZ2xld0AnK1ZhcignY2hyb21pdW1fcmV2JyksCisgICd0 aGlyZF9wYXJ0eS9mZm1wZWcnOiAjIG5lZWRlZCBieSB3ZWJraXQvbWVkaWEKKyAgICBWYXIoJ2No cm9taXVtX3N2bicpKycvdGhpcmRfcGFydHkvZmZtcGVnQCcrVmFyKCdjaHJvbWl1bV9yZXYnKSwK KyAgJ3RoaXJkX3BhcnR5L3lhc20nOiAjIG5lZWRlZCBieSBmZm1wZWcKKyAgICBWYXIoJ2Nocm9t aXVtX3N2bicpKycvdGhpcmRfcGFydHkveWFzbUAnK1ZhcignY2hyb21pdW1fcmV2JyksCisgICd0 aGlyZF9wYXJ0eS9vcGVubWF4JzogIyBuZWVkZWQgYnkgd2Via2l0L21lZGlhCisgICAgVmFyKCdj aHJvbWl1bV9zdm4nKSsnL3RoaXJkX3BhcnR5L29wZW5tYXhAJytWYXIoJ2Nocm9taXVtX3Jldicp LAorICAndG9vbHMvZ3JpdCc6CisgICAgVmFyKCdjaHJvbWl1bV9zdm4nKSsnL3Rvb2xzL2dyaXRA JytWYXIoJ2Nocm9taXVtX3JldicpLAorICAndG9vbHMvZ2VuZXJhdGVfc3R1YnMnOgorICAgIFZh cignY2hyb21pdW1fc3ZuJykrJy90b29scy9nZW5lcmF0ZV9zdHVic0AnK1ZhcignY2hyb21pdW1f cmV2JyksCiAKICAgIyBvdGhlciB0aGlyZCBwYXJ0eQogICAndGhpcmRfcGFydHkvaWN1JzoKLSAg ICBWYXIoJ2Nocm9taXVtX2RlcHNfc3ZuJykrJy9pY3U0MkAnK1ZhcignaWN1X3JldicpLAorICAg IEZyb20oJ2Nocm9taXVtX2RlcHMnLCAnc3JjL3RoaXJkX3BhcnR5L2ljdScpLAogCiAgICd0aGly ZF9wYXJ0eS9iemlwMic6CiAgICAgVmFyKCdjaHJvbWl1bV9zdm4nKSsnL3RoaXJkX3BhcnR5L2J6 aXAyQCcrVmFyKCdjaHJvbWl1bV9yZXYnKSwKQEAgLTEyMyw3ICsxMzEsNyBAQCBkZXBzID0gewog ICAgIFZhcignY2hyb21pdW1fc3ZuJykrJy90aGlyZF9wYXJ0eS9ucGFwaUAnK1ZhcignY2hyb21p dW1fcmV2JyksCiAKICAgJ3RoaXJkX3BhcnR5L290cyc6Ci0gICAgJ2h0dHA6Ly9vdHMuZ29vZ2xl Y29kZS5jb20vc3ZuL3RydW5rQCcrVmFyKCdvdHNfcmV2JyksCisgICAgRnJvbSgnY2hyb21pdW1f ZGVwcycsICdzcmMvdGhpcmRfcGFydHkvb3RzJyksCiAKICAgJ3RoaXJkX3BhcnR5L3NxbGl0ZSc6 CiAgICAgVmFyKCdjaHJvbWl1bV9zdm4nKSsnL3RoaXJkX3BhcnR5L3NxbGl0ZUAnK1ZhcignY2hy b21pdW1fcmV2JyksCkBAIC0xMzMsMzMgKzE0MSw0MCBAQCBkZXBzID0gewogCiAgICd0aGlyZF9w YXJ0eS96bGliJzoKICAgICBWYXIoJ2Nocm9taXVtX3N2bicpKycvdGhpcmRfcGFydHkvemxpYkAn K1ZhcignY2hyb21pdW1fcmV2JyksCisKKyAgJ3RoaXJkX3BhcnR5L2ZmbXBlZy9zb3VyY2UvcGF0 Y2hlZC1mZm1wZWctbXQnOgorICAgIEZyb20oJ2Nocm9taXVtX2RlcHMnLCAnc3JjL3RoaXJkX3Bh cnR5L2ZmbXBlZy9zb3VyY2UvcGF0Y2hlZC1mZm1wZWctbXQnKSwKIH0KIAogZGVwc19vcyA9IHsK ICAgJ3dpbic6IHsKICAgICAndGhpcmRfcGFydHkvY3lnd2luJzoKLSAgICAgIFZhcignY2hyb21p dW1fZGVwc19zdm4nKSsnL2N5Z3dpbkAnK1ZhcignY3lnd2luX3JldicpLAotCisgICAgICBGcm9t KCdjaHJvbWl1bV9kZXBzJywgJ3NyYy90aGlyZF9wYXJ0eS9jeWd3aW4nKSwKICAgICAndGhpcmRf cGFydHkvcHl0aG9uXzI0JzoKLSAgICAgIFZhcignY2hyb21pdW1fZGVwc19zdm4nKSsnL3B5dGhv bl8yNEAnK1ZhcigncHl0aG9uXzI0X3JldicpLAotCisgICAgICBGcm9tKCdjaHJvbWl1bV9kZXBz JywgJ3NyYy90aGlyZF9wYXJ0eS9weXRob25fMjQnKSwKICAgICAndGhpcmRfcGFydHkvZmZtcGVn L2JpbmFyaWVzL2Nocm9taXVtL3dpbi9pYTMyJzoKLSAgICAgIFZhcignY2hyb21pdW1fZGVwc19z dm4nKSsnL2ZmbXBlZy9iaW5hcmllcy93aW5AJytWYXIoJ2ZmbXBlZ19pYTMyX3JldicpLAotCisg ICAgICBGcm9tKCdjaHJvbWl1bV9kZXBzJywgJ3NyYy90aGlyZF9wYXJ0eS9mZm1wZWcvYmluYXJp ZXMvY2hyb21pdW0vd2luL2lhMzInKSwKICAgICAndGhpcmRfcGFydHkvcHRocmVhZHMtd2luMzIn OgotICAgICAgVmFyKCdjaHJvbWl1bV9kZXBzX3N2bicpKycvcHRocmVhZHMtd2luMzJAJytWYXIo J3B0aHJlYWRzLXdpbjMyX3JldicpLAotCi0gICAjIGJhc2UuZ3lwaSBkZXBlbmRzIG9uIG5zcyBv biBXaW5kb3dzCi0gICAndGhpcmRfcGFydHkvbnNzJzoKLSAgICAgIFZhcignY2hyb21pdW1fZGVw c19zdm4nKSsnL25zc0AnK1ZhcignbnNzX3JldicpLAorICAgICAgJ2h0dHA6Ly9zcmMuY2hyb21p dW0ub3JnL3N2bi90cnVuay9kZXBzL3RoaXJkX3BhcnR5L3B0aHJlYWRzLXdpbjMyQCcrVmFyKCdw dGhyZWFkcy13aW4zMl9yZXYnKSwKKyAgICAjIGJhc2UuZ3lwaSBkZXBlbmRzIG9uIG5zcyBvbiBX aW5kb3dzCisgICAgJ3RoaXJkX3BhcnR5L25zcyc6CisgICAgICBGcm9tKCdjaHJvbWl1bV9kZXBz JywgJ3NyYy90aGlyZF9wYXJ0eS9uc3MnKSwKKyAgICAndGhpcmRfcGFydHkvd3RsJzoKKyAgICAg IFZhcignY2hyb21pdW1fc3ZuJykrJy90aGlyZF9wYXJ0eS93dGxAJytWYXIoJ2Nocm9taXVtX3Jl dicpLAorICB9LAorICAnbWFjJzogeworICAgICMgbmVlZGVkIGJ5IGZmbXBlZworICAgICd0aGly ZF9wYXJ0eS95YXNtL3NvdXJjZS9wYXRjaGVkLXlhc20nOgorICAgICAgRnJvbSgnY2hyb21pdW1f ZGVwcycsICdzcmMvdGhpcmRfcGFydHkveWFzbS9zb3VyY2UvcGF0Y2hlZC15YXNtJyksCiAgIH0s CiAgICd1bml4JzogewogICAgICMgTGludXgsIGFjdHVhbGx5LgogICAgICd0aGlyZF9wYXJ0eS9o YXJmYnV6eic6CiAgICAgICBWYXIoJ2Nocm9taXVtX3N2bicpKycvdGhpcmRfcGFydHkvaGFyZmJ1 enpAJytWYXIoJ2Nocm9taXVtX3JldicpLAotCiAgICAgJ3Rvb2xzL3hkaXNwbGF5Y2hlY2snOgog ICAgICAgVmFyKCdjaHJvbWl1bV9zdm4nKSsnL3Rvb2xzL3hkaXNwbGF5Y2hlY2tAJytWYXIoJ2No cm9taXVtX3JldicpLAorICAgICd0aGlyZF9wYXJ0eS95YXNtL3NvdXJjZS9wYXRjaGVkLXlhc20n OgorICAgICAgRnJvbSgnY2hyb21pdW1fZGVwcycsICdzcmMvdGhpcmRfcGFydHkveWFzbS9zb3Vy Y2UvcGF0Y2hlZC15YXNtJyksCiAgIH0sCiB9CiAKZGlmZiAtLWdpdCBhL1dlYktpdC9jaHJvbWl1 bS9neXBfd2Via2l0IGIvV2ViS2l0L2Nocm9taXVtL2d5cF93ZWJraXQKaW5kZXggZWYxODIzOS4u MTU4OGExYyAxMDA2NDQKLS0tIGEvV2ViS2l0L2Nocm9taXVtL2d5cF93ZWJraXQKKysrIGIvV2Vi S2l0L2Nocm9taXVtL2d5cF93ZWJraXQKQEAgLTkxLDggKzkxLDkgQEAgaWYgX19uYW1lX18gPT0g J19fbWFpbl9fJzoKICAgICAgICAgICAgICAgICMgZ3lwIGhhY2s6IG90aGVyd2lzZSBneXAgYXNz dW1lcyBpdHMgaW4gY2hyb21pdW0ncyBzcmMvIGRpci4KICAgICAgICAgICAgICAgICctLWRlcHRo PS4vJywKIAotICAgICAgICAgICAgICAgIyBneXAgZmlsZSB0byBleGVjdXRlLgotICAgICAgICAg ICAgICAgJ1dlYktpdC5neXAnXSkKKyAgICAgICAgICAgICAgICMgZ3lwIGZpbGVzIHRvIGV4ZWN1 dGUuCisgICAgICAgICAgICAgICAnV2ViS2l0Lmd5cCcsCisgICAgICAgICAgICAgICAnLi4vLi4v V2ViS2l0VG9vbHMvRHVtcFJlbmRlclRyZWUvRHVtcFJlbmRlclRyZWUuZ3lwL0R1bXBSZW5kZXJU cmVlLmd5cCddKQogCiAgIHByaW50ICdVcGRhdGluZyB3ZWJraXQgcHJvamVjdHMgZnJvbSBneXAg ZmlsZXMuLi4nCiAgIHN5cy5zdGRvdXQuZmx1c2goKQpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMv Q2hhbmdlTG9nIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCmluZGV4IDViNjAwODQuLjI2ZDc0MWIg MTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZworKysgYi9XZWJLaXRUb29scy9DaGFu Z2VMb2cKQEAgLTEsMyArMSwxMyBAQAorMjAxMC0wNC0xMSAgVG9ueSBDaGFuZyAgPHRvbnlAY2hy b21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IERhcmluIEZpc2hlci4KKworICAgICAg ICBbY2hyb21pdW1dIHVwZGF0ZSBjaHJvbWl1bSBERVBTIGZvciB1cHN0cmVhbSBjb21waWxlCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zNjU3OAorCisg ICAgICAgICogRHVtcFJlbmRlclRyZWUvRHVtcFJlbmRlclRyZWUuZ3lwL0R1bXBSZW5kZXJUcmVl Lmd5cDogU21hbGwgZml4IHRvIGF2b2lkIGEgY2lyY3VsYXIgZGVwZW5kZW5jeSBiZXR3ZWVuCisg ICAgICAgICAgV2ViS2l0Lmd5cCBhbmQgd2Via2l0Lmd5cC4KKwogMjAxMC0wNC0xMSAgU2hlcmlm ZiBCb3QgIDx3ZWJraXQucmV2aWV3LmJvdEBnbWFpbC5jb20+CiAKICAgICAgICAgVW5yZXZpZXdl ZCwgcm9sbGluZyBvdXQgcjU3NDYwLgpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvRHVtcFJlbmRl clRyZWUvRHVtcFJlbmRlclRyZWUuZ3lwL0R1bXBSZW5kZXJUcmVlLmd5cCBiL1dlYktpdFRvb2xz L0R1bXBSZW5kZXJUcmVlL0R1bXBSZW5kZXJUcmVlLmd5cC9EdW1wUmVuZGVyVHJlZS5neXAKaW5k ZXggMmZlOTVjMC4uNWM4NGM2ZiAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvRHVtcFJlbmRlclRy ZWUvRHVtcFJlbmRlclRyZWUuZ3lwL0R1bXBSZW5kZXJUcmVlLmd5cAorKysgYi9XZWJLaXRUb29s cy9EdW1wUmVuZGVyVHJlZS9EdW1wUmVuZGVyVHJlZS5neXAvRHVtcFJlbmRlclRyZWUuZ3lwCkBA IC01Nyw3ICs1Nyw3IEBACiAgICAgICAgICAgICAgICAgJzwod2Via2l0X2FwaV9kaXIpL1dlYktp dC5neXA6d2Via2l0JywKICAgICAgICAgICAgICAgICAnPChjaHJvbWl1bV9zcmNfZGlyKS90aGly ZF9wYXJ0eS9ucGFwaS9ucGFwaS5neXA6bnBhcGknLAogICAgICAgICAgICAgICAgICc8KGNocm9t aXVtX3NyY19kaXIpL3NraWEvc2tpYS5neXA6c2tpYScsCi0gICAgICAgICAgICAgICAgJzwoY2hy b21pdW1fc3JjX2Rpcikvd2Via2l0L3dlYmtpdC5neXA6d2Via2l0X3N1cHBvcnQnLAorICAgICAg ICAgICAgICAgICc8KGNocm9taXVtX3NyY19kaXIpL3dlYmtpdC9zdXBwb3J0L3dlYmtpdF9zdXBw b3J0Lmd5cDp3ZWJraXRfc3VwcG9ydCcsCiAgICAgICAgICAgICBdLAogICAgICAgICAgICAgJ2lu Y2x1ZGVfZGlycyc6IFsKICAgICAgICAgICAgICAgICAnLicsCg==