138134 2014-10-28 09:00:32 -0700 [GTK] Expand wildcards inside generate-inspector-gresource-manifest.py 2015-09-25 04:22:29 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 137488 133028 1 mcrha webkit-unassigned buildbot cgarcia commit-queue mrobinson rniwa zan oldest_to_newest 1044485 0 mcrha 2014-10-28 09:00:32 -0700 The command line which invokes generate-inspector-gresource-manifest.py is 69790 bytes long on my system, which is way beyond my system (or build) environment limits. A better option is to expand the wildcards inside the script. 1044486 1 240543 mcrha 2014-10-28 09:02:55 -0700 Created attachment 240543 proposed wk patch 1044497 2 240543 cgarcia 2014-10-28 09:22:33 -0700 Comment on attachment 240543 proposed wk patch View in context: https://bugs.webkit.org/attachment.cgi?id=240543&action=review > Source/WebKit2/PlatformGTK.cmake:377 > -file(GLOB InspectorFiles > +list(APPEND InspectorFiles I think this would break the build dependencies, we really want to rebuild the inspector gresource xml file when any of the inspector files changes. 1044726 3 mcrha 2014-10-29 00:16:08 -0700 Hmm, I see, the build also failed: > ninja: error: '../../Source/WebInspectorUI/UserInterface/*.html', needed by > 'DerivedSources/webkit2gtk/InspectorGResourceBundle.xml', missing and no > known rule to make it What do you suggest, have two variables, one for dependencies, one for passing to the .py script? Something like: -------------------------------------------------------------------------- set(InspectorFiles ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/*.html .... ) file(GLOB InspectorFilesDeps ${InspectorFiles} ) add_custom_command( OUTPUT ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/InspectorGResourceBundle.xml DEPENDS ${InspectorFilesDeps} ${TOOLS_DIR}/gtk/generate-inspector-gresource-manifest.py COMMAND ${TOOLS_DIR}/gtk/generate-inspector-gresource-manifest.py --output=${DERIVED_SOURCES_WEBKIT2GTK_DIR}/InspectorGResourceBundle.xml ${InspectorFiles} VERBATIM ) -------------------------------------------------------------------------- I think this might work, though might look awkward in the .cmake file. 1045516 4 240789 mcrha 2014-11-01 10:12:21 -0700 Created attachment 240789 proposed wk patch ][ Updated version of the patch, with applied above proposal. It works fine on Windows (mingw/msys). 1083920 5 240789 cgarcia 2015-04-09 01:58:28 -0700 Comment on attachment 240789 proposed wk patch ][ View in context: https://bugs.webkit.org/attachment.cgi?id=240789&action=review I'm fine with the general idea. Martin, could you confirm you also agree with this patch? > Source/WebKit2/ChangeLog:7 > + Please, explain here why we need this. > Tools/gtk/generate-inspector-gresource-manifest.py:31 > + names = glob.glob(pattern) patterns are not just names, but paths, so I would use paths or filenames instead. > Tools/gtk/generate-inspector-gresource-manifest.py:33 > + base_dir_index = filename.rfind(BASE_DIR) BASE_DIR contains a /, isn't that a problem when os.sep is not /? > Tools/gtk/generate-inspector-gresource-manifest.py:37 > + if os.sep != '/': > + name = name.replace(os.sep, '/') I would add a comment here explaining that glob.glob changes the separator to the os one, but we need the paths with / in the xml file 1083956 6 240789 mrobinson 2015-04-09 07:49:42 -0700 Comment on attachment 240789 proposed wk patch ][ View in context: https://bugs.webkit.org/attachment.cgi?id=240789&action=review > Source/WebKit2/PlatformGTK.cmake:399 > +file(GLOB InspectorFilesDeps > + ${InspectorFiles} > +) Maybe call this InspectorManifestDependencies? 1083957 7 mrobinson 2015-04-09 07:50:06 -0700 This seems like an okay approach if it's necessary to fix compilation somewhere. 1085533 8 cgarcia 2015-04-15 09:52:23 -0700 Milan, would patch attached to bug #143755 fix this issue? 1085544 9 mcrha 2015-04-15 10:00:46 -0700 (In reply to comment #8) > Milan, would patch attached to bug #143755 fix this issue? I currently lack of free time, but I'll let you know as soon as I get to it. Initial thought would be no, because the issue here is with the command line length, not with the python being used (I faced the same issue when running the make command from a '.bat' file). 1086352 10 251028 mcrha 2015-04-17 10:56:25 -0700 Created attachment 251028 proposed wk patch ]I[ So, the command in the msys/mingw looks like this here: cd /C/MinGW/msys/1.0/data/develop/local/WebKitBuild/Source/WebKit2 && /C/MinGW/msys/1.0/data/develop/local/WebKit/Tools/gtk/generate-inspector-gresource-manifest.py --output=C:/MinGW/msys/1.0/data/develop/local/WebKitBuild/DerivedSources/webkit2gtk/InspectorGResourceBundle.xml "C:/MinGW/msys/1.0/data/develop/local/WebKit/Source/WebInspectorUI/UserInterface/*.html" .... and it generates two first entries in the .xml file: <file compressed="true">UserInterface\Main.html</file> <file compressed="true">UserInterface\Test.html</file> Hmm, it's not shown here, but only the last forward slash from the wildcard is replaced with the backslash, other deeper forward slashes are kept there, thus the BASE_DIR is not a problem. I hope I addressed all the queries above. I do not have a variant of the patch for 2.4.9, I'd appreciate if you could make it and I'll give it a try. 1086354 11 commit-queue 2015-04-17 10:58:51 -0700 Attachment 251028 did not pass style-queue: ERROR: Source/WebKit2/PlatformGTK.cmake:425: Alphabetical sorting problem. "" <file alias=\"images/missingImage@2x\">missingImage@2x.png</file>\n"" should be before "" <file alias=\"images/missingImage\">missingImage.png</file>\n"". [list/order] [5] ERROR: Source/WebKit2/PlatformGTK.cmake:426: There should be exactly one empty line instead of 0 between "" <file alias=\"images/missingImage@2x\">missingImage@2x.png</file>\n"" and "" <file alias=\"images/panIcon\">panIcon.png</file>\n"". [list/emptyline] [5] ERROR: Source/WebKit2/PlatformGTK.cmake:427: There should be exactly one empty line instead of 0 between "" <file alias=\"images/panIcon\">panIcon.png</file>\n"" and "" <file alias=\"images/textAreaResizeCorner\">textAreaResizeCorner.png</file>\n"". [list/emptyline] [5] ERROR: Source/WebKit2/PlatformGTK.cmake:428: Alphabetical sorting problem. "" <file alias=\"images/textAreaResizeCorner@2x\">textAreaResizeCorner@2x.png</file>\n"" should be before "" <file alias=\"images/textAreaResizeCorner\">textAreaResizeCorner.png</file>\n"". [list/order] [5] Total errors found: 4 in 4 files If any of these errors are false positives, please file a bug against check-webkit-style. 1086454 12 251058 mcrha 2015-04-17 15:32:08 -0700 Created attachment 251058 proposed webkit-2.4 branch patch This is what I use with the webkit-2.4 branch at revision 182543. 1095865 13 cgarcia 2015-05-19 00:26:54 -0700 Committed to 2.4 http://trac.webkit.org/changeset/184556 1097297 14 251028 zan 2015-05-26 03:37:48 -0700 Comment on attachment 251028 proposed wk patch ]I[ This looks OK, so let's try and land it. 1097301 15 251028 commit-queue 2015-05-26 04:27:06 -0700 Comment on attachment 251028 proposed wk patch ]I[ Clearing flags on attachment: 251028 Committed r184856: <http://trac.webkit.org/changeset/184856> 1107169 16 zan 2015-07-06 11:54:08 -0700 *** Bug 145375 has been marked as a duplicate of this bug. *** 1128693 17 zan 2015-09-25 04:22:29 -0700 This landed already, so closing. 240543 2014-10-28 09:02:55 -0700 2014-11-01 10:12:21 -0700 proposed wk patch wk.patch text/plain 3379 mcrha ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCBmN2Y0NWE5Li42ZjFiNTE0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTIg QEAKKzIwMTQtMTAtMjggIE1pbGFuIENyaGEgIDxtY3JoYUByZWRoYXQuY29tPgorCisgICAgICAg IFtHVEtdIEV4cGFuZCB3aWxkY2FyZHMgaW5zaWRlIGdlbmVyYXRlLWluc3BlY3Rvci1ncmVzb3Vy Y2UtbWFuaWZlc3QucHkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTEzODEzNAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgICogUGxhdGZvcm1HVEsuY21ha2U6CisKIDIwMTQtMTAtMjggIENhcmxvcyBHYXJjaWEg Q2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQuIFVwZGF0 ZSBPcHRpb25zR1RLLmNtYWtlIGFuZCBORVdTIGZvciAyLjcuMSByZWxlYXNlLgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdDIvUGxhdGZvcm1HVEsuY21ha2UgYi9Tb3VyY2UvV2ViS2l0Mi9QbGF0 Zm9ybUdUSy5jbWFrZQppbmRleCA5MDNlOWZhLi4zMDkxNGUwIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0Mi9QbGF0Zm9ybUdUSy5jbWFrZQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9QbGF0Zm9ybUdU Sy5jbWFrZQpAQCAtMzc0LDcgKzM3NCw3IEBAIHNldChXZWJLaXQyV2ViRXh0ZW5zaW9uX0lOU1RB TExFRF9IRUFERVJTCiAgICAgJHtXRUJLSVQyX0RJUn0vV2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRs ZS9BUEkvZ3RrL3dlYmtpdC13ZWItZXh0ZW5zaW9uLmgKICkKIAotZmlsZShHTE9CIEluc3BlY3Rv ckZpbGVzCitsaXN0KEFQUEVORCBJbnNwZWN0b3JGaWxlcwogICAgICR7Q01BS0VfU09VUkNFX0RJ Un0vU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvKi5odG1sCiAgICAgJHtDTUFL RV9TT1VSQ0VfRElSfS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNlLyou anMKICAgICAke0NNQUtFX1NPVVJDRV9ESVJ9L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL0NvbnRyb2xsZXJzLyouY3NzCkBAIC0zODgsOSArMzg4LDYgQEAgZmlsZShHTE9CIElu c3BlY3RvckZpbGVzCiAgICAgJHtDTUFLRV9TT1VSQ0VfRElSfS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9WaWV3cy8qLmpzCiAgICAgJHtDTUFLRV9TT1VSQ0VfRElSfS9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9JbWFnZXMvZ3RrLyoucG5nCiAgICAgJHtD TUFLRV9TT1VSQ0VfRElSfS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9JbWFn ZXMvZ3RrLyouc3ZnCi0pCi0KLWxpc3QoQVBQRU5EIEluc3BlY3RvckZpbGVzCiAgICAgJHtDTUFL RV9TT1VSQ0VfRElSfS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvTG9jYWxpemF0aW9ucy9lbi5scHJv ai9sb2NhbGl6ZWRTdHJpbmdzLmpzCiAgICAgJHtERVJJVkVEX1NPVVJDRVNfV0VCSU5TUEVDVE9S VUlfRElSfS9Vc2VySW50ZXJmYWNlL1Byb3RvY29sL0luc3BlY3RvckJhY2tlbmRDb21tYW5kcy5q cwogKQpkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4 IGY2Mzk5ODQuLjgwNTE0MjUgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9Ub29s cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMyBAQAorMjAxNC0xMC0yOCAgTWlsYW4gQ3JoYSAgPG1j cmhhQHJlZGhhdC5jb20+CisKKyAgICAgICAgW0dUS10gRXhwYW5kIHdpbGRjYXJkcyBpbnNpZGUg Z2VuZXJhdGUtaW5zcGVjdG9yLWdyZXNvdXJjZS1tYW5pZmVzdC5weQorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM4MTM0CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBndGsvZ2VuZXJhdGUtaW5zcGVjdG9y LWdyZXNvdXJjZS1tYW5pZmVzdC5weToKKyAgICAgICAgKGdldF9maWxlbmFtZXMpOgorCiAyMDE0 LTEwLTI4ICBUaWJvciBNZXN6YXJvcyAgPHRtZXN6YXJvcy51LXN6ZWdlZEBwYXJ0bmVyLnNhbXN1 bmcuY29tPgogCiAgICAgICAgIFtFRkxdIFJlbW92ZSBhbiB1bnVzZWQgaW5jbHVkZSBmcm9tIFRv b2xzL1dlYktpdFRlc3RSdW5uZXIvZWZsL1BsYXRmb3JtV2ViVmlld0VmbC5jcHAKZGlmZiAtLWdp dCBhL1Rvb2xzL2d0ay9nZW5lcmF0ZS1pbnNwZWN0b3ItZ3Jlc291cmNlLW1hbmlmZXN0LnB5IGIv VG9vbHMvZ3RrL2dlbmVyYXRlLWluc3BlY3Rvci1ncmVzb3VyY2UtbWFuaWZlc3QucHkKaW5kZXgg MDY4N2M0Yy4uMjdkMjJkNCAxMDA3NTUKLS0tIGEvVG9vbHMvZ3RrL2dlbmVyYXRlLWluc3BlY3Rv ci1ncmVzb3VyY2UtbWFuaWZlc3QucHkKKysrIGIvVG9vbHMvZ3RrL2dlbmVyYXRlLWluc3BlY3Rv ci1ncmVzb3VyY2UtbWFuaWZlc3QucHkKQEAgLTE2LDYgKzE2LDcgQEAKICMgRm91bmRhdGlvbiwg SW5jLiwgNTEgRnJhbmtsaW4gU3RyZWV0LCBGaWZ0aCBGbG9vciwgQm9zdG9uLCBNQSAgMDIxMTAt MTMwMSAgVVNBCiAKIGltcG9ydCBhcmdwYXJzZQoraW1wb3J0IGdsb2IKIGltcG9ydCBvcwogaW1w b3J0IHN5cwogCkBAIC0yNiwxMCArMjcsMTUgQEAgQkFTRV9ESVIgPSAnV2ViSW5zcGVjdG9yVUkv JwogZGVmIGdldF9maWxlbmFtZXMoYXJncyk6CiAgICAgZmlsZW5hbWVzID0gW10KIAotICAgIGZv ciBmaWxlbmFtZSBpbiBhcmdzOgotICAgICAgICBiYXNlX2Rpcl9pbmRleCA9IGZpbGVuYW1lLnJm aW5kKEJBU0VfRElSKQotICAgICAgICBpZiBiYXNlX2Rpcl9pbmRleCAhPSAtMToKLSAgICAgICAg ICAgIGZpbGVuYW1lcy5hcHBlbmQoZmlsZW5hbWVbYmFzZV9kaXJfaW5kZXggKyBsZW4oQkFTRV9E SVIpOl0pCisgICAgZm9yIHBhdHRlcm4gaW4gYXJnczoKKyAgICAgICAgbmFtZXMgPSBnbG9iLmds b2IocGF0dGVybikKKyAgICAgICAgZm9yIGZpbGVuYW1lIGluIG5hbWVzOgorICAgICAgICAgICAg YmFzZV9kaXJfaW5kZXggPSBmaWxlbmFtZS5yZmluZChCQVNFX0RJUikKKyAgICAgICAgICAgIGlm IGJhc2VfZGlyX2luZGV4ICE9IC0xOgorICAgICAgICAgICAgICAgIG5hbWUgPSBmaWxlbmFtZVti YXNlX2Rpcl9pbmRleCArIGxlbihCQVNFX0RJUik6XQorICAgICAgICAgICAgICAgIGlmIG9zLnNl cCAhPSAnLyc6CisgICAgICAgICAgICAgICAgICAgIG5hbWUgPSBuYW1lLnJlcGxhY2Uob3Muc2Vw LCAnLycpCisgICAgICAgICAgICAgICAgZmlsZW5hbWVzLmFwcGVuZChuYW1lKQogICAgIHJldHVy biBmaWxlbmFtZXMKIAogCg== 240789 2014-11-01 10:12:21 -0700 2015-04-17 10:56:25 -0700 proposed wk patch ][ wk.patch text/plain 4114 mcrha ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCA3ZThjOGJiLi5hNzQ0MzQ1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTIg QEAKKzIwMTQtMTEtMDEgIE1pbGFuIENyaGEgIDxtY3JoYUByZWRoYXQuY29tPgorCisgICAgICAg IFtHVEtdIEV4cGFuZCB3aWxkY2FyZHMgaW5zaWRlIGdlbmVyYXRlLWluc3BlY3Rvci1ncmVzb3Vy Y2UtbWFuaWZlc3QucHkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTEzODEzNAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgICogUGxhdGZvcm1HVEsuY21ha2U6CisKIDIwMTQtMTEtMDEgIENhcmxvcyBHYXJjaWEg Q2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgogCiAgICAgICAgIFJFR1JFU1NJT04ocjE2MzY1 Nik6IFJlbW90ZSBpbnNwZWN0b3IgZG9lc24ndCB3b3JrIHVubGVzcyBwcmVmZXJlbmNlcyBjaGFu Z2UgYWZ0ZXIgcGFnZSBpbml0aWFsaXphdGlvbgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIv UGxhdGZvcm1HVEsuY21ha2UgYi9Tb3VyY2UvV2ViS2l0Mi9QbGF0Zm9ybUdUSy5jbWFrZQppbmRl eCA2Njg0MmU3Li5mNDZiODQzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9QbGF0Zm9ybUdU Sy5jbWFrZQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9QbGF0Zm9ybUdUSy5jbWFrZQpAQCAtMzc2LDcg KzM3Niw3IEBAIHNldChXZWJLaXQyV2ViRXh0ZW5zaW9uX0lOU1RBTExFRF9IRUFERVJTCiAgICAg JHtXRUJLSVQyX0RJUn0vV2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9BUEkvZ3RrL3dlYmtpdC13 ZWItZXh0ZW5zaW9uLmgKICkKIAotZmlsZShHTE9CIEluc3BlY3RvckZpbGVzCitzZXQoSW5zcGVj dG9yRmlsZXMKICAgICAke0NNQUtFX1NPVVJDRV9ESVJ9L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlLyouaHRtbAogICAgICR7Q01BS0VfU09VUkNFX0RJUn0vU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS8qLmpzCiAgICAgJHtDTUFLRV9TT1VSQ0VfRElS fS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Db250cm9sbGVycy8qLmNzcwpA QCAtMzkwLDEzICszOTAsMTQgQEAgZmlsZShHTE9CIEluc3BlY3RvckZpbGVzCiAgICAgJHtDTUFL RV9TT1VSQ0VfRElSfS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy8q LmpzCiAgICAgJHtDTUFLRV9TT1VSQ0VfRElSfS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9JbWFnZXMvZ3RrLyoucG5nCiAgICAgJHtDTUFLRV9TT1VSQ0VfRElSfS9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9JbWFnZXMvZ3RrLyouc3ZnCi0pCi0KLWxpc3Qo QVBQRU5EIEluc3BlY3RvckZpbGVzCiAgICAgJHtDTUFLRV9TT1VSQ0VfRElSfS9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvTG9jYWxpemF0aW9ucy9lbi5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzCiAg ICAgJHtERVJJVkVEX1NPVVJDRVNfV0VCSU5TUEVDVE9SVUlfRElSfS9Vc2VySW50ZXJmYWNlL1By b3RvY29sL0luc3BlY3RvckJhY2tlbmRDb21tYW5kcy5qcwogKQogCitmaWxlKEdMT0IgSW5zcGVj dG9yRmlsZXNEZXBzCisgICAgJHtJbnNwZWN0b3JGaWxlc30KKykKKwogIyBUaGlzIGlzIG5lY2Vz c2FyeSBiZWNhdXNlIG9mIGEgY29uZmxpY3QgYmV0d2VlbiB0aGUgR1RLKyBBUEkgV2ViS2l0VmVy c2lvbi5oIGFuZCBvbmUgZ2VuZXJhdGVkIGJ5IFdlYkNvcmUuCiBsaXN0KElOU0VSVCBXZWJLaXQy X0lOQ0xVREVfRElSRUNUT1JJRVMgMAogICAgICIke0ZPUldBUkRJTkdfSEVBREVSU19XRUJLSVQy R1RLX0RJUn0iCkBAIC01MDMsNyArNTA0LDcgQEAgYWRkX2N1c3RvbV9jb21tYW5kKAogCiBhZGRf Y3VzdG9tX2NvbW1hbmQoCiAgICAgT1VUUFVUICR7REVSSVZFRF9TT1VSQ0VTX1dFQktJVDJHVEtf RElSfS9JbnNwZWN0b3JHUmVzb3VyY2VCdW5kbGUueG1sCi0gICAgREVQRU5EUyAke0luc3BlY3Rv ckZpbGVzfQorICAgIERFUEVORFMgJHtJbnNwZWN0b3JGaWxlc0RlcHN9CiAgICAgICAgICAgICAk e1RPT0xTX0RJUn0vZ3RrL2dlbmVyYXRlLWluc3BlY3Rvci1ncmVzb3VyY2UtbWFuaWZlc3QucHkK ICAgICBDT01NQU5EICR7VE9PTFNfRElSfS9ndGsvZ2VuZXJhdGUtaW5zcGVjdG9yLWdyZXNvdXJj ZS1tYW5pZmVzdC5weSAtLW91dHB1dD0ke0RFUklWRURfU09VUkNFU19XRUJLSVQyR1RLX0RJUn0v SW5zcGVjdG9yR1Jlc291cmNlQnVuZGxlLnhtbCAke0luc3BlY3RvckZpbGVzfQogICAgIFZFUkJB VElNCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXgg ZmI1ZjgzNy4uYWEyM2IzNiAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xz L0NoYW5nZUxvZwpAQCAtMSwzICsxLDEzIEBACisyMDE0LTExLTAxICBNaWxhbiBDcmhhICA8bWNy aGFAcmVkaGF0LmNvbT4KKworICAgICAgICBbR1RLXSBFeHBhbmQgd2lsZGNhcmRzIGluc2lkZSBn ZW5lcmF0ZS1pbnNwZWN0b3ItZ3Jlc291cmNlLW1hbmlmZXN0LnB5CisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzgxMzQKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGd0ay9nZW5lcmF0ZS1pbnNwZWN0b3It Z3Jlc291cmNlLW1hbmlmZXN0LnB5OgorICAgICAgICAoZ2V0X2ZpbGVuYW1lcyk6CisKIDIwMTQt MTAtMzEgIE1pY2hhZWwgU2Fib2ZmICA8bXNhYm9mZkBhcHBsZS5jb20+CiAKICAgICAgICAgTm8g d2F5IHRvIHNwZWNpZnkgdGFyZ2V0IG9zIG9yIGFyY2hpdGVjdHVyZSB3aGVuIHVzaW5nIHRoZSAt LW5vLWNvcHkgb3B0aW9uIHdpdGggcnVuLWpzYy1zdHJlc3MtdGVzdHMKZGlmZiAtLWdpdCBhL1Rv b2xzL2d0ay9nZW5lcmF0ZS1pbnNwZWN0b3ItZ3Jlc291cmNlLW1hbmlmZXN0LnB5IGIvVG9vbHMv Z3RrL2dlbmVyYXRlLWluc3BlY3Rvci1ncmVzb3VyY2UtbWFuaWZlc3QucHkKaW5kZXggMDY4N2M0 Yy4uMjdkMjJkNCAxMDA3NTUKLS0tIGEvVG9vbHMvZ3RrL2dlbmVyYXRlLWluc3BlY3Rvci1ncmVz b3VyY2UtbWFuaWZlc3QucHkKKysrIGIvVG9vbHMvZ3RrL2dlbmVyYXRlLWluc3BlY3Rvci1ncmVz b3VyY2UtbWFuaWZlc3QucHkKQEAgLTE2LDYgKzE2LDcgQEAKICMgRm91bmRhdGlvbiwgSW5jLiwg NTEgRnJhbmtsaW4gU3RyZWV0LCBGaWZ0aCBGbG9vciwgQm9zdG9uLCBNQSAgMDIxMTAtMTMwMSAg VVNBCiAKIGltcG9ydCBhcmdwYXJzZQoraW1wb3J0IGdsb2IKIGltcG9ydCBvcwogaW1wb3J0IHN5 cwogCkBAIC0yNiwxMCArMjcsMTUgQEAgQkFTRV9ESVIgPSAnV2ViSW5zcGVjdG9yVUkvJwogZGVm IGdldF9maWxlbmFtZXMoYXJncyk6CiAgICAgZmlsZW5hbWVzID0gW10KIAotICAgIGZvciBmaWxl bmFtZSBpbiBhcmdzOgotICAgICAgICBiYXNlX2Rpcl9pbmRleCA9IGZpbGVuYW1lLnJmaW5kKEJB U0VfRElSKQotICAgICAgICBpZiBiYXNlX2Rpcl9pbmRleCAhPSAtMToKLSAgICAgICAgICAgIGZp bGVuYW1lcy5hcHBlbmQoZmlsZW5hbWVbYmFzZV9kaXJfaW5kZXggKyBsZW4oQkFTRV9ESVIpOl0p CisgICAgZm9yIHBhdHRlcm4gaW4gYXJnczoKKyAgICAgICAgbmFtZXMgPSBnbG9iLmdsb2IocGF0 dGVybikKKyAgICAgICAgZm9yIGZpbGVuYW1lIGluIG5hbWVzOgorICAgICAgICAgICAgYmFzZV9k aXJfaW5kZXggPSBmaWxlbmFtZS5yZmluZChCQVNFX0RJUikKKyAgICAgICAgICAgIGlmIGJhc2Vf ZGlyX2luZGV4ICE9IC0xOgorICAgICAgICAgICAgICAgIG5hbWUgPSBmaWxlbmFtZVtiYXNlX2Rp cl9pbmRleCArIGxlbihCQVNFX0RJUik6XQorICAgICAgICAgICAgICAgIGlmIG9zLnNlcCAhPSAn Lyc6CisgICAgICAgICAgICAgICAgICAgIG5hbWUgPSBuYW1lLnJlcGxhY2Uob3Muc2VwLCAnLycp CisgICAgICAgICAgICAgICAgZmlsZW5hbWVzLmFwcGVuZChuYW1lKQogICAgIHJldHVybiBmaWxl bmFtZXMKIAogCg== 251028 2015-04-17 10:56:25 -0700 2015-05-26 04:27:06 -0700 proposed wk patch ]I[ wk.patch text/plain 4950 mcrha ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCA5YThiNzgyLi4yZjRjMzY4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMg QEAKKzIwMTUtMDQtMTcgIE1pbGFuIENyaGEgIDxtY3JoYUByZWRoYXQuY29tPgorCisgICAgICAg IFtHVEtdIEV4cGFuZCB3aWxkY2FyZHMgaW5zaWRlIGdlbmVyYXRlLWluc3BlY3Rvci1ncmVzb3Vy Y2UtbWFuaWZlc3QucHkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTEzODEzNAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgICogUGxhdGZvcm1HVEsuY21ha2U6IENvbW1hbmQgbGluZSB3aXRoIGV4cGFuZGVkIHJl c291cmNlcyBleGNlZWRzIDMyS0IsIHdoaWNoCisgICAgICAgIGlzIGEgbGltaXQgb24gV2luZG93 cy4gSXQncyBiZXR0ZXIgdG8gZXhwYW5kIHdpbGRjYXJkcyBpbnNpZGUgdGhlIHB5dGhvbiBzY3Jp cHQuCisKIDIwMTUtMDQtMTYgIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4K IAogICAgICAgICBTdG9wIGluc3RhbGxpbmcgV2ViS2l0Mi5mcmFtZXdvcmsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQyL1BsYXRmb3JtR1RLLmNtYWtlIGIvU291cmNlL1dlYktpdDIvUGxhdGZv cm1HVEsuY21ha2UKaW5kZXggYjAyZTk0Ny4uZjE5NWUwZCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdDIvUGxhdGZvcm1HVEsuY21ha2UKKysrIGIvU291cmNlL1dlYktpdDIvUGxhdGZvcm1HVEsu Y21ha2UKQEAgLTQwNyw3ICs0MDcsNyBAQCBzZXQoV2ViS2l0MldlYkV4dGVuc2lvbl9JTlNUQUxM RURfSEVBREVSUwogICAgICR7V0VCS0lUMl9ESVJ9L1dlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUv QVBJL2d0ay93ZWJraXQtd2ViLWV4dGVuc2lvbi5oCiApCiAKLWZpbGUoR0xPQiBJbnNwZWN0b3JG aWxlcworc2V0KEluc3BlY3RvckZpbGVzCiAgICAgJHtDTUFLRV9TT1VSQ0VfRElSfS9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS8qLmh0bWwKICAgICAke0NNQUtFX1NPVVJDRV9E SVJ9L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Jhc2UvKi5qcwogICAgICR7 Q01BS0VfU09VUkNFX0RJUn0vU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29u dHJvbGxlcnMvKi5jc3MKQEAgLTQyMiw2ICs0MjIsMTIgQEAgZmlsZShHTE9CIEluc3BlY3RvckZp bGVzCiAgICAgJHtDTUFLRV9TT1VSQ0VfRElSfS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9WaWV3cy8qLmpzCiAgICAgJHtDTUFLRV9TT1VSQ0VfRElSfS9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9JbWFnZXMvZ3RrLyoucG5nCiAgICAgJHtDTUFLRV9TT1VS Q0VfRElSfS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9JbWFnZXMvZ3RrLyou c3ZnCisgICAgJHtDTUFLRV9TT1VSQ0VfRElSfS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvTG9jYWxp emF0aW9ucy9lbi5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzCisgICAgJHtERVJJVkVEX1NPVVJD RVNfV0VCSU5TUEVDVE9SVUlfRElSfS9Vc2VySW50ZXJmYWNlL1Byb3RvY29sL0luc3BlY3RvckJh Y2tlbmRDb21tYW5kcy5qcworKQorCitmaWxlKEdMT0IgSW5zcGVjdG9yRmlsZXNEZXBlbmRlbmNp ZXMKKyAgICAke0luc3BlY3RvckZpbGVzfQogKQogCiAjIERlcml2ZWRTb3VyY2VzL0phdmFTY3Jp cHRDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JCYWNrZW5kQ29tbWFuZHMuanMgaXMKQEAgLTQzMiwx MSArNDM4LDYgQEAgYWRkX2N1c3RvbV9jb21tYW5kKAogICAgIENPTU1BTkQgY3AgJHtERVJJVkVE X1NPVVJDRVNfSkFWQVNDUklQVENPUkVfRElSfS9pbnNwZWN0b3IvSW5zcGVjdG9yQmFja2VuZENv bW1hbmRzLmpzICR7REVSSVZFRF9TT1VSQ0VTX1dFQklOU1BFQ1RPUlVJX0RJUn0vVXNlckludGVy ZmFjZS9Qcm90b2NvbC9JbnNwZWN0b3JCYWNrZW5kQ29tbWFuZHMuanMKICkKIAotbGlzdChBUFBF TkQgSW5zcGVjdG9yRmlsZXMKLSAgICAke0NNQUtFX1NPVVJDRV9ESVJ9L1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Mb2NhbGl6YXRpb25zL2VuLmxwcm9qL2xvY2FsaXplZFN0cmluZ3MuanMKLSAgICAk e0RFUklWRURfU09VUkNFU19XRUJJTlNQRUNUT1JVSV9ESVJ9L1VzZXJJbnRlcmZhY2UvUHJvdG9j b2wvSW5zcGVjdG9yQmFja2VuZENvbW1hbmRzLmpzCi0pCi0KICMgVGhpcyBpcyBuZWNlc3Nhcnkg YmVjYXVzZSBvZiBhIGNvbmZsaWN0IGJldHdlZW4gdGhlIEdUSysgQVBJIFdlYktpdFZlcnNpb24u aCBhbmQgb25lIGdlbmVyYXRlZCBieSBXZWJDb3JlLgogbGlzdChJTlNFUlQgV2ViS2l0Ml9JTkNM VURFX0RJUkVDVE9SSUVTIDAKICAgICAiJHtGT1JXQVJESU5HX0hFQURFUlNfV0VCS0lUMkdUS19E SVJ9IgpAQCAtNTcwLDcgKzU3MSw3IEBAIGFkZF9jdXN0b21fY29tbWFuZCgKIAogYWRkX2N1c3Rv bV9jb21tYW5kKAogICAgIE9VVFBVVCAke0RFUklWRURfU09VUkNFU19XRUJLSVQyR1RLX0RJUn0v SW5zcGVjdG9yR1Jlc291cmNlQnVuZGxlLnhtbAotICAgIERFUEVORFMgJHtJbnNwZWN0b3JGaWxl c30KKyAgICBERVBFTkRTICR7SW5zcGVjdG9yRmlsZXNEZXBlbmRlbmNpZXN9CiAgICAgICAgICAg ICAke1RPT0xTX0RJUn0vZ3RrL2dlbmVyYXRlLWluc3BlY3Rvci1ncmVzb3VyY2UtbWFuaWZlc3Qu cHkKICAgICBDT01NQU5EICR7VE9PTFNfRElSfS9ndGsvZ2VuZXJhdGUtaW5zcGVjdG9yLWdyZXNv dXJjZS1tYW5pZmVzdC5weSAtLW91dHB1dD0ke0RFUklWRURfU09VUkNFU19XRUJLSVQyR1RLX0RJ Un0vSW5zcGVjdG9yR1Jlc291cmNlQnVuZGxlLnhtbCAke0luc3BlY3RvckZpbGVzfQogICAgIFZF UkJBVElNCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5k ZXggMDZkYjFmNi4uYzdhZDFiMiAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rv b2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDE1LTA0LTE3ICBNaWxhbiBDcmhhICA8 bWNyaGFAcmVkaGF0LmNvbT4KKworICAgICAgICBbR1RLXSBFeHBhbmQgd2lsZGNhcmRzIGluc2lk ZSBnZW5lcmF0ZS1pbnNwZWN0b3ItZ3Jlc291cmNlLW1hbmlmZXN0LnB5CisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzgxMzQKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGd0ay9nZW5lcmF0ZS1pbnNwZWN0 b3ItZ3Jlc291cmNlLW1hbmlmZXN0LnB5OgorICAgICAgICAoZ2V0X2ZpbGVuYW1lcyk6IENvbW1h bmQgbGluZSB3aXRoIGV4cGFuZGVkIHJlc291cmNlcyBleGNlZWRzIDMyS0IsIHdoaWNoCisgICAg ICAgIGlzIGEgbGltaXQgb24gV2luZG93cy4gSXQncyBiZXR0ZXIgdG8gZXhwYW5kIHdpbGRjYXJk cyBpbnNpZGUgdGhlIHB5dGhvbiBzY3JpcHQuCisKIDIwMTUtMDQtMTcgIENzYWJhIE9zenRyb2dv bsOhYyAgPG9zc3lAd2Via2l0Lm9yZz4KIAogICAgICAgICBbR1RLXSBPbmUgbW9yZSB1bnJldmll d2VkIGZpeCBhZnRlciByMTgyODgyLgpkaWZmIC0tZ2l0IGEvVG9vbHMvZ3RrL2dlbmVyYXRlLWlu c3BlY3Rvci1ncmVzb3VyY2UtbWFuaWZlc3QucHkgYi9Ub29scy9ndGsvZ2VuZXJhdGUtaW5zcGVj dG9yLWdyZXNvdXJjZS1tYW5pZmVzdC5weQppbmRleCAwNjg3YzRjLi4wMzA2MGNmIDEwMDc1NQot LS0gYS9Ub29scy9ndGsvZ2VuZXJhdGUtaW5zcGVjdG9yLWdyZXNvdXJjZS1tYW5pZmVzdC5weQor KysgYi9Ub29scy9ndGsvZ2VuZXJhdGUtaW5zcGVjdG9yLWdyZXNvdXJjZS1tYW5pZmVzdC5weQpA QCAtMTYsNiArMTYsNyBAQAogIyBGb3VuZGF0aW9uLCBJbmMuLCA1MSBGcmFua2xpbiBTdHJlZXQs IEZpZnRoIEZsb29yLCBCb3N0b24sIE1BICAwMjExMC0xMzAxICBVU0EKIAogaW1wb3J0IGFyZ3Bh cnNlCitpbXBvcnQgZ2xvYgogaW1wb3J0IG9zCiBpbXBvcnQgc3lzCiAKQEAgLTI2LDEwICsyNywx NyBAQCBCQVNFX0RJUiA9ICdXZWJJbnNwZWN0b3JVSS8nCiBkZWYgZ2V0X2ZpbGVuYW1lcyhhcmdz KToKICAgICBmaWxlbmFtZXMgPSBbXQogCi0gICAgZm9yIGZpbGVuYW1lIGluIGFyZ3M6Ci0gICAg ICAgIGJhc2VfZGlyX2luZGV4ID0gZmlsZW5hbWUucmZpbmQoQkFTRV9ESVIpCi0gICAgICAgIGlm IGJhc2VfZGlyX2luZGV4ICE9IC0xOgotICAgICAgICAgICAgZmlsZW5hbWVzLmFwcGVuZChmaWxl bmFtZVtiYXNlX2Rpcl9pbmRleCArIGxlbihCQVNFX0RJUik6XSkKKyAgICBmb3IgcGF0dGVybiBp biBhcmdzOgorICAgICAgICBwYXRocyA9IGdsb2IuZ2xvYihwYXR0ZXJuKQorICAgICAgICBmb3Ig ZmlsZW5hbWUgaW4gcGF0aHM6CisgICAgICAgICAgICBiYXNlX2Rpcl9pbmRleCA9IGZpbGVuYW1l LnJmaW5kKEJBU0VfRElSKQorICAgICAgICAgICAgaWYgYmFzZV9kaXJfaW5kZXggIT0gLTE6Cisg ICAgICAgICAgICAgICAgbmFtZSA9IGZpbGVuYW1lW2Jhc2VfZGlyX2luZGV4ICsgbGVuKEJBU0Vf RElSKTpdCisgICAgICAgICAgICAgICAgIyBUaGUgcmVzdWx0IHNob3VsZCB1c2UgZm9yd2FyZCBz bGFzaGVzLCB0aHVzIG1ha2Ugc3VyZSBhbnkgb3Mtc3BlY2lmaWMKKyAgICAgICAgICAgICAgICAj IHNlcGFyYXRvciwgYWRkZWQgYnkgdGhlIGdsb2IuZ2xvYigpIGNhbGwsIGlzIHByb3Blcmx5IHJl cGxhY2VkCisgICAgICAgICAgICAgICAgaWYgb3Muc2VwICE9ICcvJzoKKyAgICAgICAgICAgICAg ICAgICAgbmFtZSA9IG5hbWUucmVwbGFjZShvcy5zZXAsICcvJykKKyAgICAgICAgICAgICAgICBm aWxlbmFtZXMuYXBwZW5kKG5hbWUpCiAgICAgcmV0dXJuIGZpbGVuYW1lcwogCiAK 251058 2015-04-17 15:32:08 -0700 2015-05-19 00:22:35 -0700 proposed webkit-2.4 branch patch wk.patch text/plain 7916 mcrha SW5kZXg6IENoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBDaGFuZ2VMb2cJKHJldmlzaW9uIDE4Mjk3 NCkKKysrIENoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDEzIEBACisyMDE1LTA0 LTE3ICBNaWxhbiBDcmhhICA8bWNyaGFAcmVkaGF0LmNvbT4KKworICAgICAgICBbR1RLXSBFeHBh bmQgd2lsZGNhcmRzIGluc2lkZSBnZW5lcmF0ZS1pbnNwZWN0b3ItZ3Jlc291cmNlLW1hbmlmZXN0 LnB5CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzgx MzQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIEdO VW1ha2VmaWxlLmFtOiBDb21tYW5kIGxpbmUgd2l0aCBleHBhbmRlZCByZXNvdXJjZXMgZXhjZWVk cyAzMktCLCB3aGljaAorICAgICAgICBpcyBhIGxpbWl0IG9uIFdpbmRvd3MuIEl0J3MgYmV0dGVy IHRvIGV4cGFuZCB3aWxkY2FyZHMgaW5zaWRlIHRoZSBweXRob24gc2NyaXB0LgorCiAyMDE1LTA0 LTA3ICBQaGlsaXAgQ2hpbWVudG8gIDxwaGlsaXAuY2hpbWVudG9AZ21haWwuY29tPgogCiAgICAg ICAgIGNvbmZpZ3VyZSBjaGVjayBmb3IgY2xhbmcgdmVyc2lvbiBpcyBpbmNvcnJlY3QKSW5kZXg6 IEdOVW1ha2VmaWxlLmFtCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIEdOVW1ha2VmaWxlLmFtCShyZXZpc2lvbiAx ODI5NzIpCisrKyBHTlVtYWtlZmlsZS5hbQkod29ya2luZyBjb3B5KQpAQCAtMTI0LDcgKzEyNCw2 IEBAIERJU1RDTEVBTkZJTEVTIDo9CiBNQUlOVEFJTkVSQ0xFQU5GSUxFUyA6PQogcGtnY29uZmln X0RBVEEgOj0KIGdkb21fc3ltYm9sX2ZpbGVzIDo9Ci1pbnNwZWN0b3JfZmlsZXMgOj0KIAogaWYg RU5BQkxFX0lOVFJPU1BFQ1RJT04KIGdpcl9EQVRBIDo9CkluZGV4OiBTb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFu Z2VMb2cJKHJldmlzaW9uIDE4Mjk3MykKKysrIFNvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VM b2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxMyBAQAorMjAxNS0wNC0xNyAgTWlsYW4gQ3Jo YSAgPG1jcmhhQHJlZGhhdC5jb20+CisKKyAgICAgICAgW0dUS10gRXhwYW5kIHdpbGRjYXJkcyBp bnNpZGUgZ2VuZXJhdGUtaW5zcGVjdG9yLWdyZXNvdXJjZS1tYW5pZmVzdC5weQorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM4MTM0CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBHTlVtYWtlZmlsZS5hbTog Q29tbWFuZCBsaW5lIHdpdGggZXhwYW5kZWQgcmVzb3VyY2VzIGV4Y2VlZHMgMzJLQiwgd2hpY2gK KyAgICAgICAgaXMgYSBsaW1pdCBvbiBXaW5kb3dzLiBJdCdzIGJldHRlciB0byBleHBhbmQgd2ls ZGNhcmRzIGluc2lkZSB0aGUgcHl0aG9uIHNjcmlwdC4KKwogMjAxNC0wOS0yNSAgQ2FybG9zIEdh cmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZC4g Rml4IG1ha2UgZGlzdGNoZWNrLgpJbmRleDogU291cmNlL1dlYkluc3BlY3RvclVJL0dOVW1ha2Vm aWxlLmFtCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJJbnNwZWN0b3JVSS9HTlVtYWtlZmlsZS5h bQkocmV2aXNpb24gMTgyOTcyKQorKysgU291cmNlL1dlYkluc3BlY3RvclVJL0dOVW1ha2VmaWxl LmFtCSh3b3JraW5nIGNvcHkpCkBAIC0xLDQgKzEsMTQgQEAKLWluc3BlY3Rvcl9maWxlcyArPSBc CitpbnNwZWN0b3JfZmlsZXMgPSBcCisJIiQoV2ViSW5zcGVjdG9yVUkpL0xvY2FsaXphdGlvbnMv ZW4ubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qcyIgXAorCSIkKFdlYkluc3BlY3RvclVJKS9Vc2Vy SW50ZXJmYWNlLyouaHRtbCIgXAorCSIkKFdlYkluc3BlY3RvclVJKS9Vc2VySW50ZXJmYWNlLyou anMiIFwKKwkiJChXZWJJbnNwZWN0b3JVSSkvVXNlckludGVyZmFjZS8qLmNzcyIgXAorCSIkKFdl Ykluc3BlY3RvclVJKS9Vc2VySW50ZXJmYWNlL0ltYWdlcy9ndGsvKi5wbmciIFwKKwkiJChXZWJJ bnNwZWN0b3JVSSkvVXNlckludGVyZmFjZS9JbWFnZXMvZ3RrLyouc3ZnIiBcCisJIiQoV2ViSW5z cGVjdG9yVUkpL1VzZXJJbnRlcmZhY2UvRXh0ZXJuYWwvQ29kZU1pcnJvci8qLmpzIiBcCisJIiQo V2ViSW5zcGVjdG9yVUkpL1VzZXJJbnRlcmZhY2UvRXh0ZXJuYWwvQ29kZU1pcnJvci8qLmNzcyIK KworaW5zcGVjdG9yX2ZpbGVzX2RlcGVuZGVuY2llcyA9IFwKIAkkKFdlYkluc3BlY3RvclVJKS9M b2NhbGl6YXRpb25zL2VuLmxwcm9qL2xvY2FsaXplZFN0cmluZ3MuanMgXAogCSQoc2hlbGwgbHMg JChXZWJJbnNwZWN0b3JVSSkvVXNlckludGVyZmFjZS8qLmh0bWwpIFwKIAkkKHNoZWxsIGxzICQo V2ViSW5zcGVjdG9yVUkpL1VzZXJJbnRlcmZhY2UvKi5qcykgXApAQCAtOSw3ICsxOSw3IEBAIGlu c3BlY3Rvcl9maWxlcyArPSBcCiAJJChzaGVsbCBscyAkKFdlYkluc3BlY3RvclVJKS9Vc2VySW50 ZXJmYWNlL0V4dGVybmFsL0NvZGVNaXJyb3IvKi5jc3MpCiAKICR7R0VOU09VUkNFU19XRUJJTlNQ RUNUT1JfVUl9L0dSZXNvdXJjZUJ1bmRsZS54bWw6IEdOVW1ha2VmaWxlIFwKLQkkKGluc3BlY3Rv cl9maWxlcykgXAorCSQoaW5zcGVjdG9yX2ZpbGVzX2RlcGVuZGVuY2llcykgXAogCSQoc3JjZGly KS9Ub29scy9ndGsvZ2VuZXJhdGUtaW5zcGVjdG9yLWdyZXNvdXJjZS1tYW5pZmVzdC5weQogCSQo QU1fVl9HRU4pCiAJJChBTV9WX2F0KW1rZGlyIC1wICR7R0VOU09VUkNFU19XRUJJTlNQRUNUT1Jf VUl9CkBAIC0yNywxMSArMzcsNCBAQCB3ZWJjb3JlX2J1aWx0X3NvdXJjZXMgKz0gXAogCURlcml2 ZWRTb3VyY2VzL1dlYkluc3BlY3RvclVJL0dSZXNvdXJjZUJ1bmRsZS5jCiAKIEVYVFJBX0RJU1Qg Kz0gXAotCSQoV2ViSW5zcGVjdG9yVUkpL0xvY2FsaXphdGlvbnMvZW4ubHByb2ovbG9jYWxpemVk U3RyaW5ncy5qcyBcCi0JJChzaGVsbCBscyAkKFdlYkluc3BlY3RvclVJKS9Vc2VySW50ZXJmYWNl LyouaHRtbCkgXAotCSQoc2hlbGwgbHMgJChXZWJJbnNwZWN0b3JVSSkvVXNlckludGVyZmFjZS8q LmpzKSBcCi0JJChzaGVsbCBscyAkKFdlYkluc3BlY3RvclVJKS9Vc2VySW50ZXJmYWNlLyouY3Nz KSBcCi0JJChzaGVsbCBscyAkKFdlYkluc3BlY3RvclVJKS9Vc2VySW50ZXJmYWNlL0ltYWdlcy9n dGsvKi5wbmcpIFwKLQkkKHNoZWxsIGxzICQoV2ViSW5zcGVjdG9yVUkpL1VzZXJJbnRlcmZhY2Uv SW1hZ2VzL2d0ay8qLnN2ZykgXAotCSQoc2hlbGwgbHMgJChXZWJJbnNwZWN0b3JVSSkvVXNlcklu dGVyZmFjZS9FeHRlcm5hbC9Db2RlTWlycm9yLyouanMpIFwKLQkkKHNoZWxsIGxzICQoV2ViSW5z cGVjdG9yVUkpL1VzZXJJbnRlcmZhY2UvRXh0ZXJuYWwvQ29kZU1pcnJvci8qLmNzcykKKwkkKGlu c3BlY3Rvcl9maWxlc19kZXBlbmRlbmNpZXMpCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9DaGFuZ2VM b2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCShyZXZpc2lvbiAxODI5 NzMpCisrKyBTb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyAr MSwxMyBAQAorMjAxNS0wNC0xNyAgTWlsYW4gQ3JoYSAgPG1jcmhhQHJlZGhhdC5jb20+CisKKyAg ICAgICAgW0dUS10gRXhwYW5kIHdpbGRjYXJkcyBpbnNpZGUgZ2VuZXJhdGUtaW5zcGVjdG9yLWdy ZXNvdXJjZS1tYW5pZmVzdC5weQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTM4MTM0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgKiBQbGF0Zm9ybUdUSy5jbWFrZTogQ29tbWFuZCBsaW5lIHdpdGggZXhwYW5k ZWQgcmVzb3VyY2VzIGV4Y2VlZHMgMzJLQiwgd2hpY2gKKyAgICAgICAgaXMgYSBsaW1pdCBvbiBX aW5kb3dzLiBJdCdzIGJldHRlciB0byBleHBhbmQgd2lsZGNhcmRzIGluc2lkZSB0aGUgcHl0aG9u IHNjcmlwdC4KKwogMjAxNC0xMS0xOSAgTWljaGFlbCBDYXRhbnphcm8gIDxtY2F0YW56YXJvQGln YWxpYS5jb20+CiAKICAgICAgICAgW0dUS10gRXJyb3IgaW4gZG9jdW1lbnRhdGlvbiBvZiB3ZWJr aXRfcHJpbnRfb3BlcmF0aW9uX2dldF9wYWdlX3NldHVwKCkKSW5kZXg6IFNvdXJjZS9XZWJLaXQy L1BsYXRmb3JtR1RLLmNtYWtlCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1BsYXRmb3Jt R1RLLmNtYWtlCShyZXZpc2lvbiAxODI5NzIpCisrKyBTb3VyY2UvV2ViS2l0Mi9QbGF0Zm9ybUdU Sy5jbWFrZQkod29ya2luZyBjb3B5KQpAQCAtMzY5LDcgKzM2OSw3IEBAIHNldChXZWJLaXQyV2Vi RXh0ZW5zaW9uX0lOU1RBTExFRF9IRUFERVIKICAgICAke1dFQktJVDJfRElSfS9XZWJQcm9jZXNz L0luamVjdGVkQnVuZGxlL0FQSS9ndGsvd2Via2l0LXdlYi1leHRlbnNpb24uaAogKQogCi1maWxl KEdMT0IgSW5zcGVjdG9yRmlsZXMKK3NldChJbnNwZWN0b3JGaWxlcwogICAgICR7Q01BS0VfU09V UkNFX0RJUn0vU291cmNlL1dlYkluc3BlY3RvclVJL0xvY2FsaXphdGlvbnMvZW4ubHByb2ovbG9j YWxpemVkU3RyaW5ncy5qcwogICAgICR7Q01BS0VfU09VUkNFX0RJUn0vU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvKi5jc3MKICAgICAke0NNQUtFX1NPVVJDRV9ESVJ9L1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0V4dGVybmFsL0NvZGVNaXJyb3IvKgpAQCAt Mzc5LDYgKzM3OSwxMCBAQCBmaWxlKEdMT0IgSW5zcGVjdG9yRmlsZXMKICAgICAke0NNQUtFX1NP VVJDRV9ESVJ9L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlLyouanMKICkKIAor ZmlsZShHTE9CIEluc3BlY3RvckZpbGVzRGVwZW5kZW5jaWVzCisgICAgJHtJbnNwZWN0b3JGaWxl c30KKykKKwogIyBUaGlzIGlzIG5lY2Vzc2FyeSBiZWNhdXNlIG9mIGEgY29uZmxpY3QgYmV0d2Vl biB0aGUgR1RLKyBBUEkgV2ViS2l0VmVyc2lvbi5oIGFuZCBvbmUgZ2VuZXJhdGVkIGJ5IFdlYkNv cmUuCiBsaXN0KElOU0VSVCBXZWJLaXQyX0lOQ0xVREVfRElSRUNUT1JJRVMgMAogICAgICIke0ZP UldBUkRJTkdfSEVBREVSU19XRUJLSVQyR1RLX0RJUn0iCkBAIC00ODEsNyArNDg1LDcgQEAgYWRk X2N1c3RvbV9jb21tYW5kKAogCiBhZGRfY3VzdG9tX2NvbW1hbmQoCiAgICAgT1VUUFVUICR7REVS SVZFRF9TT1VSQ0VTX1dFQktJVDJHVEtfRElSfS9JbnNwZWN0b3JHUmVzb3VyY2VCdW5kbGUueG1s Ci0gICAgREVQRU5EUyAke0luc3BlY3RvckZpbGVzfQorICAgIERFUEVORFMgJHtJbnNwZWN0b3JG aWxlc0RlcGVuZGVuY2llc30KICAgICAgICAgICAgICR7VE9PTFNfRElSfS9ndGsvZ2VuZXJhdGUt aW5zcGVjdG9yLWdyZXNvdXJjZS1tYW5pZmVzdC5weQogICAgIENPTU1BTkQgJHtUT09MU19ESVJ9 L2d0ay9nZW5lcmF0ZS1pbnNwZWN0b3ItZ3Jlc291cmNlLW1hbmlmZXN0LnB5ICR7REVSSVZFRF9T T1VSQ0VTX1dFQktJVDJHVEtfRElSfS9JbnNwZWN0b3JHUmVzb3VyY2VCdW5kbGUueG1sCiAgICAg VkVSQkFUSU0KSW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFu Z2VMb2cJKHJldmlzaW9uIDE4Mjk3MykKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5 KQpAQCAtMSwzICsxLDE0IEBACisyMDE1LTA0LTE3ICBNaWxhbiBDcmhhICA8bWNyaGFAcmVkaGF0 LmNvbT4KKworICAgICAgICBbR1RLXSBFeHBhbmQgd2lsZGNhcmRzIGluc2lkZSBnZW5lcmF0ZS1p bnNwZWN0b3ItZ3Jlc291cmNlLW1hbmlmZXN0LnB5CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzgxMzQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICAqIGd0ay9nZW5lcmF0ZS1pbnNwZWN0b3ItZ3Jlc291cmNl LW1hbmlmZXN0LnB5OgorICAgICAgICAoZ2V0X2ZpbGVuYW1lcyk6IENvbW1hbmQgbGluZSB3aXRo IGV4cGFuZGVkIHJlc291cmNlcyBleGNlZWRzIDMyS0IsIHdoaWNoCisgICAgICAgIGlzIGEgbGlt aXQgb24gV2luZG93cy4gSXQncyBiZXR0ZXIgdG8gZXhwYW5kIHdpbGRjYXJkcyBpbnNpZGUgdGhl IHB5dGhvbiBzY3JpcHQuCisKIDIwMTQtMTEtMjggIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dh cmNpYUBpZ2FsaWEuY29tPgogCiAgICAgICAgIFtHVEtdIFVzZSBjdXN0b20gSmF2YVNjcmlwdCBp bnN0ZWFkIG9mIERCdXMgdG8gaW1wbGVtZW50IFdlYlByb2Nlc3MgdGVzdHMKSW5kZXg6IFRvb2xz L2d0ay9nZW5lcmF0ZS1pbnNwZWN0b3ItZ3Jlc291cmNlLW1hbmlmZXN0LnB5Cj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFRvb2xzL2d0ay9nZW5lcmF0ZS1pbnNwZWN0b3ItZ3Jlc291cmNlLW1hbmlmZXN0LnB5CShy ZXZpc2lvbiAxODI5NzIpCisrKyBUb29scy9ndGsvZ2VuZXJhdGUtaW5zcGVjdG9yLWdyZXNvdXJj ZS1tYW5pZmVzdC5weQkod29ya2luZyBjb3B5KQpAQCAtMTYsNiArMTYsNyBAQAogIyBGb3VuZGF0 aW9uLCBJbmMuLCA1MSBGcmFua2xpbiBTdHJlZXQsIEZpZnRoIEZsb29yLCBCb3N0b24sIE1BICAw MjExMC0xMzAxICBVU0EKIAogaW1wb3J0IGFyZ3BhcnNlCitpbXBvcnQgZ2xvYgogaW1wb3J0IG9z CiBpbXBvcnQgc3lzCiAKQEAgLTI2LDEwICsyNywxNyBAQCBCQVNFX0RJUiA9ICdXZWJJbnNwZWN0 b3JVSS8nCiBkZWYgZ2V0X2ZpbGVuYW1lcyhhcmdzKToKICAgICBmaWxlbmFtZXMgPSBbXQogCi0g ICAgZm9yIGZpbGVuYW1lIGluIGFyZ3M6Ci0gICAgICAgIGJhc2VfZGlyX2luZGV4ID0gZmlsZW5h bWUucmZpbmQoQkFTRV9ESVIpCi0gICAgICAgIGlmIGJhc2VfZGlyX2luZGV4ICE9IC0xOgotICAg ICAgICAgICAgZmlsZW5hbWVzLmFwcGVuZChmaWxlbmFtZVtiYXNlX2Rpcl9pbmRleCArIGxlbihC QVNFX0RJUik6XSkKKyAgICBmb3IgcGF0dGVybiBpbiBhcmdzOgorICAgICAgICBwYXRocyA9IGds b2IuZ2xvYihwYXR0ZXJuKQorICAgICAgICBmb3IgZmlsZW5hbWUgaW4gcGF0aHM6CisgICAgICAg ICAgICBiYXNlX2Rpcl9pbmRleCA9IGZpbGVuYW1lLnJmaW5kKEJBU0VfRElSKQorICAgICAgICAg ICAgaWYgYmFzZV9kaXJfaW5kZXggIT0gLTE6CisgICAgICAgICAgICAgICAgbmFtZSA9IGZpbGVu YW1lW2Jhc2VfZGlyX2luZGV4ICsgbGVuKEJBU0VfRElSKTpdCisJCSMgVGhlIHJlc3VsdCBzaG91 bGQgdXNlIGZvcndhcmQgc2xhc2hlcywgdGh1cyBtYWtlIHN1cmUgYW55IG9zLXNwZWNpZmljCisJ CSMgc2VwYXJhdG9yLCBhZGRlZCBieSB0aGUgZ2xvYi5nbG9iKCkgY2FsbCwgaXMgcHJvcGVybHkg cmVwbGFjZWQKKyAgICAgICAgICAgICAgICBpZiBvcy5zZXAgIT0gJy8nOgorICAgICAgICAgICAg ICAgICAgICBuYW1lID0gbmFtZS5yZXBsYWNlKG9zLnNlcCwgJy8nKQorICAgICAgICAgICAgICAg IGZpbGVuYW1lcy5hcHBlbmQobmFtZSkKICAgICByZXR1cm4gZmlsZW5hbWVzCiAKIAo=