108174 2013-01-29 02:41:34 -0800 [GTK] Missing build flags when building with Harfbuzz 2013-05-30 06:07:23 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED Gtk P2 Normal --- 1 mario mario berto cgarcia gustavo mrobinson pnormand techlivezheng webkit.review.bot zan oldest_to_newest 818754 0 mario 2013-01-29 02:41:34 -0800 I've been experiencing for some time the following kind of linking errors when building WebKitGTK+ in certain scenarios (e.g. trying to build it with build-webkit inside a jhbuild shell environment for GNOME development over a Ubuntu 12.04 64bit machine): ./.libs/libwebkit2gtk-3.0.so: undefined reference to `hb_icu_script_to_script' Investigating a bit the issue I realized the problem was that the -lharfbuzz parameter was not present in the linking lines, which was the cause of the error. Investigating a bit further I found out that the $(FREETYPE_CFLAGS) and $(FREETYPE_LIBS) variables were not being added in most of the places in GNUMakefile.am files where binaries were built, so that's why the -lharfbuzz parameter was not added. I'm still not sure why this issue is not spotted in some other environments (doing a clean build with build-webkit script *outside* my jhbuild for GNOME does not hit the issue) but it seems interesting to me in any case to add these flags to GNUMakefile.am files where needed, since that fixes the issue in these other specific cases, while it leaves the other scenarios working properly as well. 818759 1 185209 mario 2013-01-29 02:48:11 -0800 Created attachment 185209 Patch proposal This patch fixes the issue for me. 818763 2 webkit.review.bot 2013-01-29 02:52:01 -0800 Thanks for the patch. If this patch contains new public API please make sure it follows the guidelines for new WebKit2 GTK+ API. See http://trac.webkit.org/wiki/WebKitGTK/AddingNewWebKit2API 818978 3 185209 mrobinson 2013-01-29 08:39:29 -0800 Comment on attachment 185209 Patch proposal I think you might be overlinking here. You only need to add it to libraries/binaries that didn't compile. 818983 4 mario 2013-01-29 08:46:10 -0800 (In reply to comment #3) > (From update of attachment 185209 [details]) > I think you might be overlinking here. You only need to add it to libraries/binaries that didn't compile. :-) That's precisely what I did: instead of wildly adding things in every makefile I could find, what I did was precisely to go step by step by trying to build with make -j1 V=1 (debug build) and fix every single problem I found, one after one. So, long way of saying that every single FREETYPE_LIBS line you see in this patch corresponds to an actual failure I've found while trying to build, so this is the minimum patch I got that fixes the build for this scenario. 818988 5 185209 mrobinson 2013-01-29 08:50:30 -0800 Comment on attachment 185209 Patch proposal Sorry! I really should converted my statement into a question, but I was only starting my first coffee. :) 818997 6 mario 2013-01-29 09:02:11 -0800 (In reply to comment #5) > (From update of attachment 185209 [details]) > Sorry! I really should converted my statement into a question, but I was only starting my first coffee. :) No problem. Thanks in any case for reviewing it! 819033 7 mario 2013-01-29 09:52:25 -0800 Committed r141126: <http://trac.webkit.org/changeset/141126> 819097 8 gustavo 2013-01-29 10:57:47 -0800 I know we do it for other libraries right now, but we shouldn't really need to explicitly link those libraries into binaries that link to webkitgtk, wonder why it's not working for you. 819101 9 mrobinson 2013-01-29 11:01:25 -0800 (In reply to comment #8) > I know we do it for other libraries right now, but we shouldn't really need to explicitly link those libraries into binaries that link to webkitgtk, wonder why it's not working for you. That's a really good point. 819968 10 mario 2013-01-30 02:01:31 -0800 (In reply to comment #8) > I know we do it for other libraries right now, but we shouldn't really need to > explicitly link those libraries into binaries that link to webkitgtk, wonder > why it's not working for you. It's working for me as long as I call build-webkit --gtk from a normal shell but it fails when I invoke that script from a -already present- jhbuild shell (e.g. GNOME's jhbuild shell). For some reason, the -lharfbuzz flag is missing in this case and so the libharfbuzz.so file is not being added to the linking, resulting in the failure shown above. In any case, please feel free to rollback the patch if you don't feel comfortable with it. If it's just me (or very rare cases) who is getting this trouble I can certainly work it around in some other (local) way. 822947 11 gustavo 2013-02-01 10:44:06 -0800 Nah, I'm just wondering. Like I said, we do it for other libraries and I don't care about purity, tbh. 895433 12 techlivezheng 2013-05-30 02:54:45 -0700 (In reply to comment #10) > (In reply to comment #8) > > I know we do it for other libraries right now, but we shouldn't really need to > explicitly link those libraries into binaries that link to webkitgtk, wonder > > why it's not working for you. > > It's working for me as long as I call build-webkit --gtk from a normal shell but it fails when I invoke that script from a -already present- jhbuild shell (e.g. GNOME's jhbuild shell). > > For some reason, the -lharfbuzz flag is missing in this case and so the libharfbuzz.so file is not being added to the linking, resulting in the failure shown above. > > In any case, please feel free to rollback the patch if you don't feel comfortable with it. If it's just me (or very rare cases) who is getting this trouble I can certainly work it around in some other (local) way. Hey, I got the same error while linking webkit2gtk against Gnome's gitg using jhbuild, can you guys help me out? /usr/lib/gcc/x86_64-unknown-linux-gnu/4.8.0/../../../../lib/libwebkit2gtk-3.0.so: undefined reference to `hb_icu_script_to_script' /usr/lib/gcc/x86_64-unknown-linux-gnu/4.8.0/../../../../lib/libwebkit2gtk-3.0.so: undefined reference to `hb_icu_get_unicode_funcs' collect2: error: ld returned 1 exit status 895471 13 berto 2013-05-30 03:53:50 -0700 (In reply to comment #12) > Hey, I got the same error while linking webkit2gtk against Gnome's > gitg using jhbuild, can you guys help me out? Looks like you're talking about bug 116978 895504 14 mrobinson 2013-05-30 05:51:00 -0700 (In reply to comment #12) > /usr/lib/gcc/x86_64-unknown-linux-gnu/4.8.0/../../../../lib/libwebkit2gtk-3.0.so: undefined reference to `hb_icu_script_to_script' > /usr/lib/gcc/x86_64-unknown-linux-gnu/4.8.0/../../../../lib/libwebkit2gtk-3.0.so: undefined reference to `hb_icu_get_unicode_funcs' > collect2: error: ld returned 1 exit status It sounds like the version of harfbuzz you are using was not compiled with ICU support. 895509 15 berto 2013-05-30 06:06:49 -0700 (In reply to comment #14) > > /usr/lib/gcc/x86_64-unknown-linux-gnu/4.8.0/../../../../lib/libwebkit2gtk-3.0.so: undefined reference to `hb_icu_script_to_script' > > /usr/lib/gcc/x86_64-unknown-linux-gnu/4.8.0/../../../../lib/libwebkit2gtk-3.0.so: undefined reference to `hb_icu_get_unicode_funcs' > > collect2: error: ld returned 1 exit status > > It sounds like the version of harfbuzz you are using was not > compiled with ICU support. Yes, that's because the latest HarfBuzz moved ICU to a separate library. Details in bug 116978. 895510 16 techlivezheng 2013-05-30 06:07:23 -0700 (In reply to comment #14) > (In reply to comment #12) > > > /usr/lib/gcc/x86_64-unknown-linux-gnu/4.8.0/../../../../lib/libwebkit2gtk-3.0.so: undefined reference to `hb_icu_script_to_script' > > /usr/lib/gcc/x86_64-unknown-linux-gnu/4.8.0/../../../../lib/libwebkit2gtk-3.0.so: undefined reference to `hb_icu_get_unicode_funcs' > > collect2: error: ld returned 1 exit status > > It sounds like the version of harfbuzz you are using was not compiled with ICU support. It's the bug 116978, after downgrade harfbuzz, get it working. Now need to wait webkit to fix it. 185209 2013-01-29 02:48:11 -0800 2013-01-29 08:50:29 -0800 Patch proposal bug-108174-20130129104440.patch text/plain 7920 mario U3VidmVyc2lvbiBSZXZpc2lvbjogMTQwOTUwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2d0 ay9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L2d0ay9DaGFuZ2VMb2cKaW5kZXggN2U5ZTUyMDQx MTU5MWI4Zjc4Y2FjYmY5YTY3Y2I4NDczODk3OGIxNS4uYzE5NWFlMmE1ODlhYzEwOTNiNDBlMWMx NTNiNzhmNTVmY2Q0ZTZhMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9ndGsvQ2hhbmdlTG9n CisrKyBiL1NvdXJjZS9XZWJLaXQvZ3RrL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEzIEBACisyMDEz LTAxLTI5ICBNYXJpbyBTYW5jaGV6IFByYWRhICA8bWFyaW8ucHJhZGFAc2Ftc3VuZy5jb20+CisK KyAgICAgICAgW0dUS10gTWlzc2luZyBidWlsZCBmbGFncyB3aGVuIGJ1aWxkaW5nIHdpdGggSGFy ZmJ1enoKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEw ODE3NAorCisgICAgICAgIEFkZCBGUkVFVFlQRV9DRkxBR1MgYW5kIEZSRUVUWVBFX0xJQlMgdG8g bWFrZWZpbGVzIHNvIC1saGFyZmJ1enoKKyAgICAgICAgcGFyYW1ldGVyIHdpbGwgYmUgYWRkZWQg dG8gbGlua2luZyBsaW5lcyB3aGVuIG5lZWRlZC4KKworICAgICAgICAqIEdOVW1ha2VmaWxlLmFt OiBBZGRlZCBGUkVFVFlQRV9DRkxBR1MgYW5kIEZSRUVUWVBFX0xJQlMuCisKIDIwMTMtMDEtMjUg IEpvb25lIEh1ciAgPGpvb25lLmh1ckBpbnRlbC5jb20+CiAKICAgICAgICAgW0dUS11bQUNdIFVz ZSBuZXcgQ2x1dHRlciBBUElzIGluc3RlYWQgb2YgZGVwcmVjYXRlZCBBUElzCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5k ZXggNWFmNjc5Yjk2MDVlYjdjZGU0MzNhMDAyNWYzNjMyMWE2MmQ1ZDEyOS4uYmI2NzEwNWFlZGEy MDFjYmQ5ZWJjMDQzNjljZmMxMzNmYTJhYWEwOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIv Q2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBA CisyMDEzLTAxLTI5ICBNYXJpbyBTYW5jaGV6IFByYWRhICA8bWFyaW8ucHJhZGFAc2Ftc3VuZy5j b20+CisKKyAgICAgICAgW0dUS10gTWlzc2luZyBidWlsZCBmbGFncyB3aGVuIGJ1aWxkaW5nIHdp dGggSGFyZmJ1enoKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTEwODE3NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIEFkZCBGUkVFVFlQRV9DRkxBR1MgYW5kIEZSRUVUWVBFX0xJQlMgdG8gbWFrZWZpbGVzIHNv IC1saGFyZmJ1enoKKyAgICAgICAgcGFyYW1ldGVyIHdpbGwgYmUgYWRkZWQgdG8gbGlua2luZyBs aW5lcyB3aGVuIG5lZWRlZC4KKworICAgICAgICAqIEdOVW1ha2VmaWxlLmFtOiBBZGRlZCBGUkVF VFlQRV9DRkxBR1MgYW5kIEZSRUVUWVBFX0xJQlMuCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9n dGsvdGVzdHMvR05VbWFrZWZpbGUuYW06IERpdHRvLgorCiAyMDEzLTAxLTI3ICBBbGV4ZXkgUHJv c2t1cnlha292ICA8YXBAYXBwbGUuY29tPgogCiAgICAgICAgIEZpeCBsb2NhdGlvbiBvZiBzYW5k Ym94IHByb2ZpbGVzIGluIGJ1aWx0IHByb2R1Y3RzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 L2d0ay9HTlVtYWtlZmlsZS5hbSBiL1NvdXJjZS9XZWJLaXQvZ3RrL0dOVW1ha2VmaWxlLmFtCmlu ZGV4IGU4NDkxMjNiMGJkZjA4ZjA1ZWQ2YzMzNTQ5YTViNjg3OTg1YzlkMjcuLjg0MDYwMzg2ZDU3 MzQxMjIyYTBhY2ZmNjE2MWQ0MTlmNTQ2MWUwYjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQv Z3RrL0dOVW1ha2VmaWxlLmFtCisrKyBiL1NvdXJjZS9XZWJLaXQvZ3RrL0dOVW1ha2VmaWxlLmFt CkBAIC00MzgsNiArNDM4LDcgQEAgd2Via2l0X3Rlc3RzX2NmbGFncyA9IFwKIAkkKGdsb2JhbF9j cHBmbGFncykgXAogCSQoZ2xvYmFsX2NmbGFncykgXAogCSQoamF2YXNjcmlwdGNvcmVfY3BwZmxh Z3MpIFwKKwkkKEZSRUVUWVBFX0NGTEFHUykgXAogCSQoR0xJQl9DRkxBR1MpIFwKIAkkKEdUS19D RkxBR1MpIFwKIAkkKExJQlNPVVBfQ0ZMQUdTKSBcCkBAIC00NDcsNiArNDQ4LDcgQEAgd2Via2l0 X3Rlc3RzX2NmbGFncyA9IFwKIHdlYmtpdF90ZXN0c19sZGFkZCA9IFwKIAlsaWJqYXZhc2NyaXB0 Y29yZWd0ay1AV0VCS0lUR1RLX0FQSV9NQUpPUl9WRVJTSU9OQC5AV0VCS0lUR1RLX0FQSV9NSU5P Ul9WRVJTSU9OQC5sYSBcCiAJbGlid2Via2l0Z3RrLUBXRUJLSVRHVEtfQVBJX01BSk9SX1ZFUlNJ T05ALkBXRUJLSVRHVEtfQVBJX01JTk9SX1ZFUlNJT05ALmxhIFwKKwkkKEZSRUVUWVBFX0xJQlMp IFwKIAkkKEdUS19MSUJTKSBcCiAJJChHTElCX0xJQlMpIFwKIAkkKExJQlNPVVBfTElCUykKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0dOVW1ha2VmaWxlLmFtIGIvU291cmNlL1dlYktpdDIv R05VbWFrZWZpbGUuYW0KaW5kZXggOGM0YmEyNjI3MWE5Nzk2MjNlZWE0Nzc4MzMzMmU0MDhjZWNj ZTBiNy4uMzkxNGQ2ZjNkMTcyM2UzN2U0NGRjNWM1YTFkYTc1NzgzMjk2MzRjMyAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdDIvR05VbWFrZWZpbGUuYW0KKysrIGIvU291cmNlL1dlYktpdDIvR05V bWFrZWZpbGUuYW0KQEAgLTQ0NCw2ICs0NDQsNyBAQCBQcm9ncmFtc19XZWJLaXRXZWJQcm9jZXNz X0NQUEZMQUdTID0gXAogUHJvZ3JhbXNfV2ViS2l0V2ViUHJvY2Vzc19DRkxBR1MgPSBcCiAJJChn bG9iYWxfY2ZsYWdzKSBcCiAJJChDQUlST19DRkxBR1MpIFwKKwkkKEZSRUVUWVBFX0NGTEFHUykg XAogCSQoR0xJQl9DRkxBR1MpIFwKIAkkKEdUS19DRkxBR1MpIFwKIAkkKEdUS19VTklYX1BSSU5U SU5HX0NGTEFHUykgXApAQCAtNDU2LDYgKzQ1Nyw3IEBAIFByb2dyYW1zX1dlYktpdFdlYlByb2Nl c3NfU09VUkNFUyA9IFwKIFByb2dyYW1zX1dlYktpdFdlYlByb2Nlc3NfTERBREQgPSBcCiAJbGli amF2YXNjcmlwdGNvcmVndGstQFdFQktJVEdUS19BUElfTUFKT1JfVkVSU0lPTkAuQFdFQktJVEdU S19BUElfTUlOT1JfVkVSU0lPTkAubGEgXAogCWxpYndlYmtpdDJndGstQFdFQktJVEdUS19BUElf TUFKT1JfVkVSU0lPTkAuQFdFQktJVEdUS19BUElfTUlOT1JfVkVSU0lPTkAubGEgXAorCSQoRlJF RVRZUEVfTElCUykgXAogCSQoR0xJQl9MSUJTKSBcCiAJJChHVEtfTElCUykgXAogCSQoR1RLX1VO SVhfUFJJTlRJTkdfTElCUykgXApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L0FQSS9ndGsvdGVzdHMvR05VbWFrZWZpbGUuYW0gYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv QVBJL2d0ay90ZXN0cy9HTlVtYWtlZmlsZS5hbQppbmRleCBmYTBmNjYzMzZmZGIzOGZlMGVhN2Fj Y2Q4OWFiNWM0MjgwOTlmYTc1Li5kMDI0NmQ2YjBkODQxOWNlNmQ0MTA1YWYxMTJkMzY3MDlhOTEw ZmEyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay90ZXN0cy9H TlVtYWtlZmlsZS5hbQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay90ZXN0 cy9HTlVtYWtlZmlsZS5hbQpAQCAtNDYsNiArNDYsNyBAQCB3ZWJraXQyX3Rlc3RzX2NwcGZsYWdz ID0gXAogCS1JJCh0b3BfYnVpbGRkaXIpL0Rlcml2ZWRTb3VyY2VzL1dlYktpdDIvd2Via2l0Mmd0 ay9pbmNsdWRlIFwKIAktSSQoc3JjZGlyKS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0 ayBcCiAJJChnbG9iYWxfY3BwZmxhZ3MpIFwKKwkkKEZSRUVUWVBFX0NGTEFHUykgXAogCSQoR0xJ Ql9DRkxBR1MpIFwKIAkkKEdUS19DRkxBR1MpIFwKIAkkKExJQlNPVVBfQ0ZMQUdTKQpAQCAtNTQs NiArNTUsNyBAQCB3ZWJraXQyX3Rlc3RzX2xkYWRkID0gXAogCUxpYnJhcmllcy9saWJXZWJLaXQy QVBJVGVzdENvcmUubGEgXAogCWxpYmphdmFzY3JpcHRjb3JlZ3RrLUBXRUJLSVRHVEtfQVBJX01B Sk9SX1ZFUlNJT05ALkBXRUJLSVRHVEtfQVBJX01JTk9SX1ZFUlNJT05ALmxhIFwKIAlsaWJ3ZWJr aXQyZ3RrLUBXRUJLSVRHVEtfQVBJX01BSk9SX1ZFUlNJT05ALkBXRUJLSVRHVEtfQVBJX01JTk9S X1ZFUlNJT05ALmxhIFwKKwkkKEZSRUVUWVBFX0xJQlMpIFwKIAkkKEdFT0NMVUVfTElCUykgXAog CSQoR0xJQl9MSUJTKSBcCiAJJChHVEtfTElCUykgXApkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdl TG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4IGNmY2FjZmRhZTQzMTQ4ZjMyNDBjYTNlNWFhZGI4 NjgzNmVkN2VlNTIuLjNkOTg1M2I2NDM5NTEyOWVjMzE1ZDVjMGRjNzg3NDhhNGFlYWRhM2UgMTAw NjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEsMyAr MSwxNyBAQAorMjAxMy0wMS0yOSAgTWFyaW8gU2FuY2hleiBQcmFkYSAgPG1hcmlvLnByYWRhQHNh bXN1bmcuY29tPgorCisgICAgICAgIFtHVEtdIE1pc3NpbmcgYnVpbGQgZmxhZ3Mgd2hlbiBidWls ZGluZyB3aXRoIEhhcmZidXp6CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xMDgxNzQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBBZGQgRlJFRVRZUEVfQ0ZMQUdTIGFuZCBGUkVFVFlQRV9MSUJTIHRvIG1ha2Vm aWxlcyBzbyAtbGhhcmZidXp6CisgICAgICAgIHBhcmFtZXRlciB3aWxsIGJlIGFkZGVkIHRvIGxp bmtpbmcgbGluZXMgd2hlbiBuZWVkZWQuCisKKyAgICAgICAgKiBHTlVtYWtlZmlsZS5hbTogQWRk ZWQgRlJFRVRZUEVfQ0ZMQUdTIGFuZCBGUkVFVFlQRV9MSUJTLgorICAgICAgICAqIE1pbmlCcm93 c2VyL2d0ay9HTlVtYWtlZmlsZS5hbTogRGl0dG8uCisgICAgICAgICogVGVzdFdlYktpdEFQSS9H TlVtYWtlZmlsZS5hbTogRGl0dG8uCisKIDIwMTMtMDEtMjcgIERhdmlkIEZhcmxlciAgPGRmYXJs ZXJAYXBwbGUuY29tPgogCiAgICAgICAgIFJFR1JFU1NJT04gKHIxNDA5MTIpOiBCcm9rZSBzcGVj aWZ5aW5nIG5vbi10cml2aWFsIEFSQ0hTIHZhbHVlIHRvIG1ha2UgLyBidWlsZC13ZWJraXQKZGlm ZiAtLWdpdCBhL1Rvb2xzL0dOVW1ha2VmaWxlLmFtIGIvVG9vbHMvR05VbWFrZWZpbGUuYW0KaW5k ZXggYjk5NjEwODQ3ZTE0YjYxNjE3N2EzMmMyZjMyOGVhNTI1YmZmOWQ0NS4uM2M4NzE5MzNlMzE1 OGJiMGE3OWNkNDExNjlmMTY0YmZiNjcxYzkzNSAxMDA2NDQKLS0tIGEvVG9vbHMvR05VbWFrZWZp bGUuYW0KKysrIGIvVG9vbHMvR05VbWFrZWZpbGUuYW0KQEAgLTI2LDYgKzI2LDcgQEAgUHJvZ3Jh bXNfR3RrTGF1bmNoZXJfQ0ZMQUdTID0gXAogCS1hbnNpIFwKIAktZm5vLXN0cmljdC1hbGlhc2lu ZyBcCiAJJChnbG9iYWxfY2ZsYWdzKSBcCisJJChGUkVFVFlQRV9DRkxBR1MpIFwKIAkkKEdUS19D RkxBR1MpIFwKIAkkKExJQlNPVVBfQ0ZMQUdTKSBcCiAJJChHU1RSRUFNRVJfQ0ZMQUdTKQpAQCAt MzMsNiArMzQsNyBAQCBQcm9ncmFtc19HdGtMYXVuY2hlcl9DRkxBR1MgPSBcCiBQcm9ncmFtc19H dGtMYXVuY2hlcl9MREFERCA9IFwKIAlsaWJ3ZWJraXRndGstQFdFQktJVEdUS19BUElfTUFKT1Jf VkVSU0lPTkAuQFdFQktJVEdUS19BUElfTUlOT1JfVkVSU0lPTkAubGEgXAogCWxpYmphdmFzY3Jp cHRjb3JlZ3RrLUBXRUJLSVRHVEtfQVBJX01BSk9SX1ZFUlNJT05ALkBXRUJLSVRHVEtfQVBJX01J Tk9SX1ZFUlNJT05ALmxhIFwKKwkkKEZSRUVUWVBFX0xJQlMpIFwKIAkkKEdUS19MSUJTKSBcCiAJ JChHTElCX0xJQlMpIFwKIAkkKExJQlNPVVBfTElCUykgXApkaWZmIC0tZ2l0IGEvVG9vbHMvTWlu aUJyb3dzZXIvZ3RrL0dOVW1ha2VmaWxlLmFtIGIvVG9vbHMvTWluaUJyb3dzZXIvZ3RrL0dOVW1h a2VmaWxlLmFtCmluZGV4IDU3NWRlYjI5MjUwNTM1NTcyZTc0OGU5MmNiMTFkMGU1YTc5ZGNhNmEu LjJmMjBkNDI1MTBjN2JhYjViMmJmNWViNTQ3MTU5OTI0NjEzMTU0MjEgMTAwNjQ0Ci0tLSBhL1Rv b2xzL01pbmlCcm93c2VyL2d0ay9HTlVtYWtlZmlsZS5hbQorKysgYi9Ub29scy9NaW5pQnJvd3Nl ci9ndGsvR05VbWFrZWZpbGUuYW0KQEAgLTEyLDYgKzEyLDcgQEAgUHJvZ3JhbXNfTWluaUJyb3dz ZXJfQ1BQRkxBR1MgPSBcCiAJLURXRUJLSVRfSU5KRUNURURfQlVORExFX1BBVEg9XCIke3NoZWxs IHB3ZH0vJCh0b3BfYnVpbGRkaXIpLy5saWJzXCIgXAogCSQoZ2xvYmFsX2NwcGZsYWdzKSBcCiAJ JChqYXZhc2NyaXB0Y29yZV9jcHBmbGFncykgXAorCSQoRlJFRVRZUEVfQ0ZMQUdTKSBcCiAJJChH TElCX0NGTEFHUykgXAogCSQoR1RLX0NGTEFHUykKIApAQCAtMzQsNiArMzUsNyBAQCBub2Rpc3Rf UHJvZ3JhbXNfTWluaUJyb3dzZXJfU09VUkNFUyA9IFwKIAogUHJvZ3JhbXNfTWluaUJyb3dzZXJf TERBREQgPSBcCiAJbGlid2Via2l0Mmd0ay1AV0VCS0lUR1RLX0FQSV9NQUpPUl9WRVJTSU9OQC5A V0VCS0lUR1RLX0FQSV9NSU5PUl9WRVJTSU9OQC5sYSBcCisJJChGUkVFVFlQRV9MSUJTKSBcCiAJ JChHTElCX0xJQlMpIFwKIAkkKEdUS19MSUJTKSBcCiAJJChMSUJTT1VQX0xJQlMpCmRpZmYgLS1n aXQgYS9Ub29scy9UZXN0V2ViS2l0QVBJL0dOVW1ha2VmaWxlLmFtIGIvVG9vbHMvVGVzdFdlYktp dEFQSS9HTlVtYWtlZmlsZS5hbQppbmRleCBjZmNjOWI2MmM3M2M4NzVkZTc2OWEzMjgwYzJiOTIy Y2U5MGY4YWNmLi42OTcxM2EwZjBhNWJlYTYxODk5MWM3ZjU3YWZmNTViZjJhZjBiMzczIDEwMDY0 NAotLS0gYS9Ub29scy9UZXN0V2ViS2l0QVBJL0dOVW1ha2VmaWxlLmFtCisrKyBiL1Rvb2xzL1Rl c3RXZWJLaXRBUEkvR05VbWFrZWZpbGUuYW0KQEAgLTczLDYgKzczLDcgQEAgUHJvZ3JhbXNfVGVz dFdlYktpdEFQSV9UZXN0R3RrX0NQUEZMQUdTID0gXAogCSQoUHJvZ3JhbXNfVGVzdFdlYktpdEFQ SV9UZXN0V1RGX0NQUEZMQUdTKSBcCiAJJCh3ZWJjb3JlX2NwcGZsYWdzKSBcCiAJJCh3ZWJjb3Jl Z3RrX2NwcGZsYWdzKSBcCisJJChGUkVFVFlQRV9DRkxBR1MpIFwKIAkkKEdMSUJfQ0ZMQUdTKSBc CiAJJChHVEtfQ0ZMQUdTKSBcCiAJJChMSUJTT1VQX0NGTEFHUykKQEAgLTgyLDYgKzgzLDcgQEAg UHJvZ3JhbXNfVGVzdFdlYktpdEFQSV9UZXN0R3RrX0xEQUREID0gXAogCUxpYnJhcmllcy9saWJn dGVzdC5sYSBcCiAJbGliamF2YXNjcmlwdGNvcmVndGstQFdFQktJVEdUS19BUElfTUFKT1JfVkVS U0lPTkAuQFdFQktJVEdUS19BUElfTUlOT1JfVkVSU0lPTkAubGEgXAogCWxpYndlYmtpdGd0ay1A V0VCS0lUR1RLX0FQSV9NQUpPUl9WRVJTSU9OQC5AV0VCS0lUR1RLX0FQSV9NSU5PUl9WRVJTSU9O QC5sYSBcCisJJChGUkVFVFlQRV9MSUJTKSBcCiAJJChHTElCX0xJQlMpIFwKIAkkKEdUS19MSUJT KSBcCiAJJChMSUJTT1VQX0xJQlMpCkBAIC0xMDQsNiArMTA2LDcgQEAgbm9pbnN0X1BST0dSQU1T ICs9IFwKIFByb2dyYW1zX1Rlc3RXZWJLaXRBUElfVGVzdFdlYktpdDJfQ1BQRkxBR1MgPSBcCiAJ JChQcm9ncmFtc19UZXN0V2ViS2l0QVBJX1Rlc3RXVEZfQ1BQRkxBR1MpIFwKIAktSSQodG9wX2J1 aWxkZGlyKS9EZXJpdmVkU291cmNlcy9XZWJLaXQyL2luY2x1ZGUgXAorCSQoRlJFRVRZUEVfQ0ZM QUdTKSBcCiAJJChHTElCX0NGTEFHUykgXAogCSQoR1RLX0NGTEFHUykgXAogCSQoTElCU09VUF9D RkxBR1MpCkBAIC0xMTMsNiArMTE2LDcgQEAgUHJvZ3JhbXNfVGVzdFdlYktpdEFQSV9UZXN0V2Vi S2l0Ml9MREFERCA9IFwKIAlMaWJyYXJpZXMvbGliZ3Rlc3QubGEgXAogCWxpYmphdmFzY3JpcHRj b3JlZ3RrLUBXRUJLSVRHVEtfQVBJX01BSk9SX1ZFUlNJT05ALkBXRUJLSVRHVEtfQVBJX01JTk9S X1ZFUlNJT05ALmxhIFwKIAlsaWJ3ZWJraXQyZ3RrLUBXRUJLSVRHVEtfQVBJX01BSk9SX1ZFUlNJ T05ALkBXRUJLSVRHVEtfQVBJX01JTk9SX1ZFUlNJT05ALmxhIFwKKwkkKEZSRUVUWVBFX0xJQlMp IFwKIAkkKEdMSUJfTElCUykgXAogCSQoR1RLX0xJQlMpIFwKIAkkKExJQlNPVVBfTElCUykK