44336 2010-08-20 07:50:43 -0700 [Qt] Find needed forwarding headers for WebKit2 automatically 2010-09-04 18:26:09 -0700 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) PC All RESOLVED FIXED P2 Normal --- 1 kbalazs webkit-unassigned abecsi commit-queue dbates eric hausmann ossy oldest_to_newest 267248 0 kbalazs 2010-08-20 07:50:43 -0700 Our plan is to set the WebKit2 build in default ews and/or buildbot builds. The problem is that our build can break because of a single new included file. As I see this is not true for mac and win (they copy almost all WebCore header to the build dir). I want to use a more sophisticated solution: generate the list of the headers with a script and use the stdout of the script in the DerivedSources.pro. 267254 1 64957 kbalazs 2010-08-20 08:10:55 -0700 Created attachment 64957 Patch 267320 2 kbalazs 2010-08-20 11:50:16 -0700 Eric, could you clue me up about what is wrong with this patch? I have created it with svn-create-patch. Normally I am using git but I would have liked to create the new file with svn copy this time. 267343 3 eric 2010-08-20 12:27:06 -0700 This may be an svn-apply regression. CCing Dan. 267659 4 64957 ariya.hidayat 2010-08-22 01:25:58 -0700 Comment on attachment 64957 Patch Nice one :) LGTM re=me 267705 5 64957 commit-queue 2010-08-22 11:20:43 -0700 Comment on attachment 64957 Patch Rejecting patch 64957 from commit-queue. Failed to run "[u'/Users/eseidel/Projects/CommitQueue/WebKitTools/Scripts/svn-apply', u'--reviewer', u'Ariya Hidayat', u'--force']" exit_code: 255 Failed to find the property value for the SVN property "svn:mergeinfo": " Merged /trunk/WebKitTools/Scripts/find-included-framework-headers:r53455 ". at /Users/eseidel/Projects/CommitQueue/WebKitTools/Scripts/VCSUtils.pm line 1036, <ARGV> line 322. Full output: http://queues.webkit.org/results/3801156 267709 6 eric 2010-08-22 11:47:28 -0700 I think this is an svn-apply regression. Dan Bates is already CC'd. 267710 7 dbates 2010-08-22 12:07:19 -0700 (In reply to comment #5) > (From update of attachment 64957 [details]) > Rejecting patch 64957 from commit-queue. > > Failed to run "[u'/Users/eseidel/Projects/CommitQueue/WebKitTools/Scripts/svn-apply', u'--reviewer', u'Ariya Hidayat', u'--force']" exit_code: 255 > Failed to find the property value for the SVN property "svn:mergeinfo": " Merged /trunk/WebKitTools/Scripts/find-included-framework-headers:r53455 > ". at /Users/eseidel/Projects/CommitQueue/WebKitTools/Scripts/VCSUtils.pm line 1036, <ARGV> line 322. > > Full output: http://queues.webkit.org/results/3801156 This patch contains an svn:mergeinfo property change: [[ Property changes on: WebKitTools/Scripts/enumerate-included-framework-headers ___________________________________________________________________ Added: svn:mergeinfo Merged /trunk/WebKitTools/Scripts/find-included-framework-headers:r53455 ]] I'm not familiar with this property. So far, from reading <http://svnbook.red-bean.com/nightly/en/svn-book.html#svn.branchmerge.basicmerging.mergeinfo> this property is used by SVN to "track changesets—that is, which changes have been merged to which branches". svn-apply/svn-unapply do not support the svn:mergeinfo property. I'm currently trying to better understand svn merge/the svn:mergeinfo property. 267837 8 kbalazs 2010-08-23 04:28:35 -0700 Here is my use case: - creating the new file by "svn copy find-included-framework-headers enumerate-included-framework-headers" - editing the new file - creating the patch by "svn-create-patch", however svn diff has similar output I am not familiar with merge logic of svn but it seems like this copy and edit use case is handled by the merginfo property. I am going to land this with a git diff now if you do not mind. 267884 9 abecsi 2010-08-23 06:59:14 -0700 Committed r65808: <http://trac.webkit.org/changeset/65808> 267885 10 64957 abecsi 2010-08-23 07:01:55 -0700 Comment on attachment 64957 Patch Clearing flags. 274415 11 dbates 2010-09-04 18:26:09 -0700 (In reply to comment #7) > (In reply to comment #5) > > (From update of attachment 64957 [details] [details]) > > Rejecting patch 64957 from commit-queue. > > > > Failed to run "[u'/Users/eseidel/Projects/CommitQueue/WebKitTools/Scripts/svn-apply', u'--reviewer', u'Ariya Hidayat', u'--force']" exit_code: 255 > > Failed to find the property value for the SVN property "svn:mergeinfo": " Merged /trunk/WebKitTools/Scripts/find-included-framework-headers:r53455 > > ". at /Users/eseidel/Projects/CommitQueue/WebKitTools/Scripts/VCSUtils.pm line 1036, <ARGV> line 322. > > > > Full output: http://queues.webkit.org/results/3801156 > > This patch contains an svn:mergeinfo property change: > [[ > Property changes on: WebKitTools/Scripts/enumerate-included-framework-headers > ___________________________________________________________________ > Added: svn:mergeinfo > Merged /trunk/WebKitTools/Scripts/find-included-framework-headers:r53455 > ]] > > I'm not familiar with this property. So far, from reading <http://svnbook.red- > [...] Filed bug #45236 to add support to svn-apply/unapply for recognizing the svn:mergeinfo property and hence process patches that contain it. 64957 2010-08-20 08:10:55 -0700 2010-08-23 07:01:55 -0700 Patch bug-44336-20100820171053.patch text/plain 12849 kbalazs SW5kZXg6IFdlYktpdDIvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdDIvQ2hhbmdlTG9n CShyZXZpc2lvbiA2NTczMSkKKysrIFdlYktpdDIvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTMgQEAKKzIwMTAtMDgtMjAgIEJhbGF6cyBLZWxlbWVuICA8a2JAaW5mLnUtc3pl Z2VkLmh1PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IFtRdF0gRmluZCBuZWVkZWQgZm9yd2FyZGluZyBoZWFkZXJzIGZvciBXZWJLaXQyIGF1dG9tYXRp Y2FsbHkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ0 MzM2CisKKyAgICAgICAgKiBEZXJpdmVkU291cmNlcy5wcm86IFVzZSB0aGUgbmV3IGVudW1lcmF0 ZS1pbmNsdWRlZC1mcmFtZXdvcmstaGVhZGVycyBzY3JpcHQgZm9yIGdlbmVyYXRpbmcKKyAgICAg ICAgdGhlIGxpc3Qgb2YgdGhlIGZvcndhcmRpbmcgaGVhZGVycyB3ZSB3YW50IHRvIGNyZWF0ZS4K KwogMjAxMC0wOC0xOSAgRGF2aWQgS2lsemVyICA8ZGRraWx6ZXJAYXBwbGUuY29tPgogCiAgICAg ICAgIEJVSUxEIEZJWDogRml4IE1hYyBidWlsZCBhZnRlciBXaW5kb3dzIFdlYktpdDIgY2hhbmdl cyBmb3IgTmV0c2NhcGUgUGx1Zy1pbnMKSW5kZXg6IFdlYktpdDIvRGVyaXZlZFNvdXJjZXMucHJv Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFdlYktpdDIvRGVyaXZlZFNvdXJjZXMucHJvCShyZXZpc2lvbiA2NTcz MCkKKysrIFdlYktpdDIvRGVyaXZlZFNvdXJjZXMucHJvCSh3b3JraW5nIGNvcHkpCkBAIC0zLDEw MyArMyw5IEBAIFRBUkdFVCA9IGR1bW15CiAKIENPTkZJRyAtPSBkZWJ1Z19hbmRfcmVsZWFzZQog Ci1XRUJDT1JFX0hFQURFUlNfRk9SX1dFQktJVDIgKz0gXAotICAgIGJpbmRpbmdzL2pzL0RPTVdy YXBwZXJXb3JsZC5oIFwKLSAgICBiaW5kaW5ncy9qcy9HQ0NvbnRyb2xsZXIuaCBcCi0gICAgYmlu ZGluZ3MvanMvSlNQbHVnaW5FbGVtZW50RnVuY3Rpb25zLmggXAotICAgIGJpbmRpbmdzL2pzL1Nj cmlwdENvbnRyb2xsZXIuaCBcCi0gICAgYnJpZGdlL0lkZW50aWZpZXJSZXAuaCBcCi0gICAgYnJp ZGdlL25wcnVudGltZV9pbnRlcm5hbC5oIFwKLSAgICBjb25maWcuaCBcCi0gICAgY3NzL0NTU0Nv bXB1dGVkU3R5bGVEZWNsYXJhdGlvbi5oIFwKLSAgICBkb20vRXZlbnQuaCBcCi0gICAgZG9tL0tl eWJvYXJkRXZlbnQuaCBcCi0gICAgZG9tL05vZGUuaCBcCi0gICAgZG9tL1JhbmdlLmggXAotICAg IGRvbS9Vc2VyVHlwaW5nR2VzdHVyZUluZGljYXRvci5oIFwKLSAgICBlZGl0aW5nL0VkaXRDb21t YW5kLmggXAotICAgIGVkaXRpbmcvRWRpdG9ySW5zZXJ0QWN0aW9uLmggXAotICAgIGVkaXRpbmcv VGV4dEFmZmluaXR5LmggXAotICAgIGhpc3RvcnkvQmFja0ZvcndhcmRDb250cm9sbGVyQ2xpZW50 LmggXAotICAgIGhpc3RvcnkvQmFja0ZvcndhcmRMaXN0LmggXAotICAgIGhpc3RvcnkvSGlzdG9y eUl0ZW0uaCBcCi0gICAgaHRtbC9IVE1MSW5wdXRFbGVtZW50LmggXAotICAgIGh0bWwvSFRNTEZv cm1FbGVtZW50LmggXAotICAgIGh0bWwvSFRNTEZyYW1lT3duZXJFbGVtZW50LmggXAotICAgIGh0 bWwvSFRNTFBsdWdJbkVsZW1lbnQuaCBcCi0gICAgaHRtbC9IVE1MVGV4dEFyZWFFbGVtZW50Lmgg XAotICAgIGluc3BlY3Rvci9JbnNwZWN0b3JDbGllbnQuaCBcCi0gICAgbG9hZGVyL2FwcGNhY2hl L0FwcGxpY2F0aW9uQ2FjaGVTdG9yYWdlLmggXAotICAgIGxvYWRlci9DYWNoZS5oIFwKLSAgICBs b2FkZXIvRG9jdW1lbnRMb2FkZXIuaCBcCi0gICAgbG9hZGVyL0Zvcm1TdGF0ZS5oIFwKLSAgICBs b2FkZXIvRnJhbWVMb2FkZXJDbGllbnQuaCBcCi0gICAgbG9hZGVyL0ZyYW1lTG9hZGVyLmggXAot ICAgIGxvYWRlci9GcmFtZUxvYWRlclR5cGVzLmggXAotICAgIGxvYWRlci9OZXRzY2FwZVBsdWdJ blN0cmVhbUxvYWRlci5oIFwKLSAgICBsb2FkZXIvUG9saWN5Q2hlY2tlci5oIFwKLSAgICBsb2Fk ZXIvUHJvZ3Jlc3NUcmFja2VyLmggXAotICAgIHBhZ2UvYW5pbWF0aW9uL0FuaW1hdGlvbkNvbnRy b2xsZXIuaCBcCi0gICAgcGFnZS9DaHJvbWVDbGllbnQuaCBcCi0gICAgcGFnZS9DaHJvbWUuaCBc Ci0gICAgcGFnZS9Db250ZXh0TWVudUNsaWVudC5oIFwKLSAgICBwYWdlL0RyYWdDbGllbnQuaCBc Ci0gICAgcGFnZS9FZGl0b3JDbGllbnQuaCBcCi0gICAgcGFnZS9FdmVudEhhbmRsZXIuaCBcCi0g ICAgcGFnZS9Gb2N1c0NvbnRyb2xsZXIuaCBcCi0gICAgcGFnZS9GcmFtZS5oIFwKLSAgICBwYWdl L0ZyYW1lTG9hZFJlcXVlc3QuaCBcCi0gICAgcGFnZS9GcmFtZVZpZXcuaCBcCi0gICAgcGFnZS9N ZWRpYUNhblN0YXJ0TGlzdGVuZXIuaCBcCi0gICAgcGFnZS9QYWdlR3JvdXAuaCBcCi0gICAgcGFn ZS9QYWdlLmggXAotICAgIHBhZ2UvU2VjdXJpdHlPcmlnaW4uaCBcCi0gICAgcGFnZS9TZXR0aW5n cy5oIFwKLSAgICBwYWdlL1dpbmRvd0ZlYXR1cmVzLmggXAotICAgIHBhZ2UvWm9vbU1vZGUuaCBc Ci0gICAgcGxhdGZvcm0vQ3Vyc29yLmggXAotICAgIHBsYXRmb3JtL0ZpbGVDaG9vc2VyLmggXAot ICAgIHBsYXRmb3JtL0ZpbGVTeXN0ZW0uaCBcCi0gICAgcGxhdGZvcm0vZ3JhcGhpY3MvRmxvYXRS ZWN0LmggXAotICAgIHBsYXRmb3JtL2dyYXBoaWNzL0ZvbnRSZW5kZXJpbmdNb2RlLmggXAotICAg IHBsYXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNzQ29udGV4dC5oIFwKLSAgICBwbGF0Zm9ybS9ncmFw aGljcy9HcmFwaGljc0xheWVyQ2xpZW50LmggXAotICAgIHBsYXRmb3JtL2dyYXBoaWNzL0dyYXBo aWNzTGF5ZXIuaCBcCi0gICAgcGxhdGZvcm0vZ3JhcGhpY3MvSW50UG9pbnQuaCBcCi0gICAgcGxh dGZvcm0vZ3JhcGhpY3MvSW50UmVjdC5oIFwKLSAgICBwbGF0Zm9ybS9ncmFwaGljcy9JbnRTaXpl LmggXAotICAgIHBsYXRmb3JtL0hvc3RXaW5kb3cuaCBcCi0gICAgcGxhdGZvcm0vS1VSTC5oIFwK LSAgICBwbGF0Zm9ybS9MaW5rSGFzaC5oIFwKLSAgICBwbGF0Zm9ybS9Mb2NhbGl6YXRpb25TdHJh dGVneS5oIFwKLSAgICBwbGF0Zm9ybS9NSU1FVHlwZVJlZ2lzdHJ5LmggXAotICAgIHBsYXRmb3Jt L25ldHdvcmsvYW5kcm9pZC9SZXNvdXJjZUVycm9yLmggXAotICAgIHBsYXRmb3JtL25ldHdvcmsv YW5kcm9pZC9SZXNvdXJjZVJlcXVlc3QuaCBcCi0gICAgcGxhdGZvcm0vbmV0d29yay9hbmRyb2lk L1Jlc291cmNlUmVzcG9uc2UuaCBcCi0gICAgcGxhdGZvcm0vbmV0d29yay9IVFRQSGVhZGVyTWFw LmggXAotICAgIHBsYXRmb3JtL1BsYXRmb3JtS2V5Ym9hcmRFdmVudC5oIFwKLSAgICBwbGF0Zm9y bS9QbGF0Zm9ybU1vdXNlRXZlbnQuaCBcCi0gICAgcGxhdGZvcm0vUGxhdGZvcm1TdHJhdGVnaWVz LmggXAotICAgIHBsYXRmb3JtL1BsYXRmb3JtV2hlZWxFdmVudC5oIFwKLSAgICBwbGF0Zm9ybS9Q b3B1cE1lbnUuaCBcCi0gICAgcGxhdGZvcm0vUG9wdXBNZW51Q2xpZW50LmggXAotICAgIHBsYXRm b3JtL1NjaGVtZVJlZ2lzdHJ5LmggXAotICAgIHBsYXRmb3JtL1Njcm9sbFZpZXcuaCBcCi0gICAg cGxhdGZvcm0vU2VhcmNoUG9wdXBNZW51LmggXAotICAgIHBsYXRmb3JtL1NoYXJlZEJ1ZmZlci5o IFwKLSAgICBwbGF0Zm9ybS90ZXh0L1BsYXRmb3JtU3RyaW5nLmggXAotICAgIHBsYXRmb3JtL1dp ZGdldC5oIFwKLSAgICBwbGF0Zm9ybS93aW4vQml0bWFwSW5mby5oIFwKLSAgICBwbGF0Zm9ybS9X aW5kb3dzS2V5Ym9hcmRDb2Rlcy5oIFwKLSAgICBwbGF0Zm9ybS93aW4vV2ViQ29yZUluc3RhbmNl SGFuZGxlLmggXAotICAgIHBsYXRmb3JtL3dpbi9XaW5kb3dNZXNzYWdlQnJvYWRjYXN0ZXIuaCBc Ci0gICAgcGxhdGZvcm0vd2luL1dpbmRvd01lc3NhZ2VMaXN0ZW5lci5oIFwKLSAgICBwbHVnaW5z L25wZnVuY3Rpb25zLmggXAotICAgIHBsdWdpbnMvUGx1Z2luRGF0YS5oIFwKLSAgICBwbHVnaW5z L1BsdWdpblN0cmF0ZWd5LmggXAotICAgIHBsdWdpbnMvUGx1Z2luVmlld0Jhc2UuaCBcCi0gICAg cmVuZGVyaW5nL1JlbmRlckxheWVyLmggXAotICAgIHJlbmRlcmluZy9SZW5kZXJUcmVlQXNUZXh0 LmggXAorV0VCQ09SRV9IRUFERVJTX0ZPUl9XRUJLSVQyID0gJCRzeXN0ZW0oLi4vV2ViS2l0VG9v bHMvU2NyaXB0cy9lbnVtZXJhdGUtaW5jbHVkZWQtZnJhbWV3b3JrLWhlYWRlcnMgV2ViQ29yZSkK K0pTQ19IRUFERVJTX0ZPUl9XRUJLSVQyID0gJCRzeXN0ZW0oLi4vV2ViS2l0VG9vbHMvU2NyaXB0 cy9lbnVtZXJhdGUtaW5jbHVkZWQtZnJhbWV3b3JrLWhlYWRlcnMgSmF2YVNjcmlwdENvcmUpCitX RUJLSVQyX0FQSV9IRUFERVJTID0gJCRzeXN0ZW0oLi4vV2ViS2l0VG9vbHMvU2NyaXB0cy9lbnVt ZXJhdGUtaW5jbHVkZWQtZnJhbWV3b3JrLWhlYWRlcnMgV2ViS2l0MikKIAogV0VCQ09SRV9HRU5F UkFURURfSEVBREVSU19GT1JfV0VCS0lUMiArPSBcCiAgICAgJCRPVVRQVVRfRElSL1dlYkNvcmUv Z2VuZXJhdGVkL0hUTUxOYW1lcy5oIFwKQEAgLTEwOCw0NCArMTQsNiBAQCBXRUJDT1JFX0dFTkVS QVRFRF9IRUFERVJTX0ZPUl9XRUJLSVQyICs9CiAgICAgJCRPVVRQVVRfRElSL1dlYkNvcmUvZ2Vu ZXJhdGVkL0pTRWxlbWVudC5oIFwKICAgICAkJE9VVFBVVF9ESVIvV2ViQ29yZS9nZW5lcmF0ZWQv SlNIVE1MRWxlbWVudC5oIFwKIAotSlNDX0hFQURFUlNfRk9SX1dFQktJVDIgKz0gXAotICAgIEFQ SS9BUElDYXN0LmggXAotICAgIEFQSS9KYXZhU2NyaXB0LmggXAotICAgIEFQSS9KU0Jhc2UuaCBc Ci0gICAgcnVudGltZS9FcnJvci5oIFwKLSAgICBydW50aW1lL0Z1bmN0aW9uUHJvdG90eXBlLmgg XAotICAgIHJ1bnRpbWUvSW50ZXJuYWxGdW5jdGlvbi5oIFwKLSAgICBydW50aW1lL0pTR2xvYmFs T2JqZWN0LmggXAotICAgIHJ1bnRpbWUvSlNMb2NrLmggXAotICAgIHJ1bnRpbWUvSlNPYmplY3Qu aCBcCi0gICAgcnVudGltZS9KU09iamVjdFdpdGhHbG9iYWxPYmplY3QuaCBcCi0gICAgcnVudGlt ZS9PYmplY3RQcm90b3R5cGUuaCBcCi0gICAgcnVudGltZS9Qcm90ZWN0LmggXAotICAgIHBhcnNl ci9Tb3VyY2VDb2RlLmggXAotICAgIHd0Zi9QbGF0Zm9ybS5oIFwKLSAgICB3dGYvdGV4dC9TdHJp bmdIYXNoLmggXAotCi1XRUJLSVQyX0FQSV9IRUFERVJTICs9IFwKLSAgICBVSVByb2Nlc3MvQVBJ L0MvV0tBUElDYXN0LmggXAotICAgIFVJUHJvY2Vzcy9BUEkvQy9XS0Jhc2UuaCBcCi0gICAgVUlQ cm9jZXNzL0FQSS9DL1dLQ29udGV4dC5oIFwKLSAgICBVSVByb2Nlc3MvQVBJL0MvV0tDb250ZXh0 UHJpdmF0ZS5oIFwKLSAgICBVSVByb2Nlc3MvQVBJL0MvV0tGcmFtZS5oIFwKLSAgICBVSVByb2Nl c3MvQVBJL0MvV0tGcmFtZVBvbGljeUxpc3RlbmVyLmggXAotICAgIFVJUHJvY2Vzcy9BUEkvQy9X S05hdmlnYXRpb25EYXRhLmggXAotICAgIFVJUHJvY2Vzcy9BUEkvQy9XS1BhZ2UuaCBcCi0gICAg VUlQcm9jZXNzL0FQSS9DL1dLUGFnZU5hbWVzcGFjZS5oIFwKLSAgICBVSVByb2Nlc3MvQVBJL0Mv V0tQYWdlUHJpdmF0ZS5oIFwKLSAgICBVSVByb2Nlc3MvQVBJL0MvV0tQcmVmZXJlbmNlcy5oIFwK LSAgICBVSVByb2Nlc3MvQVBJL0MvV0tTdHJpbmcuaCBcCi0gICAgVUlQcm9jZXNzL0FQSS9DL1dL VVJMLmggXAotICAgIFVJUHJvY2Vzcy9BUEkvQy9XZWJLaXQyLmggXAotICAgIFVJUHJvY2Vzcy9B UEkvY3BwL1dLUmV0YWluUHRyLmggXAotICAgIFVJUHJvY2Vzcy9BUEkvcXQvcWdyYXBoaWNzd2t2 aWV3LmggXAotICAgIFVJUHJvY2Vzcy9BUEkvcXQvcXdrcGFnZS5oIFwKLSAgICBXZWJQcm9jZXNz L0luamVjdGVkQnVuZGxlL0FQSS9jL1dLQnVuZGxlQmFzZS5oIFwKLSAgICBXZWJQcm9jZXNzL0lu amVjdGVkQnVuZGxlL0FQSS9jL1dLQnVuZGxlUGFnZS5oIFwKLQogCiBRVU9URSA9ICIiCiBET1VC TEVfRVNDQVBFRF9RVU9URSA9ICIiCkluZGV4OiBXZWJLaXRUb29scy9DaGFuZ2VMb2cKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCShyZXZpc2lvbiA2NTczMSkKKysrIFdlYktp dFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE3IEBACisyMDEwLTA4 LTIwICBCYWxhenMgS2VsZW1lbiAgPGtiQGluZi51LXN6ZWdlZC5odT4KKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbUXRdIEZpbmQgbmVlZGVkIGZvcndh cmRpbmcgaGVhZGVycyBmb3IgV2ViS2l0MiBhdXRvbWF0aWNhbGx5CisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00NDMzNgorCisgICAgICAgICogTWluaUJy b3dzZXIvcXQvQnJvd3NlcldpbmRvdy5jcHA6IFVzZSBub3JtYWwgKG5vdCBmcmFtZXdvcmsgc3R5 bGUpIGluY2x1ZGVzIGhlcmUuCisgICAgICAgIFRoZSBuZXcgc2NyaXB0IGRvZXMgbm90IHNhdGlz ZmllcyB0aGUgbmVlZHMgb2YgdGhpcyBmaWxlIGhvd2V2ZXIgdXNpbmcgbm9ybWFsIGluY2x1ZGVz IGlzIGdlbmVyYWxseSBiZXR0ZXIgaGVyZS4KKyAgICAgICAgKiBNaW5pQnJvd3Nlci9xdC9NaW5p QnJvd3Nlci5wcm86IEFkZGVkIGluY2x1ZGUgcGF0aHMuCisgICAgICAgICogU2NyaXB0cy9lbnVt ZXJhdGUtaW5jbHVkZWQtZnJhbWV3b3JrLWhlYWRlcnM6IENvcGllZCBmcm9tIFdlYktpdFRvb2xz L1NjcmlwdHMvZmluZC1pbmNsdWRlZC1mcmFtZXdvcmstaGVhZGVycy4KKyAgICAgICAgRW51bWVy YXRlcyBoZWFkZXJzIGluY2x1ZGVkIGZyb20gdGhlIGdpdmVuIGZyYW1ld29ya3MgYnkgZmlsZXMg aW4gdGhlIGN1cnJlbnQgZGlyZWN0b3J5IChhbmQgc3ViZGlyZWN0b3JpZXMpLgorICAgICAgICBJ biB0aGUgZnV0dXJlIHRoaXMgbmVlZCB0byBiZSByZXdyaXRlZCBpbiBwZXJsIGZvciBiZWluZyBh YmxlIHRvIHVzZSBvbiBXaW5kb3dzLgorCiAyMDEwLTA4LTE5ICBEYXZpZCBLaWx6ZXIgIDxkZGtp bHplckBhcHBsZS5jb20+CiAKICAgICAgICAgQlVJTEQgRklYOiBGaXggTWFjIGJ1aWxkIGFmdGVy IFdpbmRvd3MgV2ViS2l0MiBjaGFuZ2VzIGZvciBOZXRzY2FwZSBQbHVnLWlucwpJbmRleDogV2Vi S2l0VG9vbHMvTWluaUJyb3dzZXIvcXQvQnJvd3NlcldpbmRvdy5jcHAKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g V2ViS2l0VG9vbHMvTWluaUJyb3dzZXIvcXQvQnJvd3NlcldpbmRvdy5jcHAJKHJldmlzaW9uIDY1 NzMwKQorKysgV2ViS2l0VG9vbHMvTWluaUJyb3dzZXIvcXQvQnJvd3NlcldpbmRvdy5jcHAJKHdv cmtpbmcgY29weSkKQEAgLTI3LDggKzI3LDggQEAKICAqLwogCiAjaW5jbHVkZSAiQnJvd3Nlcldp bmRvdy5oIgotI2luY2x1ZGUgPFdlYktpdDIvV0tQYWdlTmFtZXNwYWNlLmg+Ci0jaW5jbHVkZSA8 V2ViS2l0Mi9xd2twYWdlLmg+CisjaW5jbHVkZSAiV0tQYWdlTmFtZXNwYWNlLmgiCisjaW5jbHVk ZSAicXdrcGFnZS5oIgogCiBzdGF0aWMgUVdLUGFnZSogY3JlYXRlTmV3UGFnZShRV0tQYWdlKiBw YWdlKQogewpJbmRleDogV2ViS2l0VG9vbHMvTWluaUJyb3dzZXIvcXQvTWluaUJyb3dzZXIucHJv Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFdlYktpdFRvb2xzL01pbmlCcm93c2VyL3F0L01pbmlCcm93c2VyLnBy bwkocmV2aXNpb24gNjU3MzApCisrKyBXZWJLaXRUb29scy9NaW5pQnJvd3Nlci9xdC9NaW5pQnJv d3Nlci5wcm8JKHdvcmtpbmcgY29weSkKQEAgLTEzLDcgKzEzLDExIEBAIENPTkZJRyArPSB1aXRv b2xzCiBpc0VtcHR5KE9VVFBVVF9ESVIpOiBPVVRQVVRfRElSID0gLi4vLi4vLi4KIGluY2x1ZGUo Li4vLi4vLi4vV2ViS2l0LnByaSkKIAotSU5DTFVERVBBVEggKz0gJCRPVVRQVVRfRElSL2luY2x1 ZGUKK0lOQ0xVREVQQVRIICs9IFwKKyAgICAkJFBXRC8uLi8uLi8uLi9XZWJLaXQyL1VJUHJvY2Vz cy9BUEkvQyBcCisgICAgJCRQV0QvLi4vLi4vLi4vV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0IFwK KyAgICAkJE9VVFBVVF9ESVIvaW5jbHVkZQorCiAKIERFU1RESVIgPSAkJE9VVFBVVF9ESVIvYmlu CiAhQ09ORklHKHN0YW5kYWxvbmVfcGFja2FnZSk6IENPTkZJRyAtPSBhcHBfYnVuZGxlCkluZGV4 OiBXZWJLaXRUb29scy9TY3JpcHRzL2VudW1lcmF0ZS1pbmNsdWRlZC1mcmFtZXdvcmstaGVhZGVy cwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBXZWJLaXRUb29scy9TY3JpcHRzL2VudW1lcmF0ZS1pbmNsdWRlZC1m cmFtZXdvcmstaGVhZGVycwkocmV2aXNpb24gNjU3MzApCShmcm9tIFdlYktpdFRvb2xzL1Njcmlw dHMvZmluZC1pbmNsdWRlZC1mcmFtZXdvcmstaGVhZGVyczo2NTczMCkKKysrIFdlYktpdFRvb2xz L1NjcmlwdHMvZW51bWVyYXRlLWluY2x1ZGVkLWZyYW1ld29yay1oZWFkZXJzCSh3b3JraW5nIGNv cHkpCkBAIC0wLDAgKzEsMzAgQEAKKyMhL2Jpbi9zaAorIyBDb3B5cmlnaHQgKEMpIDIwMDcsIDIw MDgsIDIwMDksIDIwMTAgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorIworIyBSZWRp c3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdp dGhvdXQKKyMgbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZv bGxvd2luZyBjb25kaXRpb25zCisjIGFyZSBtZXQ6CisjIDEuICBSZWRpc3RyaWJ1dGlvbnMgb2Yg c291cmNlIGNvZGUgbXVzdCByZXRhaW4gdGhlIGFib3ZlIGNvcHlyaWdodAorIyAgICAgbm90aWNl LCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyLgor IyAyLiAgUmVkaXN0cmlidXRpb25zIGluIGJpbmFyeSBmb3JtIG11c3QgcmVwcm9kdWNlIHRoZSBh Ym92ZSBjb3B5cmlnaHQKKyMgICAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5k IHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lciBpbiB0aGUKKyMgICAgIGRvY3VtZW50YXRpb24gYW5k L29yIG90aGVyIG1hdGVyaWFscyBwcm92aWRlZCB3aXRoIHRoZSBkaXN0cmlidXRpb24uCisjCisj IFRISVMgU09GVFdBUkUgSVMgUFJPVklERUQgQlkgQVBQTEUgSU5DLiBBTkQgSVRTIENPTlRSSUJV VE9SUyBgYEFTIElTJycgQU5EIEFOWQorIyBFWFBSRVNTIE9SIElNUExJRUQgV0FSUkFOVElFUywg SU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sIFRIRSBJTVBMSUVECisjIFdBUlJBTlRJRVMg T0YgTUVSQ0hBTlRBQklMSVRZIEFORCBGSVRORVNTIEZPUiBBIFBBUlRJQ1VMQVIgUFVSUE9TRSBB UkUKKyMgRElTQ0xBSU1FRC4gSU4gTk8gRVZFTlQgU0hBTEwgQVBQTEUgSU5DLiBPUiBJVFMgQ09O VFJJQlVUT1JTIEJFIExJQUJMRSBGT1IgQU5ZCisjIERJUkVDVCwgSU5ESVJFQ1QsIElOQ0lERU5U QUwsIFNQRUNJQUwsIEVYRU1QTEFSWSwgT1IgQ09OU0VRVUVOVElBTCBEQU1BR0VTCisjIChJTkNM VURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywgUFJPQ1VSRU1FTlQgT0YgU1VCU1RJVFVURSBHT09E UyBPUiBTRVJWSUNFUzsKKyMgTE9TUyBPRiBVU0UsIERBVEEsIE9SIFBST0ZJVFM7IE9SIEJVU0lO RVNTIElOVEVSUlVQVElPTikgSE9XRVZFUiBDQVVTRUQgQU5EIE9OCisjIEFOWSBUSEVPUlkgT0Yg TElBQklMSVRZLCBXSEVUSEVSIElOIENPTlRSQUNULCBTVFJJQ1QgTElBQklMSVRZLCBPUiBUT1JU CisjIChJTkNMVURJTkcgTkVHTElHRU5DRSBPUiBPVEhFUldJU0UpIEFSSVNJTkcgSU4gQU5ZIFdB WSBPVVQgT0YgVEhFIFVTRSBPRiBUSElTCisjIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0Yg VEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgorIworIyBBIHNjcmlwdCB0byBmaW5kIGhl YWRlcnMgaW5jbHVkZWQgZnJvbSB0aGUgZ2l2ZW4gZnJhbWV3b3JrcyBieSBmaWxlcyBpbiB0aGUK KyMgY3VycmVudCBkaXJlY3RvcnkgKGFuZCBzdWJkaXJlY3RvcmllcykuCisKK2ZvciBmcmFtZXdv cmsgaW4gJCo7IGRvCisgICAgZWNobyAtZSAiXG4kZnJhbWV3b3JrXG49PT09PT09PT09PT09PT09 PT0iCisgICAgZmluZCAuIFwoIC1uYW1lICcqLmNwcCcgLW8gLW5hbWUgJyouaCcgLW8gLW5hbWUg JyoubScgLW8gLW5hbWUgJyoubW0nIFwpIC1leGVjIGdyZXAgIjwkZnJhbWV3b3JrLyIge30gJzsn IHwgc2VkIC1lICdzfC4qL1woLipcLmhcKS4qfFwxfCcgfCBzb3J0IC11Citkb25lCkluZGV4OiBX ZWJLaXRUb29scy9TY3JpcHRzL2VudW1lcmF0ZS1pbmNsdWRlZC1mcmFtZXdvcmstaGVhZGVycwo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBXZWJLaXRUb29scy9TY3JpcHRzL2VudW1lcmF0ZS1pbmNsdWRlZC1mcmFt ZXdvcmstaGVhZGVycwkocmV2aXNpb24gNjU3MzApCisrKyBXZWJLaXRUb29scy9TY3JpcHRzL2Vu dW1lcmF0ZS1pbmNsdWRlZC1mcmFtZXdvcmstaGVhZGVycwkod29ya2luZyBjb3B5KQpAQCAtMSw1 ICsxLDYgQEAKICMhL2Jpbi9zaAogIyBDb3B5cmlnaHQgKEMpIDIwMDcsIDIwMDgsIDIwMDksIDIw MTAgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorIyBDb3B5cmlnaHQgKEMpIDIwMTAg VW5pdmVyc2l0eSBvZiBTemVnZWQuCiAjCiAjIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291 cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAogIyBtb2RpZmljYXRpb24sIGFy ZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKQEAgLTIx LDEwICsyMiwzOSBAQAogIyAoSU5DTFVESU5HIE5FR0xJR0VOQ0UgT1IgT1RIRVJXSVNFKSBBUklT SU5HIElOIEFOWSBXQVkgT1VUIE9GIFRIRSBVU0UgT0YgVEhJUwogIyBTT0ZUV0FSRSwgRVZFTiBJ RiBBRFZJU0VEIE9GIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KICMKLSMgQSBzY3Jp cHQgdG8gZmluZCBoZWFkZXJzIGluY2x1ZGVkIGZyb20gdGhlIGdpdmVuIGZyYW1ld29ya3MgYnkg ZmlsZXMgaW4gdGhlCisjIEEgc2NyaXB0IHRvIGZpbmQgYW5kIGVudW1lcmF0ZSBoZWFkZXJzIGlu Y2x1ZGVkIGZyb20gdGhlIGdpdmVuIGZyYW1ld29ya3MgYnkgZmlsZXMgaW4gdGhlCiAjIGN1cnJl bnQgZGlyZWN0b3J5IChhbmQgc3ViZGlyZWN0b3JpZXMpLgogCisjIEZJWE1FOiBDdXJyZW50bHkg b25seSB3b3JrcyBmb3IgcXQuCisjIEZJWE1FOiBzaG91bGQgYmUgcmV3cml0ZWQgaW4gcGVybCBm b3IgYmVpbmcgYWJsZSB0byB1c2Ugb24gV2luZG93cy4KKworcGxhdGZvcm1fcHJlZml4ZXM9YW5k cm9pZC9cfGJyZXcvXHxjZi9cfGNocm9taXVtL1x8Y3VybFx8ZWZsL1x8Z3RrL1x8aGFpa3UvXHxt YWMvXHxzb3VwXHx2OFx8d2luL1x8d3gvCisKIGZvciBmcmFtZXdvcmsgaW4gJCo7IGRvCi0gICAg ZWNobyAtZSAiXG4kZnJhbWV3b3JrXG49PT09PT09PT09PT09PT09PT0iCi0gICAgZmluZCAuIFwo IC1uYW1lICcqLmNwcCcgLW8gLW5hbWUgJyouaCcgLW8gLW5hbWUgJyoubScgLW8gLW5hbWUgJyou bW0nIFwpIC1leGVjIGdyZXAgIjwkZnJhbWV3b3JrLyIge30gJzsnIHwgc2VkIC1lICdzfC4qL1wo LipcLmhcKS4qfFwxfCcgfCBzb3J0IC11CisgICAgaGVhZGVycz1gZmluZCAuIFwoIC1uYW1lICcq LmNwcCcgLW8gLW5hbWUgJyouaCcgXCkgLWV4ZWMgZ3JlcCAiPCRmcmFtZXdvcmsvIiB7fSAnOycg fCBzZWQgLWUgJ3N8LiovXCguKlwuaFwpLip8XDF8JyB8IHNvcnQgLXVgCisKKyAgICBmb3IgaGVh ZGVyIGluICRoZWFkZXJzCisgICAgZG8KKyAgICAgICAgaGVhZGVyX3BhdGhzPWBmaW5kIC4uLyRm cmFtZXdvcmsgLW5hbWUgJGhlYWRlciB8IHNlZCAicy8uLlwvJGZyYW1ld29ya1wvLy9nImAKKwor ICAgICAgICBpZiB0ZXN0IGBlY2hvICRoZWFkZXJfcGF0aHMgfCB3YyAtd2AgLWVxIDEKKyAgICAg ICAgdGhlbgorICAgICAgICAgICAgaGVhZGVyX3BhdGg9JGhlYWRlcl9wYXRocworICAgICAgICAg ICAgaWYgdGVzdCBgZWNobyAkaGVhZGVyX3BhdGggfCBncmVwIC1jIC1FICRwbGF0Zm9ybV9wcmVm aXhlc2AgLW5lIDAKKyAgICAgICAgICAgIHRoZW4KKyAgICAgICAgICAgICAgICBjb250aW51ZQor ICAgICAgICAgICAgZmkKKyAgICAgICAgZWxzZQorICAgICAgICAgICAgZm9yIHBhdGggaW4gJGhl YWRlcl9wYXRocworICAgICAgICAgICAgZG8KKyAgICAgICAgICAgICAgICBpZiB0ZXN0IGBlY2hv ICRwYXRoIHwgZ3JlcCAtYyAtRSAkcGxhdGZvcm1fcHJlZml4ZXNgIC1lcSAwCisgICAgICAgICAg ICAgICAgdGhlbgorICAgICAgICAgICAgICAgICAgICBoZWFkZXJfcGF0aD0kcGF0aAorICAgICAg ICAgICAgICAgICAgICBicmVhaworICAgICAgICAgICAgICAgIGZpCisgICAgICAgICAgICBkb25l CisgICAgICAgIGZpCisKKyAgICAgICAgZWNobyAtbiAiJGhlYWRlcl9wYXRoICIKKyAgICBkb25l CiBkb25lCgpQcm9wZXJ0eSBjaGFuZ2VzIG9uOiBXZWJLaXRUb29scy9TY3JpcHRzL2VudW1lcmF0 ZS1pbmNsdWRlZC1mcmFtZXdvcmstaGVhZGVycwpfX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkFkZGVkOiBzdm46bWVyZ2Vp bmZvCiAgIE1lcmdlZCAvdHJ1bmsvV2ViS2l0VG9vbHMvU2NyaXB0cy9maW5kLWluY2x1ZGVkLWZy YW1ld29yay1oZWFkZXJzOnI1MzQ1NQoK