28721 2009-08-25 15:25:42 -0700 WebKit needs a git-merge-changelogs 2010-02-18 07:56:19 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 34206 1 eric vestbo aroben cjerdonek ddkilzer evan jchaffraix levin vestbo oldest_to_newest 142709 0 eric 2009-08-25 15:25:42 -0700 WebKit needs a git-merge-changelogs Git has the ability to specify custom merge drivers on a per-file basis. See "man gitattributes" or http://www.kernel.org/pub/software/scm/git/docs/gitattributes.html for more information. the gnu folks over at gnulib have already written a git-merge-changelog: http://cyberelk.net/tim/2008/05/29/git-merge-changelog/ Sadly, it's in C, and has a bunch of dependencies on gnu stuff. It's also GPL'd. Another kink is that although it's possible to edit the root ".gitattributes" file and check in a mapping from "ChangeLog" to a specific merge driver, merge drivers have to be defined in a git config file, which must be either in .git/config or ~/.gitconfig. :( So we'd have to have an installer to set up using a git-merge-changelog script if we wrote one. That should be easy since "git config" already handles reading/writing from .git/config files nicely. I looked briefly at writing this today. The merge driver is passed paths to 3 temp files. 1. previous version 2. other branch version. 3. this branch version. Maybe one of the other WebKit git users will get further than I did. 185008 1 vestbo 2010-01-27 01:58:47 -0800 Relates to bug 34206 185392 2 vestbo 2010-01-28 02:08:27 -0800 I'll start looking at this now, if anyone has made any progress please post patches here. I don't think the bootstrapping-part would be too much trouble, ie telling people do do 'git config merge.changelog.name Foo' or running an install-script, since most of our tools are already wrapper-scripts or helper-scripts that require knowledge about their existence and how to use them, ie they are not "automatic" in any way. 185393 3 cjerdonek 2010-01-28 02:11:22 -0800 (In reply to comment #2) > I'll start looking at this now, if anyone has made any progress please post > patches here. > > I don't think the bootstrapping-part would be too much trouble, ie telling > people do do 'git config merge.changelog.name Foo' or running an > install-script, since most of our tools are already wrapper-scripts or > helper-scripts that require knowledge about their existence and how to use > them, ie they are not "automatic" in any way. Thanks, Tor! FYI, we are already telling people to do a few "git config" statements-- http://trac.webkit.org/wiki/UsingGitWithWebKit#WebKitScriptsupportforGit so I'm sure that adding another one or two won't hurt -- as they are already familiar with doing that: 186000 4 ddkilzer 2010-01-29 16:29:24 -0800 (In reply to comment #2) > I'll start looking at this now, if anyone has made any progress please post > patches here. I thought I had a local branch with some related changes, but it seems that I do not. Sorry. 188121 5 48214 vestbo 2010-02-05 02:14:45 -0800 Created attachment 48214 first try First try, will run this locally for a few days to test before r? 188154 6 vestbo 2010-02-05 05:21:47 -0800 Apparently we don't need all those .gitattributes, just one root level file, I'll fix that in a new patch 188161 7 48227 vestbo 2010-02-05 05:41:01 -0800 Created attachment 48227 without all those gitattributes and changelogs 190932 8 48871 vestbo 2010-02-17 01:47:57 -0800 Created attachment 48871 Patch 190933 9 vestbo 2010-02-17 01:50:11 -0800 Note that if the user has not defined merge.changelog.driver, git is going to ignore the .gitattribute instruction and just try to merge it itself, so there won't be any "missing driver" messages (as far as I know). 191071 10 48871 eric 2010-02-17 10:15:55 -0800 Comment on attachment 48871 Patch LGTM. 191600 11 vestbo 2010-02-18 07:52:16 -0800 Landed in r54960 191602 12 vestbo 2010-02-18 07:56:19 -0800 Added an entry to https://trac.webkit.org/wiki/UsingGitWithWebKit about this feature too. 48214 2010-02-05 02:14:45 -0800 2010-02-05 05:41:01 -0800 first try 0001-Teach-resolve-ChangeLogs-to-act-as-a-merge-driver-fo.patch text/plain 28475 vestbo RnJvbSAxODc5NTNjNTA4MGZlNGU4MzJiM2U5ZWM0MDc1MzI1ZGFkODYyNzgxIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiA9P1VURi04P3E/VG9yPTIwQXJuZT0yMFZlc3RiPUMzPUI4Pz0g PHRvci5hcm5lLnZlc3Rib0Bub2tpYS5jb20+CkRhdGU6IEZyaSwgNSBGZWIgMjAxMCAxMTowNDoz NCArMDEwMApTdWJqZWN0OiBbUEFUQ0hdIFRlYWNoIHJlc29sdmUtQ2hhbmdlTG9ncyB0byBhY3Qg YXMgYSBtZXJnZS1kcml2ZXIgZm9yIEdpdAoKUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCgpU aGUgZHJpdmVyIGFsd2F5cyB3b3JrcyBpbiAiZG93bnN0cmVhbSIgbWVyZ2UgbW9kZSwgbWVhbmlu ZwppdCB3aWxsIGFsd2F5cyBwdXQgdGhlIHVzZXIncyBjaGFuZ2Vsb2cgZW50cmllcyBvbiB0b3Au CgpodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Mjg3MjEKCiogLmdpdGF0 dHJpYnV0ZXM6IEFkZGVkIChmb3IgZXZlcnkgQ2hhbmdlTG9nIGRpcmVjdG9yeSkKKiBTY3JpcHRz L3Jlc29sdmUtQ2hhbmdlTG9nczoKLS0tCiAuZ2l0YXR0cmlidXRlcyAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgfCAgICAzICsrCiBCdWdzU2l0ZS8uZ2l0YXR0cmlidXRlcyAgICAg ICAgICAgICAgICAgICAgICAgICAgfCAgICAzICsrCiBCdWdzU2l0ZS9DaGFuZ2VMb2cgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgfCAgICA4ICsrKysrCiBDaGFuZ2VMb2cgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgfCAgICA4ICsrKysrCiBKYXZhU2NyaXB0Q29y ZS8uZ2l0YXR0cmlidXRlcyAgICAgICAgICAgICAgICAgICAgfCAgICAzICsrCiBKYXZhU2NyaXB0 Q29yZS9DaGFuZ2VMb2cgICAgICAgICAgICAgICAgICAgICAgICAgfCAgICA4ICsrKysrCiBKYXZh U2NyaXB0R2x1ZS8uZ2l0YXR0cmlidXRlcyAgICAgICAgICAgICAgICAgICAgfCAgICAzICsrCiBK YXZhU2NyaXB0R2x1ZS9DaGFuZ2VMb2cgICAgICAgICAgICAgICAgICAgICAgICAgfCAgICA4ICsr KysrCiBMYXlvdXRUZXN0cy8uZ2l0YXR0cmlidXRlcyAgICAgICAgICAgICAgICAgICAgICAgfCAg ICAzICsrCiBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cgICAgICAgICAgICAgICAgICAgICAgICAgICAg fCAgICA4ICsrKysrCiBQYWdlTG9hZFRlc3RzLy5naXRhdHRyaWJ1dGVzICAgICAgICAgICAgICAg ICAgICAgfCAgICAzICsrCiBQYWdlTG9hZFRlc3RzL0NoYW5nZUxvZyAgICAgICAgICAgICAgICAg ICAgICAgICAgfCAgICA4ICsrKysrCiBQbGFuZXRXZWJLaXQvLmdpdGF0dHJpYnV0ZXMgICAgICAg ICAgICAgICAgICAgICAgfCAgICAzICsrCiBQbGFuZXRXZWJLaXQvQ2hhbmdlTG9nICAgICAgICAg ICAgICAgICAgICAgICAgICAgfCAgICA4ICsrKysrCiBTdW5TcGlkZXIvLmdpdGF0dHJpYnV0ZXMg ICAgICAgICAgICAgICAgICAgICAgICAgfCAgICAzICsrCiBTdW5TcGlkZXIvQ2hhbmdlTG9nICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgfCAgICA4ICsrKysrCiBXZWJDb3JlLy5naXRhdHRy aWJ1dGVzICAgICAgICAgICAgICAgICAgICAgICAgICAgfCAgICAzICsrCiBXZWJDb3JlL0NoYW5n ZUxvZyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgfCAgICA4ICsrKysrCiBXZWJLaXQv LmdpdGF0dHJpYnV0ZXMgICAgICAgICAgICAgICAgICAgICAgICAgICAgfCAgICAzICsrCiBXZWJL aXQvQ2hhbmdlTG9nICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgfCAgICA4ICsrKysr CiBXZWJLaXQvY2YvLmdpdGF0dHJpYnV0ZXMgICAgICAgICAgICAgICAgICAgICAgICAgfCAgICAz ICsrCiBXZWJLaXQvY2YvQ2hhbmdlTG9nICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgfCAg ICA4ICsrKysrCiBXZWJLaXQvY2hyb21pdW0vLmdpdGF0dHJpYnV0ZXMgICAgICAgICAgICAgICAg ICAgfCAgICAzICsrCiBXZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nICAgICAgICAgICAgICAgICAg ICAgICAgfCAgICA4ICsrKysrCiBXZWJLaXQvZ3RrLy5naXRhdHRyaWJ1dGVzICAgICAgICAgICAg ICAgICAgICAgICAgfCAgICAzICsrCiBXZWJLaXQvZ3RrL0NoYW5nZUxvZyAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgfCAgICA4ICsrKysrCiBXZWJLaXQvZ3RrL3BvLy5naXRhdHRyaWJ1dGVz ICAgICAgICAgICAgICAgICAgICAgfCAgICAzICsrCiBXZWJLaXQvZ3RrL3BvL0NoYW5nZUxvZyAg ICAgICAgICAgICAgICAgICAgICAgICAgfCAgICA4ICsrKysrCiBXZWJLaXQvaGFpa3UvLmdpdGF0 dHJpYnV0ZXMgICAgICAgICAgICAgICAgICAgICAgfCAgICAzICsrCiBXZWJLaXQvaGFpa3UvQ2hh bmdlTG9nICAgICAgICAgICAgICAgICAgICAgICAgICAgfCAgICA4ICsrKysrCiBXZWJLaXQvbWFj Ly5naXRhdHRyaWJ1dGVzICAgICAgICAgICAgICAgICAgICAgICAgfCAgICAzICsrCiBXZWJLaXQv bWFjL0NoYW5nZUxvZyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgfCAgICA4ICsrKysrCiBX ZWJLaXQvcXQvLmdpdGF0dHJpYnV0ZXMgICAgICAgICAgICAgICAgICAgICAgICAgfCAgICAzICsr CiBXZWJLaXQvcXQvQ2hhbmdlTG9nICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgfCAgICA4 ICsrKysrCiBXZWJLaXQvd2luLy5naXRhdHRyaWJ1dGVzICAgICAgICAgICAgICAgICAgICAgICAg fCAgICAzICsrCiBXZWJLaXQvd2luL0NoYW5nZUxvZyAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgfCAgICA4ICsrKysrCiBXZWJLaXQvd3gvLmdpdGF0dHJpYnV0ZXMgICAgICAgICAgICAgICAg ICAgICAgICAgfCAgICAzICsrCiBXZWJLaXQvd3gvQ2hhbmdlTG9nICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgfCAgICA4ICsrKysrCiBXZWJLaXRFeGFtcGxlUGx1Z2lucy8uZ2l0YXR0cmli dXRlcyAgICAgICAgICAgICAgfCAgICAzICsrCiBXZWJLaXRFeGFtcGxlUGx1Z2lucy9DaGFuZ2VM b2cgICAgICAgICAgICAgICAgICAgfCAgICA4ICsrKysrCiBXZWJLaXRMaWJyYXJpZXMvLmdpdGF0 dHJpYnV0ZXMgICAgICAgICAgICAgICAgICAgfCAgICAzICsrCiBXZWJLaXRMaWJyYXJpZXMvQ2hh bmdlTG9nICAgICAgICAgICAgICAgICAgICAgICAgfCAgICA4ICsrKysrCiBXZWJLaXRTaXRlLy5n aXRhdHRyaWJ1dGVzICAgICAgICAgICAgICAgICAgICAgICAgfCAgICAzICsrCiBXZWJLaXRTaXRl L0NoYW5nZUxvZyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgfCAgICA4ICsrKysrCiBXZWJL aXRTaXRlL3NwZWNzL0NTU1Zpc3VhbEVmZmVjdHMvLmdpdGF0dHJpYnV0ZXMgfCAgICAzICsrCiBX ZWJLaXRTaXRlL3NwZWNzL0NTU1Zpc3VhbEVmZmVjdHMvQ2hhbmdlTG9nICAgICAgfCAgICA5ICsr KysrLQogV2ViS2l0VG9vbHMvLmdpdGF0dHJpYnV0ZXMgICAgICAgICAgICAgICAgICAgICAgIHwg ICAgMyArKwogV2ViS2l0VG9vbHMvQ2hhbmdlTG9nICAgICAgICAgICAgICAgICAgICAgICAgICAg IHwgICAxNCArKysrKysrKysKIFdlYktpdFRvb2xzL1NjcmlwdHMvcmVzb2x2ZS1DaGFuZ2VMb2dz ICAgICAgICAgICB8ICAgMzIgKysrKysrKysrKysrKysrKystLS0tLQogNDkgZmlsZXMgY2hhbmdl ZCwgMjk1IGluc2VydGlvbnMoKyksIDggZGVsZXRpb25zKC0pCiBjcmVhdGUgbW9kZSAxMDA2NDQg LmdpdGF0dHJpYnV0ZXMKIGNyZWF0ZSBtb2RlIDEwMDY0NCBCdWdzU2l0ZS8uZ2l0YXR0cmlidXRl cwogY3JlYXRlIG1vZGUgMTAwNjQ0IEphdmFTY3JpcHRDb3JlLy5naXRhdHRyaWJ1dGVzCiBjcmVh dGUgbW9kZSAxMDA2NDQgSmF2YVNjcmlwdEdsdWUvLmdpdGF0dHJpYnV0ZXMKIGNyZWF0ZSBtb2Rl IDEwMDY0NCBMYXlvdXRUZXN0cy8uZ2l0YXR0cmlidXRlcwogY3JlYXRlIG1vZGUgMTAwNjQ0IFBh Z2VMb2FkVGVzdHMvLmdpdGF0dHJpYnV0ZXMKIGNyZWF0ZSBtb2RlIDEwMDY0NCBQbGFuZXRXZWJL aXQvLmdpdGF0dHJpYnV0ZXMKIGNyZWF0ZSBtb2RlIDEwMDY0NCBTdW5TcGlkZXIvLmdpdGF0dHJp YnV0ZXMKIGNyZWF0ZSBtb2RlIDEwMDY0NCBXZWJDb3JlLy5naXRhdHRyaWJ1dGVzCiBjcmVhdGUg bW9kZSAxMDA2NDQgV2ViS2l0Ly5naXRhdHRyaWJ1dGVzCiBjcmVhdGUgbW9kZSAxMDA2NDQgV2Vi S2l0L2NmLy5naXRhdHRyaWJ1dGVzCiBjcmVhdGUgbW9kZSAxMDA2NDQgV2ViS2l0L2Nocm9taXVt Ly5naXRhdHRyaWJ1dGVzCiBjcmVhdGUgbW9kZSAxMDA2NDQgV2ViS2l0L2d0ay8uZ2l0YXR0cmli dXRlcwogY3JlYXRlIG1vZGUgMTAwNjQ0IFdlYktpdC9ndGsvcG8vLmdpdGF0dHJpYnV0ZXMKIGNy ZWF0ZSBtb2RlIDEwMDY0NCBXZWJLaXQvaGFpa3UvLmdpdGF0dHJpYnV0ZXMKIGNyZWF0ZSBtb2Rl IDEwMDY0NCBXZWJLaXQvbWFjLy5naXRhdHRyaWJ1dGVzCiBjcmVhdGUgbW9kZSAxMDA2NDQgV2Vi S2l0L3F0Ly5naXRhdHRyaWJ1dGVzCiBjcmVhdGUgbW9kZSAxMDA2NDQgV2ViS2l0L3dpbi8uZ2l0 YXR0cmlidXRlcwogY3JlYXRlIG1vZGUgMTAwNjQ0IFdlYktpdC93eC8uZ2l0YXR0cmlidXRlcwog Y3JlYXRlIG1vZGUgMTAwNjQ0IFdlYktpdEV4YW1wbGVQbHVnaW5zLy5naXRhdHRyaWJ1dGVzCiBj cmVhdGUgbW9kZSAxMDA2NDQgV2ViS2l0TGlicmFyaWVzLy5naXRhdHRyaWJ1dGVzCiBjcmVhdGUg bW9kZSAxMDA2NDQgV2ViS2l0U2l0ZS8uZ2l0YXR0cmlidXRlcwogY3JlYXRlIG1vZGUgMTAwNjQ0 IFdlYktpdFNpdGUvc3BlY3MvQ1NTVmlzdWFsRWZmZWN0cy8uZ2l0YXR0cmlidXRlcwogY3JlYXRl IG1vZGUgMTAwNjQ0IFdlYktpdFRvb2xzLy5naXRhdHRyaWJ1dGVzCgpkaWZmIC0tZ2l0IGEvLmdp dGF0dHJpYnV0ZXMgYi8uZ2l0YXR0cmlidXRlcwpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAw MDAwMDAwLi42NDhjNTFlCi0tLSAvZGV2L251bGwKKysrIGIvLmdpdGF0dHJpYnV0ZXMKQEAgLTAs MCArMSwzIEBACisjIFRvIGVuYWJsZSBhdXRvbWF0aWMgbWVyZ2luZyBvZiBDaGFuZ2VMb2cgZmls ZXMsIHVzZSB0aGUgZm9sbG93aW5nIGNvbW1hbmQ6CisjIGdpdCBjb25maWcgbWVyZ2UuY2hhbmdl bG9nLmRyaXZlciAicmVzb2x2ZS1DaGFuZ2VMb2dzIC0tbWVyZ2UtZHJpdmVyICVPICVBICVCIgor Q2hhbmdlTG9nIG1lcmdlPWNoYW5nZWxvZwpkaWZmIC0tZ2l0IGEvQnVnc1NpdGUvLmdpdGF0dHJp YnV0ZXMgYi9CdWdzU2l0ZS8uZ2l0YXR0cmlidXRlcwpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRl eCAwMDAwMDAwLi42NDhjNTFlCi0tLSAvZGV2L251bGwKKysrIGIvQnVnc1NpdGUvLmdpdGF0dHJp YnV0ZXMKQEAgLTAsMCArMSwzIEBACisjIFRvIGVuYWJsZSBhdXRvbWF0aWMgbWVyZ2luZyBvZiBD aGFuZ2VMb2cgZmlsZXMsIHVzZSB0aGUgZm9sbG93aW5nIGNvbW1hbmQ6CisjIGdpdCBjb25maWcg bWVyZ2UuY2hhbmdlbG9nLmRyaXZlciAicmVzb2x2ZS1DaGFuZ2VMb2dzIC0tbWVyZ2UtZHJpdmVy ICVPICVBICVCIgorQ2hhbmdlTG9nIG1lcmdlPWNoYW5nZWxvZwpkaWZmIC0tZ2l0IGEvQnVnc1Np dGUvQ2hhbmdlTG9nIGIvQnVnc1NpdGUvQ2hhbmdlTG9nCmluZGV4IGZmMjNiYzkuLmY4MDAyZGQg MTAwNjQ0Ci0tLSBhL0J1Z3NTaXRlL0NoYW5nZUxvZworKysgYi9CdWdzU2l0ZS9DaGFuZ2VMb2cK QEAgLTEsMyArMSwxMSBAQAorMjAxMC0wMi0wNSAgVG9yIEFybmUgVmVzdGLDuCAgPHRvci5hcm5l LnZlc3Rib0Bub2tpYS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgQWRkIC5naXRhdHRyaWJ1dGVzIGZpbGUgZm9yIGN1c3RvbSBDaGFuZ2VMb2cg bWVyZ2UtZHJpdmVyCisKKyAgICAgICAgKiAuZ2l0YXR0cmlidXRlczogQWRkZWQuCisKIDIwMTAt MDEtMjIgIEphbnVzeiBMZXdhbmRvd3NraSAgPGxldzIxQHh0cmVlbWUub3JnPgogCiAgICAgICAg IFJldmlld2VkIGJ5IE1hY2llaiBTdGFjaG93aWFrLgpkaWZmIC0tZ2l0IGEvQ2hhbmdlTG9nIGIv Q2hhbmdlTG9nCmluZGV4IGY4ZDA4MWQuLjYwYThkMzcgMTAwNjQ0Ci0tLSBhL0NoYW5nZUxvZwor KysgYi9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMSBAQAorMjAxMC0wMi0wNSAgVG9yIEFybmUgVmVz dGLDuCAgPHRvci5hcm5lLnZlc3Rib0Bub2tpYS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkIC5naXRhdHRyaWJ1dGVzIGZpbGUgZm9yIGN1 c3RvbSBDaGFuZ2VMb2cgbWVyZ2UtZHJpdmVyCisKKyAgICAgICAgKiAuZ2l0YXR0cmlidXRlczog QWRkZWQuCisKIDIwMTAtMDItMDQgIFRvciBBcm5lIFZlc3Riw7ggIDx0b3IuYXJuZS52ZXN0Ym9A bm9raWEuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IExhcnMgS25vbGwuCmRpZmYgLS1naXQg YS9KYXZhU2NyaXB0Q29yZS8uZ2l0YXR0cmlidXRlcyBiL0phdmFTY3JpcHRDb3JlLy5naXRhdHRy aWJ1dGVzCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjY0OGM1MWUKLS0tIC9k ZXYvbnVsbAorKysgYi9KYXZhU2NyaXB0Q29yZS8uZ2l0YXR0cmlidXRlcwpAQCAtMCwwICsxLDMg QEAKKyMgVG8gZW5hYmxlIGF1dG9tYXRpYyBtZXJnaW5nIG9mIENoYW5nZUxvZyBmaWxlcywgdXNl IHRoZSBmb2xsb3dpbmcgY29tbWFuZDoKKyMgZ2l0IGNvbmZpZyBtZXJnZS5jaGFuZ2Vsb2cuZHJp dmVyICJyZXNvbHZlLUNoYW5nZUxvZ3MgLS1tZXJnZS1kcml2ZXIgJU8gJUEgJUIiCitDaGFuZ2VM b2cgbWVyZ2U9Y2hhbmdlbG9nCmRpZmYgLS1naXQgYS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cg Yi9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKaW5kZXggZWYzYmNiYy4uZTg4ZTgxYSAxMDA2NDQK LS0tIGEvSmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCisrKyBiL0phdmFTY3JpcHRDb3JlL0NoYW5n ZUxvZwpAQCAtMSwzICsxLDExIEBACisyMDEwLTAyLTA1ICBUb3IgQXJuZSBWZXN0YsO4ICA8dG9y LmFybmUudmVzdGJvQG5va2lhLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBBZGQgLmdpdGF0dHJpYnV0ZXMgZmlsZSBmb3IgY3VzdG9tIENoYW5n ZUxvZyBtZXJnZS1kcml2ZXIKKworICAgICAgICAqIC5naXRhdHRyaWJ1dGVzOiBBZGRlZC4KKwog MjAxMC0wMi0wNCAgTWFyayBSb3dlICA8bXJvd2VAYXBwbGUuY29tPgogCiAgICAgICAgIFJldmll d2VkIGJ5IFRpbW90aHkgSGF0Y2hlci4KZGlmZiAtLWdpdCBhL0phdmFTY3JpcHRHbHVlLy5naXRh dHRyaWJ1dGVzIGIvSmF2YVNjcmlwdEdsdWUvLmdpdGF0dHJpYnV0ZXMKbmV3IGZpbGUgbW9kZSAx MDA2NDQKaW5kZXggMDAwMDAwMC4uNjQ4YzUxZQotLS0gL2Rldi9udWxsCisrKyBiL0phdmFTY3Jp cHRHbHVlLy5naXRhdHRyaWJ1dGVzCkBAIC0wLDAgKzEsMyBAQAorIyBUbyBlbmFibGUgYXV0b21h dGljIG1lcmdpbmcgb2YgQ2hhbmdlTG9nIGZpbGVzLCB1c2UgdGhlIGZvbGxvd2luZyBjb21tYW5k OgorIyBnaXQgY29uZmlnIG1lcmdlLmNoYW5nZWxvZy5kcml2ZXIgInJlc29sdmUtQ2hhbmdlTG9n cyAtLW1lcmdlLWRyaXZlciAlTyAlQSAlQiIKK0NoYW5nZUxvZyBtZXJnZT1jaGFuZ2Vsb2cKZGlm ZiAtLWdpdCBhL0phdmFTY3JpcHRHbHVlL0NoYW5nZUxvZyBiL0phdmFTY3JpcHRHbHVlL0NoYW5n ZUxvZwppbmRleCA0ZjAwYjBhLi4yYTkwMTVmIDEwMDY0NAotLS0gYS9KYXZhU2NyaXB0R2x1ZS9D aGFuZ2VMb2cKKysrIGIvSmF2YVNjcmlwdEdsdWUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTEgQEAK KzIwMTAtMDItMDUgIFRvciBBcm5lIFZlc3Riw7ggIDx0b3IuYXJuZS52ZXN0Ym9Abm9raWEuY29t PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCAu Z2l0YXR0cmlidXRlcyBmaWxlIGZvciBjdXN0b20gQ2hhbmdlTG9nIG1lcmdlLWRyaXZlcgorCisg ICAgICAgICogLmdpdGF0dHJpYnV0ZXM6IEFkZGVkLgorCiAyMDEwLTAyLTA0ICBNYXJrIFJvd2Ug IDxtcm93ZUBhcHBsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgVGltb3RoeSBIYXRjaGVy LgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvLmdpdGF0dHJpYnV0ZXMgYi9MYXlvdXRUZXN0cy8u Z2l0YXR0cmlidXRlcwpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi42NDhjNTFl Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvLmdpdGF0dHJpYnV0ZXMKQEAgLTAsMCAr MSwzIEBACisjIFRvIGVuYWJsZSBhdXRvbWF0aWMgbWVyZ2luZyBvZiBDaGFuZ2VMb2cgZmlsZXMs IHVzZSB0aGUgZm9sbG93aW5nIGNvbW1hbmQ6CisjIGdpdCBjb25maWcgbWVyZ2UuY2hhbmdlbG9n LmRyaXZlciAicmVzb2x2ZS1DaGFuZ2VMb2dzIC0tbWVyZ2UtZHJpdmVyICVPICVBICVCIgorQ2hh bmdlTG9nIG1lcmdlPWNoYW5nZWxvZwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9n IGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IDFlNGU4ZjEuLjA0MzkxYTIgMTAwNjQ0Ci0t LSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAg LTEsMyArMSwxMSBAQAorMjAxMC0wMi0wNSAgVG9yIEFybmUgVmVzdGLDuCAgPHRvci5hcm5lLnZl c3Rib0Bub2tpYS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgQWRkIC5naXRhdHRyaWJ1dGVzIGZpbGUgZm9yIGN1c3RvbSBDaGFuZ2VMb2cgbWVy Z2UtZHJpdmVyCisKKyAgICAgICAgKiAuZ2l0YXR0cmlidXRlczogQWRkZWQuCisKIDIwMTAtMDIt MDUgIEZ1bWl0b3NoaSBVa2FpICA8dWthaUBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3 ZWQgYnkgQWxleGV5IFByb3NrdXJ5YWtvdi4KZGlmZiAtLWdpdCBhL1BhZ2VMb2FkVGVzdHMvLmdp dGF0dHJpYnV0ZXMgYi9QYWdlTG9hZFRlc3RzLy5naXRhdHRyaWJ1dGVzCm5ldyBmaWxlIG1vZGUg MTAwNjQ0CmluZGV4IDAwMDAwMDAuLjY0OGM1MWUKLS0tIC9kZXYvbnVsbAorKysgYi9QYWdlTG9h ZFRlc3RzLy5naXRhdHRyaWJ1dGVzCkBAIC0wLDAgKzEsMyBAQAorIyBUbyBlbmFibGUgYXV0b21h dGljIG1lcmdpbmcgb2YgQ2hhbmdlTG9nIGZpbGVzLCB1c2UgdGhlIGZvbGxvd2luZyBjb21tYW5k OgorIyBnaXQgY29uZmlnIG1lcmdlLmNoYW5nZWxvZy5kcml2ZXIgInJlc29sdmUtQ2hhbmdlTG9n cyAtLW1lcmdlLWRyaXZlciAlTyAlQSAlQiIKK0NoYW5nZUxvZyBtZXJnZT1jaGFuZ2Vsb2cKZGlm ZiAtLWdpdCBhL1BhZ2VMb2FkVGVzdHMvQ2hhbmdlTG9nIGIvUGFnZUxvYWRUZXN0cy9DaGFuZ2VM b2cKaW5kZXggZTY4YTdiMi4uZmQwM2ZkMCAxMDA2NDQKLS0tIGEvUGFnZUxvYWRUZXN0cy9DaGFu Z2VMb2cKKysrIGIvUGFnZUxvYWRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMSBAQAorMjAx MC0wMi0wNSAgVG9yIEFybmUgVmVzdGLDuCAgPHRvci5hcm5lLnZlc3Rib0Bub2tpYS5jb20+CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkIC5naXRh dHRyaWJ1dGVzIGZpbGUgZm9yIGN1c3RvbSBDaGFuZ2VMb2cgbWVyZ2UtZHJpdmVyCisKKyAgICAg ICAgKiAuZ2l0YXR0cmlidXRlczogQWRkZWQuCisKIDIwMDYtMTItMjYgIEVyaWMgU2VpZGVsICA8 ZXJpY0B3ZWJraXQub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IG9sbGllai4KZGlmZiAtLWdp dCBhL1BsYW5ldFdlYktpdC8uZ2l0YXR0cmlidXRlcyBiL1BsYW5ldFdlYktpdC8uZ2l0YXR0cmli dXRlcwpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi42NDhjNTFlCi0tLSAvZGV2 L251bGwKKysrIGIvUGxhbmV0V2ViS2l0Ly5naXRhdHRyaWJ1dGVzCkBAIC0wLDAgKzEsMyBAQAor IyBUbyBlbmFibGUgYXV0b21hdGljIG1lcmdpbmcgb2YgQ2hhbmdlTG9nIGZpbGVzLCB1c2UgdGhl IGZvbGxvd2luZyBjb21tYW5kOgorIyBnaXQgY29uZmlnIG1lcmdlLmNoYW5nZWxvZy5kcml2ZXIg InJlc29sdmUtQ2hhbmdlTG9ncyAtLW1lcmdlLWRyaXZlciAlTyAlQSAlQiIKK0NoYW5nZUxvZyBt ZXJnZT1jaGFuZ2Vsb2cKZGlmZiAtLWdpdCBhL1BsYW5ldFdlYktpdC9DaGFuZ2VMb2cgYi9QbGFu ZXRXZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGZhMmJjZGMuLjVkMjM2ZWIgMTAwNjQ0Ci0tLSBhL1Bs YW5ldFdlYktpdC9DaGFuZ2VMb2cKKysrIGIvUGxhbmV0V2ViS2l0L0NoYW5nZUxvZwpAQCAtMSwz ICsxLDExIEBACisyMDEwLTAyLTA1ICBUb3IgQXJuZSBWZXN0YsO4ICA8dG9yLmFybmUudmVzdGJv QG5va2lhLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBBZGQgLmdpdGF0dHJpYnV0ZXMgZmlsZSBmb3IgY3VzdG9tIENoYW5nZUxvZyBtZXJnZS1k cml2ZXIKKworICAgICAgICAqIC5naXRhdHRyaWJ1dGVzOiBBZGRlZC4KKwogMjAwOS0wOC0xNCAg Q3NhYmEgT3N6dHJvZ29uYWMgIDxvc3ppQGluZi51LXN6ZWdlZC5odT4KIAogICAgICAgICBSZXZp ZXdlZCBieSBTaW1vbiBIYXVzbWFubi4KZGlmZiAtLWdpdCBhL1N1blNwaWRlci8uZ2l0YXR0cmli dXRlcyBiL1N1blNwaWRlci8uZ2l0YXR0cmlidXRlcwpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRl eCAwMDAwMDAwLi42NDhjNTFlCi0tLSAvZGV2L251bGwKKysrIGIvU3VuU3BpZGVyLy5naXRhdHRy aWJ1dGVzCkBAIC0wLDAgKzEsMyBAQAorIyBUbyBlbmFibGUgYXV0b21hdGljIG1lcmdpbmcgb2Yg Q2hhbmdlTG9nIGZpbGVzLCB1c2UgdGhlIGZvbGxvd2luZyBjb21tYW5kOgorIyBnaXQgY29uZmln IG1lcmdlLmNoYW5nZWxvZy5kcml2ZXIgInJlc29sdmUtQ2hhbmdlTG9ncyAtLW1lcmdlLWRyaXZl ciAlTyAlQSAlQiIKK0NoYW5nZUxvZyBtZXJnZT1jaGFuZ2Vsb2cKZGlmZiAtLWdpdCBhL1N1blNw aWRlci9DaGFuZ2VMb2cgYi9TdW5TcGlkZXIvQ2hhbmdlTG9nCmluZGV4IGEyMDAwMTUuLmNkZjkz YjQgMTAwNjQ0Ci0tLSBhL1N1blNwaWRlci9DaGFuZ2VMb2cKKysrIGIvU3VuU3BpZGVyL0NoYW5n ZUxvZwpAQCAtMSwzICsxLDExIEBACisyMDEwLTAyLTA1ICBUb3IgQXJuZSBWZXN0YsO4ICA8dG9y LmFybmUudmVzdGJvQG5va2lhLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBBZGQgLmdpdGF0dHJpYnV0ZXMgZmlsZSBmb3IgY3VzdG9tIENoYW5n ZUxvZyBtZXJnZS1kcml2ZXIKKworICAgICAgICAqIC5naXRhdHRyaWJ1dGVzOiBBZGRlZC4KKwog MjAxMC0wMS0xMSAgT2xpdmVyIEh1bnQgIDxvbGl2ZXJAYXBwbGUuY29tPgogCiAgICAgICAgIFJl dmlld2VkIGJ5IERhcmluIEFkbGVyLgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS8uZ2l0YXR0cmlidXRl cyBiL1dlYkNvcmUvLmdpdGF0dHJpYnV0ZXMKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAw MDAwMC4uNjQ4YzUxZQotLS0gL2Rldi9udWxsCisrKyBiL1dlYkNvcmUvLmdpdGF0dHJpYnV0ZXMK QEAgLTAsMCArMSwzIEBACisjIFRvIGVuYWJsZSBhdXRvbWF0aWMgbWVyZ2luZyBvZiBDaGFuZ2VM b2cgZmlsZXMsIHVzZSB0aGUgZm9sbG93aW5nIGNvbW1hbmQ6CisjIGdpdCBjb25maWcgbWVyZ2Uu Y2hhbmdlbG9nLmRyaXZlciAicmVzb2x2ZS1DaGFuZ2VMb2dzIC0tbWVyZ2UtZHJpdmVyICVPICVB ICVCIgorQ2hhbmdlTG9nIG1lcmdlPWNoYW5nZWxvZwpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9DaGFu Z2VMb2cgYi9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA1NmMzZGRkLi4wYjljMjYyIDEwMDY0NAot LS0gYS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsx LDExIEBACisyMDEwLTAyLTA1ICBUb3IgQXJuZSBWZXN0YsO4ICA8dG9yLmFybmUudmVzdGJvQG5v a2lhLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBBZGQgLmdpdGF0dHJpYnV0ZXMgZmlsZSBmb3IgY3VzdG9tIENoYW5nZUxvZyBtZXJnZS1kcml2 ZXIKKworICAgICAgICAqIC5naXRhdHRyaWJ1dGVzOiBBZGRlZC4KKwogMjAxMC0wMi0wNSAgVG9u eSBDaGFuZyAgPHRvbnlAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEVyaWMg U2VpZGVsLgpkaWZmIC0tZ2l0IGEvV2ViS2l0Ly5naXRhdHRyaWJ1dGVzIGIvV2ViS2l0Ly5naXRh dHRyaWJ1dGVzCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjY0OGM1MWUKLS0t IC9kZXYvbnVsbAorKysgYi9XZWJLaXQvLmdpdGF0dHJpYnV0ZXMKQEAgLTAsMCArMSwzIEBACisj IFRvIGVuYWJsZSBhdXRvbWF0aWMgbWVyZ2luZyBvZiBDaGFuZ2VMb2cgZmlsZXMsIHVzZSB0aGUg Zm9sbG93aW5nIGNvbW1hbmQ6CisjIGdpdCBjb25maWcgbWVyZ2UuY2hhbmdlbG9nLmRyaXZlciAi cmVzb2x2ZS1DaGFuZ2VMb2dzIC0tbWVyZ2UtZHJpdmVyICVPICVBICVCIgorQ2hhbmdlTG9nIG1l cmdlPWNoYW5nZWxvZwpkaWZmIC0tZ2l0IGEvV2ViS2l0L0NoYW5nZUxvZyBiL1dlYktpdC9DaGFu Z2VMb2cKaW5kZXggMTM0YTI1Mi4uYTI3OTUwNiAxMDA2NDQKLS0tIGEvV2ViS2l0L0NoYW5nZUxv ZworKysgYi9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTEgQEAKKzIwMTAtMDItMDUgIFRv ciBBcm5lIFZlc3Riw7ggIDx0b3IuYXJuZS52ZXN0Ym9Abm9raWEuY29tPgorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCAuZ2l0YXR0cmlidXRlcyBm aWxlIGZvciBjdXN0b20gQ2hhbmdlTG9nIG1lcmdlLWRyaXZlcgorCisgICAgICAgICogLmdpdGF0 dHJpYnV0ZXM6IEFkZGVkLgorCiAyMDEwLTAyLTA0ICBNYXJrIFJvd2UgIDxtcm93ZUBhcHBsZS5j b20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgVGltb3RoeSBIYXRjaGVyLgpkaWZmIC0tZ2l0IGEv V2ViS2l0L2NmLy5naXRhdHRyaWJ1dGVzIGIvV2ViS2l0L2NmLy5naXRhdHRyaWJ1dGVzCm5ldyBm aWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjY0OGM1MWUKLS0tIC9kZXYvbnVsbAorKysg Yi9XZWJLaXQvY2YvLmdpdGF0dHJpYnV0ZXMKQEAgLTAsMCArMSwzIEBACisjIFRvIGVuYWJsZSBh dXRvbWF0aWMgbWVyZ2luZyBvZiBDaGFuZ2VMb2cgZmlsZXMsIHVzZSB0aGUgZm9sbG93aW5nIGNv bW1hbmQ6CisjIGdpdCBjb25maWcgbWVyZ2UuY2hhbmdlbG9nLmRyaXZlciAicmVzb2x2ZS1DaGFu Z2VMb2dzIC0tbWVyZ2UtZHJpdmVyICVPICVBICVCIgorQ2hhbmdlTG9nIG1lcmdlPWNoYW5nZWxv ZwpkaWZmIC0tZ2l0IGEvV2ViS2l0L2NmL0NoYW5nZUxvZyBiL1dlYktpdC9jZi9DaGFuZ2VMb2cK aW5kZXggMWY1OWRlYy4uZjY4YTJkMSAxMDA2NDQKLS0tIGEvV2ViS2l0L2NmL0NoYW5nZUxvZwor KysgYi9XZWJLaXQvY2YvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTEgQEAKKzIwMTAtMDItMDUgIFRv ciBBcm5lIFZlc3Riw7ggIDx0b3IuYXJuZS52ZXN0Ym9Abm9raWEuY29tPgorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCAuZ2l0YXR0cmlidXRlcyBm aWxlIGZvciBjdXN0b20gQ2hhbmdlTG9nIG1lcmdlLWRyaXZlcgorCisgICAgICAgICogLmdpdGF0 dHJpYnV0ZXM6IEFkZGVkLgorCiAyMDEwLTAxLTA3ICBBbGV4ZXkgUHJvc2t1cnlha292ICA8YXBA YXBwbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEdlb2ZmcmV5IEdhcmVuLgpkaWZmIC0t Z2l0IGEvV2ViS2l0L2Nocm9taXVtLy5naXRhdHRyaWJ1dGVzIGIvV2ViS2l0L2Nocm9taXVtLy5n aXRhdHRyaWJ1dGVzCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjY0OGM1MWUK LS0tIC9kZXYvbnVsbAorKysgYi9XZWJLaXQvY2hyb21pdW0vLmdpdGF0dHJpYnV0ZXMKQEAgLTAs MCArMSwzIEBACisjIFRvIGVuYWJsZSBhdXRvbWF0aWMgbWVyZ2luZyBvZiBDaGFuZ2VMb2cgZmls ZXMsIHVzZSB0aGUgZm9sbG93aW5nIGNvbW1hbmQ6CisjIGdpdCBjb25maWcgbWVyZ2UuY2hhbmdl bG9nLmRyaXZlciAicmVzb2x2ZS1DaGFuZ2VMb2dzIC0tbWVyZ2UtZHJpdmVyICVPICVBICVCIgor Q2hhbmdlTG9nIG1lcmdlPWNoYW5nZWxvZwpkaWZmIC0tZ2l0IGEvV2ViS2l0L2Nocm9taXVtL0No YW5nZUxvZyBiL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKaW5kZXggNzM5NmI0YS4uM2Y1ZDcy ZSAxMDA2NDQKLS0tIGEvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZworKysgYi9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTEgQEAKKzIwMTAtMDItMDUgIFRvciBBcm5lIFZl c3Riw7ggIDx0b3IuYXJuZS52ZXN0Ym9Abm9raWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCAuZ2l0YXR0cmlidXRlcyBmaWxlIGZvciBj dXN0b20gQ2hhbmdlTG9nIG1lcmdlLWRyaXZlcgorCisgICAgICAgICogLmdpdGF0dHJpYnV0ZXM6 IEFkZGVkLgorCiAyMDEwLTAyLTA0ICBZYWFyIFNjaG5pdG1hbiAgPHlhYXJAY2hyb21pdW0ub3Jn PgogCiAgICAgICAgIFJldmlld2VkIGJ5IERhcmluIEZpc2hlci4KZGlmZiAtLWdpdCBhL1dlYktp dC9ndGsvLmdpdGF0dHJpYnV0ZXMgYi9XZWJLaXQvZ3RrLy5naXRhdHRyaWJ1dGVzCm5ldyBmaWxl IG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjY0OGM1MWUKLS0tIC9kZXYvbnVsbAorKysgYi9X ZWJLaXQvZ3RrLy5naXRhdHRyaWJ1dGVzCkBAIC0wLDAgKzEsMyBAQAorIyBUbyBlbmFibGUgYXV0 b21hdGljIG1lcmdpbmcgb2YgQ2hhbmdlTG9nIGZpbGVzLCB1c2UgdGhlIGZvbGxvd2luZyBjb21t YW5kOgorIyBnaXQgY29uZmlnIG1lcmdlLmNoYW5nZWxvZy5kcml2ZXIgInJlc29sdmUtQ2hhbmdl TG9ncyAtLW1lcmdlLWRyaXZlciAlTyAlQSAlQiIKK0NoYW5nZUxvZyBtZXJnZT1jaGFuZ2Vsb2cK ZGlmZiAtLWdpdCBhL1dlYktpdC9ndGsvQ2hhbmdlTG9nIGIvV2ViS2l0L2d0ay9DaGFuZ2VMb2cK aW5kZXggZmQyOWQ5OC4uNGNjYWNlMCAxMDA2NDQKLS0tIGEvV2ViS2l0L2d0ay9DaGFuZ2VMb2cK KysrIGIvV2ViS2l0L2d0ay9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMSBAQAorMjAxMC0wMi0wNSAg VG9yIEFybmUgVmVzdGLDuCAgPHRvci5hcm5lLnZlc3Rib0Bub2tpYS5jb20+CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkIC5naXRhdHRyaWJ1dGVz IGZpbGUgZm9yIGN1c3RvbSBDaGFuZ2VMb2cgbWVyZ2UtZHJpdmVyCisKKyAgICAgICAgKiAuZ2l0 YXR0cmlidXRlczogQWRkZWQuCisKIDIwMTAtMDItMDQgIENocmlzdGlhbiBEeXdhbiAgPGNocmlz dGlhbkB0d290b2FzdHMuZGU+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgR3VzdGF2byBOb3Jvbmhh IFNpbHZhLgpkaWZmIC0tZ2l0IGEvV2ViS2l0L2d0ay9wby8uZ2l0YXR0cmlidXRlcyBiL1dlYktp dC9ndGsvcG8vLmdpdGF0dHJpYnV0ZXMKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAw MC4uNjQ4YzUxZQotLS0gL2Rldi9udWxsCisrKyBiL1dlYktpdC9ndGsvcG8vLmdpdGF0dHJpYnV0 ZXMKQEAgLTAsMCArMSwzIEBACisjIFRvIGVuYWJsZSBhdXRvbWF0aWMgbWVyZ2luZyBvZiBDaGFu Z2VMb2cgZmlsZXMsIHVzZSB0aGUgZm9sbG93aW5nIGNvbW1hbmQ6CisjIGdpdCBjb25maWcgbWVy Z2UuY2hhbmdlbG9nLmRyaXZlciAicmVzb2x2ZS1DaGFuZ2VMb2dzIC0tbWVyZ2UtZHJpdmVyICVP ICVBICVCIgorQ2hhbmdlTG9nIG1lcmdlPWNoYW5nZWxvZwpkaWZmIC0tZ2l0IGEvV2ViS2l0L2d0 ay9wby9DaGFuZ2VMb2cgYi9XZWJLaXQvZ3RrL3BvL0NoYW5nZUxvZwppbmRleCBkN2VlZTNhLi4y ZGEzMzY4IDEwMDY0NAotLS0gYS9XZWJLaXQvZ3RrL3BvL0NoYW5nZUxvZworKysgYi9XZWJLaXQv Z3RrL3BvL0NoYW5nZUxvZwpAQCAtMSwzICsxLDExIEBACisyMDEwLTAyLTA1ICBUb3IgQXJuZSBW ZXN0YsO4ICA8dG9yLmFybmUudmVzdGJvQG5va2lhLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgLmdpdGF0dHJpYnV0ZXMgZmlsZSBmb3Ig Y3VzdG9tIENoYW5nZUxvZyBtZXJnZS1kcml2ZXIKKworICAgICAgICAqIC5naXRhdHRyaWJ1dGVz OiBBZGRlZC4KKwogMjAwOS0xMC0xOSAgRGFuaWVsIE1hY2tzICA8ZG1hY2tzQG5ldHNwYWNlLm9y Zz4KIAogICAgICAgICBSZXZpZXdlZCBieSBBZGFtIEJhcnRoLgpkaWZmIC0tZ2l0IGEvV2ViS2l0 L2hhaWt1Ly5naXRhdHRyaWJ1dGVzIGIvV2ViS2l0L2hhaWt1Ly5naXRhdHRyaWJ1dGVzCm5ldyBm aWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjY0OGM1MWUKLS0tIC9kZXYvbnVsbAorKysg Yi9XZWJLaXQvaGFpa3UvLmdpdGF0dHJpYnV0ZXMKQEAgLTAsMCArMSwzIEBACisjIFRvIGVuYWJs ZSBhdXRvbWF0aWMgbWVyZ2luZyBvZiBDaGFuZ2VMb2cgZmlsZXMsIHVzZSB0aGUgZm9sbG93aW5n IGNvbW1hbmQ6CisjIGdpdCBjb25maWcgbWVyZ2UuY2hhbmdlbG9nLmRyaXZlciAicmVzb2x2ZS1D aGFuZ2VMb2dzIC0tbWVyZ2UtZHJpdmVyICVPICVBICVCIgorQ2hhbmdlTG9nIG1lcmdlPWNoYW5n ZWxvZwpkaWZmIC0tZ2l0IGEvV2ViS2l0L2hhaWt1L0NoYW5nZUxvZyBiL1dlYktpdC9oYWlrdS9D aGFuZ2VMb2cKaW5kZXggMmFhNGFkNy4uODZiNDM5ZCAxMDA2NDQKLS0tIGEvV2ViS2l0L2hhaWt1 L0NoYW5nZUxvZworKysgYi9XZWJLaXQvaGFpa3UvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTEgQEAK KzIwMTAtMDItMDUgIFRvciBBcm5lIFZlc3Riw7ggIDx0b3IuYXJuZS52ZXN0Ym9Abm9raWEuY29t PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCAu Z2l0YXR0cmlidXRlcyBmaWxlIGZvciBjdXN0b20gQ2hhbmdlTG9nIG1lcmdlLWRyaXZlcgorCisg ICAgICAgICogLmdpdGF0dHJpYnV0ZXM6IEFkZGVkLgorCiAyMDA5LTEyLTA2ICBNYXhpbWUgU2lt b24gIDxzaW1vbi5tYXhpbWVAZ21haWwuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEFkYW0g QmFydGguCmRpZmYgLS1naXQgYS9XZWJLaXQvbWFjLy5naXRhdHRyaWJ1dGVzIGIvV2ViS2l0L21h Yy8uZ2l0YXR0cmlidXRlcwpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi42NDhj NTFlCi0tLSAvZGV2L251bGwKKysrIGIvV2ViS2l0L21hYy8uZ2l0YXR0cmlidXRlcwpAQCAtMCww ICsxLDMgQEAKKyMgVG8gZW5hYmxlIGF1dG9tYXRpYyBtZXJnaW5nIG9mIENoYW5nZUxvZyBmaWxl cywgdXNlIHRoZSBmb2xsb3dpbmcgY29tbWFuZDoKKyMgZ2l0IGNvbmZpZyBtZXJnZS5jaGFuZ2Vs b2cuZHJpdmVyICJyZXNvbHZlLUNoYW5nZUxvZ3MgLS1tZXJnZS1kcml2ZXIgJU8gJUEgJUIiCitD aGFuZ2VMb2cgbWVyZ2U9Y2hhbmdlbG9nCmRpZmYgLS1naXQgYS9XZWJLaXQvbWFjL0NoYW5nZUxv ZyBiL1dlYktpdC9tYWMvQ2hhbmdlTG9nCmluZGV4IDE1YjY1ZWUuLmM2YmQ1ODcgMTAwNjQ0Ci0t LSBhL1dlYktpdC9tYWMvQ2hhbmdlTG9nCisrKyBiL1dlYktpdC9tYWMvQ2hhbmdlTG9nCkBAIC0x LDMgKzEsMTEgQEAKKzIwMTAtMDItMDUgIFRvciBBcm5lIFZlc3Riw7ggIDx0b3IuYXJuZS52ZXN0 Ym9Abm9raWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIEFkZCAuZ2l0YXR0cmlidXRlcyBmaWxlIGZvciBjdXN0b20gQ2hhbmdlTG9nIG1lcmdl LWRyaXZlcgorCisgICAgICAgICogLmdpdGF0dHJpYnV0ZXM6IEFkZGVkLgorCiAyMDEwLTAyLTA0 ICBNYXJrIFJvd2UgIDxtcm93ZUBhcHBsZS5jb20+CiAKICAgICAgICAgUnViYmVyLXN0YW1wZWQg YnkgRGFuIEJlcm5zdGVpbi4KZGlmZiAtLWdpdCBhL1dlYktpdC9xdC8uZ2l0YXR0cmlidXRlcyBi L1dlYktpdC9xdC8uZ2l0YXR0cmlidXRlcwpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAw MDAwLi42NDhjNTFlCi0tLSAvZGV2L251bGwKKysrIGIvV2ViS2l0L3F0Ly5naXRhdHRyaWJ1dGVz CkBAIC0wLDAgKzEsMyBAQAorIyBUbyBlbmFibGUgYXV0b21hdGljIG1lcmdpbmcgb2YgQ2hhbmdl TG9nIGZpbGVzLCB1c2UgdGhlIGZvbGxvd2luZyBjb21tYW5kOgorIyBnaXQgY29uZmlnIG1lcmdl LmNoYW5nZWxvZy5kcml2ZXIgInJlc29sdmUtQ2hhbmdlTG9ncyAtLW1lcmdlLWRyaXZlciAlTyAl QSAlQiIKK0NoYW5nZUxvZyBtZXJnZT1jaGFuZ2Vsb2cKZGlmZiAtLWdpdCBhL1dlYktpdC9xdC9D aGFuZ2VMb2cgYi9XZWJLaXQvcXQvQ2hhbmdlTG9nCmluZGV4IGRiYzg0MWUuLmM3MmViYWMgMTAw NjQ0Ci0tLSBhL1dlYktpdC9xdC9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0L3F0L0NoYW5nZUxvZwpA QCAtMSwzICsxLDExIEBACisyMDEwLTAyLTA1ICBUb3IgQXJuZSBWZXN0YsO4ICA8dG9yLmFybmUu dmVzdGJvQG5va2lhLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBBZGQgLmdpdGF0dHJpYnV0ZXMgZmlsZSBmb3IgY3VzdG9tIENoYW5nZUxvZyBt ZXJnZS1kcml2ZXIKKworICAgICAgICAqIC5naXRhdHRyaWJ1dGVzOiBBZGRlZC4KKwogMjAxMC0w Mi0wNCAgTm8nYW0gUm9zZW50aGFsICA8bm9hbS5yb3NlbnRoYWxAbm9raWEuY29tPgogCiAgICAg ICAgIFJldmlld2VkIGJ5IEFyaXlhIEhpZGF5YXQuCmRpZmYgLS1naXQgYS9XZWJLaXQvd2luLy5n aXRhdHRyaWJ1dGVzIGIvV2ViS2l0L3dpbi8uZ2l0YXR0cmlidXRlcwpuZXcgZmlsZSBtb2RlIDEw MDY0NAppbmRleCAwMDAwMDAwLi42NDhjNTFlCi0tLSAvZGV2L251bGwKKysrIGIvV2ViS2l0L3dp bi8uZ2l0YXR0cmlidXRlcwpAQCAtMCwwICsxLDMgQEAKKyMgVG8gZW5hYmxlIGF1dG9tYXRpYyBt ZXJnaW5nIG9mIENoYW5nZUxvZyBmaWxlcywgdXNlIHRoZSBmb2xsb3dpbmcgY29tbWFuZDoKKyMg Z2l0IGNvbmZpZyBtZXJnZS5jaGFuZ2Vsb2cuZHJpdmVyICJyZXNvbHZlLUNoYW5nZUxvZ3MgLS1t ZXJnZS1kcml2ZXIgJU8gJUEgJUIiCitDaGFuZ2VMb2cgbWVyZ2U9Y2hhbmdlbG9nCmRpZmYgLS1n aXQgYS9XZWJLaXQvd2luL0NoYW5nZUxvZyBiL1dlYktpdC93aW4vQ2hhbmdlTG9nCmluZGV4IGRh MWFiMDUuLmQwNDk0NDMgMTAwNjQ0Ci0tLSBhL1dlYktpdC93aW4vQ2hhbmdlTG9nCisrKyBiL1dl YktpdC93aW4vQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTEgQEAKKzIwMTAtMDItMDUgIFRvciBBcm5l IFZlc3Riw7ggIDx0b3IuYXJuZS52ZXN0Ym9Abm9raWEuY29tPgorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCAuZ2l0YXR0cmlidXRlcyBmaWxlIGZv ciBjdXN0b20gQ2hhbmdlTG9nIG1lcmdlLWRyaXZlcgorCisgICAgICAgICogLmdpdGF0dHJpYnV0 ZXM6IEFkZGVkLgorCiAyMDEwLTAyLTA0ICBBbGljZSBMaXUgIDxhbGljZS5saXVAYXBwbGUuY29t PgogCiAgICAgICAgIFJldmlld2VkIGJ5IEpvbiBIb25leWN1dHQuCmRpZmYgLS1naXQgYS9XZWJL aXQvd3gvLmdpdGF0dHJpYnV0ZXMgYi9XZWJLaXQvd3gvLmdpdGF0dHJpYnV0ZXMKbmV3IGZpbGUg bW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uNjQ4YzUxZQotLS0gL2Rldi9udWxsCisrKyBiL1dl YktpdC93eC8uZ2l0YXR0cmlidXRlcwpAQCAtMCwwICsxLDMgQEAKKyMgVG8gZW5hYmxlIGF1dG9t YXRpYyBtZXJnaW5nIG9mIENoYW5nZUxvZyBmaWxlcywgdXNlIHRoZSBmb2xsb3dpbmcgY29tbWFu ZDoKKyMgZ2l0IGNvbmZpZyBtZXJnZS5jaGFuZ2Vsb2cuZHJpdmVyICJyZXNvbHZlLUNoYW5nZUxv Z3MgLS1tZXJnZS1kcml2ZXIgJU8gJUEgJUIiCitDaGFuZ2VMb2cgbWVyZ2U9Y2hhbmdlbG9nCmRp ZmYgLS1naXQgYS9XZWJLaXQvd3gvQ2hhbmdlTG9nIGIvV2ViS2l0L3d4L0NoYW5nZUxvZwppbmRl eCAwNWVmYmQyLi5kYzVmNzYyIDEwMDY0NAotLS0gYS9XZWJLaXQvd3gvQ2hhbmdlTG9nCisrKyBi L1dlYktpdC93eC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMSBAQAorMjAxMC0wMi0wNSAgVG9yIEFy bmUgVmVzdGLDuCAgPHRvci5hcm5lLnZlc3Rib0Bub2tpYS5jb20+CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkIC5naXRhdHRyaWJ1dGVzIGZpbGUg Zm9yIGN1c3RvbSBDaGFuZ2VMb2cgbWVyZ2UtZHJpdmVyCisKKyAgICAgICAgKiAuZ2l0YXR0cmli dXRlczogQWRkZWQuCisKIDIwMTAtMDItMDQgIEtldmluIE9sbGl2aWVyICA8a2V2aW5vQHRoZW9s bGl2aWVycy5jb20+CiAKICAgICAgICAgQnVpbGQgZml4IGFmdGVyIGNoYW5nZXMgaW4gcjU0MzQ1 LgpkaWZmIC0tZ2l0IGEvV2ViS2l0RXhhbXBsZVBsdWdpbnMvLmdpdGF0dHJpYnV0ZXMgYi9XZWJL aXRFeGFtcGxlUGx1Z2lucy8uZ2l0YXR0cmlidXRlcwpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRl eCAwMDAwMDAwLi42NDhjNTFlCi0tLSAvZGV2L251bGwKKysrIGIvV2ViS2l0RXhhbXBsZVBsdWdp bnMvLmdpdGF0dHJpYnV0ZXMKQEAgLTAsMCArMSwzIEBACisjIFRvIGVuYWJsZSBhdXRvbWF0aWMg bWVyZ2luZyBvZiBDaGFuZ2VMb2cgZmlsZXMsIHVzZSB0aGUgZm9sbG93aW5nIGNvbW1hbmQ6Cisj IGdpdCBjb25maWcgbWVyZ2UuY2hhbmdlbG9nLmRyaXZlciAicmVzb2x2ZS1DaGFuZ2VMb2dzIC0t bWVyZ2UtZHJpdmVyICVPICVBICVCIgorQ2hhbmdlTG9nIG1lcmdlPWNoYW5nZWxvZwpkaWZmIC0t Z2l0IGEvV2ViS2l0RXhhbXBsZVBsdWdpbnMvQ2hhbmdlTG9nIGIvV2ViS2l0RXhhbXBsZVBsdWdp bnMvQ2hhbmdlTG9nCmluZGV4IDU0MjEyNDkuLjhkNGEwYmQgMTAwNjQ0Ci0tLSBhL1dlYktpdEV4 YW1wbGVQbHVnaW5zL0NoYW5nZUxvZworKysgYi9XZWJLaXRFeGFtcGxlUGx1Z2lucy9DaGFuZ2VM b2cKQEAgLTEsMyArMSwxMSBAQAorMjAxMC0wMi0wNSAgVG9yIEFybmUgVmVzdGLDuCAgPHRvci5h cm5lLnZlc3Rib0Bub2tpYS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgQWRkIC5naXRhdHRyaWJ1dGVzIGZpbGUgZm9yIGN1c3RvbSBDaGFuZ2VM b2cgbWVyZ2UtZHJpdmVyCisKKyAgICAgICAgKiAuZ2l0YXR0cmlidXRlczogQWRkZWQuCisKIDIw MDktMDctMTAgIEFkYW0gUm9iZW4gIDxhcm9iZW5AYXBwbGUuY29tPgogCiAgICAgICAgIFNvcnQg YWxsIG91ciBYY29kZSBwcm9qZWN0cwpkaWZmIC0tZ2l0IGEvV2ViS2l0TGlicmFyaWVzLy5naXRh dHRyaWJ1dGVzIGIvV2ViS2l0TGlicmFyaWVzLy5naXRhdHRyaWJ1dGVzCm5ldyBmaWxlIG1vZGUg MTAwNjQ0CmluZGV4IDAwMDAwMDAuLjY0OGM1MWUKLS0tIC9kZXYvbnVsbAorKysgYi9XZWJLaXRM aWJyYXJpZXMvLmdpdGF0dHJpYnV0ZXMKQEAgLTAsMCArMSwzIEBACisjIFRvIGVuYWJsZSBhdXRv bWF0aWMgbWVyZ2luZyBvZiBDaGFuZ2VMb2cgZmlsZXMsIHVzZSB0aGUgZm9sbG93aW5nIGNvbW1h bmQ6CisjIGdpdCBjb25maWcgbWVyZ2UuY2hhbmdlbG9nLmRyaXZlciAicmVzb2x2ZS1DaGFuZ2VM b2dzIC0tbWVyZ2UtZHJpdmVyICVPICVBICVCIgorQ2hhbmdlTG9nIG1lcmdlPWNoYW5nZWxvZwpk aWZmIC0tZ2l0IGEvV2ViS2l0TGlicmFyaWVzL0NoYW5nZUxvZyBiL1dlYktpdExpYnJhcmllcy9D aGFuZ2VMb2cKaW5kZXggM2ViZTc5Ni4uZjAyOWE0YyAxMDA2NDQKLS0tIGEvV2ViS2l0TGlicmFy aWVzL0NoYW5nZUxvZworKysgYi9XZWJLaXRMaWJyYXJpZXMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEs MTEgQEAKKzIwMTAtMDItMDUgIFRvciBBcm5lIFZlc3Riw7ggIDx0b3IuYXJuZS52ZXN0Ym9Abm9r aWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IEFkZCAuZ2l0YXR0cmlidXRlcyBmaWxlIGZvciBjdXN0b20gQ2hhbmdlTG9nIG1lcmdlLWRyaXZl cgorCisgICAgICAgICogLmdpdGF0dHJpYnV0ZXM6IEFkZGVkLgorCiAyMDEwLTAyLTA0ICBNYXJr IFJvd2UgIDxtcm93ZUBhcHBsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgU3RldmUgRmFs a2VuYnVyZy4KZGlmZiAtLWdpdCBhL1dlYktpdFNpdGUvLmdpdGF0dHJpYnV0ZXMgYi9XZWJLaXRT aXRlLy5naXRhdHRyaWJ1dGVzCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjY0 OGM1MWUKLS0tIC9kZXYvbnVsbAorKysgYi9XZWJLaXRTaXRlLy5naXRhdHRyaWJ1dGVzCkBAIC0w LDAgKzEsMyBAQAorIyBUbyBlbmFibGUgYXV0b21hdGljIG1lcmdpbmcgb2YgQ2hhbmdlTG9nIGZp bGVzLCB1c2UgdGhlIGZvbGxvd2luZyBjb21tYW5kOgorIyBnaXQgY29uZmlnIG1lcmdlLmNoYW5n ZWxvZy5kcml2ZXIgInJlc29sdmUtQ2hhbmdlTG9ncyAtLW1lcmdlLWRyaXZlciAlTyAlQSAlQiIK K0NoYW5nZUxvZyBtZXJnZT1jaGFuZ2Vsb2cKZGlmZiAtLWdpdCBhL1dlYktpdFNpdGUvQ2hhbmdl TG9nIGIvV2ViS2l0U2l0ZS9DaGFuZ2VMb2cKaW5kZXggOWFlYTc2My4uY2FjNWQzOSAxMDA2NDQK LS0tIGEvV2ViS2l0U2l0ZS9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0U2l0ZS9DaGFuZ2VMb2cKQEAg LTEsMyArMSwxMSBAQAorMjAxMC0wMi0wNSAgVG9yIEFybmUgVmVzdGLDuCAgPHRvci5hcm5lLnZl c3Rib0Bub2tpYS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgQWRkIC5naXRhdHRyaWJ1dGVzIGZpbGUgZm9yIGN1c3RvbSBDaGFuZ2VMb2cgbWVy Z2UtZHJpdmVyCisKKyAgICAgICAgKiAuZ2l0YXR0cmlidXRlczogQWRkZWQuCisKIDIwMTAtMDIt MDIgIEplbnMgQWxma2UgIDxzbmVqQGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBi eSBEYXZpZCBMZXZpbi4KZGlmZiAtLWdpdCBhL1dlYktpdFNpdGUvc3BlY3MvQ1NTVmlzdWFsRWZm ZWN0cy8uZ2l0YXR0cmlidXRlcyBiL1dlYktpdFNpdGUvc3BlY3MvQ1NTVmlzdWFsRWZmZWN0cy8u Z2l0YXR0cmlidXRlcwpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi42NDhjNTFl Ci0tLSAvZGV2L251bGwKKysrIGIvV2ViS2l0U2l0ZS9zcGVjcy9DU1NWaXN1YWxFZmZlY3RzLy5n aXRhdHRyaWJ1dGVzCkBAIC0wLDAgKzEsMyBAQAorIyBUbyBlbmFibGUgYXV0b21hdGljIG1lcmdp bmcgb2YgQ2hhbmdlTG9nIGZpbGVzLCB1c2UgdGhlIGZvbGxvd2luZyBjb21tYW5kOgorIyBnaXQg Y29uZmlnIG1lcmdlLmNoYW5nZWxvZy5kcml2ZXIgInJlc29sdmUtQ2hhbmdlTG9ncyAtLW1lcmdl LWRyaXZlciAlTyAlQSAlQiIKK0NoYW5nZUxvZyBtZXJnZT1jaGFuZ2Vsb2cKZGlmZiAtLWdpdCBh L1dlYktpdFNpdGUvc3BlY3MvQ1NTVmlzdWFsRWZmZWN0cy9DaGFuZ2VMb2cgYi9XZWJLaXRTaXRl L3NwZWNzL0NTU1Zpc3VhbEVmZmVjdHMvQ2hhbmdlTG9nCmluZGV4IDYwNTI5ZDAuLjU1YjExYzQg MTAwNjQ0Ci0tLSBhL1dlYktpdFNpdGUvc3BlY3MvQ1NTVmlzdWFsRWZmZWN0cy9DaGFuZ2VMb2cK KysrIGIvV2ViS2l0U2l0ZS9zcGVjcy9DU1NWaXN1YWxFZmZlY3RzL0NoYW5nZUxvZwpAQCAtMSwz ICsxLDExIEBACisyMDEwLTAyLTA1ICBUb3IgQXJuZSBWZXN0YsO4ICA8dG9yLmFybmUudmVzdGJv QG5va2lhLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBBZGQgLmdpdGF0dHJpYnV0ZXMgZmlsZSBmb3IgY3VzdG9tIENoYW5nZUxvZyBtZXJnZS1k cml2ZXIKKworICAgICAgICAqIC5naXRhdHRyaWJ1dGVzOiBBZGRlZC4KKwogMjAwOS0xMS0wMyAg RGFyaW4gQWRsZXIgIDxkYXJpbkBhcHBsZS5jb20+CiAKICAgICAgICAgU2V0IHRoZSBNSU1FIHR5 cGUgZm9yIGFsbCBQTkcgZmlsZXMgaW4gdGhpcyBkaXJlY3RvcnkuCkBAIC0xMjcsNCArMTM1LDMg QEAKICAgICAgICAgKiBSZW1vdmVkIG1lbnRpb24gb2YgdHJhbnNpdGlvbnMgd2hlbiBkaXNjdXNz aW9uIGtleWZyYW1lcyBydWxlCiAgICAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzYxMDMwNzI+IFth bmltYXRpb25zXSBDU1MgQW5pbWF0aW9uIHNwZWMgbWVudGlvbnMgdHJhbnNpdGlvbiBrZXlmcmFt ZXMKICAgICAKLSAgICAKXCBObyBuZXdsaW5lIGF0IGVuZCBvZiBmaWxlCmRpZmYgLS1naXQgYS9X ZWJLaXRUb29scy8uZ2l0YXR0cmlidXRlcyBiL1dlYktpdFRvb2xzLy5naXRhdHRyaWJ1dGVzCm5l dyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjY0OGM1MWUKLS0tIC9kZXYvbnVsbAor KysgYi9XZWJLaXRUb29scy8uZ2l0YXR0cmlidXRlcwpAQCAtMCwwICsxLDMgQEAKKyMgVG8gZW5h YmxlIGF1dG9tYXRpYyBtZXJnaW5nIG9mIENoYW5nZUxvZyBmaWxlcywgdXNlIHRoZSBmb2xsb3dp bmcgY29tbWFuZDoKKyMgZ2l0IGNvbmZpZyBtZXJnZS5jaGFuZ2Vsb2cuZHJpdmVyICJyZXNvbHZl LUNoYW5nZUxvZ3MgLS1tZXJnZS1kcml2ZXIgJU8gJUEgJUIiCitDaGFuZ2VMb2cgbWVyZ2U9Y2hh bmdlbG9nCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9DaGFuZ2VMb2cgYi9XZWJLaXRUb29scy9D aGFuZ2VMb2cKaW5kZXggMGZlN2ZkYi4uZGY0Njk5NCAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMv Q2hhbmdlTG9nCisrKyBiL1dlYktpdFRvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisy MDEwLTAyLTA1ICBUb3IgQXJuZSBWZXN0YsO4ICA8dG9yLmFybmUudmVzdGJvQG5va2lhLmNvbT4K KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUZWFjaCBy ZXNvbHZlLUNoYW5nZUxvZ3MgdG8gYWN0IGFzIGEgbWVyZ2UtZHJpdmVyIGZvciBHaXQKKworICAg ICAgICBUaGUgZHJpdmVyIGFsd2F5cyB3b3JrcyBpbiAiZG93bnN0cmVhbSIgbWVyZ2UgbW9kZSwg bWVhbmluZworICAgICAgICBpdCB3aWxsIGFsd2F5cyBwdXQgdGhlIHVzZXIncyBjaGFuZ2Vsb2cg ZW50cmllcyBvbiB0b3AuCisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTI4NzIxCisKKyAgICAgICAgKiAuZ2l0YXR0cmlidXRlczogQWRkZWQuCisgICAg ICAgICogU2NyaXB0cy9yZXNvbHZlLUNoYW5nZUxvZ3M6CisKIDIwMTAtMDItMDQgIE1hcmsgUm93 ZSAgPG1yb3dlQGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBUaW1vdGh5IEhhdGNo ZXIuCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9TY3JpcHRzL3Jlc29sdmUtQ2hhbmdlTG9ncyBi L1dlYktpdFRvb2xzL1NjcmlwdHMvcmVzb2x2ZS1DaGFuZ2VMb2dzCmluZGV4IDFhMmQyYWYuLjYx NTg2MTUgMTAwNzU1Ci0tLSBhL1dlYktpdFRvb2xzL1NjcmlwdHMvcmVzb2x2ZS1DaGFuZ2VMb2dz CisrKyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvcmVzb2x2ZS1DaGFuZ2VMb2dzCkBAIC0zNCw2ICsz NCw3IEBAIHVzZSBGaW5kQmluOwogdXNlIGxpYiAkRmluZEJpbjo6QmluOwogCiB1c2UgRmlsZTo6 QmFzZW5hbWU7Cit1c2UgRmlsZTo6Q29weTsKIHVzZSBGaWxlOjpQYXRoOwogdXNlIEZpbGU6OlNw ZWM7CiB1c2UgR2V0b3B0OjpMb25nOwpAQCAtNjQsMjggKzY1LDMwIEBAIG15ICRHSVQgPSAiZ2l0 IjsKIAogbXkgJGZpeE1lcmdlZDsKIG15ICRnaXRSZWJhc2VDb250aW51ZSA9IDA7CitteSAkbWVy Z2VEcml2ZXIgPSAwOwogbXkgJHByaW50V2FybmluZ3MgPSAxOwogbXkgJHNob3dIZWxwOwogCiBt eSAkZ2V0T3B0aW9uc1Jlc3VsdCA9IEdldE9wdGlvbnMoCi0gICAgJ2N8Y29udGludWUhJyAgICA9 PiBcJGdpdFJlYmFzZUNvbnRpbnVlLAotICAgICdmfGZpeC1tZXJnZWQ6cycgPT4gXCZwYXJzZUZp eE1lcmdlZCwKLSAgICAnaHxoZWxwJyAgICAgICAgID0+IFwkc2hvd0hlbHAsCi0gICAgJ3d8d2Fy bmluZ3MhJyAgICA9PiBcJHByaW50V2FybmluZ3MsCisgICAgJ2N8Y29udGludWUhJyAgICAgPT4g XCRnaXRSZWJhc2VDb250aW51ZSwKKyAgICAnZnxmaXgtbWVyZ2VkOnMnICA9PiBcJnBhcnNlRml4 TWVyZ2VkLAorICAgICdtfG1lcmdlLWRyaXZlciEnID0+IFwkbWVyZ2VEcml2ZXIsCisgICAgJ2h8 aGVscCcgICAgICAgICAgPT4gXCRzaG93SGVscCwKKyAgICAnd3x3YXJuaW5ncyEnICAgICA9PiBc JHByaW50V2FybmluZ3MsCiApOwogCiBteSAkcmVsYXRpdmVQYXRoID0gaXNJbkdpdEZpbHRlckJy YW5jaCgpID8gJy4nIDogY2hkaXJSZXR1cm5pbmdSZWxhdGl2ZVBhdGgoZGV0ZXJtaW5lVkNTUm9v dCgpKTsKIAogbXkgQGNoYW5nZUxvZ0ZpbGVzID0gcmVtb3ZlQ2hhbmdlTG9nQXJndW1lbnRzKCRy ZWxhdGl2ZVBhdGgpOwogCi1pZiAoIWRlZmluZWQgJGZpeE1lcmdlZCAmJiBzY2FsYXIoQGNoYW5n ZUxvZ0ZpbGVzKSA9PSAwKSB7CitpZiAoIWRlZmluZWQgJGZpeE1lcmdlZCAmJiAhZGVmaW5lZCAk bWVyZ2VEcml2ZXIgJiYgc2NhbGFyKEBjaGFuZ2VMb2dGaWxlcykgPT0gMCkgewogICAgIEBjaGFu Z2VMb2dGaWxlcyA9IGZpbmRVbm1lcmdlZENoYW5nZUxvZ3MoKTsKIH0KIAotaWYgKHNjYWxhcihA QVJHVikgPiAwKSB7CitpZiAoIWRlZmluZWQgJG1lcmdlRHJpdmVyICYmIHNjYWxhcihAQVJHVikg PiAwKSB7CiAgICAgcHJpbnQgU1RERVJSICJFUlJPUjogRmlsZXMgbGlzdGVkIG9uIGNvbW1hbmQt bGluZSB0aGF0IGFyZSBub3QgQ2hhbmdlTG9ncy5cbiI7CiAgICAgdW5kZWYgJGdldE9wdGlvbnNS ZXN1bHQ7Ci19IGVsc2lmICghZGVmaW5lZCAkZml4TWVyZ2VkICYmIHNjYWxhcihAY2hhbmdlTG9n RmlsZXMpID09IDApIHsKK30gZWxzaWYgKCFkZWZpbmVkICRmaXhNZXJnZWQgJiYgIWRlZmluZWQg JG1lcmdlRHJpdmVyICYmIHNjYWxhcihAY2hhbmdlTG9nRmlsZXMpID09IDApIHsKICAgICBwcmlu dCBTVERFUlIgIkVSUk9SOiBObyBDaGFuZ2VMb2cgZmlsZXMgbGlzdGVkIG9uIGNvbW1hbmQtbGlu ZSBvciBmb3VuZCB1bm1lcmdlZC5cbiI7CiAgICAgdW5kZWYgJGdldE9wdGlvbnNSZXN1bHQ7CiB9 IGVsc2lmICgkZ2l0UmViYXNlQ29udGludWUgJiYgISRpc0dpdCkgewpAQCAtOTQsNiArOTcsMTIg QEAgaWYgKHNjYWxhcihAQVJHVikgPiAwKSB7CiB9IGVsc2lmIChkZWZpbmVkICRmaXhNZXJnZWQg JiYgISRpc0dpdCkgewogICAgIHByaW50IFNUREVSUiAiRVJST1I6IC0tZml4LW1lcmdlZCBtYXkg b25seSBiZSB1c2VkIHdpdGggYSBnaXQgcmVwb3NpdG9yeVxuIjsKICAgICB1bmRlZiAkZ2V0T3B0 aW9uc1Jlc3VsdDsKK30gZWxzaWYgKGRlZmluZWQgJG1lcmdlRHJpdmVyICYmICEkaXNHaXQpIHsK KyAgICBwcmludCBTVERFUlIgIkVSUk9SOiAtLW1lcmdlLWRyaXZlciBtYXkgb25seSBiZSB1c2Vk IHdpdGggYSBnaXQgcmVwb3NpdG9yeVxuIjsKKyAgICB1bmRlZiAkZ2V0T3B0aW9uc1Jlc3VsdDsK K30gZWxzaWYgKGRlZmluZWQgJG1lcmdlRHJpdmVyICYmIHNjYWxhcihAQVJHVikgPCAzKSB7Cisg ICAgcHJpbnQgU1RERVJSICJFUlJPUjogLS1tZXJnZS1kcml2ZXIgZXhwZWN0cyAlTyAlQSAlQiBh cyBhcmd1bWVudHNcbiI7CisgICAgdW5kZWYgJGdldE9wdGlvbnNSZXN1bHQ7CiB9CiAKIHN1YiB1 c2FnZUFuZEV4aXQoKQpAQCAtMTA0LDYgKzExMyw3IEBAIFVzYWdlOiBAe1sgYmFzZW5hbWUoJDAp IF19IFtvcHRpb25zXSBbcGF0aC90by9DaGFuZ2VMb2ddIFtwYXRoL3RvL2Fub3RoZXIvQ2hhbmdl CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGVudHJpZXMgKGRlZmF1bHQ6IC0t bm8tY29udGludWUpCiAgIC1mfC0tZml4LW1lcmdlZCBbcmV2aXNpb24tcmFuZ2VdIGZpeCBnaXQt bWVyZ2VkIENoYW5nZUxvZyBlbnRyaWVzOyBpZiBhIHJldmlzaW9uLXJhbmdlCiAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIGlzIHNwZWNpZmllZCwgcnVuIGdpdCBmaWx0ZXItYnJh bmNoIG9uIHRoZSByYW5nZQorICAtbXwtLW1lcmdlLWRyaXZlciAlTyAlQSAlQiAgICAgICBhY3Qg YXMgYSBnaXQgbWVyZ2UtZHJpdmVyIG9uIGZpbGVzICVPICVBICVCCiAgIC1ofC0taGVscCAgICAg ICAgICAgICAgICAgICAgICAgIHNob3cgdGhpcyBoZWxwIG1lc3NhZ2UKICAgLXd8LS1bbm8tXXdh cm5pbmdzICAgICAgICAgICAgICAgc2hvdyBvciBzdXBwcmVzcyB3YXJuaW5ncyAoZGVmYXVsdDog c2hvdyB3YXJuaW5ncykKIF9fRU5EX18KQEAgLTExOCw2ICsxMjgsMTQgQEAgaWYgKGRlZmluZWQg JGZpeE1lcmdlZCAmJiBsZW5ndGgoJGZpeE1lcmdlZCkgPiAwKSB7CiAgICAgbXkgJGNvbW1pdFJh bmdlID0gJGZpeE1lcmdlZDsKICAgICAkY29tbWl0UmFuZ2UgPSAkY29tbWl0UmFuZ2UgLiAiLi5I RUFEIiBpZiBpbmRleCgkY29tbWl0UmFuZ2UsICIuLiIpIDwgMDsKICAgICBmaXhNZXJnZWRDaGFu Z2VMb2dzKCRjb21taXRSYW5nZSwgQGNoYW5nZUxvZ0ZpbGVzKTsKK30gZWxzaWYgKCRtZXJnZURy aXZlcikgeworICAgIG15ICgkYmFzZSwgJHRoZWlycywgJG91cnMpID0gQEFSR1Y7CisgICAgaWYg KG1lcmdlQ2hhbmdlcygkb3VycywgJGJhc2UsICR0aGVpcnMpKSB7CisgICAgICAgIHVubGluaygk b3Vycyk7CisgICAgICAgIGNvcHkoJHRoZWlycywgJG91cnMpIG9yIGRpZSAkITsKKyAgICB9IGVs c2UgeworICAgICAgICBleGl0IDE7CisgICAgfQogfSBlbHNpZiAoQGNoYW5nZUxvZ0ZpbGVzKSB7 CiAgICAgZm9yIG15ICRmaWxlIChAY2hhbmdlTG9nRmlsZXMpIHsKICAgICAgICAgaWYgKGRlZmlu ZWQgJGZpeE1lcmdlZCkgewotLSAKMS42LjUucmMyCgo= 48227 2010-02-05 05:41:01 -0800 2010-02-17 01:47:51 -0800 without all those gitattributes and changelogs 0001-Teach-resolve-ChangeLogs-to-act-as-a-merge-driver-fo.patch text/plain 5936 vestbo RnJvbSBhMTljOTJlNjgzNGVhZjI0ZWQ1YjJjM2QzMWRjYTYzMDYyMGY3NzM3IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiA9P1VURi04P3E/VG9yPTIwQXJuZT0yMFZlc3RiPUMzPUI4Pz0g PHRvci5hcm5lLnZlc3Rib0Bub2tpYS5jb20+CkRhdGU6IEZyaSwgNSBGZWIgMjAxMCAxNDozNjo1 OSArMDEwMApTdWJqZWN0OiBbUEFUQ0hdIFRlYWNoIHJlc29sdmUtQ2hhbmdlTG9ncyB0byBhY3Qg YXMgYSBtZXJnZS1kcml2ZXIgZm9yIEdpdAoKUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCgpU aGUgZHJpdmVyIGFsd2F5cyB3b3JrcyBpbiAiZG93bnN0cmVhbSIgbWVyZ2UgbW9kZSwgbWVhbmlu ZwppdCB3aWxsIGFsd2F5cyBwdXQgdGhlIHVzZXIncyBjaGFuZ2Vsb2cgZW50cmllcyBvbiB0b3Au CgpodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Mjg3MjEKCiogLmdpdGF0 dHJpYnV0ZXM6IEFkZGVkLgoqIFNjcmlwdHMvcmVzb2x2ZS1DaGFuZ2VMb2dzOgotLS0KIC5naXRh dHRyaWJ1dGVzICAgICAgICAgICAgICAgICAgICAgICAgIHwgICAgMyArKysKIENoYW5nZUxvZyAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIHwgICAgOCArKysrKysrKwogV2ViS2l0VG9vbHMv Q2hhbmdlTG9nICAgICAgICAgICAgICAgICAgfCAgIDE0ICsrKysrKysrKysrKysrCiBXZWJLaXRU b29scy9TY3JpcHRzL3Jlc29sdmUtQ2hhbmdlTG9ncyB8ICAgMzIgKysrKysrKysrKysrKysrKysr KysrKysrKy0tLS0tLS0KIDQgZmlsZXMgY2hhbmdlZCwgNTAgaW5zZXJ0aW9ucygrKSwgNyBkZWxl dGlvbnMoLSkKIGNyZWF0ZSBtb2RlIDEwMDY0NCAuZ2l0YXR0cmlidXRlcwoKZGlmZiAtLWdpdCBh Ly5naXRhdHRyaWJ1dGVzIGIvLmdpdGF0dHJpYnV0ZXMKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5k ZXggMDAwMDAwMC4uY2Y4MGY2OQotLS0gL2Rldi9udWxsCisrKyBiLy5naXRhdHRyaWJ1dGVzCkBA IC0wLDAgKzEsMyBAQAorIyBUbyBlbmFibGUgYXV0b21hdGljIG1lcmdpbmcgb2YgQ2hhbmdlTG9n IGZpbGVzLCB1c2UgdGhlIGZvbGxvd2luZyBjb21tYW5kOgorIyBnaXQgY29uZmlnIG1lcmdlLmNo YW5nZWxvZy5kcml2ZXIgInJlc29sdmUtQ2hhbmdlTG9ncyAtLW1lcmdlLWRyaXZlciAlTyAlQSAl QiIKK0NoYW5nZUxvZyogbWVyZ2U9Y2hhbmdlbG9nCmRpZmYgLS1naXQgYS9DaGFuZ2VMb2cgYi9D aGFuZ2VMb2cKaW5kZXggOTk4ZTE5My4uZDYxNDUxOSAxMDA2NDQKLS0tIGEvQ2hhbmdlTG9nCisr KyBiL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDEzIEBACiAyMDEwLTAyLTA1ICBUb3IgQXJuZSBWZXN0 YsO4ICA8dG9yLmFybmUudmVzdGJvQG5va2lhLmNvbT4KIAorICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgLmdpdGF0dHJpYnV0ZXMgZmlsZSBmb3IgY3Vz dG9tIENoYW5nZUxvZyBtZXJnZS1kcml2ZXIKKworICAgICAgICAqIC5naXRhdHRyaWJ1dGVzOiBB ZGRlZC4KKworMjAxMC0wMi0wNSAgVG9yIEFybmUgVmVzdGLDuCAgPHRvci5hcm5lLnZlc3Rib0Bu b2tpYS5jb20+CisKICAgICAgICAgUmV2aWV3ZWQgYnkgU2ltb24gSGF1c21hbm4uCiAKICAgICAg ICAgW1F0XSBHZW5lcmF0ZSBjb252ZW5pZW5jZSBoZWFkZXJzIChRV2ViVmlldywgZXRjKSB1c2lu ZyBxbWFrZQpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nIGIvV2ViS2l0VG9vbHMv Q2hhbmdlTG9nCmluZGV4IDQwZDE5ZDIuLmE1ZWU4NzggMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xz L0NoYW5nZUxvZworKysgYi9XZWJLaXRUb29scy9DaGFuZ2VMb2cKQEAgLTEsNSArMSwxOSBAQAog MjAxMC0wMi0wNSAgVG9yIEFybmUgVmVzdGLDuCAgPHRvci5hcm5lLnZlc3Rib0Bub2tpYS5jb20+ CiAKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGVhY2gg cmVzb2x2ZS1DaGFuZ2VMb2dzIHRvIGFjdCBhcyBhIG1lcmdlLWRyaXZlciBmb3IgR2l0CisKKyAg ICAgICAgVGhlIGRyaXZlciBhbHdheXMgd29ya3MgaW4gImRvd25zdHJlYW0iIG1lcmdlIG1vZGUs IG1lYW5pbmcKKyAgICAgICAgaXQgd2lsbCBhbHdheXMgcHV0IHRoZSB1c2VyJ3MgY2hhbmdlbG9n IGVudHJpZXMgb24gdG9wLgorCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0yODcyMQorCisgICAgICAgICogLmdpdGF0dHJpYnV0ZXM6IEFkZGVkLgorICAg ICAgICAqIFNjcmlwdHMvcmVzb2x2ZS1DaGFuZ2VMb2dzOgorCisyMDEwLTAyLTA1ICBUb3IgQXJu ZSBWZXN0YsO4ICA8dG9yLmFybmUudmVzdGJvQG5va2lhLmNvbT4KKwogICAgICAgICBSZXZpZXdl ZCBieSBTaW1vbiBIYXVzbWFubi4KIAogICAgICAgICBbUXRdIEdlbmVyYXRlIGNvbnZlbmllbmNl IGhlYWRlcnMgKFFXZWJWaWV3LCBldGMpIHVzaW5nIHFtYWtlCmRpZmYgLS1naXQgYS9XZWJLaXRU b29scy9TY3JpcHRzL3Jlc29sdmUtQ2hhbmdlTG9ncyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvcmVz b2x2ZS1DaGFuZ2VMb2dzCmluZGV4IDFhMmQyYWYuLjYxNTg2MTUgMTAwNzU1Ci0tLSBhL1dlYktp dFRvb2xzL1NjcmlwdHMvcmVzb2x2ZS1DaGFuZ2VMb2dzCisrKyBiL1dlYktpdFRvb2xzL1Njcmlw dHMvcmVzb2x2ZS1DaGFuZ2VMb2dzCkBAIC0zNCw2ICszNCw3IEBAIHVzZSBGaW5kQmluOwogdXNl IGxpYiAkRmluZEJpbjo6QmluOwogCiB1c2UgRmlsZTo6QmFzZW5hbWU7Cit1c2UgRmlsZTo6Q29w eTsKIHVzZSBGaWxlOjpQYXRoOwogdXNlIEZpbGU6OlNwZWM7CiB1c2UgR2V0b3B0OjpMb25nOwpA QCAtNjQsMjggKzY1LDMwIEBAIG15ICRHSVQgPSAiZ2l0IjsKIAogbXkgJGZpeE1lcmdlZDsKIG15 ICRnaXRSZWJhc2VDb250aW51ZSA9IDA7CitteSAkbWVyZ2VEcml2ZXIgPSAwOwogbXkgJHByaW50 V2FybmluZ3MgPSAxOwogbXkgJHNob3dIZWxwOwogCiBteSAkZ2V0T3B0aW9uc1Jlc3VsdCA9IEdl dE9wdGlvbnMoCi0gICAgJ2N8Y29udGludWUhJyAgICA9PiBcJGdpdFJlYmFzZUNvbnRpbnVlLAot ICAgICdmfGZpeC1tZXJnZWQ6cycgPT4gXCZwYXJzZUZpeE1lcmdlZCwKLSAgICAnaHxoZWxwJyAg ICAgICAgID0+IFwkc2hvd0hlbHAsCi0gICAgJ3d8d2FybmluZ3MhJyAgICA9PiBcJHByaW50V2Fy bmluZ3MsCisgICAgJ2N8Y29udGludWUhJyAgICAgPT4gXCRnaXRSZWJhc2VDb250aW51ZSwKKyAg ICAnZnxmaXgtbWVyZ2VkOnMnICA9PiBcJnBhcnNlRml4TWVyZ2VkLAorICAgICdtfG1lcmdlLWRy aXZlciEnID0+IFwkbWVyZ2VEcml2ZXIsCisgICAgJ2h8aGVscCcgICAgICAgICAgPT4gXCRzaG93 SGVscCwKKyAgICAnd3x3YXJuaW5ncyEnICAgICA9PiBcJHByaW50V2FybmluZ3MsCiApOwogCiBt eSAkcmVsYXRpdmVQYXRoID0gaXNJbkdpdEZpbHRlckJyYW5jaCgpID8gJy4nIDogY2hkaXJSZXR1 cm5pbmdSZWxhdGl2ZVBhdGgoZGV0ZXJtaW5lVkNTUm9vdCgpKTsKIAogbXkgQGNoYW5nZUxvZ0Zp bGVzID0gcmVtb3ZlQ2hhbmdlTG9nQXJndW1lbnRzKCRyZWxhdGl2ZVBhdGgpOwogCi1pZiAoIWRl ZmluZWQgJGZpeE1lcmdlZCAmJiBzY2FsYXIoQGNoYW5nZUxvZ0ZpbGVzKSA9PSAwKSB7CitpZiAo IWRlZmluZWQgJGZpeE1lcmdlZCAmJiAhZGVmaW5lZCAkbWVyZ2VEcml2ZXIgJiYgc2NhbGFyKEBj aGFuZ2VMb2dGaWxlcykgPT0gMCkgewogICAgIEBjaGFuZ2VMb2dGaWxlcyA9IGZpbmRVbm1lcmdl ZENoYW5nZUxvZ3MoKTsKIH0KIAotaWYgKHNjYWxhcihAQVJHVikgPiAwKSB7CitpZiAoIWRlZmlu ZWQgJG1lcmdlRHJpdmVyICYmIHNjYWxhcihAQVJHVikgPiAwKSB7CiAgICAgcHJpbnQgU1RERVJS ICJFUlJPUjogRmlsZXMgbGlzdGVkIG9uIGNvbW1hbmQtbGluZSB0aGF0IGFyZSBub3QgQ2hhbmdl TG9ncy5cbiI7CiAgICAgdW5kZWYgJGdldE9wdGlvbnNSZXN1bHQ7Ci19IGVsc2lmICghZGVmaW5l ZCAkZml4TWVyZ2VkICYmIHNjYWxhcihAY2hhbmdlTG9nRmlsZXMpID09IDApIHsKK30gZWxzaWYg KCFkZWZpbmVkICRmaXhNZXJnZWQgJiYgIWRlZmluZWQgJG1lcmdlRHJpdmVyICYmIHNjYWxhcihA Y2hhbmdlTG9nRmlsZXMpID09IDApIHsKICAgICBwcmludCBTVERFUlIgIkVSUk9SOiBObyBDaGFu Z2VMb2cgZmlsZXMgbGlzdGVkIG9uIGNvbW1hbmQtbGluZSBvciBmb3VuZCB1bm1lcmdlZC5cbiI7 CiAgICAgdW5kZWYgJGdldE9wdGlvbnNSZXN1bHQ7CiB9IGVsc2lmICgkZ2l0UmViYXNlQ29udGlu dWUgJiYgISRpc0dpdCkgewpAQCAtOTQsNiArOTcsMTIgQEAgaWYgKHNjYWxhcihAQVJHVikgPiAw KSB7CiB9IGVsc2lmIChkZWZpbmVkICRmaXhNZXJnZWQgJiYgISRpc0dpdCkgewogICAgIHByaW50 IFNUREVSUiAiRVJST1I6IC0tZml4LW1lcmdlZCBtYXkgb25seSBiZSB1c2VkIHdpdGggYSBnaXQg cmVwb3NpdG9yeVxuIjsKICAgICB1bmRlZiAkZ2V0T3B0aW9uc1Jlc3VsdDsKK30gZWxzaWYgKGRl ZmluZWQgJG1lcmdlRHJpdmVyICYmICEkaXNHaXQpIHsKKyAgICBwcmludCBTVERFUlIgIkVSUk9S OiAtLW1lcmdlLWRyaXZlciBtYXkgb25seSBiZSB1c2VkIHdpdGggYSBnaXQgcmVwb3NpdG9yeVxu IjsKKyAgICB1bmRlZiAkZ2V0T3B0aW9uc1Jlc3VsdDsKK30gZWxzaWYgKGRlZmluZWQgJG1lcmdl RHJpdmVyICYmIHNjYWxhcihAQVJHVikgPCAzKSB7CisgICAgcHJpbnQgU1RERVJSICJFUlJPUjog LS1tZXJnZS1kcml2ZXIgZXhwZWN0cyAlTyAlQSAlQiBhcyBhcmd1bWVudHNcbiI7CisgICAgdW5k ZWYgJGdldE9wdGlvbnNSZXN1bHQ7CiB9CiAKIHN1YiB1c2FnZUFuZEV4aXQoKQpAQCAtMTA0LDYg KzExMyw3IEBAIFVzYWdlOiBAe1sgYmFzZW5hbWUoJDApIF19IFtvcHRpb25zXSBbcGF0aC90by9D aGFuZ2VMb2ddIFtwYXRoL3RvL2Fub3RoZXIvQ2hhbmdlCiAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIGVudHJpZXMgKGRlZmF1bHQ6IC0tbm8tY29udGludWUpCiAgIC1mfC0tZml4 LW1lcmdlZCBbcmV2aXNpb24tcmFuZ2VdIGZpeCBnaXQtbWVyZ2VkIENoYW5nZUxvZyBlbnRyaWVz OyBpZiBhIHJldmlzaW9uLXJhbmdlCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IGlzIHNwZWNpZmllZCwgcnVuIGdpdCBmaWx0ZXItYnJhbmNoIG9uIHRoZSByYW5nZQorICAtbXwt LW1lcmdlLWRyaXZlciAlTyAlQSAlQiAgICAgICBhY3QgYXMgYSBnaXQgbWVyZ2UtZHJpdmVyIG9u IGZpbGVzICVPICVBICVCCiAgIC1ofC0taGVscCAgICAgICAgICAgICAgICAgICAgICAgIHNob3cg dGhpcyBoZWxwIG1lc3NhZ2UKICAgLXd8LS1bbm8tXXdhcm5pbmdzICAgICAgICAgICAgICAgc2hv dyBvciBzdXBwcmVzcyB3YXJuaW5ncyAoZGVmYXVsdDogc2hvdyB3YXJuaW5ncykKIF9fRU5EX18K QEAgLTExOCw2ICsxMjgsMTQgQEAgaWYgKGRlZmluZWQgJGZpeE1lcmdlZCAmJiBsZW5ndGgoJGZp eE1lcmdlZCkgPiAwKSB7CiAgICAgbXkgJGNvbW1pdFJhbmdlID0gJGZpeE1lcmdlZDsKICAgICAk Y29tbWl0UmFuZ2UgPSAkY29tbWl0UmFuZ2UgLiAiLi5IRUFEIiBpZiBpbmRleCgkY29tbWl0UmFu Z2UsICIuLiIpIDwgMDsKICAgICBmaXhNZXJnZWRDaGFuZ2VMb2dzKCRjb21taXRSYW5nZSwgQGNo YW5nZUxvZ0ZpbGVzKTsKK30gZWxzaWYgKCRtZXJnZURyaXZlcikgeworICAgIG15ICgkYmFzZSwg JHRoZWlycywgJG91cnMpID0gQEFSR1Y7CisgICAgaWYgKG1lcmdlQ2hhbmdlcygkb3VycywgJGJh c2UsICR0aGVpcnMpKSB7CisgICAgICAgIHVubGluaygkb3Vycyk7CisgICAgICAgIGNvcHkoJHRo ZWlycywgJG91cnMpIG9yIGRpZSAkITsKKyAgICB9IGVsc2UgeworICAgICAgICBleGl0IDE7Cisg ICAgfQogfSBlbHNpZiAoQGNoYW5nZUxvZ0ZpbGVzKSB7CiAgICAgZm9yIG15ICRmaWxlIChAY2hh bmdlTG9nRmlsZXMpIHsKICAgICAgICAgaWYgKGRlZmluZWQgJGZpeE1lcmdlZCkgewotLSAKMS42 LjUucmMyCgo= 48871 2010-02-17 01:47:57 -0800 2010-02-17 10:15:55 -0800 Patch bug-28721-20100217104755.patch text/plain 5254 vestbo ZGlmZiAtLWdpdCBjLy5naXRhdHRyaWJ1dGVzIHcvLmdpdGF0dHJpYnV0ZXMKaW5kZXggNDZjYTQ1 NC4uODAzODZhZSAxMDA2NDQKLS0tIGMvLmdpdGF0dHJpYnV0ZXMKKysrIHcvLmdpdGF0dHJpYnV0 ZXMKQEAgLTEsMyArMSw3IEBACisjIFRvIGVuYWJsZSBhdXRvbWF0aWMgbWVyZ2luZyBvZiBDaGFu Z2VMb2cgZmlsZXMsIHVzZSB0aGUgZm9sbG93aW5nIGNvbW1hbmQ6CisjIGdpdCBjb25maWcgbWVy Z2UuY2hhbmdlbG9nLmRyaXZlciAicmVzb2x2ZS1DaGFuZ2VMb2dzIC0tbWVyZ2UtZHJpdmVyICVP ICVBICVCIgorQ2hhbmdlTG9nKiBtZXJnZT1jaGFuZ2Vsb2cKKwogSmF2YVNjcmlwdENvcmUvSmF2 YVNjcmlwdENvcmUudmNwcm9qL0phdmFTY3JpcHRDb3JlLnNsbiAtY3JsZgogSmF2YVNjcmlwdENv cmUvSmF2YVNjcmlwdENvcmUudmNwcm9qL0phdmFTY3JpcHRDb3JlL0phdmFTY3JpcHRDb3JlLnZj cHJvaiAtY3JsZgogSmF2YVNjcmlwdENvcmUvSmF2YVNjcmlwdENvcmUudmNwcm9qL0phdmFTY3Jp cHRDb3JlL0phdmFTY3JpcHRDb3JlQ0YudnNwcm9wcyAtY3JsZgpkaWZmIC0tZ2l0IGMvQ2hhbmdl TG9nIHcvQ2hhbmdlTG9nCmluZGV4IDY2OWY5YzYuLjg1MzMwNDMgMTAwNjQ0Ci0tLSBjL0NoYW5n ZUxvZworKysgdy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMSBAQAorMjAxMC0wMi0wNSAgVG9yIEFy bmUgVmVzdGLDuCAgPHRvci5hcm5lLnZlc3Rib0Bub2tpYS5jb20+CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkIC5naXRhdHRyaWJ1dGVzIGZpbGUg Zm9yIGN1c3RvbSBDaGFuZ2VMb2cgbWVyZ2UtZHJpdmVyCisKKyAgICAgICAgKiAuZ2l0YXR0cmli dXRlczogQWRkZWQuCisKIDIwMTAtMDItMTUgIFBoaWxpcHBlIE5vcm1hbmQgIDxwbm9ybWFuZEBp Z2FsaWEuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEd1c3Rhdm8gTm9yb25oYSBTaWx2YS4K ZGlmZiAtLWdpdCBjL1dlYktpdFRvb2xzL0NoYW5nZUxvZyB3L1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCA0YjY1NjU5Li43M2Q3YTI0IDEwMDY0NAotLS0gYy9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIHcvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTAtMDIt MTcgIFRvciBBcm5lIFZlc3Riw7ggIDx0b3IuYXJuZS52ZXN0Ym9Abm9raWEuY29tPgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRlYWNoIHJlc29sdmUt Q2hhbmdlTG9ncyB0byBhY3QgYXMgYSBtZXJnZS1kcml2ZXIgZm9yIEdpdAorCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yODcyMQorCisgICAgICAgIFRv IGVuYWJsZSBhdXRvbWF0aWMgbWVyZ2luZyBvZiBDaGFuZ2VMb2cgZmlsZXMsIHVzZSB0aGUgZm9s bG93aW5nIGNvbW1hbmQ6CisKKyAgICAgICAgZ2l0IGNvbmZpZyBtZXJnZS5jaGFuZ2Vsb2cuZHJp dmVyICJyZXNvbHZlLUNoYW5nZUxvZ3MgLS1tZXJnZS1kcml2ZXIgJU8gJUEgJUIiCisKKyAgICAg ICAgVGhlIGRyaXZlciBhbHdheXMgd29ya3MgaW4gImRvd25zdHJlYW0iIG1lcmdlIG1vZGUsIG1l YW5pbmcKKyAgICAgICAgaXQgd2lsbCBhbHdheXMgcHV0IHRoZSB1c2VyJ3MgY2hhbmdlbG9nIGVu dHJpZXMgb24gdG9wLgorCisgICAgICAgICogU2NyaXB0cy9yZXNvbHZlLUNoYW5nZUxvZ3M6CisK IDIwMTAtMDItMTUgIENocmlzIEplcmRvbmVrICA8Y2plcmRvbmVrQHdlYmtpdC5vcmc+CiAKICAg ICAgICAgUmV2aWV3ZWQgYnkgU2hpbmljaGlybyBIYW1hamkuCmRpZmYgLS1naXQgYy9XZWJLaXRU b29scy9TY3JpcHRzL3Jlc29sdmUtQ2hhbmdlTG9ncyB3L1dlYktpdFRvb2xzL1NjcmlwdHMvcmVz b2x2ZS1DaGFuZ2VMb2dzCmluZGV4IDFhMmQyYWYuLjMyMzgzNTAgMTAwNzU1Ci0tLSBjL1dlYktp dFRvb2xzL1NjcmlwdHMvcmVzb2x2ZS1DaGFuZ2VMb2dzCisrKyB3L1dlYktpdFRvb2xzL1Njcmlw dHMvcmVzb2x2ZS1DaGFuZ2VMb2dzCkBAIC0zNCw2ICszNCw3IEBAIHVzZSBGaW5kQmluOwogdXNl IGxpYiAkRmluZEJpbjo6QmluOwogCiB1c2UgRmlsZTo6QmFzZW5hbWU7Cit1c2UgRmlsZTo6Q29w eTsKIHVzZSBGaWxlOjpQYXRoOwogdXNlIEZpbGU6OlNwZWM7CiB1c2UgR2V0b3B0OjpMb25nOwpA QCAtNjQsMjggKzY1LDMwIEBAIG15ICRHSVQgPSAiZ2l0IjsKIAogbXkgJGZpeE1lcmdlZDsKIG15 ICRnaXRSZWJhc2VDb250aW51ZSA9IDA7CitteSAkbWVyZ2VEcml2ZXIgPSAwOwogbXkgJHByaW50 V2FybmluZ3MgPSAxOwogbXkgJHNob3dIZWxwOwogCiBteSAkZ2V0T3B0aW9uc1Jlc3VsdCA9IEdl dE9wdGlvbnMoCi0gICAgJ2N8Y29udGludWUhJyAgICA9PiBcJGdpdFJlYmFzZUNvbnRpbnVlLAot ICAgICdmfGZpeC1tZXJnZWQ6cycgPT4gXCZwYXJzZUZpeE1lcmdlZCwKLSAgICAnaHxoZWxwJyAg ICAgICAgID0+IFwkc2hvd0hlbHAsCi0gICAgJ3d8d2FybmluZ3MhJyAgICA9PiBcJHByaW50V2Fy bmluZ3MsCisgICAgJ2N8Y29udGludWUhJyAgICAgPT4gXCRnaXRSZWJhc2VDb250aW51ZSwKKyAg ICAnZnxmaXgtbWVyZ2VkOnMnICA9PiBcJnBhcnNlRml4TWVyZ2VkLAorICAgICdtfG1lcmdlLWRy aXZlciEnID0+IFwkbWVyZ2VEcml2ZXIsCisgICAgJ2h8aGVscCcgICAgICAgICAgPT4gXCRzaG93 SGVscCwKKyAgICAnd3x3YXJuaW5ncyEnICAgICA9PiBcJHByaW50V2FybmluZ3MsCiApOwogCiBt eSAkcmVsYXRpdmVQYXRoID0gaXNJbkdpdEZpbHRlckJyYW5jaCgpID8gJy4nIDogY2hkaXJSZXR1 cm5pbmdSZWxhdGl2ZVBhdGgoZGV0ZXJtaW5lVkNTUm9vdCgpKTsKIAogbXkgQGNoYW5nZUxvZ0Zp bGVzID0gcmVtb3ZlQ2hhbmdlTG9nQXJndW1lbnRzKCRyZWxhdGl2ZVBhdGgpOwogCi1pZiAoIWRl ZmluZWQgJGZpeE1lcmdlZCAmJiBzY2FsYXIoQGNoYW5nZUxvZ0ZpbGVzKSA9PSAwKSB7CitpZiAo IWRlZmluZWQgJGZpeE1lcmdlZCAmJiAhJG1lcmdlRHJpdmVyICYmIHNjYWxhcihAY2hhbmdlTG9n RmlsZXMpID09IDApIHsKICAgICBAY2hhbmdlTG9nRmlsZXMgPSBmaW5kVW5tZXJnZWRDaGFuZ2VM b2dzKCk7CiB9CiAKLWlmIChzY2FsYXIoQEFSR1YpID4gMCkgeworaWYgKCEkbWVyZ2VEcml2ZXIg JiYgc2NhbGFyKEBBUkdWKSA+IDApIHsKICAgICBwcmludCBTVERFUlIgIkVSUk9SOiBGaWxlcyBs aXN0ZWQgb24gY29tbWFuZC1saW5lIHRoYXQgYXJlIG5vdCBDaGFuZ2VMb2dzLlxuIjsKICAgICB1 bmRlZiAkZ2V0T3B0aW9uc1Jlc3VsdDsKLX0gZWxzaWYgKCFkZWZpbmVkICRmaXhNZXJnZWQgJiYg c2NhbGFyKEBjaGFuZ2VMb2dGaWxlcykgPT0gMCkgeworfSBlbHNpZiAoIWRlZmluZWQgJGZpeE1l cmdlZCAmJiAhJG1lcmdlRHJpdmVyICYmIHNjYWxhcihAY2hhbmdlTG9nRmlsZXMpID09IDApIHsK ICAgICBwcmludCBTVERFUlIgIkVSUk9SOiBObyBDaGFuZ2VMb2cgZmlsZXMgbGlzdGVkIG9uIGNv bW1hbmQtbGluZSBvciBmb3VuZCB1bm1lcmdlZC5cbiI7CiAgICAgdW5kZWYgJGdldE9wdGlvbnNS ZXN1bHQ7CiB9IGVsc2lmICgkZ2l0UmViYXNlQ29udGludWUgJiYgISRpc0dpdCkgewpAQCAtOTQs NiArOTcsMTIgQEAgaWYgKHNjYWxhcihAQVJHVikgPiAwKSB7CiB9IGVsc2lmIChkZWZpbmVkICRm aXhNZXJnZWQgJiYgISRpc0dpdCkgewogICAgIHByaW50IFNUREVSUiAiRVJST1I6IC0tZml4LW1l cmdlZCBtYXkgb25seSBiZSB1c2VkIHdpdGggYSBnaXQgcmVwb3NpdG9yeVxuIjsKICAgICB1bmRl ZiAkZ2V0T3B0aW9uc1Jlc3VsdDsKK30gZWxzaWYgKCRtZXJnZURyaXZlciAmJiAhJGlzR2l0KSB7 CisgICAgcHJpbnQgU1RERVJSICJFUlJPUjogLS1tZXJnZS1kcml2ZXIgbWF5IG9ubHkgYmUgdXNl ZCB3aXRoIGEgZ2l0IHJlcG9zaXRvcnlcbiI7CisgICAgdW5kZWYgJGdldE9wdGlvbnNSZXN1bHQ7 Cit9IGVsc2lmICgkbWVyZ2VEcml2ZXIgJiYgc2NhbGFyKEBBUkdWKSA8IDMpIHsKKyAgICBwcmlu dCBTVERFUlIgIkVSUk9SOiAtLW1lcmdlLWRyaXZlciBleHBlY3RzICVPICVBICVCIGFzIGFyZ3Vt ZW50c1xuIjsKKyAgICB1bmRlZiAkZ2V0T3B0aW9uc1Jlc3VsdDsKIH0KIAogc3ViIHVzYWdlQW5k RXhpdCgpCkBAIC0xMDQsNiArMTEzLDcgQEAgVXNhZ2U6IEB7WyBiYXNlbmFtZSgkMCkgXX0gW29w dGlvbnNdIFtwYXRoL3RvL0NoYW5nZUxvZ10gW3BhdGgvdG8vYW5vdGhlci9DaGFuZ2UKICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZW50cmllcyAoZGVmYXVsdDogLS1uby1jb250 aW51ZSkKICAgLWZ8LS1maXgtbWVyZ2VkIFtyZXZpc2lvbi1yYW5nZV0gZml4IGdpdC1tZXJnZWQg Q2hhbmdlTG9nIGVudHJpZXM7IGlmIGEgcmV2aXNpb24tcmFuZ2UKICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgaXMgc3BlY2lmaWVkLCBydW4gZ2l0IGZpbHRlci1icmFuY2ggb24g dGhlIHJhbmdlCisgIC1tfC0tbWVyZ2UtZHJpdmVyICVPICVBICVCICAgICAgIGFjdCBhcyBhIGdp dCBtZXJnZS1kcml2ZXIgb24gZmlsZXMgJU8gJUEgJUIKICAgLWh8LS1oZWxwICAgICAgICAgICAg ICAgICAgICAgICAgc2hvdyB0aGlzIGhlbHAgbWVzc2FnZQogICAtd3wtLVtuby1dd2FybmluZ3Mg ICAgICAgICAgICAgICBzaG93IG9yIHN1cHByZXNzIHdhcm5pbmdzIChkZWZhdWx0OiBzaG93IHdh cm5pbmdzKQogX19FTkRfXwpAQCAtMTE4LDYgKzEyOCwxNCBAQCBpZiAoZGVmaW5lZCAkZml4TWVy Z2VkICYmIGxlbmd0aCgkZml4TWVyZ2VkKSA+IDApIHsKICAgICBteSAkY29tbWl0UmFuZ2UgPSAk Zml4TWVyZ2VkOwogICAgICRjb21taXRSYW5nZSA9ICRjb21taXRSYW5nZSAuICIuLkhFQUQiIGlm IGluZGV4KCRjb21taXRSYW5nZSwgIi4uIikgPCAwOwogICAgIGZpeE1lcmdlZENoYW5nZUxvZ3Mo JGNvbW1pdFJhbmdlLCBAY2hhbmdlTG9nRmlsZXMpOworfSBlbHNpZiAoJG1lcmdlRHJpdmVyKSB7 CisgICAgbXkgKCRiYXNlLCAkdGhlaXJzLCAkb3VycykgPSBAQVJHVjsKKyAgICBpZiAobWVyZ2VD aGFuZ2VzKCRvdXJzLCAkYmFzZSwgJHRoZWlycykpIHsKKyAgICAgICAgdW5saW5rKCRvdXJzKTsK KyAgICAgICAgY29weSgkdGhlaXJzLCAkb3Vycykgb3IgZGllICQhOworICAgIH0gZWxzZSB7Cisg ICAgICAgIGV4aXQgMTsKKyAgICB9CiB9IGVsc2lmIChAY2hhbmdlTG9nRmlsZXMpIHsKICAgICBm b3IgbXkgJGZpbGUgKEBjaGFuZ2VMb2dGaWxlcykgewogICAgICAgICBpZiAoZGVmaW5lZCAkZml4 TWVyZ2VkKSB7Cg==