117543 2013-06-12 07:42:17 -0700 [GTK] Merge decamelizations fix ups in the GObject DOM bindings code generator 2013-07-19 05:45:37 -0700 1 1 1 Unclassified WebKit Bindings 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 0 dpino webkit-unassigned cdumez cgarcia commit-queue gtk-ews mrobinson rego+ews xan.lopez oldest_to_newest 899547 0 dpino 2013-06-12 07:42:17 -0700 The function decamelize() cannot decamelize all strings the right way, so some hard coded fix ups are applied. At this moment, there are two functions that applied two different sets of fixups. There should be a single point to apply the same fix ups, which ensures that the result of decamelizing a string is always the same. 899548 1 204439 dpino 2013-06-12 07:51:32 -0700 Created attachment 204439 Patch 901813 2 205009 dpino 2013-06-19 09:33:10 -0700 Created attachment 205009 Patch 901815 3 dpino 2013-06-19 09:37:19 -0700 I forgot to remove "No new tests (OOPS!)." 905322 4 dpino 2013-07-02 04:17:13 -0700 Since this patch changes several parts of the code and it's hard to follow how those changes will affect the code generated, Xan suggested me to compare all the files under "WebKitBuild/Release/DerivedSources/webkitdom/" in branch master and a branch with this patch applied. I wrote a script to do that (http://pastebin.com/T14kWZpF). The script revealed the following files were different: * WebKitBuild/Release/DerivedSources/webkitdom/WebKitDOMWebKitNamedFlow.cpp * WebKitBuild/Release/DerivedSources/webkitdom/WebKitDOMWebKitPoint.cpp * WebKitBuild/Release/DerivedSources/webkitdom/WebKitDOMHTMLIFrameElement.cpp * WebKitBuild/Release/DerivedSources/webkitdom/WebKitDOMXPathResult.cpp The differences are due to an impromper decamelization of the variable "$nick" in master. Take for instance the file WebKitDOMHTMLIFrameElement.cpp, you can see code like this: g_object_class_install_property(gobjectClass, PROP_ALIGN, g_param_spec_string("align", /* name */ "htmli_frame_element_align", /* short description */ "read-write gchar* HTMLIFrameElement.align", /* longer - could do with some extra doc stuff here */ "", /* default */ WEBKIT_PARAM_READWRITE)); The string "htmli_frame_element_align" (value of the variable $nick), is not properly decamelized, it should be "html_iframe_element_align". This patch solves that unnoticed error too \o/ Besides "htmli", there are also an improper decamelization of the strings (as value of variable $nick) : * "web_kit" should be "webkit" * "x_path" shouldb be "xpath" 905327 5 205009 cgarcia 2013-07-02 04:27:59 -0700 Comment on attachment 205009 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=205009&action=review > Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm:137 > + return FixUpDecamelize($s); So, now that FixUpDecamelize is only called here, maybe we can add the implementation here? 905422 6 205912 dpino 2013-07-02 07:37:08 -0700 Created attachment 205912 Patch 905428 7 205912 gtk-ews 2013-07-02 07:46:56 -0700 Comment on attachment 205912 Patch Attachment 205912 did not pass gtk-ews (gtk): Output: http://webkit-queues.appspot.com/results/1016363 905499 8 205912 dpino 2013-07-02 11:12:55 -0700 Comment on attachment 205912 Patch >Subversion Revision: 152267 >diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog >index f82d3f32bbc7d9dedd0656ab18ab746363fbceaa..e30525e640b5ab899858c707d8c692be4ac90fca 100644 >--- a/Source/WebCore/ChangeLog >+++ b/Source/WebCore/ChangeLog >@@ -1,3 +1,28 @@ >+2013-07-02 Diego Pino Garcia <dpino@igalia.com> >+ >+ [GTK] Merge decamelizations fix ups in the GObject DOM bindings code generator >+ https://bugs.webkit.org/show_bug.cgi?id=117543 >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ Ensure that all the code that calls to decamelization() applies the >+ same fix ups. >+ >+ Now all functions that need to decamelize a string should simply >+ call to decamelize(). This function calls to FixUpDecamelize to >+ apply some fix ups. >+ >+ * bindings/scripts/CodeGeneratorGObject.pm: >+ (decamelize): decamelizes a string and applies fix ups >+ (FixUpDecamelize): applies a series of fix ups to a decamelized string >+ (GetParentGObjType): moved fix ups to FixUpDecamelize() >+ (GenerateProperties): simply call to decamelize >+ (GenerateHeader): simply call to decamelize >+ (GetGReturnMacro): simply call to decamelize >+ (GenerateFunction): simply call to decamelize >+ (GenerateCFile): simply call to decamelize >+ (GenerateEventTargetIface): simply call to decamelize >+ > 2013-07-01 Tim Horton <timothy_horton@apple.com> > > Maximum scroll position can be negative in some cases >diff --git a/Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm b/Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm >index a52d47cc09c1370c4f4bbe721e40d604464b1959..061b13a27373bd54519b337349184dd20d7c7147 100644 >--- a/Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm >+++ b/Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm >@@ -134,18 +134,19 @@ sub decamelize > $t .= $p3 ? $p1 ? "${p1}_$p2$p3" : "$p2$p3" : "$p1$p2"; > $t; > }ge; >- $s; >-} >- >-sub FixUpDecamelizedName { >- my $classname = shift; > >- # FIXME: try to merge this somehow with the fixes in ClassNameToGobjectType >- $classname =~ s/x_path/xpath/; >- $classname =~ s/web_kit/webkit/; >- $classname =~ s/htmli_frame/html_iframe/; >- >- return $classname; >+ # Some strings are not correctly decamelized, apply fix ups >+ for ($s) { >+ s/domcss/dom_css/; >+ s/domhtml/dom_html/; >+ s/domdom/dom_dom/; >+ s/domcdata/dom_cdata/; >+ s/domui/dom_ui/; >+ s/x_path/xpath/; >+ s/web_kit/webkit/; >+ s/htmli_frame/html_iframe/; >+ } >+ return $s; > } > > sub HumanReadableConditional { >@@ -163,28 +164,11 @@ sub HumanReadableConditional { > return join(' ', @humanReadable); > } > >-sub ClassNameToGObjectType { >- my $className = shift; >- my $CLASS_NAME = uc(decamelize($className)); >- # Fixup: with our prefix being 'WebKitDOM' decamelize can't get >- # WebKitDOMCSS and similar names right, so we have to fix it >- # manually. >- $CLASS_NAME =~ s/DOMCSS/DOM_CSS/; >- $CLASS_NAME =~ s/DOMHTML/DOM_HTML/; >- $CLASS_NAME =~ s/DOMDOM/DOM_DOM/; >- $CLASS_NAME =~ s/DOMCDATA/DOM_CDATA/; >- $CLASS_NAME =~ s/DOMX_PATH/DOM_XPATH/; >- $CLASS_NAME =~ s/DOM_WEB_KIT/DOM_WEBKIT/; >- $CLASS_NAME =~ s/DOMUI/DOM_UI/; >- $CLASS_NAME =~ s/HTMLI_FRAME/HTML_IFRAME/; >- return $CLASS_NAME; >-} >- > sub GetParentGObjType { > my $interface = shift; > > return "WEBKIT_TYPE_DOM_OBJECT" if @{$interface->parents} eq 0; >- return "WEBKIT_TYPE_DOM_" . ClassNameToGObjectType($interface->parents(0)); >+ return "WEBKIT_TYPE_DOM_" . uc(decamelize($interface->parents(0))); > } > > sub GetClassName { >@@ -604,8 +588,9 @@ EOF > sub GenerateProperties { > my ($object, $interfaceName, $interface) = @_; > >- my $clsCaps = substr(ClassNameToGObjectType($className), 12); >- my $lowerCaseIfaceName = "webkit_dom_" . (FixUpDecamelizedName(decamelize($interfaceName))); >+ my $decamelize = decamelize($interfaceName); >+ my $clsCaps = uc($decamelize); >+ my $lowerCaseIfaceName = "webkit_dom_$decamelize"; > my $parentImplClassName = GetParentImplClassName($interface); > > my $conditionGuardStart = ""; >@@ -832,9 +817,9 @@ EOF > > push(@hBodyPre, $implContent); > >- my $decamelize = FixUpDecamelizedName(decamelize($interfaceName)); >+ my $decamelize = decamelize($interfaceName); > my $clsCaps = uc($decamelize); >- my $lowerCaseIfaceName = "webkit_dom_" . ($decamelize); >+ my $lowerCaseIfaceName = "webkit_dom_$decamelize"; > > $implContent = << "EOF"; > #define WEBKIT_TYPE_DOM_${clsCaps} (${lowerCaseIfaceName}_get_type()) >@@ -867,7 +852,7 @@ sub GetGReturnMacro { > if ($paramIDLType eq "GError") { > $condition = "!$paramName || !*$paramName"; > } elsif (IsGDOMClassType($paramIDLType)) { >- my $paramTypeCaps = uc(FixUpDecamelizedName(decamelize($paramIDLType))); >+ my $paramTypeCaps = uc(decamelize($paramIDLType)); > $condition = "WEBKIT_DOM_IS_${paramTypeCaps}($paramName)"; > if (ParamCanBeNull($functionName, $paramName)) { > $condition = "!$paramName || $condition"; >@@ -902,7 +887,7 @@ sub ParamCanBeNull { > sub GenerateFunction { > my ($object, $interfaceName, $function, $prefix, $parentNode) = @_; > >- my $decamelize = FixUpDecamelizedName(decamelize($interfaceName)); >+ my $decamelize = decamelize($interfaceName); > > if ($object eq "MediaQueryListListener") { > return; >@@ -1299,8 +1284,9 @@ sub GenerateCFile { > > my $implContent = ""; > >- my $clsCaps = uc(FixUpDecamelizedName(decamelize($interfaceName))); >- my $lowerCaseIfaceName = "webkit_dom_" . FixUpDecamelizedName(decamelize($interfaceName)); >+ my $decamelize = decamelize($interfaceName); >+ my $clsCaps = uc($decamelize); >+ my $lowerCaseIfaceName = "webkit_dom_$decamelize"; > my $parentImplClassName = GetParentImplClassName($interface); > my $baseClassName = GetBaseClass($parentImplClassName); > >@@ -1390,7 +1376,7 @@ sub GenerateEventTargetIface { > my $interface = shift; > > my $interfaceName = $interface->name; >- my $decamelize = FixUpDecamelizedName(decamelize($interfaceName)); >+ my $decamelize = decamelize($interfaceName); > my $conditionalString = $codeGenerator->GenerateConditionalString($interface); > my @conditionalWarn = GenerateConditionalWarning($interface); > 905503 9 dpino 2013-07-02 11:16:37 -0700 The last patch didn't apply because I used "//" to write a comment and Perl uses "#". I tried to modified the patch directly but don't know how to do it. I'm going to send the patch again. 905512 10 205932 dpino 2013-07-02 11:41:24 -0700 Created attachment 205932 Patch 910039 11 205932 cgarcia 2013-07-19 01:10:56 -0700 Comment on attachment 205932 Patch Thanks! 910041 12 205932 commit-queue 2013-07-19 01:12:56 -0700 Comment on attachment 205932 Patch Rejecting attachment 205932 from commit-queue. Failed to run "['/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch', '--status-host=webkit-queues.appspot.com', '--bot-id=webkit-cq-01', 'apply-attachment', '--no-update', '--non-interactive', 205932, '--port=mac']" exit_code: 2 cwd: /Volumes/Data/EWS/WebKit Last 500 characters of output: lumes/Data/EWS/WebKit Parsed 2 diffs from patch file(s). patching file Source/WebCore/ChangeLog Hunk #1 succeeded at 1 with fuzz 3. patching file Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm Hunk #2 FAILED at 164. 1 out of 8 hunks FAILED -- saving rejects to file Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm.rej Failed to run "[u'/Volumes/Data/EWS/WebKit/Tools/Scripts/svn-apply', '--force', '--reviewer', u'Carlos Garcia Campos']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit Full output: http://webkit-queues.appspot.com/results/1130633 910097 13 207078 dpino 2013-07-19 04:31:21 -0700 Created attachment 207078 Patch 910111 14 207078 commit-queue 2013-07-19 05:45:34 -0700 Comment on attachment 207078 Patch Clearing flags on attachment: 207078 Committed r152898: <http://trac.webkit.org/changeset/152898> 910112 15 commit-queue 2013-07-19 05:45:37 -0700 All reviewed patches have been landed. Closing bug. 204439 2013-06-12 07:51:32 -0700 2013-06-19 09:33:03 -0700 Patch bug-117543-20130612164951.patch text/plain 6397 dpino U3VidmVyc2lvbiBSZXZpc2lvbjogMTUxNDkyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODA0ZjlmNTk2Mjg3ZWQ5 NDU1MzFiM2NjMzUwY2UyNTJlYjg4MWI4NC4uYzM5MzNhZDMyMzQzODY2ZTA3YjdmYjQ4YWM3ZTNk ZmU3MmU5MDg1MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDEzLTA2LTEyICBEaWVn byBQaW5vIEdhcmNpYSAgPGRwaW5vQGlnYWxpYS5jb20+CisKKyAgICAgICAgW0dUS10gTWVyZ2Ug ZGVjYW1lbGl6YXRpb25zIGZpeCB1cHMgaW4gdGhlIEdPYmplY3QgRE9NIGJpbmRpbmdzIGNvZGUg Z2VuZXJhdG9yCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xMTc1NDMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBFbnN1cmUgdGhhdCBhbGwgdGhlIGNvZGUgdGhhdCBjYWxscyB0byBkZWNhbWVsaXplKCkgYXBw bGllcyB0aGUgc2FtZSBmaXggdXBzCisKKyAgICAgICAgTm93IGFsbCBmdW5jdGlvbnMgdGhhdCBu ZWVkIHRvIGRlY2FtZWxpemUgYSBzdHJpbmcgc2hvdWxkIHNpbXBseSBjYWxsCisgICAgICAgIHRv IGRlY2FtZWxpemUoKS4gVGhpcyBmdW5jdGlvbiBjYWxscyB0byBGaXhVcERlY2FtZWxpemUgdG8g YXBwbHkgc29tZQorICAgICAgICBmaXggdXBzLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cyAoT09Q UyEpLgorCisgICAgICAgICogYmluZGluZ3Mvc2NyaXB0cy9Db2RlR2VuZXJhdG9yR09iamVjdC5w bToKKyAgICAgICAgKGRlY2FtZWxpemUpOiBkZWNhbWVsaXplcyBhIHN0cmluZyBhbmQgYXBwbGll cyBmaXggdXBzCisgICAgICAgIChGaXhVcERlY2FtZWxpemUpOiBhcHBsaWVzIGEgc2VyaWVzIG9m IGZpeCB1cHMgdG8gYSBkZWNhbWVsaXplZCBzdHJpbmcKKyAgICAgICAgKEdldFBhcmVudEdPYmpU eXBlKTogbW92ZWQgZml4IHVwcyB0byBGaXhVcERlY2FtZWxpemUoKQorICAgICAgICAoR2VuZXJh dGVQcm9wZXJ0aWVzKTogc2ltcGx5IGNhbGwgdG8gZGVjYW1lbGl6ZQorICAgICAgICAoR2VuZXJh dGVIZWFkZXIpOiBzaW1wbHkgY2FsbCB0byBkZWNhbWVsaXplCisgICAgICAgIChHZXRHUmV0dXJu TWFjcm8pOiBzaW1wbHkgY2FsbCB0byBkZWNhbWVsaXplCisgICAgICAgIChHZW5lcmF0ZUZ1bmN0 aW9uKTogc2ltcGx5IGNhbGwgdG8gZGVjYW1lbGl6ZQorICAgICAgICAoR2VuZXJhdGVDRmlsZSk6 IHNpbXBseSBjYWxsIHRvIGRlY2FtZWxpemUKKyAgICAgICAgKEdlbmVyYXRlRXZlbnRUYXJnZXRJ ZmFjZSk6IHNpbXBseSBjYWxsIHRvIGRlY2FtZWxpemUKKwogMjAxMy0wNi0xMiAgWmFuIERvYmVy c2VrICA8emRvYmVyc2VrQGlnYWxpYS5jb20+CiAKICAgICAgICAgUmVtb3ZlIG1lbW9yeUluZm9F bmFibGVkLCBxdWFudGl6ZWRNZW1vcnlJbmZvRW5hYmxlZCBzZXR0aW5ncwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy9Db2RlR2VuZXJhdG9yR09iamVjdC5wbSBi L1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvQ29kZUdlbmVyYXRvckdPYmplY3QucG0K aW5kZXggY2YwYjc0NDZkMjE3ZmE3YzZhODVjZmQ4ZDIyZmM2Y2Q0MGI5Y2RmZC4uM2IyM2E2ZmI3 MzY5ZmE2MjA3ZjAyNjI1YTQ0OTg3NWNkODBmMWMxOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvYmluZGluZ3Mvc2NyaXB0cy9Db2RlR2VuZXJhdG9yR09iamVjdC5wbQorKysgYi9Tb3VyY2Uv V2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL0NvZGVHZW5lcmF0b3JHT2JqZWN0LnBtCkBAIC0xMzQs MTcgKzEzNCwyMiBAQCBzdWIgZGVjYW1lbGl6ZQogICAgICAgICAgICAgICAgICR0IC49ICRwMyA/ ICRwMSA/ICIke3AxfV8kcDIkcDMiIDogIiRwMiRwMyIgOiAiJHAxJHAyIjsKICAgICAgICAgICAg ICAgICAkdDsKICAgICAgICAgfWdlOwotICAgICAgICAkczsKKyAgICAgICAgcmV0dXJuIEZpeFVw RGVjYW1lbGl6ZSgkcyk7CiB9CiAKLXN1YiBGaXhVcERlY2FtZWxpemVkTmFtZSB7CitzdWIgRml4 VXBEZWNhbWVsaXplIHsKICAgICBteSAkY2xhc3NuYW1lID0gc2hpZnQ7CiAKLSAgICAjIEZJWE1F OiB0cnkgdG8gbWVyZ2UgdGhpcyBzb21laG93IHdpdGggdGhlIGZpeGVzIGluIENsYXNzTmFtZVRv R29iamVjdFR5cGUKLSAgICAkY2xhc3NuYW1lID1+IHMveF9wYXRoL3hwYXRoLzsKLSAgICAkY2xh c3NuYW1lID1+IHMvd2ViX2tpdC93ZWJraXQvOwotICAgICRjbGFzc25hbWUgPX4gcy9odG1saV9m cmFtZS9odG1sX2lmcmFtZS87Ci0KKyAgICBmb3IgKCRjbGFzc25hbWUpIHsKKyAgICAgICAgcy9k b21jc3MvZG9tX2Nzcy87CisgICAgICAgIHMvZG9taHRtbC9kb21faHRtbC87CisgICAgICAgIHMv ZG9tZG9tL2RvbV9kb20vOworICAgICAgICBzL2RvbWNkYXRhL2RvbV9jZGF0YS87CisgICAgICAg IHMvZG9tdWkvZG9tX3VpLzsKKyAgICAgICAgcy94X3BhdGgveHBhdGgvOworICAgICAgICBzL3dl Yl9raXQvd2Via2l0LzsKKyAgICAgICAgcy9odG1saV9mcmFtZS9odG1sX2lmcmFtZS87CisgICAg fQogICAgIHJldHVybiAkY2xhc3NuYW1lOwogfQogCkBAIC0xNjMsMjggKzE2OCwxMSBAQCBzdWIg SHVtYW5SZWFkYWJsZUNvbmRpdGlvbmFsIHsKICAgICByZXR1cm4gam9pbignICcsIEBodW1hblJl YWRhYmxlKTsKIH0KIAotc3ViIENsYXNzTmFtZVRvR09iamVjdFR5cGUgewotICAgIG15ICRjbGFz c05hbWUgPSBzaGlmdDsKLSAgICBteSAkQ0xBU1NfTkFNRSA9IHVjKGRlY2FtZWxpemUoJGNsYXNz TmFtZSkpOwotICAgICMgRml4dXA6IHdpdGggb3VyIHByZWZpeCBiZWluZyAnV2ViS2l0RE9NJyBk ZWNhbWVsaXplIGNhbid0IGdldAotICAgICMgV2ViS2l0RE9NQ1NTIGFuZCBzaW1pbGFyIG5hbWVz IHJpZ2h0LCBzbyB3ZSBoYXZlIHRvIGZpeCBpdAotICAgICMgbWFudWFsbHkuCi0gICAgJENMQVNT X05BTUUgPX4gcy9ET01DU1MvRE9NX0NTUy87Ci0gICAgJENMQVNTX05BTUUgPX4gcy9ET01IVE1M L0RPTV9IVE1MLzsKLSAgICAkQ0xBU1NfTkFNRSA9fiBzL0RPTURPTS9ET01fRE9NLzsKLSAgICAk Q0xBU1NfTkFNRSA9fiBzL0RPTUNEQVRBL0RPTV9DREFUQS87Ci0gICAgJENMQVNTX05BTUUgPX4g cy9ET01YX1BBVEgvRE9NX1hQQVRILzsKLSAgICAkQ0xBU1NfTkFNRSA9fiBzL0RPTV9XRUJfS0lU L0RPTV9XRUJLSVQvOwotICAgICRDTEFTU19OQU1FID1+IHMvRE9NVUkvRE9NX1VJLzsKLSAgICAk Q0xBU1NfTkFNRSA9fiBzL0hUTUxJX0ZSQU1FL0hUTUxfSUZSQU1FLzsKLSAgICByZXR1cm4gJENM QVNTX05BTUU7Ci19Ci0KIHN1YiBHZXRQYXJlbnRHT2JqVHlwZSB7CiAgICAgbXkgJGludGVyZmFj ZSA9IHNoaWZ0OwogCiAgICAgcmV0dXJuICJXRUJLSVRfVFlQRV9ET01fT0JKRUNUIiBpZiBAeyRp bnRlcmZhY2UtPnBhcmVudHN9IGVxIDA7Ci0gICAgcmV0dXJuICJXRUJLSVRfVFlQRV9ET01fIiAu IENsYXNzTmFtZVRvR09iamVjdFR5cGUoJGludGVyZmFjZS0+cGFyZW50cygwKSk7CisgICAgcmV0 dXJuICJXRUJLSVRfVFlQRV9ET01fIiAuIHVjKGRlY2FtZWxpemUoJGludGVyZmFjZS0+cGFyZW50 cygwKSkpOwogfQogCiBzdWIgR2V0Q2xhc3NOYW1lIHsKQEAgLTU5Nyw4ICs1ODUsOSBAQCBFT0YK IHN1YiBHZW5lcmF0ZVByb3BlcnRpZXMgewogICAgIG15ICgkb2JqZWN0LCAkaW50ZXJmYWNlTmFt ZSwgJGludGVyZmFjZSkgPSBAXzsKIAotICAgIG15ICRjbHNDYXBzID0gc3Vic3RyKENsYXNzTmFt ZVRvR09iamVjdFR5cGUoJGNsYXNzTmFtZSksIDEyKTsKLSAgICBteSAkbG93ZXJDYXNlSWZhY2VO YW1lID0gIndlYmtpdF9kb21fIiAuIChGaXhVcERlY2FtZWxpemVkTmFtZShkZWNhbWVsaXplKCRp bnRlcmZhY2VOYW1lKSkpOworICAgIG15ICRkZWNhbWVsaXplID0gZGVjYW1lbGl6ZSgkaW50ZXJm YWNlTmFtZSk7CisgICAgbXkgJGNsc0NhcHMgPSB1YygkZGVjYW1lbGl6ZSk7CisgICAgbXkgJGxv d2VyQ2FzZUlmYWNlTmFtZSA9ICJ3ZWJraXRfZG9tXyRkZWNhbWVsaXplIjsKICAgICBteSAkcGFy ZW50SW1wbENsYXNzTmFtZSA9IEdldFBhcmVudEltcGxDbGFzc05hbWUoJGludGVyZmFjZSk7CiAK ICAgICBteSAkY29uZGl0aW9uR3VhcmRTdGFydCA9ICIiOwpAQCAtODI1LDkgKzgxNCw5IEBAIEVP RgogCiAgICAgcHVzaChAaEJvZHlQcmUsICRpbXBsQ29udGVudCk7CiAKLSAgICBteSAkZGVjYW1l bGl6ZSA9IEZpeFVwRGVjYW1lbGl6ZWROYW1lKGRlY2FtZWxpemUoJGludGVyZmFjZU5hbWUpKTsK KyAgICBteSAkZGVjYW1lbGl6ZSA9IGRlY2FtZWxpemUoJGludGVyZmFjZU5hbWUpOwogICAgIG15 ICRjbHNDYXBzID0gdWMoJGRlY2FtZWxpemUpOwotICAgIG15ICRsb3dlckNhc2VJZmFjZU5hbWUg PSAid2Via2l0X2RvbV8iIC4gKCRkZWNhbWVsaXplKTsKKyAgICBteSAkbG93ZXJDYXNlSWZhY2VO YW1lID0gIndlYmtpdF9kb21fJGRlY2FtZWxpemUiOwogCiAgICAgJGltcGxDb250ZW50ID0gPDwg IkVPRiI7CiAjZGVmaW5lIFdFQktJVF9UWVBFX0RPTV8ke2Nsc0NhcHN9ICAgICAgICAgICAgKCR7 bG93ZXJDYXNlSWZhY2VOYW1lfV9nZXRfdHlwZSgpKQpAQCAtODYwLDcgKzg0OSw3IEBAIHN1YiBH ZXRHUmV0dXJuTWFjcm8gewogICAgIGlmICgkcGFyYW1JRExUeXBlIGVxICJHRXJyb3IiKSB7CiAg ICAgICAgICRjb25kaXRpb24gPSAiISRwYXJhbU5hbWUgfHwgISokcGFyYW1OYW1lIjsKICAgICB9 IGVsc2lmIChJc0dET01DbGFzc1R5cGUoJHBhcmFtSURMVHlwZSkpIHsKLSAgICAgICAgbXkgJHBh cmFtVHlwZUNhcHMgPSB1YyhGaXhVcERlY2FtZWxpemVkTmFtZShkZWNhbWVsaXplKCRwYXJhbUlE TFR5cGUpKSk7CisgICAgICAgIG15ICRwYXJhbVR5cGVDYXBzID0gdWMoZGVjYW1lbGl6ZSgkcGFy YW1JRExUeXBlKSk7CiAgICAgICAgICRjb25kaXRpb24gPSAiV0VCS0lUX0RPTV9JU18ke3BhcmFt VHlwZUNhcHN9KCRwYXJhbU5hbWUpIjsKICAgICAgICAgaWYgKFBhcmFtQ2FuQmVOdWxsKCRmdW5j dGlvbk5hbWUsICRwYXJhbU5hbWUpKSB7CiAgICAgICAgICAgICAkY29uZGl0aW9uID0gIiEkcGFy YW1OYW1lIHx8ICRjb25kaXRpb24iOwpAQCAtODk1LDcgKzg4NCw3IEBAIHN1YiBQYXJhbUNhbkJl TnVsbCB7CiBzdWIgR2VuZXJhdGVGdW5jdGlvbiB7CiAgICAgbXkgKCRvYmplY3QsICRpbnRlcmZh Y2VOYW1lLCAkZnVuY3Rpb24sICRwcmVmaXgsICRwYXJlbnROb2RlKSA9IEBfOwogCi0gICAgbXkg JGRlY2FtZWxpemUgPSBGaXhVcERlY2FtZWxpemVkTmFtZShkZWNhbWVsaXplKCRpbnRlcmZhY2VO YW1lKSk7CisgICAgbXkgJGRlY2FtZWxpemUgPSBkZWNhbWVsaXplKCRpbnRlcmZhY2VOYW1lKTsK IAogICAgIGlmICgkb2JqZWN0IGVxICJNZWRpYVF1ZXJ5TGlzdExpc3RlbmVyIikgewogICAgICAg ICByZXR1cm47CkBAIC0xMjkyLDggKzEyODEsOSBAQCBzdWIgR2VuZXJhdGVDRmlsZSB7CiAKICAg ICBteSAkaW1wbENvbnRlbnQgPSAiIjsKIAotICAgIG15ICRjbHNDYXBzID0gdWMoRml4VXBEZWNh bWVsaXplZE5hbWUoZGVjYW1lbGl6ZSgkaW50ZXJmYWNlTmFtZSkpKTsKLSAgICBteSAkbG93ZXJD YXNlSWZhY2VOYW1lID0gIndlYmtpdF9kb21fIiAuIEZpeFVwRGVjYW1lbGl6ZWROYW1lKGRlY2Ft ZWxpemUoJGludGVyZmFjZU5hbWUpKTsKKyAgICBteSAkZGVjYW1lbGl6ZSA9IGRlY2FtZWxpemUo JGludGVyZmFjZU5hbWUpOworICAgIG15ICRjbHNDYXBzID0gdWMoJGRlY2FtZWxpemUpOworICAg IG15ICRsb3dlckNhc2VJZmFjZU5hbWUgPSAid2Via2l0X2RvbV8kZGVjYW1lbGl6ZSI7CiAgICAg bXkgJHBhcmVudEltcGxDbGFzc05hbWUgPSBHZXRQYXJlbnRJbXBsQ2xhc3NOYW1lKCRpbnRlcmZh Y2UpOwogICAgIG15ICRiYXNlQ2xhc3NOYW1lID0gR2V0QmFzZUNsYXNzKCRwYXJlbnRJbXBsQ2xh c3NOYW1lKTsKIApAQCAtMTM4NSw3ICsxMzc1LDcgQEAgc3ViIEdlbmVyYXRlRXZlbnRUYXJnZXRJ ZmFjZSB7CiAgICAgbXkgJGludGVyZmFjZSA9IHNoaWZ0OwogCiAgICAgbXkgJGludGVyZmFjZU5h bWUgPSAkaW50ZXJmYWNlLT5uYW1lOwotICAgIG15ICRkZWNhbWVsaXplID0gRml4VXBEZWNhbWVs aXplZE5hbWUoZGVjYW1lbGl6ZSgkaW50ZXJmYWNlTmFtZSkpOworICAgIG15ICRkZWNhbWVsaXpl ID0gZGVjYW1lbGl6ZSgkaW50ZXJmYWNlTmFtZSk7CiAgICAgbXkgJGNvbmRpdGlvbmFsU3RyaW5n ID0gJGNvZGVHZW5lcmF0b3ItPkdlbmVyYXRlQ29uZGl0aW9uYWxTdHJpbmcoJGludGVyZmFjZSk7 CiAgICAgbXkgQGNvbmRpdGlvbmFsV2FybiA9IEdlbmVyYXRlQ29uZGl0aW9uYWxXYXJuaW5nKCRp bnRlcmZhY2UpOwogCg== 205009 2013-06-19 09:33:10 -0700 2013-07-02 07:37:01 -0700 Patch bug-117543-20130619183121.patch text/plain 6387 dpino U3VidmVyc2lvbiBSZXZpc2lvbjogMTUxNzM1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGNlNDIwNjJiNDA3OTlj ZGZkYmQ0NjJiNTlhOTkzOTlhMmRmNzAzNC4uNGM2M2FjNDg2NzQyOWE3NjA2ODE4Y2U2OGM0MzVj N2M2MWQ0MDYyYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDEzLTA2LTE5ICBEaWVn byBQaW5vIEdhcmNpYSAgPGRwaW5vQGlnYWxpYS5jb20+CisKKyAgICAgICAgW0dUS10gTWVyZ2Ug ZGVjYW1lbGl6YXRpb25zIGZpeCB1cHMgaW4gdGhlIEdPYmplY3QgRE9NIGJpbmRpbmdzIGNvZGUg Z2VuZXJhdG9yCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xMTc1NDMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBFbnN1cmUgdGhhdCBhbGwgdGhlIGNvZGUgdGhhdCBjYWxscyB0byBkZWNhbWVsaXplKCkgYXBw bGllcyB0aGUgc2FtZSBmaXggdXBzCisKKyAgICAgICAgTm93IGFsbCBmdW5jdGlvbnMgdGhhdCBu ZWVkIHRvIGRlY2FtZWxpemUgYSBzdHJpbmcgc2hvdWxkIHNpbXBseSBjYWxsCisgICAgICAgIHRv IGRlY2FtZWxpemUoKS4gVGhpcyBmdW5jdGlvbiBjYWxscyB0byBGaXhVcERlY2FtZWxpemUgdG8g YXBwbHkgc29tZQorICAgICAgICBmaXggdXBzLgorCisgICAgICAgICogYmluZGluZ3Mvc2NyaXB0 cy9Db2RlR2VuZXJhdG9yR09iamVjdC5wbToKKyAgICAgICAgKGRlY2FtZWxpemUpOiBkZWNhbWVs aXplcyBhIHN0cmluZyBhbmQgYXBwbGllcyBmaXggdXBzCisgICAgICAgIChGaXhVcERlY2FtZWxp emUpOiBhcHBsaWVzIGEgc2VyaWVzIG9mIGZpeCB1cHMgdG8gYSBkZWNhbWVsaXplZCBzdHJpbmcK KyAgICAgICAgKEdldFBhcmVudEdPYmpUeXBlKTogbW92ZWQgZml4IHVwcyB0byBGaXhVcERlY2Ft ZWxpemUoKQorICAgICAgICAoR2VuZXJhdGVQcm9wZXJ0aWVzKTogc2ltcGx5IGNhbGwgdG8gZGVj YW1lbGl6ZQorICAgICAgICAoR2VuZXJhdGVIZWFkZXIpOiBzaW1wbHkgY2FsbCB0byBkZWNhbWVs aXplCisgICAgICAgIChHZXRHUmV0dXJuTWFjcm8pOiBzaW1wbHkgY2FsbCB0byBkZWNhbWVsaXpl CisgICAgICAgIChHZW5lcmF0ZUZ1bmN0aW9uKTogc2ltcGx5IGNhbGwgdG8gZGVjYW1lbGl6ZQor ICAgICAgICAoR2VuZXJhdGVDRmlsZSk6IHNpbXBseSBjYWxsIHRvIGRlY2FtZWxpemUKKyAgICAg ICAgKEdlbmVyYXRlRXZlbnRUYXJnZXRJZmFjZSk6IHNpbXBseSBjYWxsIHRvIGRlY2FtZWxpemUK KwogMjAxMy0wNi0xOSAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+ CiAKICAgICAgICAgW0JsYWNrQmVycnldIFNldmVyYWwgdGVzdHMgY3Jhc2ggZHVlIHRvIGFuIGFz c2VydCB3aGVuIGNyZWF0aW5nIGFuIEltYWdlQnVmZmVyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9iaW5kaW5ncy9zY3JpcHRzL0NvZGVHZW5lcmF0b3JHT2JqZWN0LnBtIGIvU291cmNlL1dl YkNvcmUvYmluZGluZ3Mvc2NyaXB0cy9Db2RlR2VuZXJhdG9yR09iamVjdC5wbQppbmRleCBhNTJk NDdjYzA5YzEzNzBjNGY0YmJlNzIxZTQwZDYwNDQ2NGIxOTU5Li40M2FlODBkMDI2MmViYmM3MjA2 M2MzYmMwZDdjZGVjMGJhYmY2OTc5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5n cy9zY3JpcHRzL0NvZGVHZW5lcmF0b3JHT2JqZWN0LnBtCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Jp bmRpbmdzL3NjcmlwdHMvQ29kZUdlbmVyYXRvckdPYmplY3QucG0KQEAgLTEzNCwxNyArMTM0LDIy IEBAIHN1YiBkZWNhbWVsaXplCiAgICAgICAgICAgICAgICAgJHQgLj0gJHAzID8gJHAxID8gIiR7 cDF9XyRwMiRwMyIgOiAiJHAyJHAzIiA6ICIkcDEkcDIiOwogICAgICAgICAgICAgICAgICR0Owog ICAgICAgICB9Z2U7Ci0gICAgICAgICRzOworICAgICAgICByZXR1cm4gRml4VXBEZWNhbWVsaXpl KCRzKTsKIH0KIAotc3ViIEZpeFVwRGVjYW1lbGl6ZWROYW1lIHsKK3N1YiBGaXhVcERlY2FtZWxp emUgewogICAgIG15ICRjbGFzc25hbWUgPSBzaGlmdDsKIAotICAgICMgRklYTUU6IHRyeSB0byBt ZXJnZSB0aGlzIHNvbWVob3cgd2l0aCB0aGUgZml4ZXMgaW4gQ2xhc3NOYW1lVG9Hb2JqZWN0VHlw ZQotICAgICRjbGFzc25hbWUgPX4gcy94X3BhdGgveHBhdGgvOwotICAgICRjbGFzc25hbWUgPX4g cy93ZWJfa2l0L3dlYmtpdC87Ci0gICAgJGNsYXNzbmFtZSA9fiBzL2h0bWxpX2ZyYW1lL2h0bWxf aWZyYW1lLzsKLQorICAgIGZvciAoJGNsYXNzbmFtZSkgeworICAgICAgICBzL2RvbWNzcy9kb21f Y3NzLzsKKyAgICAgICAgcy9kb21odG1sL2RvbV9odG1sLzsKKyAgICAgICAgcy9kb21kb20vZG9t X2RvbS87CisgICAgICAgIHMvZG9tY2RhdGEvZG9tX2NkYXRhLzsKKyAgICAgICAgcy9kb211aS9k b21fdWkvOworICAgICAgICBzL3hfcGF0aC94cGF0aC87CisgICAgICAgIHMvd2ViX2tpdC93ZWJr aXQvOworICAgICAgICBzL2h0bWxpX2ZyYW1lL2h0bWxfaWZyYW1lLzsKKyAgICB9CiAgICAgcmV0 dXJuICRjbGFzc25hbWU7CiB9CiAKQEAgLTE2MywyOCArMTY4LDExIEBAIHN1YiBIdW1hblJlYWRh YmxlQ29uZGl0aW9uYWwgewogICAgIHJldHVybiBqb2luKCcgJywgQGh1bWFuUmVhZGFibGUpOwog fQogCi1zdWIgQ2xhc3NOYW1lVG9HT2JqZWN0VHlwZSB7Ci0gICAgbXkgJGNsYXNzTmFtZSA9IHNo aWZ0OwotICAgIG15ICRDTEFTU19OQU1FID0gdWMoZGVjYW1lbGl6ZSgkY2xhc3NOYW1lKSk7Ci0g ICAgIyBGaXh1cDogd2l0aCBvdXIgcHJlZml4IGJlaW5nICdXZWJLaXRET00nIGRlY2FtZWxpemUg Y2FuJ3QgZ2V0Ci0gICAgIyBXZWJLaXRET01DU1MgYW5kIHNpbWlsYXIgbmFtZXMgcmlnaHQsIHNv IHdlIGhhdmUgdG8gZml4IGl0Ci0gICAgIyBtYW51YWxseS4KLSAgICAkQ0xBU1NfTkFNRSA9fiBz L0RPTUNTUy9ET01fQ1NTLzsKLSAgICAkQ0xBU1NfTkFNRSA9fiBzL0RPTUhUTUwvRE9NX0hUTUwv OwotICAgICRDTEFTU19OQU1FID1+IHMvRE9NRE9NL0RPTV9ET00vOwotICAgICRDTEFTU19OQU1F ID1+IHMvRE9NQ0RBVEEvRE9NX0NEQVRBLzsKLSAgICAkQ0xBU1NfTkFNRSA9fiBzL0RPTVhfUEFU SC9ET01fWFBBVEgvOwotICAgICRDTEFTU19OQU1FID1+IHMvRE9NX1dFQl9LSVQvRE9NX1dFQktJ VC87Ci0gICAgJENMQVNTX05BTUUgPX4gcy9ET01VSS9ET01fVUkvOwotICAgICRDTEFTU19OQU1F ID1+IHMvSFRNTElfRlJBTUUvSFRNTF9JRlJBTUUvOwotICAgIHJldHVybiAkQ0xBU1NfTkFNRTsK LX0KLQogc3ViIEdldFBhcmVudEdPYmpUeXBlIHsKICAgICBteSAkaW50ZXJmYWNlID0gc2hpZnQ7 CiAKICAgICByZXR1cm4gIldFQktJVF9UWVBFX0RPTV9PQkpFQ1QiIGlmIEB7JGludGVyZmFjZS0+ cGFyZW50c30gZXEgMDsKLSAgICByZXR1cm4gIldFQktJVF9UWVBFX0RPTV8iIC4gQ2xhc3NOYW1l VG9HT2JqZWN0VHlwZSgkaW50ZXJmYWNlLT5wYXJlbnRzKDApKTsKKyAgICByZXR1cm4gIldFQktJ VF9UWVBFX0RPTV8iIC4gdWMoZGVjYW1lbGl6ZSgkaW50ZXJmYWNlLT5wYXJlbnRzKDApKSk7CiB9 CiAKIHN1YiBHZXRDbGFzc05hbWUgewpAQCAtNjA0LDggKzU5Miw5IEBAIEVPRgogc3ViIEdlbmVy YXRlUHJvcGVydGllcyB7CiAgICAgbXkgKCRvYmplY3QsICRpbnRlcmZhY2VOYW1lLCAkaW50ZXJm YWNlKSA9IEBfOwogCi0gICAgbXkgJGNsc0NhcHMgPSBzdWJzdHIoQ2xhc3NOYW1lVG9HT2JqZWN0 VHlwZSgkY2xhc3NOYW1lKSwgMTIpOwotICAgIG15ICRsb3dlckNhc2VJZmFjZU5hbWUgPSAid2Vi a2l0X2RvbV8iIC4gKEZpeFVwRGVjYW1lbGl6ZWROYW1lKGRlY2FtZWxpemUoJGludGVyZmFjZU5h bWUpKSk7CisgICAgbXkgJGRlY2FtZWxpemUgPSBkZWNhbWVsaXplKCRpbnRlcmZhY2VOYW1lKTsK KyAgICBteSAkY2xzQ2FwcyA9IHVjKCRkZWNhbWVsaXplKTsKKyAgICBteSAkbG93ZXJDYXNlSWZh Y2VOYW1lID0gIndlYmtpdF9kb21fJGRlY2FtZWxpemUiOwogICAgIG15ICRwYXJlbnRJbXBsQ2xh c3NOYW1lID0gR2V0UGFyZW50SW1wbENsYXNzTmFtZSgkaW50ZXJmYWNlKTsKIAogICAgIG15ICRj b25kaXRpb25HdWFyZFN0YXJ0ID0gIiI7CkBAIC04MzIsOSArODIxLDkgQEAgRU9GCiAKICAgICBw dXNoKEBoQm9keVByZSwgJGltcGxDb250ZW50KTsKIAotICAgIG15ICRkZWNhbWVsaXplID0gRml4 VXBEZWNhbWVsaXplZE5hbWUoZGVjYW1lbGl6ZSgkaW50ZXJmYWNlTmFtZSkpOworICAgIG15ICRk ZWNhbWVsaXplID0gZGVjYW1lbGl6ZSgkaW50ZXJmYWNlTmFtZSk7CiAgICAgbXkgJGNsc0NhcHMg PSB1YygkZGVjYW1lbGl6ZSk7Ci0gICAgbXkgJGxvd2VyQ2FzZUlmYWNlTmFtZSA9ICJ3ZWJraXRf ZG9tXyIgLiAoJGRlY2FtZWxpemUpOworICAgIG15ICRsb3dlckNhc2VJZmFjZU5hbWUgPSAid2Vi a2l0X2RvbV8kZGVjYW1lbGl6ZSI7CiAKICAgICAkaW1wbENvbnRlbnQgPSA8PCAiRU9GIjsKICNk ZWZpbmUgV0VCS0lUX1RZUEVfRE9NXyR7Y2xzQ2Fwc30gICAgICAgICAgICAoJHtsb3dlckNhc2VJ ZmFjZU5hbWV9X2dldF90eXBlKCkpCkBAIC04NjcsNyArODU2LDcgQEAgc3ViIEdldEdSZXR1cm5N YWNybyB7CiAgICAgaWYgKCRwYXJhbUlETFR5cGUgZXEgIkdFcnJvciIpIHsKICAgICAgICAgJGNv bmRpdGlvbiA9ICIhJHBhcmFtTmFtZSB8fCAhKiRwYXJhbU5hbWUiOwogICAgIH0gZWxzaWYgKElz R0RPTUNsYXNzVHlwZSgkcGFyYW1JRExUeXBlKSkgewotICAgICAgICBteSAkcGFyYW1UeXBlQ2Fw cyA9IHVjKEZpeFVwRGVjYW1lbGl6ZWROYW1lKGRlY2FtZWxpemUoJHBhcmFtSURMVHlwZSkpKTsK KyAgICAgICAgbXkgJHBhcmFtVHlwZUNhcHMgPSB1YyhkZWNhbWVsaXplKCRwYXJhbUlETFR5cGUp KTsKICAgICAgICAgJGNvbmRpdGlvbiA9ICJXRUJLSVRfRE9NX0lTXyR7cGFyYW1UeXBlQ2Fwc30o JHBhcmFtTmFtZSkiOwogICAgICAgICBpZiAoUGFyYW1DYW5CZU51bGwoJGZ1bmN0aW9uTmFtZSwg JHBhcmFtTmFtZSkpIHsKICAgICAgICAgICAgICRjb25kaXRpb24gPSAiISRwYXJhbU5hbWUgfHwg JGNvbmRpdGlvbiI7CkBAIC05MDIsNyArODkxLDcgQEAgc3ViIFBhcmFtQ2FuQmVOdWxsIHsKIHN1 YiBHZW5lcmF0ZUZ1bmN0aW9uIHsKICAgICBteSAoJG9iamVjdCwgJGludGVyZmFjZU5hbWUsICRm dW5jdGlvbiwgJHByZWZpeCwgJHBhcmVudE5vZGUpID0gQF87CiAKLSAgICBteSAkZGVjYW1lbGl6 ZSA9IEZpeFVwRGVjYW1lbGl6ZWROYW1lKGRlY2FtZWxpemUoJGludGVyZmFjZU5hbWUpKTsKKyAg ICBteSAkZGVjYW1lbGl6ZSA9IGRlY2FtZWxpemUoJGludGVyZmFjZU5hbWUpOwogCiAgICAgaWYg KCRvYmplY3QgZXEgIk1lZGlhUXVlcnlMaXN0TGlzdGVuZXIiKSB7CiAgICAgICAgIHJldHVybjsK QEAgLTEyOTksOCArMTI4OCw5IEBAIHN1YiBHZW5lcmF0ZUNGaWxlIHsKIAogICAgIG15ICRpbXBs Q29udGVudCA9ICIiOwogCi0gICAgbXkgJGNsc0NhcHMgPSB1YyhGaXhVcERlY2FtZWxpemVkTmFt ZShkZWNhbWVsaXplKCRpbnRlcmZhY2VOYW1lKSkpOwotICAgIG15ICRsb3dlckNhc2VJZmFjZU5h bWUgPSAid2Via2l0X2RvbV8iIC4gRml4VXBEZWNhbWVsaXplZE5hbWUoZGVjYW1lbGl6ZSgkaW50 ZXJmYWNlTmFtZSkpOworICAgIG15ICRkZWNhbWVsaXplID0gZGVjYW1lbGl6ZSgkaW50ZXJmYWNl TmFtZSk7CisgICAgbXkgJGNsc0NhcHMgPSB1YygkZGVjYW1lbGl6ZSk7CisgICAgbXkgJGxvd2Vy Q2FzZUlmYWNlTmFtZSA9ICJ3ZWJraXRfZG9tXyRkZWNhbWVsaXplIjsKICAgICBteSAkcGFyZW50 SW1wbENsYXNzTmFtZSA9IEdldFBhcmVudEltcGxDbGFzc05hbWUoJGludGVyZmFjZSk7CiAgICAg bXkgJGJhc2VDbGFzc05hbWUgPSBHZXRCYXNlQ2xhc3MoJHBhcmVudEltcGxDbGFzc05hbWUpOwog CkBAIC0xMzkwLDcgKzEzODAsNyBAQCBzdWIgR2VuZXJhdGVFdmVudFRhcmdldElmYWNlIHsKICAg ICBteSAkaW50ZXJmYWNlID0gc2hpZnQ7CiAKICAgICBteSAkaW50ZXJmYWNlTmFtZSA9ICRpbnRl cmZhY2UtPm5hbWU7Ci0gICAgbXkgJGRlY2FtZWxpemUgPSBGaXhVcERlY2FtZWxpemVkTmFtZShk ZWNhbWVsaXplKCRpbnRlcmZhY2VOYW1lKSk7CisgICAgbXkgJGRlY2FtZWxpemUgPSBkZWNhbWVs aXplKCRpbnRlcmZhY2VOYW1lKTsKICAgICBteSAkY29uZGl0aW9uYWxTdHJpbmcgPSAkY29kZUdl bmVyYXRvci0+R2VuZXJhdGVDb25kaXRpb25hbFN0cmluZygkaW50ZXJmYWNlKTsKICAgICBteSBA Y29uZGl0aW9uYWxXYXJuID0gR2VuZXJhdGVDb25kaXRpb25hbFdhcm5pbmcoJGludGVyZmFjZSk7 CiAK 205912 2013-07-02 07:37:08 -0700 2013-07-02 11:41:14 -0700 Patch bug-117543-20130702163503.patch text/plain 6466 dpino U3VidmVyc2lvbiBSZXZpc2lvbjogMTUyMjY3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjgyZDNmMzJiYmM3ZDlk ZWRkMDY1NmFiMThhYjc0NjM2M2ZiY2VhYS4uZTMwNTI1ZTY0MGI1YWI4OTk4NThjNzA3ZDhjNjky YmU0YWM5MGZjYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDEzLTA3LTAyICBEaWVn byBQaW5vIEdhcmNpYSAgPGRwaW5vQGlnYWxpYS5jb20+CisKKyAgICAgICAgW0dUS10gTWVyZ2Ug ZGVjYW1lbGl6YXRpb25zIGZpeCB1cHMgaW4gdGhlIEdPYmplY3QgRE9NIGJpbmRpbmdzIGNvZGUg Z2VuZXJhdG9yCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xMTc1NDMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBFbnN1cmUgdGhhdCBhbGwgdGhlIGNvZGUgdGhhdCBjYWxscyB0byBkZWNhbWVsaXphdGlvbigp IGFwcGxpZXMgdGhlCisgICAgICAgIHNhbWUgZml4IHVwcy4KKworICAgICAgICBOb3cgYWxsIGZ1 bmN0aW9ucyB0aGF0IG5lZWQgdG8gZGVjYW1lbGl6ZSBhIHN0cmluZyBzaG91bGQgc2ltcGx5Cisg ICAgICAgIGNhbGwgdG8gZGVjYW1lbGl6ZSgpLiBUaGlzIGZ1bmN0aW9uIGNhbGxzIHRvIEZpeFVw RGVjYW1lbGl6ZSB0bworICAgICAgICBhcHBseSBzb21lIGZpeCB1cHMuCisKKyAgICAgICAgKiBi aW5kaW5ncy9zY3JpcHRzL0NvZGVHZW5lcmF0b3JHT2JqZWN0LnBtOgorICAgICAgICAoZGVjYW1l bGl6ZSk6IGRlY2FtZWxpemVzIGEgc3RyaW5nIGFuZCBhcHBsaWVzIGZpeCB1cHMKKyAgICAgICAg KEZpeFVwRGVjYW1lbGl6ZSk6IGFwcGxpZXMgYSBzZXJpZXMgb2YgZml4IHVwcyB0byBhIGRlY2Ft ZWxpemVkIHN0cmluZworICAgICAgICAoR2V0UGFyZW50R09ialR5cGUpOiBtb3ZlZCBmaXggdXBz IHRvIEZpeFVwRGVjYW1lbGl6ZSgpCisgICAgICAgIChHZW5lcmF0ZVByb3BlcnRpZXMpOiBzaW1w bHkgY2FsbCB0byBkZWNhbWVsaXplCisgICAgICAgIChHZW5lcmF0ZUhlYWRlcik6IHNpbXBseSBj YWxsIHRvIGRlY2FtZWxpemUKKyAgICAgICAgKEdldEdSZXR1cm5NYWNybyk6IHNpbXBseSBjYWxs IHRvIGRlY2FtZWxpemUKKyAgICAgICAgKEdlbmVyYXRlRnVuY3Rpb24pOiBzaW1wbHkgY2FsbCB0 byBkZWNhbWVsaXplCisgICAgICAgIChHZW5lcmF0ZUNGaWxlKTogc2ltcGx5IGNhbGwgdG8gZGVj YW1lbGl6ZQorICAgICAgICAoR2VuZXJhdGVFdmVudFRhcmdldElmYWNlKTogc2ltcGx5IGNhbGwg dG8gZGVjYW1lbGl6ZQorCiAyMDEzLTA3LTAxICBUaW0gSG9ydG9uICA8dGltb3RoeV9ob3J0b25A YXBwbGUuY29tPgogCiAgICAgICAgIE1heGltdW0gc2Nyb2xsIHBvc2l0aW9uIGNhbiBiZSBuZWdh dGl2ZSBpbiBzb21lIGNhc2VzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9z Y3JpcHRzL0NvZGVHZW5lcmF0b3JHT2JqZWN0LnBtIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mv c2NyaXB0cy9Db2RlR2VuZXJhdG9yR09iamVjdC5wbQppbmRleCBhNTJkNDdjYzA5YzEzNzBjNGY0 YmJlNzIxZTQwZDYwNDQ2NGIxOTU5Li4wNjFiMTNhMjczNzNiZDU0NTE5YjMzNzM0OTE4NGRkMjBk N2M3MTQ3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL0NvZGVH ZW5lcmF0b3JHT2JqZWN0LnBtCisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMv Q29kZUdlbmVyYXRvckdPYmplY3QucG0KQEAgLTEzNCwxOCArMTM0LDE5IEBAIHN1YiBkZWNhbWVs aXplCiAgICAgICAgICAgICAgICAgJHQgLj0gJHAzID8gJHAxID8gIiR7cDF9XyRwMiRwMyIgOiAi JHAyJHAzIiA6ICIkcDEkcDIiOwogICAgICAgICAgICAgICAgICR0OwogICAgICAgICB9Z2U7Ci0g ICAgICAgICRzOwotfQotCi1zdWIgRml4VXBEZWNhbWVsaXplZE5hbWUgewotICAgIG15ICRjbGFz c25hbWUgPSBzaGlmdDsKIAotICAgICMgRklYTUU6IHRyeSB0byBtZXJnZSB0aGlzIHNvbWVob3cg d2l0aCB0aGUgZml4ZXMgaW4gQ2xhc3NOYW1lVG9Hb2JqZWN0VHlwZQotICAgICRjbGFzc25hbWUg PX4gcy94X3BhdGgveHBhdGgvOwotICAgICRjbGFzc25hbWUgPX4gcy93ZWJfa2l0L3dlYmtpdC87 Ci0gICAgJGNsYXNzbmFtZSA9fiBzL2h0bWxpX2ZyYW1lL2h0bWxfaWZyYW1lLzsKLQotICAgIHJl dHVybiAkY2xhc3NuYW1lOworICAgICAgICAvLyBTb21lIHN0cmluZ3MgYXJlIG5vdCBjb3JyZWN0 bHkgZGVjYW1lbGl6ZWQsIGFwcGx5IGZpeCB1cHMKKyAgICAgICAgZm9yICgkcykgeworICAgICAg ICAgICAgcy9kb21jc3MvZG9tX2Nzcy87CisgICAgICAgICAgICBzL2RvbWh0bWwvZG9tX2h0bWwv OworICAgICAgICAgICAgcy9kb21kb20vZG9tX2RvbS87CisgICAgICAgICAgICBzL2RvbWNkYXRh L2RvbV9jZGF0YS87CisgICAgICAgICAgICBzL2RvbXVpL2RvbV91aS87CisgICAgICAgICAgICBz L3hfcGF0aC94cGF0aC87CisgICAgICAgICAgICBzL3dlYl9raXQvd2Via2l0LzsKKyAgICAgICAg ICAgIHMvaHRtbGlfZnJhbWUvaHRtbF9pZnJhbWUvOworICAgICAgICB9CisgICAgICAgIHJldHVy biAkczsKIH0KIAogc3ViIEh1bWFuUmVhZGFibGVDb25kaXRpb25hbCB7CkBAIC0xNjMsMjggKzE2 NCwxMSBAQCBzdWIgSHVtYW5SZWFkYWJsZUNvbmRpdGlvbmFsIHsKICAgICByZXR1cm4gam9pbign ICcsIEBodW1hblJlYWRhYmxlKTsKIH0KIAotc3ViIENsYXNzTmFtZVRvR09iamVjdFR5cGUgewot ICAgIG15ICRjbGFzc05hbWUgPSBzaGlmdDsKLSAgICBteSAkQ0xBU1NfTkFNRSA9IHVjKGRlY2Ft ZWxpemUoJGNsYXNzTmFtZSkpOwotICAgICMgRml4dXA6IHdpdGggb3VyIHByZWZpeCBiZWluZyAn V2ViS2l0RE9NJyBkZWNhbWVsaXplIGNhbid0IGdldAotICAgICMgV2ViS2l0RE9NQ1NTIGFuZCBz aW1pbGFyIG5hbWVzIHJpZ2h0LCBzbyB3ZSBoYXZlIHRvIGZpeCBpdAotICAgICMgbWFudWFsbHku Ci0gICAgJENMQVNTX05BTUUgPX4gcy9ET01DU1MvRE9NX0NTUy87Ci0gICAgJENMQVNTX05BTUUg PX4gcy9ET01IVE1ML0RPTV9IVE1MLzsKLSAgICAkQ0xBU1NfTkFNRSA9fiBzL0RPTURPTS9ET01f RE9NLzsKLSAgICAkQ0xBU1NfTkFNRSA9fiBzL0RPTUNEQVRBL0RPTV9DREFUQS87Ci0gICAgJENM QVNTX05BTUUgPX4gcy9ET01YX1BBVEgvRE9NX1hQQVRILzsKLSAgICAkQ0xBU1NfTkFNRSA9fiBz L0RPTV9XRUJfS0lUL0RPTV9XRUJLSVQvOwotICAgICRDTEFTU19OQU1FID1+IHMvRE9NVUkvRE9N X1VJLzsKLSAgICAkQ0xBU1NfTkFNRSA9fiBzL0hUTUxJX0ZSQU1FL0hUTUxfSUZSQU1FLzsKLSAg ICByZXR1cm4gJENMQVNTX05BTUU7Ci19Ci0KIHN1YiBHZXRQYXJlbnRHT2JqVHlwZSB7CiAgICAg bXkgJGludGVyZmFjZSA9IHNoaWZ0OwogCiAgICAgcmV0dXJuICJXRUJLSVRfVFlQRV9ET01fT0JK RUNUIiBpZiBAeyRpbnRlcmZhY2UtPnBhcmVudHN9IGVxIDA7Ci0gICAgcmV0dXJuICJXRUJLSVRf VFlQRV9ET01fIiAuIENsYXNzTmFtZVRvR09iamVjdFR5cGUoJGludGVyZmFjZS0+cGFyZW50cygw KSk7CisgICAgcmV0dXJuICJXRUJLSVRfVFlQRV9ET01fIiAuIHVjKGRlY2FtZWxpemUoJGludGVy ZmFjZS0+cGFyZW50cygwKSkpOwogfQogCiBzdWIgR2V0Q2xhc3NOYW1lIHsKQEAgLTYwNCw4ICs1 ODgsOSBAQCBFT0YKIHN1YiBHZW5lcmF0ZVByb3BlcnRpZXMgewogICAgIG15ICgkb2JqZWN0LCAk aW50ZXJmYWNlTmFtZSwgJGludGVyZmFjZSkgPSBAXzsKIAotICAgIG15ICRjbHNDYXBzID0gc3Vi c3RyKENsYXNzTmFtZVRvR09iamVjdFR5cGUoJGNsYXNzTmFtZSksIDEyKTsKLSAgICBteSAkbG93 ZXJDYXNlSWZhY2VOYW1lID0gIndlYmtpdF9kb21fIiAuIChGaXhVcERlY2FtZWxpemVkTmFtZShk ZWNhbWVsaXplKCRpbnRlcmZhY2VOYW1lKSkpOworICAgIG15ICRkZWNhbWVsaXplID0gZGVjYW1l bGl6ZSgkaW50ZXJmYWNlTmFtZSk7CisgICAgbXkgJGNsc0NhcHMgPSB1YygkZGVjYW1lbGl6ZSk7 CisgICAgbXkgJGxvd2VyQ2FzZUlmYWNlTmFtZSA9ICJ3ZWJraXRfZG9tXyRkZWNhbWVsaXplIjsK ICAgICBteSAkcGFyZW50SW1wbENsYXNzTmFtZSA9IEdldFBhcmVudEltcGxDbGFzc05hbWUoJGlu dGVyZmFjZSk7CiAKICAgICBteSAkY29uZGl0aW9uR3VhcmRTdGFydCA9ICIiOwpAQCAtODMyLDkg KzgxNyw5IEBAIEVPRgogCiAgICAgcHVzaChAaEJvZHlQcmUsICRpbXBsQ29udGVudCk7CiAKLSAg ICBteSAkZGVjYW1lbGl6ZSA9IEZpeFVwRGVjYW1lbGl6ZWROYW1lKGRlY2FtZWxpemUoJGludGVy ZmFjZU5hbWUpKTsKKyAgICBteSAkZGVjYW1lbGl6ZSA9IGRlY2FtZWxpemUoJGludGVyZmFjZU5h bWUpOwogICAgIG15ICRjbHNDYXBzID0gdWMoJGRlY2FtZWxpemUpOwotICAgIG15ICRsb3dlckNh c2VJZmFjZU5hbWUgPSAid2Via2l0X2RvbV8iIC4gKCRkZWNhbWVsaXplKTsKKyAgICBteSAkbG93 ZXJDYXNlSWZhY2VOYW1lID0gIndlYmtpdF9kb21fJGRlY2FtZWxpemUiOwogCiAgICAgJGltcGxD b250ZW50ID0gPDwgIkVPRiI7CiAjZGVmaW5lIFdFQktJVF9UWVBFX0RPTV8ke2Nsc0NhcHN9ICAg ICAgICAgICAgKCR7bG93ZXJDYXNlSWZhY2VOYW1lfV9nZXRfdHlwZSgpKQpAQCAtODY3LDcgKzg1 Miw3IEBAIHN1YiBHZXRHUmV0dXJuTWFjcm8gewogICAgIGlmICgkcGFyYW1JRExUeXBlIGVxICJH RXJyb3IiKSB7CiAgICAgICAgICRjb25kaXRpb24gPSAiISRwYXJhbU5hbWUgfHwgISokcGFyYW1O YW1lIjsKICAgICB9IGVsc2lmIChJc0dET01DbGFzc1R5cGUoJHBhcmFtSURMVHlwZSkpIHsKLSAg ICAgICAgbXkgJHBhcmFtVHlwZUNhcHMgPSB1YyhGaXhVcERlY2FtZWxpemVkTmFtZShkZWNhbWVs aXplKCRwYXJhbUlETFR5cGUpKSk7CisgICAgICAgIG15ICRwYXJhbVR5cGVDYXBzID0gdWMoZGVj YW1lbGl6ZSgkcGFyYW1JRExUeXBlKSk7CiAgICAgICAgICRjb25kaXRpb24gPSAiV0VCS0lUX0RP TV9JU18ke3BhcmFtVHlwZUNhcHN9KCRwYXJhbU5hbWUpIjsKICAgICAgICAgaWYgKFBhcmFtQ2Fu QmVOdWxsKCRmdW5jdGlvbk5hbWUsICRwYXJhbU5hbWUpKSB7CiAgICAgICAgICAgICAkY29uZGl0 aW9uID0gIiEkcGFyYW1OYW1lIHx8ICRjb25kaXRpb24iOwpAQCAtOTAyLDcgKzg4Nyw3IEBAIHN1 YiBQYXJhbUNhbkJlTnVsbCB7CiBzdWIgR2VuZXJhdGVGdW5jdGlvbiB7CiAgICAgbXkgKCRvYmpl Y3QsICRpbnRlcmZhY2VOYW1lLCAkZnVuY3Rpb24sICRwcmVmaXgsICRwYXJlbnROb2RlKSA9IEBf OwogCi0gICAgbXkgJGRlY2FtZWxpemUgPSBGaXhVcERlY2FtZWxpemVkTmFtZShkZWNhbWVsaXpl KCRpbnRlcmZhY2VOYW1lKSk7CisgICAgbXkgJGRlY2FtZWxpemUgPSBkZWNhbWVsaXplKCRpbnRl cmZhY2VOYW1lKTsKIAogICAgIGlmICgkb2JqZWN0IGVxICJNZWRpYVF1ZXJ5TGlzdExpc3RlbmVy IikgewogICAgICAgICByZXR1cm47CkBAIC0xMjk5LDggKzEyODQsOSBAQCBzdWIgR2VuZXJhdGVD RmlsZSB7CiAKICAgICBteSAkaW1wbENvbnRlbnQgPSAiIjsKIAotICAgIG15ICRjbHNDYXBzID0g dWMoRml4VXBEZWNhbWVsaXplZE5hbWUoZGVjYW1lbGl6ZSgkaW50ZXJmYWNlTmFtZSkpKTsKLSAg ICBteSAkbG93ZXJDYXNlSWZhY2VOYW1lID0gIndlYmtpdF9kb21fIiAuIEZpeFVwRGVjYW1lbGl6 ZWROYW1lKGRlY2FtZWxpemUoJGludGVyZmFjZU5hbWUpKTsKKyAgICBteSAkZGVjYW1lbGl6ZSA9 IGRlY2FtZWxpemUoJGludGVyZmFjZU5hbWUpOworICAgIG15ICRjbHNDYXBzID0gdWMoJGRlY2Ft ZWxpemUpOworICAgIG15ICRsb3dlckNhc2VJZmFjZU5hbWUgPSAid2Via2l0X2RvbV8kZGVjYW1l bGl6ZSI7CiAgICAgbXkgJHBhcmVudEltcGxDbGFzc05hbWUgPSBHZXRQYXJlbnRJbXBsQ2xhc3NO YW1lKCRpbnRlcmZhY2UpOwogICAgIG15ICRiYXNlQ2xhc3NOYW1lID0gR2V0QmFzZUNsYXNzKCRw YXJlbnRJbXBsQ2xhc3NOYW1lKTsKIApAQCAtMTM5MCw3ICsxMzc2LDcgQEAgc3ViIEdlbmVyYXRl RXZlbnRUYXJnZXRJZmFjZSB7CiAgICAgbXkgJGludGVyZmFjZSA9IHNoaWZ0OwogCiAgICAgbXkg JGludGVyZmFjZU5hbWUgPSAkaW50ZXJmYWNlLT5uYW1lOwotICAgIG15ICRkZWNhbWVsaXplID0g Rml4VXBEZWNhbWVsaXplZE5hbWUoZGVjYW1lbGl6ZSgkaW50ZXJmYWNlTmFtZSkpOworICAgIG15 ICRkZWNhbWVsaXplID0gZGVjYW1lbGl6ZSgkaW50ZXJmYWNlTmFtZSk7CiAgICAgbXkgJGNvbmRp dGlvbmFsU3RyaW5nID0gJGNvZGVHZW5lcmF0b3ItPkdlbmVyYXRlQ29uZGl0aW9uYWxTdHJpbmco JGludGVyZmFjZSk7CiAgICAgbXkgQGNvbmRpdGlvbmFsV2FybiA9IEdlbmVyYXRlQ29uZGl0aW9u YWxXYXJuaW5nKCRpbnRlcmZhY2UpOwogCg== 205932 2013-07-02 11:41:24 -0700 2013-07-19 04:31:13 -0700 Patch bug-117543-20130702203918.patch text/plain 6485 dpino U3VidmVyc2lvbiBSZXZpc2lvbjogMTUyMzAzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjQ4NTVkMDU2ZWQ4MDk1 NTRiZTAxNjg1ZTNjMjRiMjU0ZjVkZTQ2Yi4uYjU2YTJiOTBkOWMwYWQyZjk4YTY4MjdlZjEyYTc2 MWZiYmFlNzZlNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDEzLTA3LTAyICBEaWVn byBQaW5vIEdhcmNpYSAgPGRwaW5vQGlnYWxpYS5jb20+CisKKyAgICAgICAgW0dUS10gTWVyZ2Ug ZGVjYW1lbGl6YXRpb25zIGZpeCB1cHMgaW4gdGhlIEdPYmplY3QgRE9NIGJpbmRpbmdzIGNvZGUg Z2VuZXJhdG9yCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xMTc1NDMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBFbnN1cmUgdGhhdCBhbGwgdGhlIGNvZGUgdGhhdCBjYWxscyB0byBkZWNhbWVsaXphdGlvbigp IGFwcGxpZXMgdGhlCisgICAgICAgIHNhbWUgZml4IHVwcy4KKworICAgICAgICBOb3cgYWxsIGZ1 bmN0aW9ucyB0aGF0IG5lZWQgdG8gZGVjYW1lbGl6ZSBhIHN0cmluZyBzaG91bGQgc2ltcGx5Cisg ICAgICAgIGNhbGwgdG8gZGVjYW1lbGl6ZSgpLiBUaGlzIGZ1bmN0aW9uIGNhbGxzIHRvIEZpeFVw RGVjYW1lbGl6ZSB0bworICAgICAgICBhcHBseSBzb21lIGZpeCB1cHMuCisKKyAgICAgICAgKiBi aW5kaW5ncy9zY3JpcHRzL0NvZGVHZW5lcmF0b3JHT2JqZWN0LnBtOgorICAgICAgICAoZGVjYW1l bGl6ZSk6IGRlY2FtZWxpemVzIGEgc3RyaW5nIGFuZCBhcHBsaWVzIGZpeCB1cHMKKyAgICAgICAg KEZpeFVwRGVjYW1lbGl6ZSk6IGFwcGxpZXMgYSBzZXJpZXMgb2YgZml4IHVwcyB0byBhIGRlY2Ft ZWxpemVkIHN0cmluZworICAgICAgICAoR2V0UGFyZW50R09ialR5cGUpOiBtb3ZlZCBmaXggdXBz IHRvIEZpeFVwRGVjYW1lbGl6ZSgpCisgICAgICAgIChHZW5lcmF0ZVByb3BlcnRpZXMpOiBzaW1w bHkgY2FsbCB0byBkZWNhbWVsaXplCisgICAgICAgIChHZW5lcmF0ZUhlYWRlcik6IHNpbXBseSBj YWxsIHRvIGRlY2FtZWxpemUKKyAgICAgICAgKEdldEdSZXR1cm5NYWNybyk6IHNpbXBseSBjYWxs IHRvIGRlY2FtZWxpemUKKyAgICAgICAgKEdlbmVyYXRlRnVuY3Rpb24pOiBzaW1wbHkgY2FsbCB0 byBkZWNhbWVsaXplCisgICAgICAgIChHZW5lcmF0ZUNGaWxlKTogc2ltcGx5IGNhbGwgdG8gZGVj YW1lbGl6ZQorICAgICAgICAoR2VuZXJhdGVFdmVudFRhcmdldElmYWNlKTogc2ltcGx5IGNhbGwg dG8gZGVjYW1lbGl6ZQorCiAyMDEzLTA3LTAyICBUaW0gSG9ydG9uICA8dGltb3RoeV9ob3J0b25A YXBwbGUuY29tPgogCiAgICAgICAgIGNvbnN0cmFpblNjcm9sbFBvc2l0aW9uRm9yT3Zlcmhhbmcg bmVlZHMgdG8gaGFuZGxlIHNjcm9sbE9yaWdpbiBjb3JyZWN0bHkKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvQ29kZUdlbmVyYXRvckdPYmplY3QucG0gYi9Tb3Vy Y2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL0NvZGVHZW5lcmF0b3JHT2JqZWN0LnBtCmluZGV4 IGE1MmQ0N2NjMDljMTM3MGM0ZjRiYmU3MjFlNDBkNjA0NDY0YjE5NTkuLjNhMzY1MjU5ZTZiMjk4 MGQ2OGM5ODUzNWUzNDJlZTFhYTMyMTllYmUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Jp bmRpbmdzL3NjcmlwdHMvQ29kZUdlbmVyYXRvckdPYmplY3QucG0KKysrIGIvU291cmNlL1dlYkNv cmUvYmluZGluZ3Mvc2NyaXB0cy9Db2RlR2VuZXJhdG9yR09iamVjdC5wbQpAQCAtMTM0LDE4ICsx MzQsMTkgQEAgc3ViIGRlY2FtZWxpemUKICAgICAgICAgICAgICAgICAkdCAuPSAkcDMgPyAkcDEg PyAiJHtwMX1fJHAyJHAzIiA6ICIkcDIkcDMiIDogIiRwMSRwMiI7CiAgICAgICAgICAgICAgICAg JHQ7CiAgICAgICAgIH1nZTsKLSAgICAgICAgJHM7Ci19Ci0KLXN1YiBGaXhVcERlY2FtZWxpemVk TmFtZSB7Ci0gICAgbXkgJGNsYXNzbmFtZSA9IHNoaWZ0OwogCi0gICAgIyBGSVhNRTogdHJ5IHRv IG1lcmdlIHRoaXMgc29tZWhvdyB3aXRoIHRoZSBmaXhlcyBpbiBDbGFzc05hbWVUb0dvYmplY3RU eXBlCi0gICAgJGNsYXNzbmFtZSA9fiBzL3hfcGF0aC94cGF0aC87Ci0gICAgJGNsYXNzbmFtZSA9 fiBzL3dlYl9raXQvd2Via2l0LzsKLSAgICAkY2xhc3NuYW1lID1+IHMvaHRtbGlfZnJhbWUvaHRt bF9pZnJhbWUvOwotCi0gICAgcmV0dXJuICRjbGFzc25hbWU7CisgICAgICAgICMgU29tZSBzdHJp bmdzIGFyZSBub3QgY29ycmVjdGx5IGRlY2FtZWxpemVkLCBhcHBseSBmaXggdXBzCisgICAgICAg IGZvciAoJHMpIHsKKyAgICAgICAgICAgIHMvZG9tY3NzL2RvbV9jc3MvOworICAgICAgICAgICAg cy9kb21odG1sL2RvbV9odG1sLzsKKyAgICAgICAgICAgIHMvZG9tZG9tL2RvbV9kb20vOworICAg ICAgICAgICAgcy9kb21jZGF0YS9kb21fY2RhdGEvOworICAgICAgICAgICAgcy9kb211aS9kb21f dWkvOworICAgICAgICAgICAgcy94X3BhdGgveHBhdGgvOworICAgICAgICAgICAgcy93ZWJfa2l0 L3dlYmtpdC87CisgICAgICAgICAgICBzL2h0bWxpX2ZyYW1lL2h0bWxfaWZyYW1lLzsKKyAgICAg ICAgfQorICAgICAgICByZXR1cm4gJHM7CiB9CiAKIHN1YiBIdW1hblJlYWRhYmxlQ29uZGl0aW9u YWwgewpAQCAtMTYzLDI4ICsxNjQsMTEgQEAgc3ViIEh1bWFuUmVhZGFibGVDb25kaXRpb25hbCB7 CiAgICAgcmV0dXJuIGpvaW4oJyAnLCBAaHVtYW5SZWFkYWJsZSk7CiB9CiAKLXN1YiBDbGFzc05h bWVUb0dPYmplY3RUeXBlIHsKLSAgICBteSAkY2xhc3NOYW1lID0gc2hpZnQ7Ci0gICAgbXkgJENM QVNTX05BTUUgPSB1YyhkZWNhbWVsaXplKCRjbGFzc05hbWUpKTsKLSAgICAjIEZpeHVwOiB3aXRo IG91ciBwcmVmaXggYmVpbmcgJ1dlYktpdERPTScgZGVjYW1lbGl6ZSBjYW4ndCBnZXQKLSAgICAj IFdlYktpdERPTUNTUyBhbmQgc2ltaWxhciBuYW1lcyByaWdodCwgc28gd2UgaGF2ZSB0byBmaXgg aXQKLSAgICAjIG1hbnVhbGx5LgotICAgICRDTEFTU19OQU1FID1+IHMvRE9NQ1NTL0RPTV9DU1Mv OwotICAgICRDTEFTU19OQU1FID1+IHMvRE9NSFRNTC9ET01fSFRNTC87Ci0gICAgJENMQVNTX05B TUUgPX4gcy9ET01ET00vRE9NX0RPTS87Ci0gICAgJENMQVNTX05BTUUgPX4gcy9ET01DREFUQS9E T01fQ0RBVEEvOwotICAgICRDTEFTU19OQU1FID1+IHMvRE9NWF9QQVRIL0RPTV9YUEFUSC87Ci0g ICAgJENMQVNTX05BTUUgPX4gcy9ET01fV0VCX0tJVC9ET01fV0VCS0lULzsKLSAgICAkQ0xBU1Nf TkFNRSA9fiBzL0RPTVVJL0RPTV9VSS87Ci0gICAgJENMQVNTX05BTUUgPX4gcy9IVE1MSV9GUkFN RS9IVE1MX0lGUkFNRS87Ci0gICAgcmV0dXJuICRDTEFTU19OQU1FOwotfQotCiBzdWIgR2V0UGFy ZW50R09ialR5cGUgewogICAgIG15ICRpbnRlcmZhY2UgPSBzaGlmdDsKIAogICAgIHJldHVybiAi V0VCS0lUX1RZUEVfRE9NX09CSkVDVCIgaWYgQHskaW50ZXJmYWNlLT5wYXJlbnRzfSBlcSAwOwot ICAgIHJldHVybiAiV0VCS0lUX1RZUEVfRE9NXyIgLiBDbGFzc05hbWVUb0dPYmplY3RUeXBlKCRp bnRlcmZhY2UtPnBhcmVudHMoMCkpOworICAgIHJldHVybiAiV0VCS0lUX1RZUEVfRE9NXyIgLiB1 YyhkZWNhbWVsaXplKCRpbnRlcmZhY2UtPnBhcmVudHMoMCkpKTsKIH0KIAogc3ViIEdldENsYXNz TmFtZSB7CkBAIC02MDQsOCArNTg4LDkgQEAgRU9GCiBzdWIgR2VuZXJhdGVQcm9wZXJ0aWVzIHsK ICAgICBteSAoJG9iamVjdCwgJGludGVyZmFjZU5hbWUsICRpbnRlcmZhY2UpID0gQF87CiAKLSAg ICBteSAkY2xzQ2FwcyA9IHN1YnN0cihDbGFzc05hbWVUb0dPYmplY3RUeXBlKCRjbGFzc05hbWUp LCAxMik7Ci0gICAgbXkgJGxvd2VyQ2FzZUlmYWNlTmFtZSA9ICJ3ZWJraXRfZG9tXyIgLiAoRml4 VXBEZWNhbWVsaXplZE5hbWUoZGVjYW1lbGl6ZSgkaW50ZXJmYWNlTmFtZSkpKTsKKyAgICBteSAk ZGVjYW1lbGl6ZSA9IGRlY2FtZWxpemUoJGludGVyZmFjZU5hbWUpOworICAgIG15ICRjbHNDYXBz ID0gdWMoJGRlY2FtZWxpemUpOworICAgIG15ICRsb3dlckNhc2VJZmFjZU5hbWUgPSAid2Via2l0 X2RvbV8kZGVjYW1lbGl6ZSI7CiAgICAgbXkgJHBhcmVudEltcGxDbGFzc05hbWUgPSBHZXRQYXJl bnRJbXBsQ2xhc3NOYW1lKCRpbnRlcmZhY2UpOwogCiAgICAgbXkgJGNvbmRpdGlvbkd1YXJkU3Rh cnQgPSAiIjsKQEAgLTgzMiw5ICs4MTcsOSBAQCBFT0YKIAogICAgIHB1c2goQGhCb2R5UHJlLCAk aW1wbENvbnRlbnQpOwogCi0gICAgbXkgJGRlY2FtZWxpemUgPSBGaXhVcERlY2FtZWxpemVkTmFt ZShkZWNhbWVsaXplKCRpbnRlcmZhY2VOYW1lKSk7CisgICAgbXkgJGRlY2FtZWxpemUgPSBkZWNh bWVsaXplKCRpbnRlcmZhY2VOYW1lKTsKICAgICBteSAkY2xzQ2FwcyA9IHVjKCRkZWNhbWVsaXpl KTsKLSAgICBteSAkbG93ZXJDYXNlSWZhY2VOYW1lID0gIndlYmtpdF9kb21fIiAuICgkZGVjYW1l bGl6ZSk7CisgICAgbXkgJGxvd2VyQ2FzZUlmYWNlTmFtZSA9ICJ3ZWJraXRfZG9tXyRkZWNhbWVs aXplIjsKIAogICAgICRpbXBsQ29udGVudCA9IDw8ICJFT0YiOwogI2RlZmluZSBXRUJLSVRfVFlQ RV9ET01fJHtjbHNDYXBzfSAgICAgICAgICAgICgke2xvd2VyQ2FzZUlmYWNlTmFtZX1fZ2V0X3R5 cGUoKSkKQEAgLTg2Nyw3ICs4NTIsNyBAQCBzdWIgR2V0R1JldHVybk1hY3JvIHsKICAgICBpZiAo JHBhcmFtSURMVHlwZSBlcSAiR0Vycm9yIikgewogICAgICAgICAkY29uZGl0aW9uID0gIiEkcGFy YW1OYW1lIHx8ICEqJHBhcmFtTmFtZSI7CiAgICAgfSBlbHNpZiAoSXNHRE9NQ2xhc3NUeXBlKCRw YXJhbUlETFR5cGUpKSB7Ci0gICAgICAgIG15ICRwYXJhbVR5cGVDYXBzID0gdWMoRml4VXBEZWNh bWVsaXplZE5hbWUoZGVjYW1lbGl6ZSgkcGFyYW1JRExUeXBlKSkpOworICAgICAgICBteSAkcGFy YW1UeXBlQ2FwcyA9IHVjKGRlY2FtZWxpemUoJHBhcmFtSURMVHlwZSkpOwogICAgICAgICAkY29u ZGl0aW9uID0gIldFQktJVF9ET01fSVNfJHtwYXJhbVR5cGVDYXBzfSgkcGFyYW1OYW1lKSI7CiAg ICAgICAgIGlmIChQYXJhbUNhbkJlTnVsbCgkZnVuY3Rpb25OYW1lLCAkcGFyYW1OYW1lKSkgewog ICAgICAgICAgICAgJGNvbmRpdGlvbiA9ICIhJHBhcmFtTmFtZSB8fCAkY29uZGl0aW9uIjsKQEAg LTkwMiw3ICs4ODcsNyBAQCBzdWIgUGFyYW1DYW5CZU51bGwgewogc3ViIEdlbmVyYXRlRnVuY3Rp b24gewogICAgIG15ICgkb2JqZWN0LCAkaW50ZXJmYWNlTmFtZSwgJGZ1bmN0aW9uLCAkcHJlZml4 LCAkcGFyZW50Tm9kZSkgPSBAXzsKIAotICAgIG15ICRkZWNhbWVsaXplID0gRml4VXBEZWNhbWVs aXplZE5hbWUoZGVjYW1lbGl6ZSgkaW50ZXJmYWNlTmFtZSkpOworICAgIG15ICRkZWNhbWVsaXpl ID0gZGVjYW1lbGl6ZSgkaW50ZXJmYWNlTmFtZSk7CiAKICAgICBpZiAoJG9iamVjdCBlcSAiTWVk aWFRdWVyeUxpc3RMaXN0ZW5lciIpIHsKICAgICAgICAgcmV0dXJuOwpAQCAtMTI5OSw4ICsxMjg0 LDkgQEAgc3ViIEdlbmVyYXRlQ0ZpbGUgewogCiAgICAgbXkgJGltcGxDb250ZW50ID0gIiI7CiAK LSAgICBteSAkY2xzQ2FwcyA9IHVjKEZpeFVwRGVjYW1lbGl6ZWROYW1lKGRlY2FtZWxpemUoJGlu dGVyZmFjZU5hbWUpKSk7Ci0gICAgbXkgJGxvd2VyQ2FzZUlmYWNlTmFtZSA9ICJ3ZWJraXRfZG9t XyIgLiBGaXhVcERlY2FtZWxpemVkTmFtZShkZWNhbWVsaXplKCRpbnRlcmZhY2VOYW1lKSk7Cisg ICAgbXkgJGRlY2FtZWxpemUgPSBkZWNhbWVsaXplKCRpbnRlcmZhY2VOYW1lKTsKKyAgICBteSAk Y2xzQ2FwcyA9IHVjKCRkZWNhbWVsaXplKTsKKyAgICBteSAkbG93ZXJDYXNlSWZhY2VOYW1lID0g IndlYmtpdF9kb21fJGRlY2FtZWxpemUiOwogICAgIG15ICRwYXJlbnRJbXBsQ2xhc3NOYW1lID0g R2V0UGFyZW50SW1wbENsYXNzTmFtZSgkaW50ZXJmYWNlKTsKICAgICBteSAkYmFzZUNsYXNzTmFt ZSA9IEdldEJhc2VDbGFzcygkcGFyZW50SW1wbENsYXNzTmFtZSk7CiAKQEAgLTEzOTAsNyArMTM3 Niw3IEBAIHN1YiBHZW5lcmF0ZUV2ZW50VGFyZ2V0SWZhY2UgewogICAgIG15ICRpbnRlcmZhY2Ug PSBzaGlmdDsKIAogICAgIG15ICRpbnRlcmZhY2VOYW1lID0gJGludGVyZmFjZS0+bmFtZTsKLSAg ICBteSAkZGVjYW1lbGl6ZSA9IEZpeFVwRGVjYW1lbGl6ZWROYW1lKGRlY2FtZWxpemUoJGludGVy ZmFjZU5hbWUpKTsKKyAgICBteSAkZGVjYW1lbGl6ZSA9IGRlY2FtZWxpemUoJGludGVyZmFjZU5h bWUpOwogICAgIG15ICRjb25kaXRpb25hbFN0cmluZyA9ICRjb2RlR2VuZXJhdG9yLT5HZW5lcmF0 ZUNvbmRpdGlvbmFsU3RyaW5nKCRpbnRlcmZhY2UpOwogICAgIG15IEBjb25kaXRpb25hbFdhcm4g PSBHZW5lcmF0ZUNvbmRpdGlvbmFsV2FybmluZygkaW50ZXJmYWNlKTsKIAo= 207078 2013-07-19 04:31:21 -0700 2013-07-19 05:45:34 -0700 Patch bug-117543-20130719133120.patch text/plain 6431 dpino U3VidmVyc2lvbiBSZXZpc2lvbjogMTUyODg3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZWIwNzA4MTlmZWFmMGE3 YmExMjYwNmY4OWNlNmI2YjM0MTMwMGE3ZS4uMDliNzQxMmQzNzFlYWU2YTdjYTVhNDhlNGRlYzI1 ZDAwZTNlOGE5MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDEzLTA2LTE5ICBEaWVn byBQaW5vIEdhcmNpYSAgPGRwaW5vQGlnYWxpYS5jb20+CisKKyAgICAgICAgW0dUS10gTWVyZ2Ug ZGVjYW1lbGl6YXRpb25zIGZpeCB1cHMgaW4gdGhlIEdPYmplY3QgRE9NIGJpbmRpbmdzIGNvZGUg Z2VuZXJhdG9yCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xMTc1NDMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBFbnN1cmUgdGhhdCBhbGwgdGhlIGNvZGUgdGhhdCBjYWxscyB0byBkZWNhbWVsaXplKCkgYXBw bGllcyB0aGUgc2FtZSBmaXggdXBzCisKKyAgICAgICAgTm93IGFsbCBmdW5jdGlvbnMgdGhhdCBu ZWVkIHRvIGRlY2FtZWxpemUgYSBzdHJpbmcgc2hvdWxkIHNpbXBseSBjYWxsCisgICAgICAgIHRv IGRlY2FtZWxpemUoKS4gVGhpcyBmdW5jdGlvbiBjYWxscyB0byBGaXhVcERlY2FtZWxpemUgdG8g YXBwbHkgc29tZQorICAgICAgICBmaXggdXBzLgorCisgICAgICAgICogYmluZGluZ3Mvc2NyaXB0 cy9Db2RlR2VuZXJhdG9yR09iamVjdC5wbToKKyAgICAgICAgKGRlY2FtZWxpemUpOiBkZWNhbWVs aXplcyBhIHN0cmluZyBhbmQgYXBwbGllcyBmaXggdXBzCisgICAgICAgIChGaXhVcERlY2FtZWxp emUpOiBhcHBsaWVzIGEgc2VyaWVzIG9mIGZpeCB1cHMgdG8gYSBkZWNhbWVsaXplZCBzdHJpbmcK KyAgICAgICAgKEdldFBhcmVudEdPYmpUeXBlKTogbW92ZWQgZml4IHVwcyB0byBGaXhVcERlY2Ft ZWxpemUoKQorICAgICAgICAoR2VuZXJhdGVQcm9wZXJ0aWVzKTogc2ltcGx5IGNhbGwgdG8gZGVj YW1lbGl6ZQorICAgICAgICAoR2VuZXJhdGVIZWFkZXIpOiBzaW1wbHkgY2FsbCB0byBkZWNhbWVs aXplCisgICAgICAgIChHZXRHUmV0dXJuTWFjcm8pOiBzaW1wbHkgY2FsbCB0byBkZWNhbWVsaXpl CisgICAgICAgIChHZW5lcmF0ZUZ1bmN0aW9uKTogc2ltcGx5IGNhbGwgdG8gZGVjYW1lbGl6ZQor ICAgICAgICAoR2VuZXJhdGVDRmlsZSk6IHNpbXBseSBjYWxsIHRvIGRlY2FtZWxpemUKKyAgICAg ICAgKEdlbmVyYXRlRXZlbnRUYXJnZXRJZmFjZSk6IHNpbXBseSBjYWxsIHRvIGRlY2FtZWxpemUK KwogMjAxMy0wNy0xOCAgQ2hyaXN0b3BoZSBEdW1leiAgPGNoLmR1bWV6QHNpc2Euc2Ftc3VuZy5j b20+CiAKICAgICAgICAgQmluZGluZ3MgZ2VuZXJhdGlvbiB0ZXN0cyBhcmUgZmFpbGluZwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy9Db2RlR2VuZXJhdG9yR09i amVjdC5wbSBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvQ29kZUdlbmVyYXRvckdP YmplY3QucG0KaW5kZXggZWYwYmYwN2NkMjU1NzBiZjI3ZmUyYTk4ODk4ZjYzYmVlMmU5ZTFmNS4u ODEwMWVmYTcxYjFiZmYzYTdjN2ZhMzU3MDlmOTJjZGIxYzYwNWZhNCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy9Db2RlR2VuZXJhdG9yR09iamVjdC5wbQorKysg Yi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL0NvZGVHZW5lcmF0b3JHT2JqZWN0LnBt CkBAIC0xMzQsMTggKzEzNCwxOSBAQCBzdWIgZGVjYW1lbGl6ZQogICAgICAgICAgICAgICAgICR0 IC49ICRwMyA/ICRwMSA/ICIke3AxfV8kcDIkcDMiIDogIiRwMiRwMyIgOiAiJHAxJHAyIjsKICAg ICAgICAgICAgICAgICAkdDsKICAgICAgICAgfWdlOwotICAgICAgICAkczsKLX0KLQotc3ViIEZp eFVwRGVjYW1lbGl6ZWROYW1lIHsKLSAgICBteSAkY2xhc3NuYW1lID0gc2hpZnQ7CiAKLSAgICAj IEZJWE1FOiB0cnkgdG8gbWVyZ2UgdGhpcyBzb21laG93IHdpdGggdGhlIGZpeGVzIGluIENsYXNz TmFtZVRvR29iamVjdFR5cGUKLSAgICAkY2xhc3NuYW1lID1+IHMveF9wYXRoL3hwYXRoLzsKLSAg ICAkY2xhc3NuYW1lID1+IHMvd2ViX2tpdC93ZWJraXQvOwotICAgICRjbGFzc25hbWUgPX4gcy9o dG1saV9mcmFtZS9odG1sX2lmcmFtZS87Ci0KLSAgICByZXR1cm4gJGNsYXNzbmFtZTsKKyAgICAg ICAgIyBTb21lIHN0cmluZ3MgYXJlIG5vdCBjb3JyZWN0bHkgZGVjYW1lbGl6ZWQsIGFwcGx5IGZp eCB1cHMKKyAgICAgICAgZm9yICgkcykgeworICAgICAgICAgICAgcy9kb21jc3MvZG9tX2Nzcy87 CisgICAgICAgICAgICBzL2RvbWh0bWwvZG9tX2h0bWwvOworICAgICAgICAgICAgcy9kb21kb20v ZG9tX2RvbS87CisgICAgICAgICAgICBzL2RvbWNkYXRhL2RvbV9jZGF0YS87CisgICAgICAgICAg ICBzL2RvbXVpL2RvbV91aS87CisgICAgICAgICAgICBzL3hfcGF0aC94cGF0aC87CisgICAgICAg ICAgICBzL3dlYl9raXQvd2Via2l0LzsKKyAgICAgICAgICAgIHMvaHRtbGlfZnJhbWUvaHRtbF9p ZnJhbWUvOworICAgICAgICB9CisgICAgICAgIHJldHVybiAkczsKIH0KIAogc3ViIEh1bWFuUmVh ZGFibGVDb25kaXRpb25hbCB7CkBAIC0xNjMsMjggKzE2NCwxMSBAQCBzdWIgSHVtYW5SZWFkYWJs ZUNvbmRpdGlvbmFsIHsKICAgICByZXR1cm4gam9pbignICcsIEBodW1hblJlYWRhYmxlKTsKIH0K IAotc3ViIENsYXNzTmFtZVRvR09iamVjdFR5cGUgewotICAgIG15ICRjbGFzc05hbWUgPSBzaGlm dDsKLSAgICBteSAkQ0xBU1NfTkFNRSA9IHVjKGRlY2FtZWxpemUoJGNsYXNzTmFtZSkpOwotICAg ICMgRml4dXA6IHdpdGggb3VyIHByZWZpeCBiZWluZyAnV2ViS2l0RE9NJyBkZWNhbWVsaXplIGNh bid0IGdldAotICAgICMgV2ViS2l0RE9NQ1NTIGFuZCBzaW1pbGFyIG5hbWVzIHJpZ2h0LCBzbyB3 ZSBoYXZlIHRvIGZpeCBpdAotICAgICMgbWFudWFsbHkuCi0gICAgJENMQVNTX05BTUUgPX4gcy9E T01DU1MvRE9NX0NTUy87Ci0gICAgJENMQVNTX05BTUUgPX4gcy9ET01IVE1ML0RPTV9IVE1MLzsK LSAgICAkQ0xBU1NfTkFNRSA9fiBzL0RPTURPTS9ET01fRE9NLzsKLSAgICAkQ0xBU1NfTkFNRSA9 fiBzL0RPTUNEQVRBL0RPTV9DREFUQS87Ci0gICAgJENMQVNTX05BTUUgPX4gcy9ET01YX1BBVEgv RE9NX1hQQVRILzsKLSAgICAkQ0xBU1NfTkFNRSA9fiBzL0RPTV9XRUJfS0lUL0RPTV9XRUJLSVQv OwotICAgICRDTEFTU19OQU1FID1+IHMvRE9NVUkvRE9NX1VJLzsKLSAgICAkQ0xBU1NfTkFNRSA9 fiBzL0hUTUxJX0ZSQU1FL0hUTUxfSUZSQU1FLzsKLSAgICByZXR1cm4gJENMQVNTX05BTUU7Ci19 Ci0KIHN1YiBHZXRQYXJlbnRHT2JqVHlwZSB7CiAgICAgbXkgJGludGVyZmFjZSA9IHNoaWZ0Owog CiAgICAgcmV0dXJuICJXRUJLSVRfVFlQRV9ET01fT0JKRUNUIiB1bmxlc3MgJGludGVyZmFjZS0+ cGFyZW50OwotICAgIHJldHVybiAiV0VCS0lUX1RZUEVfRE9NXyIgLiBDbGFzc05hbWVUb0dPYmpl Y3RUeXBlKCRpbnRlcmZhY2UtPnBhcmVudCk7CisgICAgcmV0dXJuICJXRUJLSVRfVFlQRV9ET01f IiAuIHVjKGRlY2FtZWxpemUoKCRpbnRlcmZhY2UtPnBhcmVudCkpKTsKIH0KIAogc3ViIEdldENs YXNzTmFtZSB7CkBAIC02MDQsOCArNTg4LDkgQEAgRU9GCiBzdWIgR2VuZXJhdGVQcm9wZXJ0aWVz IHsKICAgICBteSAoJG9iamVjdCwgJGludGVyZmFjZU5hbWUsICRpbnRlcmZhY2UpID0gQF87CiAK LSAgICBteSAkY2xzQ2FwcyA9IHN1YnN0cihDbGFzc05hbWVUb0dPYmplY3RUeXBlKCRjbGFzc05h bWUpLCAxMik7Ci0gICAgbXkgJGxvd2VyQ2FzZUlmYWNlTmFtZSA9ICJ3ZWJraXRfZG9tXyIgLiAo Rml4VXBEZWNhbWVsaXplZE5hbWUoZGVjYW1lbGl6ZSgkaW50ZXJmYWNlTmFtZSkpKTsKKyAgICBt eSAkZGVjYW1lbGl6ZSA9IGRlY2FtZWxpemUoJGludGVyZmFjZU5hbWUpOworICAgIG15ICRjbHND YXBzID0gdWMoJGRlY2FtZWxpemUpOworICAgIG15ICRsb3dlckNhc2VJZmFjZU5hbWUgPSAid2Vi a2l0X2RvbV8kZGVjYW1lbGl6ZSI7CiAgICAgbXkgJHBhcmVudEltcGxDbGFzc05hbWUgPSBHZXRQ YXJlbnRJbXBsQ2xhc3NOYW1lKCRpbnRlcmZhY2UpOwogCiAgICAgbXkgJGNvbmRpdGlvbkd1YXJk U3RhcnQgPSAiIjsKQEAgLTgzMiw5ICs4MTcsOSBAQCBFT0YKIAogICAgIHB1c2goQGhCb2R5UHJl LCAkaW1wbENvbnRlbnQpOwogCi0gICAgbXkgJGRlY2FtZWxpemUgPSBGaXhVcERlY2FtZWxpemVk TmFtZShkZWNhbWVsaXplKCRpbnRlcmZhY2VOYW1lKSk7CisgICAgbXkgJGRlY2FtZWxpemUgPSBk ZWNhbWVsaXplKCRpbnRlcmZhY2VOYW1lKTsKICAgICBteSAkY2xzQ2FwcyA9IHVjKCRkZWNhbWVs aXplKTsKLSAgICBteSAkbG93ZXJDYXNlSWZhY2VOYW1lID0gIndlYmtpdF9kb21fIiAuICgkZGVj YW1lbGl6ZSk7CisgICAgbXkgJGxvd2VyQ2FzZUlmYWNlTmFtZSA9ICJ3ZWJraXRfZG9tXyRkZWNh bWVsaXplIjsKIAogICAgICRpbXBsQ29udGVudCA9IDw8ICJFT0YiOwogI2RlZmluZSBXRUJLSVRf VFlQRV9ET01fJHtjbHNDYXBzfSAgICAgICAgICAgICgke2xvd2VyQ2FzZUlmYWNlTmFtZX1fZ2V0 X3R5cGUoKSkKQEAgLTg2Nyw3ICs4NTIsNyBAQCBzdWIgR2V0R1JldHVybk1hY3JvIHsKICAgICBp ZiAoJHBhcmFtSURMVHlwZSBlcSAiR0Vycm9yIikgewogICAgICAgICAkY29uZGl0aW9uID0gIiEk cGFyYW1OYW1lIHx8ICEqJHBhcmFtTmFtZSI7CiAgICAgfSBlbHNpZiAoSXNHRE9NQ2xhc3NUeXBl KCRwYXJhbUlETFR5cGUpKSB7Ci0gICAgICAgIG15ICRwYXJhbVR5cGVDYXBzID0gdWMoRml4VXBE ZWNhbWVsaXplZE5hbWUoZGVjYW1lbGl6ZSgkcGFyYW1JRExUeXBlKSkpOworICAgICAgICBteSAk cGFyYW1UeXBlQ2FwcyA9IHVjKGRlY2FtZWxpemUoJHBhcmFtSURMVHlwZSkpOwogICAgICAgICAk Y29uZGl0aW9uID0gIldFQktJVF9ET01fSVNfJHtwYXJhbVR5cGVDYXBzfSgkcGFyYW1OYW1lKSI7 CiAgICAgICAgIGlmIChQYXJhbUNhbkJlTnVsbCgkZnVuY3Rpb25OYW1lLCAkcGFyYW1OYW1lKSkg ewogICAgICAgICAgICAgJGNvbmRpdGlvbiA9ICIhJHBhcmFtTmFtZSB8fCAkY29uZGl0aW9uIjsK QEAgLTkwMiw3ICs4ODcsNyBAQCBzdWIgUGFyYW1DYW5CZU51bGwgewogc3ViIEdlbmVyYXRlRnVu Y3Rpb24gewogICAgIG15ICgkb2JqZWN0LCAkaW50ZXJmYWNlTmFtZSwgJGZ1bmN0aW9uLCAkcHJl Zml4LCAkcGFyZW50Tm9kZSkgPSBAXzsKIAotICAgIG15ICRkZWNhbWVsaXplID0gRml4VXBEZWNh bWVsaXplZE5hbWUoZGVjYW1lbGl6ZSgkaW50ZXJmYWNlTmFtZSkpOworICAgIG15ICRkZWNhbWVs aXplID0gZGVjYW1lbGl6ZSgkaW50ZXJmYWNlTmFtZSk7CiAKICAgICBpZiAoJG9iamVjdCBlcSAi TWVkaWFRdWVyeUxpc3RMaXN0ZW5lciIpIHsKICAgICAgICAgcmV0dXJuOwpAQCAtMTI5OSw4ICsx Mjg0LDkgQEAgc3ViIEdlbmVyYXRlQ0ZpbGUgewogCiAgICAgbXkgJGltcGxDb250ZW50ID0gIiI7 CiAKLSAgICBteSAkY2xzQ2FwcyA9IHVjKEZpeFVwRGVjYW1lbGl6ZWROYW1lKGRlY2FtZWxpemUo JGludGVyZmFjZU5hbWUpKSk7Ci0gICAgbXkgJGxvd2VyQ2FzZUlmYWNlTmFtZSA9ICJ3ZWJraXRf ZG9tXyIgLiBGaXhVcERlY2FtZWxpemVkTmFtZShkZWNhbWVsaXplKCRpbnRlcmZhY2VOYW1lKSk7 CisgICAgbXkgJGRlY2FtZWxpemUgPSBkZWNhbWVsaXplKCRpbnRlcmZhY2VOYW1lKTsKKyAgICBt eSAkY2xzQ2FwcyA9IHVjKCRkZWNhbWVsaXplKTsKKyAgICBteSAkbG93ZXJDYXNlSWZhY2VOYW1l ID0gIndlYmtpdF9kb21fJGRlY2FtZWxpemUiOwogICAgIG15ICRwYXJlbnRJbXBsQ2xhc3NOYW1l ID0gR2V0UGFyZW50SW1wbENsYXNzTmFtZSgkaW50ZXJmYWNlKTsKICAgICBteSAkYmFzZUNsYXNz TmFtZSA9IEdldEJhc2VDbGFzcygkcGFyZW50SW1wbENsYXNzTmFtZSk7CiAKQEAgLTEzOTAsNyAr MTM3Niw3IEBAIHN1YiBHZW5lcmF0ZUV2ZW50VGFyZ2V0SWZhY2UgewogICAgIG15ICRpbnRlcmZh Y2UgPSBzaGlmdDsKIAogICAgIG15ICRpbnRlcmZhY2VOYW1lID0gJGludGVyZmFjZS0+bmFtZTsK LSAgICBteSAkZGVjYW1lbGl6ZSA9IEZpeFVwRGVjYW1lbGl6ZWROYW1lKGRlY2FtZWxpemUoJGlu dGVyZmFjZU5hbWUpKTsKKyAgICBteSAkZGVjYW1lbGl6ZSA9IGRlY2FtZWxpemUoJGludGVyZmFj ZU5hbWUpOwogICAgIG15ICRjb25kaXRpb25hbFN0cmluZyA9ICRjb2RlR2VuZXJhdG9yLT5HZW5l cmF0ZUNvbmRpdGlvbmFsU3RyaW5nKCRpbnRlcmZhY2UpOwogICAgIG15IEBjb25kaXRpb25hbFdh cm4gPSBHZW5lcmF0ZUNvbmRpdGlvbmFsV2FybmluZygkaW50ZXJmYWNlKTsKIAo=