109932 2013-02-15 06:01:24 -0800 [GTK] Limit the supported compilers to GCC >= 4.7 and Clang >= 3.0 2013-03-07 09:01:36 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 zan zan cgarcia gustavo mrobinson pnormand oldest_to_newest 833937 0 zan 2013-02-15 06:01:24 -0800 [GTK] Limit the supported compilers to GCC >= 4.7 and Clang >= 3.0 833951 1 zan 2013-02-15 06:22:28 -0800 Given that more and more C++11 features will be coming into WebKit2[1] I think it would make sense to support that by compiling WebKit2 with C++11 support enabled. At the moment this limits us to choose between two compilers - GCC >= 4.7 and Clang >= 3.0. Given the near stable release branching I'd like to see this get included, the reasoning being that it would probably ease merging fixes in WebKit2 into the stable branch. I'm not sure though how this would pass through with packagers and distributors. Could such an abrupt and late decision cause problems for them? The developers on Windows (based on the information I've gathered so far) can use GCC 4.7 with C++11 support. I'd still like to double-check with them though. [1] https://lists.webkit.org/pipermail/webkit-dev/2013-January/023527.html 833954 2 188549 zan 2013-02-15 06:26:15 -0800 Created attachment 188549 Provisional patch Just a provisional patch, I'd like to first clear things up regarding the possibility of already restricting for the stable release. 834087 3 188549 mrobinson 2013-02-15 09:11:40 -0800 Comment on attachment 188549 Provisional patch View in context: https://bugs.webkit.org/attachment.cgi?id=188549&action=review I think this is a pretty good decision. I guess it deserves a mail to the list though. > Source/autotools/CheckSystemAndBasicDependencies.m4:96 > +# Check that an appropriate C compiler is available. > +AC_LANG_PUSH([C]) > +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([ > +#if !(defined(__GNUC__) && !defined(__clang__) && __GNUC__ >= 4 && __GNUC_MINOR__ >= 7) \ > + && !(defined(__clang__) && __clang_major__ >= 3 && __clang_minor__ >= 0) > +#error Unsupported compiler > +#endif > +],[])],[],[AC_MSG_ERROR([Compiler GCC >= 4.7 or Clang >= 3.0 is required for C compilation])]) > +AC_LANG_POP([C]) Hrm. There's really no macro for checking via the command-line? > Source/autotools/CheckSystemAndBasicDependencies.m4:111 > +# Use C99 as the language standard for C code. > +CFLAGS="$CFLAGS -std=c99" > +# Do not warn about C++11 incompatibilities and extensions. > +CXXFLAGS="$CXXFLAGS -Wno-c++11-compat -Wno-c++11-extensions" See below. > Source/autotools/CheckSystemAndBasicDependencies.m4:127 > +# Clang requires suppression of unused arguments warning. > +if test "$CC" = "clang"; then > + CFLAGS="$CFLAGS -Qunused-arguments" > +fi > +# libstdc++ is at the moment the only option as the C++ standard library. > +if test "$CXX" = "clang++"; then Probably good to move these to SetupCompilerFlags.m4 834229 4 188549 zan 2013-02-15 11:53:13 -0800 Comment on attachment 188549 Provisional patch View in context: https://bugs.webkit.org/attachment.cgi?id=188549&action=review >> Source/autotools/CheckSystemAndBasicDependencies.m4:96 >> +AC_LANG_POP([C]) > > Hrm. There's really no macro for checking via the command-line? What kind of check that would be performed via command line did you have in mind? >> Source/autotools/CheckSystemAndBasicDependencies.m4:127 >> +if test "$CXX" = "clang++"; then > > Probably good to move these to SetupCompilerFlags.m4 Yup. 834244 5 188549 mrobinson 2013-02-15 12:00:11 -0800 Comment on attachment 188549 Provisional patch View in context: https://bugs.webkit.org/attachment.cgi?id=188549&action=review >>> Source/autotools/CheckSystemAndBasicDependencies.m4:96 >>> +AC_LANG_POP([C]) >> >> Hrm. There's really no macro for checking via the command-line? > > What kind of check that would be performed via command line did you have in mind? It seems there are some autoconf macros that depend on the -dumpversion flag, but I don't really know if that's better or worse than this. :) 834263 6 188549 zan 2013-02-15 12:14:51 -0800 Comment on attachment 188549 Provisional patch View in context: https://bugs.webkit.org/attachment.cgi?id=188549&action=review >>>> Source/autotools/CheckSystemAndBasicDependencies.m4:96 >>>> +AC_LANG_POP([C]) >>> >>> Hrm. There's really no macro for checking via the command-line? >> >> What kind of check that would be performed via command line did you have in mind? > > It seems there are some autoconf macros that depend on the -dumpversion flag, but I don't really know if that's better or worse than this. :) Looking only at the output it seems this simply prints out `__GNUC__.__GNUC_MINOR__` in gcc/g++ and `__GNUC__.__GNUC_MINOR__.__GNUC_PATCHLEVEL__` in clang/clang++. The problem is that Clang compilers define those macros as well, for compatibility, but with Clang 3.0 the output is 4.2.1 which is not helpful. That's why the AC_COMPILE_IFELSE macros work on code that strictly rules out Clang in case of a defined __GNUC__ macro. Note that the Intel compilers do the same thing so I'll add a check to rule them out as well. http://nadeausoftware.com/articles/2012/10/c_c_tip_how_detect_compiler_name_and_version_using_compiler_predefined_macros > Source/autotools/CheckSystemAndBasicDependencies.m4:101 > +#if !(defined(__GNUC__) && !defined(__clang__) && __GNUC__ >= 4 && __GNUC_MINOR__ >= 7) \ I'll add a further define check for the __GNUG__ macro which should be defined when compiling C++ with GCC. Just in case, really, but I'd like to be thorough here. 834270 7 188618 zan 2013-02-15 12:30:26 -0800 Created attachment 188618 Patch 848921 8 gustavo 2013-03-06 09:14:45 -0800 I approve of this change with both my webkitgtk and debian hats on. gcc 4.7 will be in the next stable release for debian, which is the only one we should care about from now on anyway, so green light from me. 848931 9 188618 mrobinson 2013-03-06 09:18:34 -0800 Comment on attachment 188618 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=188618&action=review > Source/WebCore/ChangeLog:8 > + No new tests (OOPS!). You'll need to remove this line. 848965 10 zan 2013-03-06 09:42:05 -0800 (In reply to comment #8) > I approve of this change with both my webkitgtk and debian hats on. gcc 4.7 will be in the next stable release for debian, which is the only one we should care about from now on anyway, so green light from me. Thanks! Just to clarify the stable release reference, is this OK to merge into the webkit-2.0 branch? 848972 11 mrobinson 2013-03-06 09:44:33 -0800 (In reply to comment #10) > (In reply to comment #8) > > I approve of this change with both my webkitgtk and debian hats on. gcc 4.7 will be in the next stable release for debian, which is the only one we should care about from now on anyway, so green light from me. > > Thanks! Just to clarify the stable release reference, is this OK to merge into the webkit-2.0 branch? I think we should do it. 848975 12 cgarcia 2013-03-06 09:45:22 -0800 (In reply to comment #11) > (In reply to comment #10) > > (In reply to comment #8) > > > I approve of this change with both my webkitgtk and debian hats on. gcc 4.7 will be in the next stable release for debian, which is the only one we should care about from now on anyway, so green light from me. > > > > Thanks! Just to clarify the stable release reference, is this OK to merge into the webkit-2.0 branch? > > I think we should do it. why? 848983 13 mrobinson 2013-03-06 09:48:40 -0800 (In reply to comment #12) > > I think we should do it. > > why? If we did this at 2.2 we'd be raising our dependency requirements before 3.0, so doing it for 2.0 means we don't have to wait until 3.0. 848990 14 cgarcia 2013-03-06 09:52:35 -0800 (In reply to comment #13) > (In reply to comment #12) > > > > I think we should do it. > > > > why? > > If we did this at 2.2 we'd be raising our dependency requirements before 3.0, so doing it for 2.0 means we don't have to wait until 3.0. Is there any rule that doesn't allow us to bump requirements until we release a 3.0? 849141 15 zan 2013-03-06 11:43:00 -0800 I reason the merging with the idea that since more and more WebKit2 (and someday WebCore as well) code will use C++11 goodness, along with the fact the 2.0 release series will be (AFAIK) supported in the long term, this would ease merging of future patches (security fixes etc.) into the webkit-2.0 branch. 849229 16 zan 2013-03-06 13:12:28 -0800 Waiting for nods from both Carlos and Gustavo on comment #10 before landing this. 849251 17 cgarcia 2013-03-06 13:32:26 -0800 (In reply to comment #16) > Waiting for nods from both Carlos and Gustavo on comment #10 before landing this. nod 850122 18 zan 2013-03-07 08:39:20 -0800 (In reply to comment #16) > Waiting for nods from both Carlos and Gustavo on comment #10 before landing this. via IRC: (05:00:44 PM) kov: zdobersek, yeah, I'm OK with pushing that to webkit-2.0 \o/ 850135 19 zan 2013-03-07 09:01:36 -0800 Added changelogs (dunno why they weren't there in the first place) and landed in r145084. http://trac.webkit.org/changeset/145084 188549 2013-02-15 06:26:15 -0800 2013-02-15 12:30:22 -0800 Provisional patch bug-109932-20130215152242.patch text/plain 9867 zan U3VidmVyc2lvbiBSZXZpc2lvbjogMTQyOTg3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzA4OGI3NzA0MWQyMDNl MDZhODJhMWE0NTAzMjIzMGIxYWE1ODY0MS4uZjQwYTk0N2Q0MDgwZjAwYmNiMjM1MWM4M2Y5YTQ3 YWZhYzM4NTc0NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDEzLTAyLTE1ICBaYW4g RG9iZXJzZWsgIDx6ZG9iZXJzZWtAaWdhbGlhLmNvbT4KKworICAgICAgICBbR1RLXSBMaW1pdCB0 aGUgc3VwcG9ydGVkIGNvbXBpbGVycyB0byBHQ0MgPj0gNC43IGFuZCBDbGFuZyA+PSAzLjAKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwOTkzMgorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE5vIG5ldyB0ZXN0 cyAoT09QUyEpLgorCisgICAgICAgICogR05VbWFrZWZpbGUuYW06CisgICAgICAgICogYmluZGlu Z3MvZ29iamVjdC9HTlVtYWtlZmlsZS5hbToKKwogMjAxMy0wMi0xNSAgS2Vpc2hpIEhhdHRvcmkg IDxrZWlzaGlAd2Via2l0Lm9yZz4KIAogICAgICAgICBBZGQgc2V0VmFsdWUgYW5kIGNsb3NlUG9w dXAgbWV0aG9kcyB0byBQYWdlUG9wdXBDb250cm9sbGVyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0L2d0ay9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L2d0ay9DaGFuZ2VMb2cKaW5kZXggMGZm ZDBiZWNhZmI5NjM5NzA2MDJjMTc1NzEyNWY2NzJjNTcxMzBjYy4uMjA2OTZhYzEyMzRmZmNlZjI2 MThjMjhkMmU2ZTY0MzEzNjNmODlkMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9ndGsvQ2hh bmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvZ3RrL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEyIEBA CisyMDEzLTAyLTE1ICBaYW4gRG9iZXJzZWsgIDx6ZG9iZXJzZWtAaWdhbGlhLmNvbT4KKworICAg ICAgICBbR1RLXSBMaW1pdCB0aGUgc3VwcG9ydGVkIGNvbXBpbGVycyB0byBHQ0MgPj0gNC43IGFu ZCBDbGFuZyA+PSAzLjAKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTEwOTkzMgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgICogR05VbWFrZWZpbGUuYW06CisKIDIwMTMtMDItMTMgIEFsbGFuIFNhbmRmZWxkIEpl bnNlbiAgPGFsbGFuLmplbnNlbkBkaWdpYS5jb20+CiAKICAgICAgICAgW1F0XSB3aW5kb3cub3Bl biBwYXNzZXMgaGVpZ2h0IGFuZCB3aWR0aCBwYXJhbWV0ZXJzIGV2ZW4gaWYgbm90IGRlZmluZWQg aW4gYSBwYWdlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cgYi9Tb3VyY2Uv V2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggNWRhMjFmNDVlNTg2MjRiNzI4NTZjMjJiN2Y5NWVkN2Rj YTNjOTBkOC4uY2M0NzAxMTQ1YzI5MGYyNDliYTQzZjg0MjczODgzNjk4NmEyMGVkMCAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwpAQCAtMSwzICsxLDEyIEBACisyMDEzLTAyLTE1ICBaYW4gRG9iZXJzZWsgIDx6ZG9iZXJz ZWtAaWdhbGlhLmNvbT4KKworICAgICAgICBbR1RLXSBMaW1pdCB0aGUgc3VwcG9ydGVkIGNvbXBp bGVycyB0byBHQ0MgPj0gNC43IGFuZCBDbGFuZyA+PSAzLjAKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwOTkzMgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogR05VbWFrZWZpbGUuYW06CisKIDIwMTMtMDIt MTUgIEFsbGFuIFNhbmRmZWxkIEplbnNlbiAgPGFsbGFuLmplbnNlbkBkaWdpYS5jb20+CiAKICAg ICAgICAgU2ltcGxpZnkgaGl0VGVzdFJlc3VsdEF0UG9pbnQgYW5kIG5vZGVzRnJvbVJlY3QgQVBJ cwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvR05VbWFrZWZpbGUuYW0gYi9Tb3VyY2UvV2Vi Q29yZS9HTlVtYWtlZmlsZS5hbQppbmRleCBjYTAxMTkxMmU0MTVkYmQwZWRkOTg5NDAxYjRiNzY2 MGQwMjJmMDE5Li5mYmQ3YTBkNzJjNTMxOWUxYjg1Mjc5YjZkZTEzZDI5MTRhMzFkYmFjIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9HTlVtYWtlZmlsZS5hbQorKysgYi9Tb3VyY2UvV2ViQ29y ZS9HTlVtYWtlZmlsZS5hbQpAQCAtMjI1LDExICsyMjUsMTEgQEAgbGliV2ViQ29yZVNWR19sYV9T T1VSQ0VTID0gXAogCSQod2ViY29yZV9zdmdfc291cmNlcykKIAogbGliV2ViQ29yZVNWR19sYV9D WFhGTEFHUyA9IFwKLQkkKFNZTUJPTF9WSVNJQklMSVRZX0lOTElORVMpIFwKKwktZnZpc2liaWxp dHktaW5saW5lcy1oaWRkZW4gXAogCSQoZ2xvYmFsX2N4eGZsYWdzKQogCiBsaWJXZWJDb3JlU1ZH X2xhX0NGTEFHUyA9IFwKLQkkKFNZTUJPTF9WSVNJQklMSVRZKSBcCisJLWZ2aXNpYmlsaXR5PWhp ZGRlbiBcCiAJJChnbG9iYWxfY2ZsYWdzKQogCiBsaWJXZWJDb3JlU1ZHX2xhX0NQUEZMQUdTID0g XApAQCAtNTkxLDExICs1OTEsMTEgQEAgbGliV2ViQ29yZV9sYV9TT1VSQ0VTID0gXAogCSQod2Vi Y29yZV9zb3VyY2VzKQogCiBsaWJXZWJDb3JlX2xhX0NYWEZMQUdTID0gXAotCSQoU1lNQk9MX1ZJ U0lCSUxJVFlfSU5MSU5FUykgXAorCS1mdmlzaWJpbGl0eS1pbmxpbmVzLWhpZGRlbiBcCiAJJChn bG9iYWxfY3h4ZmxhZ3MpCiAKIGxpYldlYkNvcmVfbGFfQ0ZMQUdTID0gXAotCSQoU1lNQk9MX1ZJ U0lCSUxJVFkpIFwKKwktZnZpc2liaWxpdHk9aGlkZGVuIFwKIAkkKGdsb2JhbF9jZmxhZ3MpCiAK IGxpYldlYkNvcmVfbGFfQ1BQRkxBR1MgPSBcCkBAIC02NTcsMTAgKzY1NywxMCBAQCBlbmRpZgog bGliV2ViQ29yZVBsYXRmb3JtX2xhX1NPVVJDRVMgPSBcCiAJJCh3ZWJjb3JlX3BsYXRmb3JtX3Nv dXJjZXMpCiBsaWJXZWJDb3JlUGxhdGZvcm1fbGFfQ1hYRkxBR1MgPSBcCi0JJChTWU1CT0xfVklT SUJJTElUWV9JTkxJTkVTKSBcCisJLWZ2aXNpYmlsaXR5LWlubGluZXMtaGlkZGVuIFwKIAkkKGds b2JhbF9jeHhmbGFncykKIGxpYldlYkNvcmVQbGF0Zm9ybV9sYV9DRkxBR1MgPSBcCi0JJChTWU1C T0xfVklTSUJJTElUWSkgXAorCS1mdmlzaWJpbGl0eT1oaWRkZW4gXAogCSQoZ2xvYmFsX2NmbGFn cykKIGxpYldlYkNvcmVQbGF0Zm9ybV9sYV9DUFBGTEFHUyA9IFwKIAktREJVSUxESU5HX1dFQktJ VCBcCkBAIC03MDAsMTEgKzcwMCwxMSBAQCBsaWJXZWJDb3JlR3RrX2xhX1NPVVJDRVMgPSBcCiAJ JCh3ZWJjb3JlZ3RrX3NvdXJjZXMpCiAKIGxpYldlYkNvcmVHdGtfbGFfQ1hYRkxBR1MgPSBcCi0J JChTWU1CT0xfVklTSUJJTElUWV9JTkxJTkVTKSBcCisJLWZ2aXNpYmlsaXR5LWlubGluZXMtaGlk ZGVuIFwKIAkkKGdsb2JhbF9jeHhmbGFncykKIAogbGliV2ViQ29yZUd0a19sYV9DRkxBR1MgPSBc Ci0JJChTWU1CT0xfVklTSUJJTElUWSkgXAorCS1mdmlzaWJpbGl0eT1oaWRkZW4gXAogCSQoZ2xv YmFsX2NmbGFncykKIAogbGliV2ViQ29yZUd0a19sYV9DUFBGTEFHUyA9IFwKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2dvYmplY3QvR05VbWFrZWZpbGUuYW0gYi9Tb3VyY2Uv V2ViQ29yZS9iaW5kaW5ncy9nb2JqZWN0L0dOVW1ha2VmaWxlLmFtCmluZGV4IDIxMTRmYThlMzhj Y2Q0MDJlMzAxNTZmOTVhYThhYWUwNjU0Y2Y0OWIuLjIyYWVkNDUxM2UxMDIzNmU5ZDlkYjZmODAw YTJkOThlNjZjZTdjNmUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2dvYmpl Y3QvR05VbWFrZWZpbGUuYW0KKysrIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvZ29iamVjdC9H TlVtYWtlZmlsZS5hbQpAQCAtNTE4LDExICs1MTgsMTEgQEAgbGliV2ViQ29yZURPTV9sYV9TT1VS Q0VTID0gXAogCVNvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2dvYmplY3QvV2ViS2l0SFRNTEVsZW1l bnRXcmFwcGVyRmFjdG9yeS5oCiAKIGxpYldlYkNvcmVET01fbGFfQ1hYRkxBR1MgPSBcCi0JJChT WU1CT0xfVklTSUJJTElUWV9JTkxJTkVTKSBcCisJLWZ2aXNpYmlsaXR5LWlubGluZXMtaGlkZGVu IFwKIAkkKGdsb2JhbF9jeHhmbGFncykKIAogbGliV2ViQ29yZURPTV9sYV9DRkxBR1MgPSBcCi0J JChTWU1CT0xfVklTSUJJTElUWSkgXAorCS1mdmlzaWJpbGl0eT1oaWRkZW4gXAogCSQoZ2xvYmFs X2NmbGFncykKIAogbGliV2ViQ29yZURPTV9sYV9DUFBGTEFHUyA9IFwKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQvZ3RrL0dOVW1ha2VmaWxlLmFtIGIvU291cmNlL1dlYktpdC9ndGsvR05VbWFr ZWZpbGUuYW0KaW5kZXggZjhlODczYTkzZWNhNjgxM2U3NWMzMGRjZWQwZTRmZDYwNTU1OTBmYy4u NzQ0M2JmMDE3YTUwYWJhYjI4MGMwYmUwODBlNDU4ZDAxZjhkYjI1YyAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdC9ndGsvR05VbWFrZWZpbGUuYW0KKysrIGIvU291cmNlL1dlYktpdC9ndGsvR05V bWFrZWZpbGUuYW0KQEAgLTE4LDExICsxOCwxMSBAQCBsaWJ3ZWJraXRndGtfQFdFQktJVEdUS19B UElfTUFKT1JfVkVSU0lPTkBfQFdFQktJVEdUS19BUElfTUlOT1JfVkVSU0lPTkBfbGFfU09VUgog CSQod2Via2l0Z3RrX3NvdXJjZXMpCiAKIGxpYndlYmtpdGd0a19AV0VCS0lUR1RLX0FQSV9NQUpP Ul9WRVJTSU9OQF9AV0VCS0lUR1RLX0FQSV9NSU5PUl9WRVJTSU9OQF9sYV9DWFhGTEFHUyA9IFwK LQkkKFNZTUJPTF9WSVNJQklMSVRZX0lOTElORVMpIFwKKwktZnZpc2liaWxpdHktaW5saW5lcy1o aWRkZW4gXAogCSQoZ2xvYmFsX2N4eGZsYWdzKQogCiBsaWJ3ZWJraXRndGtfQFdFQktJVEdUS19B UElfTUFKT1JfVkVSU0lPTkBfQFdFQktJVEdUS19BUElfTUlOT1JfVkVSU0lPTkBfbGFfQ0ZMQUdT ID0gXAotCSQoU1lNQk9MX1ZJU0lCSUxJVFkpIFwKKwktZnZpc2liaWxpdHk9aGlkZGVuIFwKIAkk KGdsb2JhbF9jZmxhZ3MpCiAKIGlmIEVOQUJMRV9TUEVMTENIRUNLCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0Mi9HTlVtYWtlZmlsZS5hbSBiL1NvdXJjZS9XZWJLaXQyL0dOVW1ha2VmaWxlLmFt CmluZGV4IDA4MTEyOGIzNzY3NmExZWQzNTllMWM4ODgyNjk2NzQxNGI1ZjkyYzkuLmVlZjIzMTE4 NjFmMTczMjk4MjdlOTkyNDg4MGY1NWQ5OGY4ODM2ZGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQyL0dOVW1ha2VmaWxlLmFtCisrKyBiL1NvdXJjZS9XZWJLaXQyL0dOVW1ha2VmaWxlLmFtCkBA IC00NTAsMTEgKzQ1MCwxMSBAQCBsaWJXZWJDb3JlR3RrMl9sYV9TT1VSQ0VTID0gXAogCSQod2Vi Y29yZWd0a19zb3VyY2VzKQogCiBsaWJXZWJDb3JlR3RrMl9sYV9DWFhGTEFHUyA9IFwKLQkkKFNZ TUJPTF9WSVNJQklMSVRZX0lOTElORVMpIFwKKwktZnZpc2liaWxpdHktaW5saW5lcy1oaWRkZW4g XAogCSQoZ2xvYmFsX2N4eGZsYWdzKQogCiBsaWJXZWJDb3JlR3RrMl9sYV9DRkxBR1MgPSBcCi0J JChTWU1CT0xfVklTSUJJTElUWSkgXAorCS1mdmlzaWJpbGl0eT1oaWRkZW4gXAogCSQoZ2xvYmFs X2NmbGFncykKIAogbGliV2ViQ29yZUd0azJfbGFfQ1BQRkxBR1MgPSBcCkBAIC01NTEsNyArNTUx LDcgQEAgUHJvZ3JhbXNfV2ViS2l0UGx1Z2luUHJvY2Vzc19DUFBGTEFHUyA9IFwKIAkkKFVOSUNP REVfQ0ZMQUdTKQogCiBQcm9ncmFtc19XZWJLaXRQbHVnaW5Qcm9jZXNzX0NGTEFHUyA9IFwKLQkk KFNZTUJPTF9WSVNJQklMSVRZKSBcCisJLWZ2aXNpYmlsaXR5LWlubGluZXMtaGlkZGVuIFwKIAkk KGdsb2JhbF9jZmxhZ3MpIFwKIAkkKENBSVJPX0NGTEFHUykgXAogCSQoR0xJQl9DRkxBR1MpIFwK QEAgLTYxMiw3ICs2MTIsNyBAQCBQcm9ncmFtc19XZWJLaXRQbHVnaW5Qcm9jZXNzX0xERkxBR1Mg PSBcCiAJLVdsLC0tdW5yZXNvbHZlZC1zeW1ib2xzPWlnbm9yZS1pbi1vYmplY3QtZmlsZXMKIAog UHJvZ3JhbXNfV2ViS2l0UGx1Z2luUHJvY2Vzc19DWFhGTEFHUyA9IFwKLQkkKFNZTUJPTF9WSVNJ QklMSVRZX0lOTElORVMpIFwKKwktZnZpc2liaWxpdHktaW5saW5lcy1oaWRkZW4gXAogCSQoZ2xv YmFsX2N4eGZsYWdzKQogCiBFWFRSQV9ESVNUICs9IFwKZGlmZiAtLWdpdCBhL1NvdXJjZS9hdXRv dG9vbHMvQ2hlY2tTeXN0ZW1BbmRCYXNpY0RlcGVuZGVuY2llcy5tNCBiL1NvdXJjZS9hdXRvdG9v bHMvQ2hlY2tTeXN0ZW1BbmRCYXNpY0RlcGVuZGVuY2llcy5tNAppbmRleCBiM2QxM2VhN2ZjMmRj YzZjNTYzMDE1Y2Q0OTg5Y2M2NzJjN2QxYmIxLi41NjQxOGY2YWQ5NDJiNmZmMWE4YWJmMjRkNjA2 YWM0YjQ3MDM2OWMxIDEwMDY0NAotLS0gYS9Tb3VyY2UvYXV0b3Rvb2xzL0NoZWNrU3lzdGVtQW5k QmFzaWNEZXBlbmRlbmNpZXMubTQKKysrIGIvU291cmNlL2F1dG90b29scy9DaGVja1N5c3RlbUFu ZEJhc2ljRGVwZW5kZW5jaWVzLm00CkBAIC04NSwxMSArODUsMzEgQEAgQUNfUFJPR19DWFgKIEFD X1BST0dfSU5TVEFMTAogQUNfU1lTX0xBUkdFRklMRQogCi0jIENoZWNrIHdoZXRoZXIgYSBDKysg d2FzIGZvdW5kIChBQ19QUk9HX0NYWCBzZXRzICRDWFggdG8gImcrKyIgZXZlbiB3aGVuIGl0IGRv ZXNuJ3QgZXhpc3QpLgorIyBDaGVjayB0aGF0IGFuIGFwcHJvcHJpYXRlIEMgY29tcGlsZXIgaXMg YXZhaWxhYmxlLgorQUNfTEFOR19QVVNIKFtDXSkKK0FDX0NPTVBJTEVfSUZFTFNFKFtBQ19MQU5H X1BST0dSQU0oWworI2lmICEoZGVmaW5lZChfX0dOVUNfXykgJiYgIWRlZmluZWQoX19jbGFuZ19f KSAmJiBfX0dOVUNfXyA+PSA0ICYmIF9fR05VQ19NSU5PUl9fID49IDcpIFwKKyAgICAmJiAhKGRl ZmluZWQoX19jbGFuZ19fKSAmJiBfX2NsYW5nX21ham9yX18gPj0gMyAmJiBfX2NsYW5nX21pbm9y X18gPj0gMCkKKyNlcnJvciBVbnN1cHBvcnRlZCBjb21waWxlcgorI2VuZGlmCitdLFtdKV0sW10s W0FDX01TR19FUlJPUihbQ29tcGlsZXIgR0NDID49IDQuNyBvciBDbGFuZyA+PSAzLjAgaXMgcmVx dWlyZWQgZm9yIEMgY29tcGlsYXRpb25dKV0pCitBQ19MQU5HX1BPUChbQ10pCisKKyMgQ2hlY2sg dGhhdCBhbiBhcHByb3ByaWF0ZSBDKysgY29tcGlsZXIgaXMgYXZhaWxhYmxlLgogQUNfTEFOR19Q VVNIKFtDKytdKQotQUNfQ09NUElMRV9JRkVMU0UoW0FDX0xBTkdfUFJPR1JBTShbXSxbXSldLFtd LFtBQ19NU0dfRVJST1IoW05vIEMrKyBjb21waWxlciBmb3VuZF0pXSkKK0FDX0NPTVBJTEVfSUZF TFNFKFtBQ19MQU5HX1BST0dSQU0oWworI2lmICEoZGVmaW5lZChfX0dOVUNfXykgJiYgIWRlZmlu ZWQoX19jbGFuZ19fKSAmJiBfX0dOVUNfXyA+PSA0ICYmIF9fR05VQ19NSU5PUl9fID49IDcpIFwK KyAgICAmJiAhKGRlZmluZWQoX19jbGFuZ19fKSAmJiBfX2NsYW5nX21ham9yX18gPj0gMyAmJiBf X2NsYW5nX21pbm9yX18gPj0gMCkKKyNlcnJvciBVbnN1cHBvcnRlZCBjb21waWxlcgorI2VuZGlm CitdLFtdKV0sW10sW0FDX01TR19FUlJPUihbQ29tcGlsZXIgR0NDID49IDQuNyBvciBDbGFuZyA+ PSAzLjAgaXMgcmVxdWlyZWQgZm9yIEMrKyBjb21waWxhdGlvbl0pXSkKIEFDX0xBTkdfUE9QKFtD KytdKQogCisjIFVzZSBDOTkgYXMgdGhlIGxhbmd1YWdlIHN0YW5kYXJkIGZvciBDIGNvZGUuCitD RkxBR1M9IiRDRkxBR1MgLXN0ZD1jOTkiCisjIERvIG5vdCB3YXJuIGFib3V0IEMrKzExIGluY29t cGF0aWJpbGl0aWVzIGFuZCBleHRlbnNpb25zLgorQ1hYRkxBR1M9IiRDWFhGTEFHUyAtV25vLWMr KzExLWNvbXBhdCAtV25vLWMrKzExLWV4dGVuc2lvbnMiCisKICMgQy9DKysgTGFuZ3VhZ2UgRmVh dHVyZXMKIEFDX0NfQ09OU1QKIEFDX0NfSU5MSU5FCkBAIC05OSwzMiArMTE5LDExIEBAIEFDX0Nf Vk9MQVRJTEUKIEFDX0hFQURFUl9TVERDCiBBQ19IRUFERVJfU1REQk9PTAogCi0jIENoZWNrIGZv ciAtZnZpc2liaWxpdHk9aGlkZGVuIGNvbXBpbGVyIHN1cHBvcnQgKEdDQyA+PSA0KS4KLXNhdmVk X0NGTEFHUz0iJENGTEFHUyIKLUNGTEFHUz0iJENGTEFHUyAtZnZpc2liaWxpdHk9aGlkZGVuIC1m dmlzaWJpbGl0eS1pbmxpbmVzLWhpZGRlbiIKLUFDX01TR19DSEVDS0lORyhbaWYgJHtDWFh9IHN1 cHBvcnRzIC1mdmlzaWJpbGl0eT1oaWRkZW4gLWZ2aXNpYmlsaXR5LWlubGluZXMtaGlkZGVuXSkK LUFDX0NPTVBJTEVfSUZFTFNFKFtBQ19MQU5HX1NPVVJDRShbY2hhciBmb287XSldLCBbQUNfTVNH X1JFU1VMVChbeWVzXSkKLSAgICBTWU1CT0xfVklTSUJJTElUWT0iLWZ2aXNpYmlsaXR5PWhpZGRl biIgU1lNQk9MX1ZJU0lCSUxJVFlfSU5MSU5FUz0iLWZ2aXNpYmlsaXR5LWlubGluZXMtaGlkZGVu Il0sIFtBQ19NU0dfUkVTVUxUKFtub10pXSkKLUNGTEFHUz0iJHNhdmVkX0NGTEFHUyIKLUFDX1NV QlNUKFNZTUJPTF9WSVNJQklMSVRZKQotQUNfU1VCU1QoU1lNQk9MX1ZJU0lCSUxJVFlfSU5MSU5F UykKLQotIyBEaXNhYmxlIEMrKzB4IGNvbXBhdCB3YXJuaW5ncyBmb3IgR0NDID49IDQuNi4wIHVu dGlsIHdlIGJ1aWxkIGNsZWFubHkgd2l0aCB0aGF0LgotQUNfTEFOR19QVVNIKEMrKykKLVRNUENY WEZMQUdTPSRDWFhGTEFHUwotQ1hYRkxBR1M9Ii1XYWxsIC1XZXJyb3IiCi1BQ19NU0dfQ0hFQ0tJ TkcoW2lmIHdlIGhhdmUgdG8gZGlzYWJsZSBDKysweCBjb21wYXQgd2FybmluZ3MgZm9yIEdDQyA+ PSA0LjYuMF0pCi1BQ19UUllfQ09NUElMRShbCi1uYW1lc3BhY2Ugc3RkIHsKLSAgICBjbGFzcyBu dWxscHRyX3QgeyB9OwotfQotZXh0ZXJuIHN0ZDo6bnVsbHB0cl90IG51bGxwdHI7Ci1dLCBbcmV0 dXJuIDA7XSwgZGlzYWJsZV9jeHgweF9jb21wYXQ9bm8sIGRpc2FibGVfY3h4MHhfY29tcGF0PXll cykKLUFDX01TR19SRVNVTFQoJGRpc2FibGVfY3h4MHhfY29tcGF0KQotaWYgdGVzdCAiJGRpc2Fi bGVfY3h4MHhfY29tcGF0IiA9IHllczsgdGhlbgotICAgIENYWEZMQUdTPSIkVE1QQ1hYRkxBR1Mg LVduby1jKysweC1jb21wYXQiCi1lbHNlCi0gICAgQ1hYRkxBR1M9IiRUTVBDWFhGTEFHUyIKKyMg Q2xhbmcgcmVxdWlyZXMgc3VwcHJlc3Npb24gb2YgdW51c2VkIGFyZ3VtZW50cyB3YXJuaW5nLgor aWYgdGVzdCAiJENDIiA9ICJjbGFuZyI7IHRoZW4KKyAgICBDRkxBR1M9IiRDRkxBR1MgLVF1bnVz ZWQtYXJndW1lbnRzIgorZmkKKyMgbGlic3RkYysrIGlzIGF0IHRoZSBtb21lbnQgdGhlIG9ubHkg b3B0aW9uIGFzIHRoZSBDKysgc3RhbmRhcmQgbGlicmFyeS4KK2lmIHRlc3QgIiRDWFgiID0gImNs YW5nKysiOyB0aGVuCisgICAgQ1hYRkxBR1M9IiRDWFhGTEFHUyAtc3RkbGliPWxpYnN0ZGMrKyAt UXVudXNlZC1hcmd1bWVudHMiCiBmaQotQUNfTEFOR19QT1AoQysrKQotCmRpZmYgLS1naXQgYS9D aGFuZ2VMb2cgYi9DaGFuZ2VMb2cKaW5kZXggOWE3YmEwZTE2MzcwMWNmMmU5MDQ0ZGM5YTU2YzMw MmQzMjlkZTc4Yy4uNGE0NmJiYjc0NmYyZGIzNWUzNDVkZWRlMDQ0MmQ3ZWVmNmYyZDEyNSAxMDA2 NDQKLS0tIGEvQ2hhbmdlTG9nCisrKyBiL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEyIEBACisyMDEz LTAyLTE1ICBaYW4gRG9iZXJzZWsgIDx6ZG9iZXJzZWtAaWdhbGlhLmNvbT4KKworICAgICAgICBb R1RLXSBMaW1pdCB0aGUgc3VwcG9ydGVkIGNvbXBpbGVycyB0byBHQ0MgPj0gNC43IGFuZCBDbGFu ZyA+PSAzLjAKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTEwOTkzMgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg ICogU291cmNlL2F1dG90b29scy9DaGVja1N5c3RlbUFuZEJhc2ljRGVwZW5kZW5jaWVzLm00Ogor CiAyMDEzLTAyLTE1ICBLZWlzaGkgSGF0dG9yaSAgPGtlaXNoaUB3ZWJraXQub3JnPgogCiAgICAg ICAgIEFkZCBzZXRWYWx1ZSBhbmQgY2xvc2VQb3B1cCBtZXRob2RzIHRvIFBhZ2VQb3B1cENvbnRy b2xsZXIK 188618 2013-02-15 12:30:26 -0800 2013-03-06 09:18:34 -0800 Patch bug-109932-20130215212653.patch text/plain 9984 zan SW5kZXg6IENoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBDaGFuZ2VMb2cJKHJldmlzaW9uIDE0MzAz MSkKKysrIENoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDEzIEBACisyMDEzLTAy LTE1ICBaYW4gRG9iZXJzZWsgIDx6ZG9iZXJzZWtAaWdhbGlhLmNvbT4KKworICAgICAgICBbR1RL XSBMaW1pdCB0aGUgc3VwcG9ydGVkIGNvbXBpbGVycyB0byBHQ0MgPj0gNC43IGFuZCBDbGFuZyA+ PSAzLjAKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEw OTkzMgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICog U291cmNlL2F1dG90b29scy9DaGVja1N5c3RlbUFuZEJhc2ljRGVwZW5kZW5jaWVzLm00OgorICAg ICAgICAqIFNvdXJjZS9hdXRvdG9vbHMvU2V0dXBDb21waWxlckZsYWdzLm00OgorCiAyMDEzLTAy LTE1ICBHdXN0YXZvIE5vcm9uaGEgU2lsdmEgIDxnbnNAZ25vbWUub3JnPgogCiAgICAgICAgIFVu cmV2aWV3ZWQgYnVpbGQgZml4LgpJbmRleDogU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTQzMDMxKQorKysg U291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTUgQEAK KzIwMTMtMDItMTUgIFphbiBEb2JlcnNlayAgPHpkb2JlcnNla0BpZ2FsaWEuY29tPgorCisgICAg ICAgIFtHVEtdIExpbWl0IHRoZSBzdXBwb3J0ZWQgY29tcGlsZXJzIHRvIEdDQyA+PSA0LjcgYW5k IENsYW5nID49IDMuMAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTA5OTMyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgTm8gbmV3IHRlc3RzIChPT1BTISkuCisKKyAgICAgICAgKiBHTlVtYWtlZmlsZS5hbToK KyAgICAgICAgKiBiaW5kaW5ncy9nb2JqZWN0L0dOVW1ha2VmaWxlLmFtOgorCiAyMDEzLTAyLTE1 ICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKICAgICAgICAgUmVtb3Zl IGNvbnN0IGZyb20gYSBidW5jaCBvZiBTdG9yYWdlQXJlYSBtZW1iZXIgZnVuY3Rpb25zCkluZGV4 OiBTb3VyY2UvV2ViQ29yZS9HTlVtYWtlZmlsZS5hbQo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9HTlVtYWtlZmlsZS5hbQkocmV2aXNpb24gMTQzMDMxKQorKysgU291cmNlL1dlYkNvcmUv R05VbWFrZWZpbGUuYW0JKHdvcmtpbmcgY29weSkKQEAgLTIyNSwxMSArMjI1LDExIEBAIGxpYldl YkNvcmVTVkdfbGFfU09VUkNFUyA9IFwKIAkkKHdlYmNvcmVfc3ZnX3NvdXJjZXMpCiAKIGxpYldl YkNvcmVTVkdfbGFfQ1hYRkxBR1MgPSBcCi0JJChTWU1CT0xfVklTSUJJTElUWV9JTkxJTkVTKSBc CisJLWZ2aXNpYmlsaXR5LWlubGluZXMtaGlkZGVuIFwKIAkkKGdsb2JhbF9jeHhmbGFncykKIAog bGliV2ViQ29yZVNWR19sYV9DRkxBR1MgPSBcCi0JJChTWU1CT0xfVklTSUJJTElUWSkgXAorCS1m dmlzaWJpbGl0eT1oaWRkZW4gXAogCSQoZ2xvYmFsX2NmbGFncykKIAogbGliV2ViQ29yZVNWR19s YV9DUFBGTEFHUyA9IFwKQEAgLTU5MSwxMSArNTkxLDExIEBAIGxpYldlYkNvcmVfbGFfU09VUkNF UyA9IFwKIAkkKHdlYmNvcmVfc291cmNlcykKIAogbGliV2ViQ29yZV9sYV9DWFhGTEFHUyA9IFwK LQkkKFNZTUJPTF9WSVNJQklMSVRZX0lOTElORVMpIFwKKwktZnZpc2liaWxpdHktaW5saW5lcy1o aWRkZW4gXAogCSQoZ2xvYmFsX2N4eGZsYWdzKQogCiBsaWJXZWJDb3JlX2xhX0NGTEFHUyA9IFwK LQkkKFNZTUJPTF9WSVNJQklMSVRZKSBcCisJLWZ2aXNpYmlsaXR5PWhpZGRlbiBcCiAJJChnbG9i YWxfY2ZsYWdzKQogCiBsaWJXZWJDb3JlX2xhX0NQUEZMQUdTID0gXApAQCAtNjU3LDEwICs2NTcs MTAgQEAgZW5kaWYKIGxpYldlYkNvcmVQbGF0Zm9ybV9sYV9TT1VSQ0VTID0gXAogCSQod2ViY29y ZV9wbGF0Zm9ybV9zb3VyY2VzKQogbGliV2ViQ29yZVBsYXRmb3JtX2xhX0NYWEZMQUdTID0gXAot CSQoU1lNQk9MX1ZJU0lCSUxJVFlfSU5MSU5FUykgXAorCS1mdmlzaWJpbGl0eS1pbmxpbmVzLWhp ZGRlbiBcCiAJJChnbG9iYWxfY3h4ZmxhZ3MpCiBsaWJXZWJDb3JlUGxhdGZvcm1fbGFfQ0ZMQUdT ID0gXAotCSQoU1lNQk9MX1ZJU0lCSUxJVFkpIFwKKwktZnZpc2liaWxpdHk9aGlkZGVuIFwKIAkk KGdsb2JhbF9jZmxhZ3MpCiBsaWJXZWJDb3JlUGxhdGZvcm1fbGFfQ1BQRkxBR1MgPSBcCiAJLURC VUlMRElOR19XRUJLSVQgXApAQCAtNzAwLDExICs3MDAsMTEgQEAgbGliV2ViQ29yZUd0a19sYV9T T1VSQ0VTID0gXAogCSQod2ViY29yZWd0a19zb3VyY2VzKQogCiBsaWJXZWJDb3JlR3RrX2xhX0NY WEZMQUdTID0gXAotCSQoU1lNQk9MX1ZJU0lCSUxJVFlfSU5MSU5FUykgXAorCS1mdmlzaWJpbGl0 eS1pbmxpbmVzLWhpZGRlbiBcCiAJJChnbG9iYWxfY3h4ZmxhZ3MpCiAKIGxpYldlYkNvcmVHdGtf bGFfQ0ZMQUdTID0gXAotCSQoU1lNQk9MX1ZJU0lCSUxJVFkpIFwKKwktZnZpc2liaWxpdHk9aGlk ZGVuIFwKIAkkKGdsb2JhbF9jZmxhZ3MpCiAKIGxpYldlYkNvcmVHdGtfbGFfQ1BQRkxBR1MgPSBc CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9nb2JqZWN0L0dOVW1ha2VmaWxlLmFtCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2dvYmplY3QvR05VbWFrZWZpbGUu YW0JKHJldmlzaW9uIDE0MzAzMSkKKysrIFNvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2dvYmplY3Qv R05VbWFrZWZpbGUuYW0JKHdvcmtpbmcgY29weSkKQEAgLTUxOCwxMSArNTE4LDExIEBAIGxpYldl YkNvcmVET01fbGFfU09VUkNFUyA9IFwKIAlTb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9nb2JqZWN0 L1dlYktpdEhUTUxFbGVtZW50V3JhcHBlckZhY3RvcnkuaAogCiBsaWJXZWJDb3JlRE9NX2xhX0NY WEZMQUdTID0gXAotCSQoU1lNQk9MX1ZJU0lCSUxJVFlfSU5MSU5FUykgXAorCS1mdmlzaWJpbGl0 eS1pbmxpbmVzLWhpZGRlbiBcCiAJJChnbG9iYWxfY3h4ZmxhZ3MpCiAKIGxpYldlYkNvcmVET01f bGFfQ0ZMQUdTID0gXAotCSQoU1lNQk9MX1ZJU0lCSUxJVFkpIFwKKwktZnZpc2liaWxpdHk9aGlk ZGVuIFwKIAkkKGdsb2JhbF9jZmxhZ3MpCiAKIGxpYldlYkNvcmVET01fbGFfQ1BQRkxBR1MgPSBc CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl YktpdDIvQ2hhbmdlTG9nCShyZXZpc2lvbiAxNDMwMzEpCisrKyBTb3VyY2UvV2ViS2l0Mi9DaGFu Z2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxMiBAQAorMjAxMy0wMi0xNSAgWmFuIERv YmVyc2VrICA8emRvYmVyc2VrQGlnYWxpYS5jb20+CisKKyAgICAgICAgW0dUS10gTGltaXQgdGhl IHN1cHBvcnRlZCBjb21waWxlcnMgdG8gR0NDID49IDQuNyBhbmQgQ2xhbmcgPj0gMy4wCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDk5MzIKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIEdOVW1ha2VmaWxl LmFtOgorCiAyMDEzLTAyLTE1ICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+ CiAKICAgICAgICAgUmVtb3ZlIGNvbnN0IGZyb20gYSBidW5jaCBvZiBTdG9yYWdlQXJlYSBtZW1i ZXIgZnVuY3Rpb25zCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9HTlVtYWtlZmlsZS5hbQo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9HTlVtYWtlZmlsZS5hbQkocmV2aXNpb24gMTQzMDMxKQor KysgU291cmNlL1dlYktpdDIvR05VbWFrZWZpbGUuYW0JKHdvcmtpbmcgY29weSkKQEAgLTQ1MCwx MSArNDUwLDExIEBAIGxpYldlYkNvcmVHdGsyX2xhX1NPVVJDRVMgPSBcCiAJJCh3ZWJjb3JlZ3Rr X3NvdXJjZXMpCiAKIGxpYldlYkNvcmVHdGsyX2xhX0NYWEZMQUdTID0gXAotCSQoU1lNQk9MX1ZJ U0lCSUxJVFlfSU5MSU5FUykgXAorCS1mdmlzaWJpbGl0eS1pbmxpbmVzLWhpZGRlbiBcCiAJJChn bG9iYWxfY3h4ZmxhZ3MpCiAKIGxpYldlYkNvcmVHdGsyX2xhX0NGTEFHUyA9IFwKLQkkKFNZTUJP TF9WSVNJQklMSVRZKSBcCisJLWZ2aXNpYmlsaXR5PWhpZGRlbiBcCiAJJChnbG9iYWxfY2ZsYWdz KQogCiBsaWJXZWJDb3JlR3RrMl9sYV9DUFBGTEFHUyA9IFwKQEAgLTU1MSw3ICs1NTEsNyBAQCBQ cm9ncmFtc19XZWJLaXRQbHVnaW5Qcm9jZXNzX0NQUEZMQUdTID0KIAkkKFVOSUNPREVfQ0ZMQUdT KQogCiBQcm9ncmFtc19XZWJLaXRQbHVnaW5Qcm9jZXNzX0NGTEFHUyA9IFwKLQkkKFNZTUJPTF9W SVNJQklMSVRZKSBcCisJLWZ2aXNpYmlsaXR5LWlubGluZXMtaGlkZGVuIFwKIAkkKGdsb2JhbF9j ZmxhZ3MpIFwKIAkkKENBSVJPX0NGTEFHUykgXAogCSQoR0xJQl9DRkxBR1MpIFwKQEAgLTYxMiw3 ICs2MTIsNyBAQCBQcm9ncmFtc19XZWJLaXRQbHVnaW5Qcm9jZXNzX0xERkxBR1MgPSBcCiAJLVds LC0tdW5yZXNvbHZlZC1zeW1ib2xzPWlnbm9yZS1pbi1vYmplY3QtZmlsZXMKIAogUHJvZ3JhbXNf V2ViS2l0UGx1Z2luUHJvY2Vzc19DWFhGTEFHUyA9IFwKLQkkKFNZTUJPTF9WSVNJQklMSVRZX0lO TElORVMpIFwKKwktZnZpc2liaWxpdHktaW5saW5lcy1oaWRkZW4gXAogCSQoZ2xvYmFsX2N4eGZs YWdzKQogCiBFWFRSQV9ESVNUICs9IFwKSW5kZXg6IFNvdXJjZS9XZWJLaXQvZ3RrL0NoYW5nZUxv Zwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L2d0ay9DaGFuZ2VMb2cJKHJldmlzaW9uIDE0 MzAzMSkKKysrIFNvdXJjZS9XZWJLaXQvZ3RrL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAt MSwzICsxLDEyIEBACisyMDEzLTAyLTE1ICBaYW4gRG9iZXJzZWsgIDx6ZG9iZXJzZWtAaWdhbGlh LmNvbT4KKworICAgICAgICBbR1RLXSBMaW1pdCB0aGUgc3VwcG9ydGVkIGNvbXBpbGVycyB0byBH Q0MgPj0gNC43IGFuZCBDbGFuZyA+PSAzLjAKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTEwOTkzMgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgICogR05VbWFrZWZpbGUuYW06CisKIDIwMTMtMDItMTMgIEFsbGFu IFNhbmRmZWxkIEplbnNlbiAgPGFsbGFuLmplbnNlbkBkaWdpYS5jb20+CiAKICAgICAgICAgW1F0 XSB3aW5kb3cub3BlbiBwYXNzZXMgaGVpZ2h0IGFuZCB3aWR0aCBwYXJhbWV0ZXJzIGV2ZW4gaWYg bm90IGRlZmluZWQgaW4gYSBwYWdlCkluZGV4OiBTb3VyY2UvV2ViS2l0L2d0ay9HTlVtYWtlZmls ZS5hbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L2d0ay9HTlVtYWtlZmlsZS5hbQkocmV2 aXNpb24gMTQzMDMxKQorKysgU291cmNlL1dlYktpdC9ndGsvR05VbWFrZWZpbGUuYW0JKHdvcmtp bmcgY29weSkKQEAgLTE4LDExICsxOCwxMSBAQCBsaWJ3ZWJraXRndGtfQFdFQktJVEdUS19BUElf TUFKT1JfVkVSU0lPCiAJJCh3ZWJraXRndGtfc291cmNlcykKIAogbGlid2Via2l0Z3RrX0BXRUJL SVRHVEtfQVBJX01BSk9SX1ZFUlNJT05AX0BXRUJLSVRHVEtfQVBJX01JTk9SX1ZFUlNJT05AX2xh X0NYWEZMQUdTID0gXAotCSQoU1lNQk9MX1ZJU0lCSUxJVFlfSU5MSU5FUykgXAorCS1mdmlzaWJp bGl0eS1pbmxpbmVzLWhpZGRlbiBcCiAJJChnbG9iYWxfY3h4ZmxhZ3MpCiAKIGxpYndlYmtpdGd0 a19AV0VCS0lUR1RLX0FQSV9NQUpPUl9WRVJTSU9OQF9AV0VCS0lUR1RLX0FQSV9NSU5PUl9WRVJT SU9OQF9sYV9DRkxBR1MgPSBcCi0JJChTWU1CT0xfVklTSUJJTElUWSkgXAorCS1mdmlzaWJpbGl0 eT1oaWRkZW4gXAogCSQoZ2xvYmFsX2NmbGFncykKIAogaWYgRU5BQkxFX1NQRUxMQ0hFQ0sKSW5k ZXg6IFNvdXJjZS9hdXRvdG9vbHMvQ2hlY2tTeXN0ZW1BbmRCYXNpY0RlcGVuZGVuY2llcy5tNAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvYXV0b3Rvb2xzL0NoZWNrU3lzdGVtQW5kQmFzaWNEZXBlbmRl bmNpZXMubTQJKHJldmlzaW9uIDE0MzAzMSkKKysrIFNvdXJjZS9hdXRvdG9vbHMvQ2hlY2tTeXN0 ZW1BbmRCYXNpY0RlcGVuZGVuY2llcy5tNAkod29ya2luZyBjb3B5KQpAQCAtODUsOSArODUsMjQg QEAgQUNfUFJPR19DWFgKIEFDX1BST0dfSU5TVEFMTAogQUNfU1lTX0xBUkdFRklMRQogCi0jIENo ZWNrIHdoZXRoZXIgYSBDKysgd2FzIGZvdW5kIChBQ19QUk9HX0NYWCBzZXRzICRDWFggdG8gImcr KyIgZXZlbiB3aGVuIGl0IGRvZXNuJ3QgZXhpc3QpLgorIyBDaGVjayB0aGF0IGFuIGFwcHJvcHJp YXRlIEMgY29tcGlsZXIgaXMgYXZhaWxhYmxlLgorQUNfTEFOR19QVVNIKFtDXSkKK0FDX0NPTVBJ TEVfSUZFTFNFKFtBQ19MQU5HX1BST0dSQU0oWworI2lmICEoZGVmaW5lZChfX0dOVUNfXykgJiYg IWRlZmluZWQoX19jbGFuZ19fKSAmJiAhZGVmaW5lZChfX0lOVEVMX0NPTVBJTEVSKSAmJiBfX0dO VUNfXyA+PSA0ICYmIF9fR05VQ19NSU5PUl9fID49IDcpIFwKKyAgICAmJiAhKGRlZmluZWQoX19j bGFuZ19fKSAmJiBfX2NsYW5nX21ham9yX18gPj0gMyAmJiBfX2NsYW5nX21pbm9yX18gPj0gMCkK KyNlcnJvciBVbnN1cHBvcnRlZCBjb21waWxlcgorI2VuZGlmCitdLFtdKV0sW10sW0FDX01TR19F UlJPUihbQ29tcGlsZXIgR0NDID49IDQuNyBvciBDbGFuZyA+PSAzLjAgaXMgcmVxdWlyZWQgZm9y IEMgY29tcGlsYXRpb25dKV0pCitBQ19MQU5HX1BPUChbQ10pCisKKyMgQ2hlY2sgdGhhdCBhbiBh cHByb3ByaWF0ZSBDKysgY29tcGlsZXIgaXMgYXZhaWxhYmxlLgogQUNfTEFOR19QVVNIKFtDKytd KQotQUNfQ09NUElMRV9JRkVMU0UoW0FDX0xBTkdfUFJPR1JBTShbXSxbXSldLFtdLFtBQ19NU0df RVJST1IoW05vIEMrKyBjb21waWxlciBmb3VuZF0pXSkKK0FDX0NPTVBJTEVfSUZFTFNFKFtBQ19M QU5HX1BST0dSQU0oWworI2lmICEoZGVmaW5lZChfX0dOVUdfXykgJiYgZGVmaW5lZChfX0dOVUNf XykgJiYgIWRlZmluZWQoX19jbGFuZ19fKSAmJiAhZGVmaW5lZChfX0lOVEVMX0NPTVBJTEVSKSAm JiBfX0dOVUNfXyA+PSA0ICYmIF9fR05VQ19NSU5PUl9fID49IDcpIFwKKyAgICAmJiAhKGRlZmlu ZWQoX19jbGFuZ19fKSAmJiBfX2NsYW5nX21ham9yX18gPj0gMyAmJiBfX2NsYW5nX21pbm9yX18g Pj0gMCkKKyNlcnJvciBVbnN1cHBvcnRlZCBjb21waWxlcgorI2VuZGlmCitdLFtdKV0sW10sW0FD X01TR19FUlJPUihbQ29tcGlsZXIgR0NDID49IDQuNyBvciBDbGFuZyA+PSAzLjAgaXMgcmVxdWly ZWQgZm9yIEMrKyBjb21waWxhdGlvbl0pXSkKIEFDX0xBTkdfUE9QKFtDKytdKQogCiAjIEMvQysr IExhbmd1YWdlIEZlYXR1cmVzCkBAIC05OCwzMyArMTEzLDMgQEAgQUNfQ19WT0xBVElMRQogIyBD L0MrKyBIZWFkZXJzCiBBQ19IRUFERVJfU1REQwogQUNfSEVBREVSX1NUREJPT0wKLQotIyBDaGVj ayBmb3IgLWZ2aXNpYmlsaXR5PWhpZGRlbiBjb21waWxlciBzdXBwb3J0IChHQ0MgPj0gNCkuCi1z YXZlZF9DRkxBR1M9IiRDRkxBR1MiCi1DRkxBR1M9IiRDRkxBR1MgLWZ2aXNpYmlsaXR5PWhpZGRl biAtZnZpc2liaWxpdHktaW5saW5lcy1oaWRkZW4iCi1BQ19NU0dfQ0hFQ0tJTkcoW2lmICR7Q1hY fSBzdXBwb3J0cyAtZnZpc2liaWxpdHk9aGlkZGVuIC1mdmlzaWJpbGl0eS1pbmxpbmVzLWhpZGRl bl0pCi1BQ19DT01QSUxFX0lGRUxTRShbQUNfTEFOR19TT1VSQ0UoW2NoYXIgZm9vO10pXSwgW0FD X01TR19SRVNVTFQoW3llc10pCi0gICAgU1lNQk9MX1ZJU0lCSUxJVFk9Ii1mdmlzaWJpbGl0eT1o aWRkZW4iIFNZTUJPTF9WSVNJQklMSVRZX0lOTElORVM9Ii1mdmlzaWJpbGl0eS1pbmxpbmVzLWhp ZGRlbiJdLCBbQUNfTVNHX1JFU1VMVChbbm9dKV0pCi1DRkxBR1M9IiRzYXZlZF9DRkxBR1MiCi1B Q19TVUJTVChTWU1CT0xfVklTSUJJTElUWSkKLUFDX1NVQlNUKFNZTUJPTF9WSVNJQklMSVRZX0lO TElORVMpCi0KLSMgRGlzYWJsZSBDKysweCBjb21wYXQgd2FybmluZ3MgZm9yIEdDQyA+PSA0LjYu MCB1bnRpbCB3ZSBidWlsZCBjbGVhbmx5IHdpdGggdGhhdC4KLUFDX0xBTkdfUFVTSChDKyspCi1U TVBDWFhGTEFHUz0kQ1hYRkxBR1MKLUNYWEZMQUdTPSItV2FsbCAtV2Vycm9yIgotQUNfTVNHX0NI RUNLSU5HKFtpZiB3ZSBoYXZlIHRvIGRpc2FibGUgQysrMHggY29tcGF0IHdhcm5pbmdzIGZvciBH Q0MgPj0gNC42LjBdKQotQUNfVFJZX0NPTVBJTEUoWwotbmFtZXNwYWNlIHN0ZCB7Ci0gICAgY2xh c3MgbnVsbHB0cl90IHsgfTsKLX0KLWV4dGVybiBzdGQ6Om51bGxwdHJfdCBudWxscHRyOwotXSwg W3JldHVybiAwO10sIGRpc2FibGVfY3h4MHhfY29tcGF0PW5vLCBkaXNhYmxlX2N4eDB4X2NvbXBh dD15ZXMpCi1BQ19NU0dfUkVTVUxUKCRkaXNhYmxlX2N4eDB4X2NvbXBhdCkKLWlmIHRlc3QgIiRk aXNhYmxlX2N4eDB4X2NvbXBhdCIgPSB5ZXM7IHRoZW4KLSAgICBDWFhGTEFHUz0iJFRNUENYWEZM QUdTIC1Xbm8tYysrMHgtY29tcGF0IgotZWxzZQotICAgIENYWEZMQUdTPSIkVE1QQ1hYRkxBR1Mi Ci1maQotQUNfTEFOR19QT1AoQysrKQotCkluZGV4OiBTb3VyY2UvYXV0b3Rvb2xzL1NldHVwQ29t cGlsZXJGbGFncy5tNAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvYXV0b3Rvb2xzL1NldHVwQ29tcGls ZXJGbGFncy5tNAkocmV2aXNpb24gMTQzMDMxKQorKysgU291cmNlL2F1dG90b29scy9TZXR1cENv bXBpbGVyRmxhZ3MubTQJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxNyBAQAorIyBVc2UgQzk5 IGFzIHRoZSBsYW5ndWFnZSBzdGFuZGFyZCBmb3IgQyBjb2RlLgorQ0ZMQUdTPSIkQ0ZMQUdTIC1z dGQ9Yzk5IgorIyBEbyBub3Qgd2FybiBhYm91dCBDKysxMSBpbmNvbXBhdGliaWxpdGllcyBhbmQg ZXh0ZW5zaW9ucy4KK0NYWEZMQUdTPSIkQ1hYRkxBR1MgLVduby1jKysxMS1jb21wYXQgLVduby1j KysxMS1leHRlbnNpb25zIgorCisjIENsYW5nIHJlcXVpcmVzIHN1cHByZXNzaW9uIG9mIHVudXNl ZCBhcmd1bWVudHMgd2FybmluZy4KK2lmIHRlc3QgIiRDQyIgPSAiY2xhbmciOyB0aGVuCisgICAg Q0ZMQUdTPSIkQ0ZMQUdTIC1RdW51c2VkLWFyZ3VtZW50cyIKK2ZpCisjIGxpYnN0ZGMrKyBpcyBh dCB0aGUgbW9tZW50IHRoZSBvbmx5IG9wdGlvbiBhcyB0aGUgQysrIHN0YW5kYXJkIGxpYnJhcnku CitpZiB0ZXN0ICIkQ1hYIiA9ICJjbGFuZysrIjsgdGhlbgorICAgIENYWEZMQUdTPSIkQ1hYRkxB R1MgLXN0ZGxpYj1saWJzdGRjKysgLVF1bnVzZWQtYXJndW1lbnRzIgorZmkKKwogaWYgdGVzdCAi JGhvc3RfY3B1IiA9ICJzaDQiOyB0aGVuCiAgICAgQ1hYRkxBR1M9IiRDWFhGTEFHUyAtbWllZWUg LXciCiAgICAgQ0ZMQUdTPSIkQ0ZMQUdTIC1taWVlZSAtdyIKQEAgLTIwLDUgKzM0LDMgQEAgZWxz ZQogICAgIENYWEZMQUdTPSIkQ1hYRkxBR1MgLU8wIgogICAgIENGTEFHUz0iJENGTEFHUyAtTzAi CiBmaQotCi0K