220636 2021-01-14 14:51:10 -0800 [GTK] Multilib conflicts in gir files 2021-01-18 07:56:57 -0800 1 1 1 Unclassified WebKit WebKitGTK WebKit Nightly Build PC Linux RESOLVED FIXED P2 Normal --- 1 mcatanzaro mcatanzaro annulen bugs-noreply cgarcia ews-watchlist gyuyoung.kim keith_miller mark.lam mcatanzaro msaboff ryuan.choi saam sergio tzagallo oldest_to_newest 1719712 0 mcatanzaro 2021-01-14 14:51:10 -0800 Our generated gir files currently include absolute paths. This is a problem for multilib because the gir files need to be identical on all architectures, since they are installed under /usr/share, but distro build directory names often vary based on architecture. For example, the top of JavaScriptCore-4.0.gir: <?xml version="1.0"?> <!-- This file was automatically generated from C sources - DO NOT EDIT! To affect the contents of this file, edit the original C definitions, and/or use gtk-doc annotations. --> <repository version="1.2" xmlns="http://www.gtk.org/introspection/core/1.0" xmlns:c="http://www.gtk.org/introspection/c/1.0" xmlns:glib="http://www.gtk.org/introspection/glib/1.0"> <include name="GObject" version="2.0"/> <package name="javascriptcoregtk-4.0"/> <c:include name="jsc/jsc.h"/> <namespace name="JavaScriptCore" version="4.0" shared-library="libjavascriptcoregtk-4.0.so.18" c:identifier-prefixes="JSC" c:symbol-prefixes="jsc"> <function-macro name="CHECK_VERSION" c:identifier="JSC_CHECK_VERSION" introspectable="0"> <source-position filename="x86_64-redhat-linux-gnu/DerivedSources/JavaScriptCore/javascriptcoregtk/jsc/JSCVersion.h" line="67"/> So the problem is clear: on i686, the <source-position filename="i686-redhat-linux-gnu" instead. This was not a problem in the past due to downstream build reasons: we had been creating our own build directory, but now the CMake RPM macro creates the build directory for us and includes the target arch in the name of the build directory. Anyway, this is easy to fix pas passing --sources-top-dirs to g-ir-scanner. Then we get this instead: <source-position filename="DerivedSources/JavaScriptCore/javascriptcoregtk/jsc/JSCVersion.h" line="67"/> Much better! 1719716 1 mcatanzaro 2021-01-14 14:54:01 -0800 (In reply to Michael Catanzaro from comment #0) > Our generated gir files currently include absolute paths. Er, well that's not true. Point remains: paths need to be relative to the builddir or we'll have multilib conflicts. 1719718 2 417660 mcatanzaro 2021-01-14 15:04:40 -0800 Created attachment 417660 Patch 1719720 3 417661 mcatanzaro 2021-01-14 15:09:29 -0800 Created attachment 417661 Patch 1720274 4 417661 cgarcia 2021-01-18 00:26:53 -0800 Comment on attachment 417661 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=417661&action=review > Source/JavaScriptCore/PlatformGTK.cmake:83 > + --sources-top-dirs=${CMAKE_BINARY_DIR} > + --sources-top-dirs=${CMAKE_SOURCE_DIR} why do we need to pass both? do we want the toplevel soures dir or the toplevel build dir? 1720342 5 mcatanzaro 2021-01-18 07:26:41 -0800 (In reply to Carlos Garcia Campos from comment #4) > Comment on attachment 417661 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=417661&action=review > > > Source/JavaScriptCore/PlatformGTK.cmake:83 > > + --sources-top-dirs=${CMAKE_BINARY_DIR} > > + --sources-top-dirs=${CMAKE_SOURCE_DIR} > > why do we need to pass both? do we want the toplevel soures dir or the > toplevel build dir? The first version of my patch only passed the builddir, which is sufficient to avoid the multilib conflicts. Then I looked into what meson was doing and realized it was passing both. Setting the builddir shortens the paths for anything built from DerivedSources, while setting sourcedir just shortens the paths for things under Source/ when the introspection scanner is called from a subdirectory of the toplevel source directory. Except... cmake actually runs all commands from the toplevel source directory, so passing it does nothing (except make the command line longer). So yeah, it's not needed. Let's go back to the first version of my patch. 1720343 6 mcatanzaro 2021-01-18 07:30:12 -0800 Er... also it seems I missed the WebKit2WebExtension-4.0.gir... oops. Will fix that in the patch that lands. 1720344 7 417831 mcatanzaro 2021-01-18 07:30:40 -0800 Created attachment 417831 Patch for landing 1720346 8 ews-feeder 2021-01-18 07:56:53 -0800 Committed r271580: <https://trac.webkit.org/changeset/271580> All reviewed patches have been landed. Closing bug and clearing flags on attachment 417831. 417660 2021-01-14 15:04:40 -0800 2021-01-14 15:09:25 -0800 Patch bug-220636-20210114170439.patch text/plain 2966 mcatanzaro U3VidmVyc2lvbiBSZXZpc2lvbjogMjcxNDk0CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCBk N2FmOTEzMWZjYzY3ZjkzYzY2NDg1MjFmMTNlZDQ4NGUyM2QxZTZmLi40MDVjNTRkNTk0M2ZkMmM0 MzE3MjNjOWYzMzA5ODkwYjVkM2ViYjI0IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxMiBAQAorMjAyMS0wMS0xNCAgTWljaGFlbCBDYXRhbnphcm8gIDxtY2F0YW56YXJvQGdu b21lLm9yZz4KKworICAgICAgICBbR1RLXSBNdWx0aWxpYiBjb25mbGljdHMgaW4gZ2lyIGZpbGVz CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjA2MzYK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFBsYXRm b3JtR1RLLmNtYWtlOgorCiAyMDIxLTAxLTE0ICBTYWFtIEJhcmF0aSAgPHNiYXJhdGlAYXBwbGUu Y29tPgogCiAgICAgICAgIFNwZWN1bGF0aXZlSklUOjpjb21waWxlR2V0RW51bWVyYWJsZUxlbmd0 aCBzaG91bGQgbm90IHVzZSBHUFJGbHVzaGVkQ2FsbFJlc3VsdApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdC9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwppbmRleCA5NjFmYjY1 NDM0ODBmOTc1YmViYmNiYzVlYjE4ZjNlMDcxNzBmMDJjLi5iYjMyYjk2NTU4MTc4Y2I5NzFlNzVm Zjg2YjBmYWIyOGI2NjUxN2RkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwor KysgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDIxLTAxLTE0 ICBNaWNoYWVsIENhdGFuemFybyAgPG1jYXRhbnphcm9AZ25vbWUub3JnPgorCisgICAgICAgIFtH VEtdIE11bHRpbGliIGNvbmZsaWN0cyBpbiBnaXIgZmlsZXMKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMDYzNgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEJ5IHBhc3NpbmcgLS1zb3VyY2VzLXRvcC1kaXJz IHRvIGctaXItc2Nhbm5lciwgd2UgZW5zdXJlIGFsbCBwYXRocyBpbiB0aGUgZ2VuZXJhdGVkIGdp cgorICAgICAgICBmaWxlcyBhcmUgcmVsYXRpdmUgdG8gdGhlIGJ1aWxkZGlyLiBUaGlzIG1hdGNo ZXMgd2hhdCBtZXNvbiBkb2VzLCBhbmQgYXZvaWRzIG11bHRpbGliCisgICAgICAgIGNvbmZsaWN0 cyB3aGVuIHRoZSBidWlsZGRpciBjb250YWlucyB0aGUgbmFtZSBvZiB0aGUgdGFyZ2V0IGFyY2hp dGVjdHVyZS4KKworICAgICAgICAqIFBsYXRmb3JtR1RLLmNtYWtlOgorCiAyMDIxLTAxLTE0ICBH ZW9mZnJleSBHYXJlbiAgPGdnYXJlbkBhcHBsZS5jb20+CiAKICAgICAgICAgUmVtb3ZlZCBtb3N0 IHVzZXMgb2YgZGlzcGF0Y2hfYXN5bmMoZGlzcGF0Y2hfZ2V0X21haW5fcXVldWUoKSwgLi4uKQpk aWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL1BsYXRmb3JtR1RLLmNtYWtlIGIvU291 cmNlL0phdmFTY3JpcHRDb3JlL1BsYXRmb3JtR1RLLmNtYWtlCmluZGV4IDI3N2Y4MWExYzE4MmJk MWEwMWExOGJiMWYxYzc1OWI1ZGU2MjY4NmEuLjg0NzdjNmNhYTg4MDVmYWNiMWM3YjM2OTM5MjA1 MWNiYTJiMzFkMjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9QbGF0Zm9ybUdU Sy5jbWFrZQorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvUGxhdGZvcm1HVEsuY21ha2UKQEAg LTc5LDYgKzc5LDggQEAgaWYgKEVOQUJMRV9JTlRST1NQRUNUSU9OKQogICAgICAgICAgICAgLS1w a2ctZXhwb3J0PWphdmFzY3JpcHRjb3JlZ3RrLSR7V0VCS0lUR1RLX0FQSV9WRVJTSU9OfQogICAg ICAgICAgICAgLS1vdXRwdXQ9JHtDTUFLRV9CSU5BUllfRElSfS9KYXZhU2NyaXB0Q29yZS0ke1dF QktJVEdUS19BUElfVkVSU0lPTn0uZ2lyCiAgICAgICAgICAgICAtLWMtaW5jbHVkZT0ianNjL2pz Yy5oIgorICAgICAgICAgICAgLS1zb3VyY2VzLXRvcC1kaXJzPSR7Q01BS0VfQklOQVJZX0RJUn0K KyAgICAgICAgICAgIC0tc291cmNlcy10b3AtZGlycz0ke0NNQUtFX1NPVVJDRV9ESVJ9CiAgICAg ICAgICAgICAtREpTQ19DT01QSUxBVElPTgogICAgICAgICAgICAgLUkke0NNQUtFX1NPVVJDRV9E SVJ9L1NvdXJjZQogICAgICAgICAgICAgLUkke0pBVkFTQ1JJUFRDT1JFX0RJUn0KZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQvUGxhdGZvcm1HVEsuY21ha2UgYi9Tb3VyY2UvV2ViS2l0L1BsYXRm b3JtR1RLLmNtYWtlCmluZGV4IDE1ZWY2YTljZDkxYzg3Zjg1ZjZmZWEwMzBlYTQ4ZDZkZmI0YTJi NDAuLjc1OWY2OTEyMjgzYWU0NzVhMmNmNDZhM2Y0NTg3ZmFiZTZlMzIyMDkgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQvUGxhdGZvcm1HVEsuY21ha2UKKysrIGIvU291cmNlL1dlYktpdC9QbGF0 Zm9ybUdUSy5jbWFrZQpAQCAtNjc4LDYgKzY3OCw4IEBAIGlmIChFTkFCTEVfSU5UUk9TUEVDVElP TikKICAgICAgICAgICAgIC0tcGtnLWV4cG9ydD13ZWJraXQyZ3RrLSR7V0VCS0lUR1RLX0FQSV9W RVJTSU9OfQogICAgICAgICAgICAgLS1vdXRwdXQ9JHtDTUFLRV9CSU5BUllfRElSfS9XZWJLaXQy LSR7V0VCS0lUR1RLX0FQSV9WRVJTSU9OfS5naXIKICAgICAgICAgICAgIC0tYy1pbmNsdWRlPSJ3 ZWJraXQyL3dlYmtpdDIuaCIKKyAgICAgICAgICAgIC0tc291cmNlcy10b3AtZGlycz0ke0NNQUtF X0JJTkFSWV9ESVJ9CisgICAgICAgICAgICAtLXNvdXJjZXMtdG9wLWRpcnM9JHtDTUFLRV9TT1VS Q0VfRElSfQogICAgICAgICAgICAgLURCVUlMRElOR19XRUJLSVQKICAgICAgICAgICAgIC1EV0VC S0lUMl9DT01QSUxBVElPTgogICAgICAgICAgICAgLUkke0NNQUtFX1NPVVJDRV9ESVJ9L1NvdXJj ZQo= 417661 2021-01-14 15:09:29 -0800 2021-01-18 07:30:36 -0800 Patch bug-220636-20210114170928.patch text/plain 2976 mcatanzaro U3VidmVyc2lvbiBSZXZpc2lvbjogMjcxNDk0CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCBk N2FmOTEzMWZjYzY3ZjkzYzY2NDg1MjFmMTNlZDQ4NGUyM2QxZTZmLi40MDVjNTRkNTk0M2ZkMmM0 MzE3MjNjOWYzMzA5ODkwYjVkM2ViYjI0IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxMiBAQAorMjAyMS0wMS0xNCAgTWljaGFlbCBDYXRhbnphcm8gIDxtY2F0YW56YXJvQGdu b21lLm9yZz4KKworICAgICAgICBbR1RLXSBNdWx0aWxpYiBjb25mbGljdHMgaW4gZ2lyIGZpbGVz CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjA2MzYK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFBsYXRm b3JtR1RLLmNtYWtlOgorCiAyMDIxLTAxLTE0ICBTYWFtIEJhcmF0aSAgPHNiYXJhdGlAYXBwbGUu Y29tPgogCiAgICAgICAgIFNwZWN1bGF0aXZlSklUOjpjb21waWxlR2V0RW51bWVyYWJsZUxlbmd0 aCBzaG91bGQgbm90IHVzZSBHUFJGbHVzaGVkQ2FsbFJlc3VsdApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdC9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwppbmRleCA5NjFmYjY1 NDM0ODBmOTc1YmViYmNiYzVlYjE4ZjNlMDcxNzBmMDJjLi42MTEwODQ4NjlmNTExYjFlZTNlNmJl NWJjNDNkMTZlZGY0MjFmOTU3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwor KysgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDIxLTAxLTE0 ICBNaWNoYWVsIENhdGFuemFybyAgPG1jYXRhbnphcm9AZ25vbWUub3JnPgorCisgICAgICAgIFtH VEtdIE11bHRpbGliIGNvbmZsaWN0cyBpbiBnaXIgZmlsZXMKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMDYzNgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEJ5IHBhc3NpbmcgLS1zb3VyY2VzLXRvcC1kaXJz IHRvIGctaXItc2Nhbm5lciwgd2UgZW5zdXJlIGFsbCBwYXRocyBpbiB0aGUgZ2VuZXJhdGVkIGdp cgorICAgICAgICBmaWxlcyBhcmUgcmVsYXRpdmUgdG8gdGhlIHRvcGxldmVsIGJ1aWxkZGlyIG9y IHNvdXJjZWRpci4gVGhpcyBtYXRjaGVzIHdoYXQgbWVzb24gZG9lcywKKyAgICAgICAgYW5kIGF2 b2lkcyBtdWx0aWxpYiBjb25mbGljdHMgd2hlbiB0aGUgYnVpbGRkaXIgY29udGFpbnMgdGhlIHRh cmdldCBhcmNoaXRlY3R1cmUuCisKKyAgICAgICAgKiBQbGF0Zm9ybUdUSy5jbWFrZToKKwogMjAy MS0wMS0xNCAgR2VvZmZyZXkgR2FyZW4gIDxnZ2FyZW5AYXBwbGUuY29tPgogCiAgICAgICAgIFJl bW92ZWQgbW9zdCB1c2VzIG9mIGRpc3BhdGNoX2FzeW5jKGRpc3BhdGNoX2dldF9tYWluX3F1ZXVl KCksIC4uLikKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9QbGF0Zm9ybUdUSy5j bWFrZSBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9QbGF0Zm9ybUdUSy5jbWFrZQppbmRleCAyNzdm ODFhMWMxODJiZDFhMDFhMThiYjFmMWM3NTliNWRlNjI2ODZhLi44NDc3YzZjYWE4ODA1ZmFjYjFj N2IzNjkzOTIwNTFjYmEyYjMxZDI4IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUv UGxhdGZvcm1HVEsuY21ha2UKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL1BsYXRmb3JtR1RL LmNtYWtlCkBAIC03OSw2ICs3OSw4IEBAIGlmIChFTkFCTEVfSU5UUk9TUEVDVElPTikKICAgICAg ICAgICAgIC0tcGtnLWV4cG9ydD1qYXZhc2NyaXB0Y29yZWd0ay0ke1dFQktJVEdUS19BUElfVkVS U0lPTn0KICAgICAgICAgICAgIC0tb3V0cHV0PSR7Q01BS0VfQklOQVJZX0RJUn0vSmF2YVNjcmlw dENvcmUtJHtXRUJLSVRHVEtfQVBJX1ZFUlNJT059LmdpcgogICAgICAgICAgICAgLS1jLWluY2x1 ZGU9ImpzYy9qc2MuaCIKKyAgICAgICAgICAgIC0tc291cmNlcy10b3AtZGlycz0ke0NNQUtFX0JJ TkFSWV9ESVJ9CisgICAgICAgICAgICAtLXNvdXJjZXMtdG9wLWRpcnM9JHtDTUFLRV9TT1VSQ0Vf RElSfQogICAgICAgICAgICAgLURKU0NfQ09NUElMQVRJT04KICAgICAgICAgICAgIC1JJHtDTUFL RV9TT1VSQ0VfRElSfS9Tb3VyY2UKICAgICAgICAgICAgIC1JJHtKQVZBU0NSSVBUQ09SRV9ESVJ9 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1BsYXRmb3JtR1RLLmNtYWtlIGIvU291cmNlL1dl YktpdC9QbGF0Zm9ybUdUSy5jbWFrZQppbmRleCAxNWVmNmE5Y2Q5MWM4N2Y4NWY2ZmVhMDMwZWE0 OGQ2ZGZiNGEyYjQwLi43NTlmNjkxMjI4M2FlNDc1YTJjZjQ2YTNmNDU4N2ZhYmU2ZTMyMjA5IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1BsYXRmb3JtR1RLLmNtYWtlCisrKyBiL1NvdXJjZS9X ZWJLaXQvUGxhdGZvcm1HVEsuY21ha2UKQEAgLTY3OCw2ICs2NzgsOCBAQCBpZiAoRU5BQkxFX0lO VFJPU1BFQ1RJT04pCiAgICAgICAgICAgICAtLXBrZy1leHBvcnQ9d2Via2l0Mmd0ay0ke1dFQktJ VEdUS19BUElfVkVSU0lPTn0KICAgICAgICAgICAgIC0tb3V0cHV0PSR7Q01BS0VfQklOQVJZX0RJ Un0vV2ViS2l0Mi0ke1dFQktJVEdUS19BUElfVkVSU0lPTn0uZ2lyCiAgICAgICAgICAgICAtLWMt aW5jbHVkZT0id2Via2l0Mi93ZWJraXQyLmgiCisgICAgICAgICAgICAtLXNvdXJjZXMtdG9wLWRp cnM9JHtDTUFLRV9CSU5BUllfRElSfQorICAgICAgICAgICAgLS1zb3VyY2VzLXRvcC1kaXJzPSR7 Q01BS0VfU09VUkNFX0RJUn0KICAgICAgICAgICAgIC1EQlVJTERJTkdfV0VCS0lUCiAgICAgICAg ICAgICAtRFdFQktJVDJfQ09NUElMQVRJT04KICAgICAgICAgICAgIC1JJHtDTUFLRV9TT1VSQ0Vf RElSfS9Tb3VyY2UK 417831 2021-01-18 07:30:40 -0800 2021-01-18 07:56:55 -0800 Patch for landing bug-220636-20210118093039.patch text/plain 3214 mcatanzaro U3VidmVyc2lvbiBSZXZpc2lvbjogMjcxNTI2CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCBj N2IyMzYxOGIyOTU4Y2JlMGVhMjRkMTYwNjM5NTAzYzM4Y2RmZWUyLi43OWRiNzk1OGQ4MGQzMTQx N2IyZjc1NzAzNjhhOTgzMzlmZmQxMmQ5IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxMiBAQAorMjAyMS0wMS0xOCAgTWljaGFlbCBDYXRhbnphcm8gIDxtY2F0YW56YXJvQGdu b21lLm9yZz4KKworICAgICAgICBbR1RLXSBNdWx0aWxpYiBjb25mbGljdHMgaW4gZ2lyIGZpbGVz CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjA2MzYK KworICAgICAgICBSZXZpZXdlZCBieSBDYXJsb3MgR2FyY2lhIENhbXBvcy4KKworICAgICAgICAq IFBsYXRmb3JtR1RLLmNtYWtlOgorCiAyMDIxLTAxLTE0ICBSb3NzIEtpcnNsaW5nICA8cm9zcy5r aXJzbGluZ0Bzb255LmNvbT4KIAogICAgICAgICBbSlNDXSBDb3JyZWN0bHkgaGFuZGxlIGVzY2Fw ZWQga2V5d29yZCBpZGVudGlmaWVycwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9DaGFuZ2VM b2cgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwppbmRleCBhOWFmYjcyMTQyZTlmYWZjNDgyYWU2 ODZhODhhMWQ5MzYyZTdhNGZkLi5kYzY0MWY1MjdlOWQ4ZjdkOGFmYzk5MTlkYmVkYTY0N2QwODM3 ZDdjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2Vi S2l0L0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDIxLTAxLTE4ICBNaWNoYWVsIENhdGFu emFybyAgPG1jYXRhbnphcm9AZ25vbWUub3JnPgorCisgICAgICAgIFtHVEtdIE11bHRpbGliIGNv bmZsaWN0cyBpbiBnaXIgZmlsZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTIyMDYzNgorCisgICAgICAgIFJldmlld2VkIGJ5IENhcmxvcyBHYXJjaWEg Q2FtcG9zLgorCisgICAgICAgIEJ5IHBhc3NpbmcgLS1zb3VyY2VzLXRvcC1kaXJzIHRvIGctaXIt c2Nhbm5lciwgd2UgZW5zdXJlIGFsbCBwYXRocyBpbiB0aGUgZ2VuZXJhdGVkIGdpcgorICAgICAg ICBmaWxlcyBhcmUgcmVsYXRpdmUgdG8gdGhlIHRvcGxldmVsIGJ1aWxkZGlyLiBUaGlzIGF2b2lk cyBtdWx0aWxpYiBjb25mbGljdHMgd2hlbiB0aGUKKyAgICAgICAgYnVpbGRkaXIgY29udGFpbnMg dGhlIHRhcmdldCBhcmNoaXRlY3R1cmUuCisKKyAgICAgICAgKiBQbGF0Zm9ybUdUSy5jbWFrZToK KwogMjAyMS0wMS0xNSAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgogCiAgICAgICAg IFtHUFVQcm9jZXNzXSBJbXByb3ZlIHRoZSBHUFVQcm9jZXNzJyBtZW1vcnkgcHJlc3N1cmUgaGFu ZGxlcgpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL1BsYXRmb3JtR1RLLmNtYWtl IGIvU291cmNlL0phdmFTY3JpcHRDb3JlL1BsYXRmb3JtR1RLLmNtYWtlCmluZGV4IDI3N2Y4MWEx YzE4MmJkMWEwMWExOGJiMWYxYzc1OWI1ZGU2MjY4NmEuLjYwOGRmZTIwMTRjMDk2ZTY5OTBhNjNh ZWU2YjMxYTZmYjgzNzBkNmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9QbGF0 Zm9ybUdUSy5jbWFrZQorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvUGxhdGZvcm1HVEsuY21h a2UKQEAgLTc4LDYgKzc4LDcgQEAgaWYgKEVOQUJMRV9JTlRST1NQRUNUSU9OKQogICAgICAgICAg ICAgLS1wa2c9Z29iamVjdC0yLjAKICAgICAgICAgICAgIC0tcGtnLWV4cG9ydD1qYXZhc2NyaXB0 Y29yZWd0ay0ke1dFQktJVEdUS19BUElfVkVSU0lPTn0KICAgICAgICAgICAgIC0tb3V0cHV0PSR7 Q01BS0VfQklOQVJZX0RJUn0vSmF2YVNjcmlwdENvcmUtJHtXRUJLSVRHVEtfQVBJX1ZFUlNJT059 LmdpcgorICAgICAgICAgICAgLS1zb3VyY2VzLXRvcC1kaXJzPSR7Q01BS0VfQklOQVJZX0RJUn0K ICAgICAgICAgICAgIC0tYy1pbmNsdWRlPSJqc2MvanNjLmgiCiAgICAgICAgICAgICAtREpTQ19D T01QSUxBVElPTgogICAgICAgICAgICAgLUkke0NNQUtFX1NPVVJDRV9ESVJ9L1NvdXJjZQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdC9QbGF0Zm9ybUdUSy5jbWFrZSBiL1NvdXJjZS9XZWJLaXQv UGxhdGZvcm1HVEsuY21ha2UKaW5kZXggMTVlZjZhOWNkOTFjODdmODVmNmZlYTAzMGVhNDhkNmRm YjRhMmI0MC4uOWM4NjMyMDY5N2EzOTc5YTM0NjU0ZDNlMjc1OTE4ZWM1YzgzYTZhOSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdC9QbGF0Zm9ybUdUSy5jbWFrZQorKysgYi9Tb3VyY2UvV2ViS2l0 L1BsYXRmb3JtR1RLLmNtYWtlCkBAIC02NzcsNiArNjc3LDcgQEAgaWYgKEVOQUJMRV9JTlRST1NQ RUNUSU9OKQogICAgICAgICAgICAgLS1wa2c9bGlic291cC0yLjQKICAgICAgICAgICAgIC0tcGtn LWV4cG9ydD13ZWJraXQyZ3RrLSR7V0VCS0lUR1RLX0FQSV9WRVJTSU9OfQogICAgICAgICAgICAg LS1vdXRwdXQ9JHtDTUFLRV9CSU5BUllfRElSfS9XZWJLaXQyLSR7V0VCS0lUR1RLX0FQSV9WRVJT SU9OfS5naXIKKyAgICAgICAgICAgIC0tc291cmNlcy10b3AtZGlycz0ke0NNQUtFX0JJTkFSWV9E SVJ9CiAgICAgICAgICAgICAtLWMtaW5jbHVkZT0id2Via2l0Mi93ZWJraXQyLmgiCiAgICAgICAg ICAgICAtREJVSUxESU5HX1dFQktJVAogICAgICAgICAgICAgLURXRUJLSVQyX0NPTVBJTEFUSU9O CkBAIC03MjQsNiArNzI1LDcgQEAgaWYgKEVOQUJMRV9JTlRST1NQRUNUSU9OKQogICAgICAgICAg ICAgLS1wa2c9bGlic291cC0yLjQKICAgICAgICAgICAgIC0tcGtnLWV4cG9ydD13ZWJraXQyZ3Rr LXdlYi1leHRlbnNpb24tJHtXRUJLSVRHVEtfQVBJX1ZFUlNJT059CiAgICAgICAgICAgICAtLW91 dHB1dD0ke0NNQUtFX0JJTkFSWV9ESVJ9L1dlYktpdDJXZWJFeHRlbnNpb24tJHtXRUJLSVRHVEtf QVBJX1ZFUlNJT059LmdpcgorICAgICAgICAgICAgLS1zb3VyY2VzLXRvcC1kaXJzPSR7Q01BS0Vf QklOQVJZX0RJUn0KICAgICAgICAgICAgIC0tYy1pbmNsdWRlPSJ3ZWJraXQyL3dlYmtpdC13ZWIt ZXh0ZW5zaW9uLmgiCiAgICAgICAgICAgICAtREJVSUxESU5HX1dFQktJVAogICAgICAgICAgICAg LURXRUJLSVQyX0NPTVBJTEFUSU9OCg==