194744 2019-02-16 01:52:25 -0800 [GTK][STABLE] Update-webkitgtk-libs for Webkit GTK 2.22 can not be generated anymore 2019-02-16 11:17:17 -0800 1 1 1 Unclassified WebKit WebKitGTK WebKit Local Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 psaavedra webkit-unassigned aperez bugs-noreply mcatanzaro pnormand oldest_to_newest 1506996 0 psaavedra 2019-02-16 01:52:25 -0800 The following patches added in 236726 (https://trac.webkit.org/changeset/236726/webkit#file4) probably during the preparation of the release are not longer available in the 2.22 branch: <patch file="gst-plugins-good-0007-matroskademux-Allow-Matroska-headers-to-be-read-more.patch" strip="1" /> <!-- Merged as 9dc7859184d4b7ad1dd7e2b54704e994dbace329 (to be shipped in 1.14.4) --> <patch file="gst-plugins-good-0008-matroskademux-Refactor-track-parsing-out-from-adding.patch" strip="1" /> <!-- Merged as f279bc5336dda19741a5996a108da42dd3201366 (to be shipped in 1.14.4) --> <patch file="gst-plugins-good-0009-matroskademux-Parse-successive-Tracks-elements.patch" strip="1" /> <!-- Merged as 0e60076a390fd3ef53d350940b2c695ff7bbe008 (to be shipped in 1.14.4) --> $ ls /home/buildbot/webkitgtk/gtk-linux-stable3-64/build/Tools/gstreamer/patches/ gst-plugins-base-0001-parsebin-Post-STREAM_COLLECTION-on-EVENT_STREAM_COLL.patch gst-plugins-good-0003-qtdemux-Clarify-field-name-about-stream-encryption-s.patch gst-plugins-good-0001-qtdemux-Do-not-run-the-preferred-decryptor-context-q.patch gst-plugins-good-0003-qtdemux-also-push-buffers-without-encryption-info-in.patch gst-plugins-good-0002-qtdemux-Do-not-unref-a-NULL-stream_tags.patch gst-plugins-good-0010-matroskademux-Emit-no-more-pads-after-parsing-Tracks.patch gst-plugins-good-0002-qtdemux-add-context-for-a-preferred-protection.patch openh264-configure.patch These are missing in in webkit-2.22: https://trac.webkit.org/browser/webkit/releases/WebKitGTK/webkit-2.22/Tools/gstreamer?rev=236726#patches This situation causes the fail in the `perl ./Tools/Scripts/update-webkitgtk-libs`. Trace (https://build-webkit.igalia.com/builders/GTK%20Linux%2064-bit%20Release%20Stable%20%282.22%29/builds/1/steps/jhbuild/logs/stdio): xzcat -d "/home/buildbot/webkitgtk/jhbuild-mirror/gst-plugins-good-1.14.1.tar.xz" | tar xf - *** Applying patch gst-plugins-good-0002-qtdemux-add-context-for-a-preferred-protection.patch *** [29/47] patch -p1 < "/home/buildbot/webkitgtk/gtk-linux-stable3-64/build/Tools/gstreamer/patches/gst-plugins-good-0002-qtdemux-add-context-for-a- preferred-protection.patch" patching file gst/isomp4/qtdemux.c patching file gst/isomp4/qtdemux.h *** Applying patch gst-plugins-good-0003-qtdemux-also-push-buffers-without-encryption-info-in.patch *** [29/47] patch -p1 < "/home/buildbot/webkitgtk/gtk-linux-stable3-64/build/Tools/gstreamer/patches/gst-plugins-good-0003-qtdemux-also-push-buffers-without-encryption-info-in.patch" patching file gst/isomp4/qtdemux.c *** Applying patch gst-plugins-good-0001-qtdemux-Do-not-run-the-preferred-decryptor-context-q.patch *** [29/47] patch -p1 < "/home/buildbot/webkitgtk/gtk-linux-stable3-64/build/Tools/gstreamer/patches/gst-plugins-good-0001-qtdemux-Do-not-run-the-preferred-decryptor-context-q.patch" patching file gst/isomp4/qtdemux.c Hunk #1 succeeded at 7854 (offset -202 lines). *** Applying patch gst-plugins-good-0002-qtdemux-Do-not-unref-a-NULL-stream_tags.patch *** [29/47] patch -p1 < "/home/buildbot/webkitgtk/gtk-linux-stable3-64/build/Tools/gstreamer/patches/gst-plugins-good-0002-qtdemux-Do-not-unref-a-NULL-stream_tags.patch" patching file gst/isomp4/qtdemux.c Hunk #1 succeeded at 2518 (offset -82 lines). *** Applying patch gst-plugins-good-0003-qtdemux-Clarify-field-name-about-stream-encryption-s.patch *** [29/47] patch -p1 < "/home/buildbot/webkitgtk/gtk-linux-stable3-64/build/Tools/gstreamer/patches/gst-plugins-good-0003-qtdemux-Clarify-field-name-about-stream-encryption-s.patch" patching file gst/isomp4/qtdemux.c Hunk #1 succeeded at 7857 (offset -239 lines). Hunk #2 succeeded at 7888 (offset -239 lines). Hunk #3 succeeded at 7913 (offset -239 lines). Failed to build GTK+ port dependencies with jhbuild Those patches was removed in trunk (r236960: <https://trac.webkit.org/changeset/236960>): 2018-10-09 Philippe Normand <pnormand@igalia.com> [JHBuild] Update to GStreamer 1.14.4 https://bugs.webkit.org/show_bug.cgi?id=190395 Reviewed by Xabier Rodriguez-Calvar. * gstreamer/jhbuild.modules: Remove patches merged in 1.14.4 and bump version of GStreamer modules. * gstreamer/patches/gst-plugins-good-0007-matroskademux-Allow-Matroska-headers-to-be-read-more.patch: Removed. * gstreamer/patches/gst-plugins-good-0008-matroskademux-Refactor-track-parsing-out-from-adding.patch: Removed. * gstreamer/patches/gst-plugins-good-0009-matroskademux-Parse-successive-Tracks-elements.patch: Removed. * gstreamer/patches/gst-plugins-good-0010-matroskademux-Emit-no-more-pads-after-parsing-Tracks.patch: Removed. 1507007 1 362218 psaavedra 2019-02-16 04:36:49 -0800 Created attachment 362218 patch 1507030 2 mcatanzaro 2019-02-16 11:16:04 -0800 Thanks. 1507031 3 mcatanzaro 2019-02-16 11:17:17 -0800 Committed https://trac.webkit.org/changeset/241650/webkit 362218 2019-02-16 04:36:49 -0800 2019-02-16 06:11:32 -0800 patch patch text/plain 21035 psaavedra ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCA1ZGRm MTdjYjU5MC4uYWI3MDdkYWU1ZTEgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9U b29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNCBAQAorMjAxOS0wMi0xNiAgUGFibG8gU2FhdmVk cmEgIDxwc2FhdmVkcmFAaWdhbGlhLmNvbT4KKworICAgICAgICBbR1RLXSBVcGRhdGUtd2Via2l0 Z3RrLWxpYnMgZm9yIFdlYmtpdCBHVEsgMi4yMiBjYW4gbm90IGJlIGdlbmVyYXRlZCBhbnltb3Jl CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTQ3NDQK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGdzdHJl YW1lci9wYXRjaGVzL2dzdC1wbHVnaW5zLWdvb2QtMDAwNy1tYXRyb3NrYWRlbXV4LUFsbG93LU1h dHJvc2thLWhlYWRlcnMtdG8tYmUtcmVhZC1tb3JlLnBhdGNoOiBBZGRlZC4KKyAgICAgICAgKiBn c3RyZWFtZXIvcGF0Y2hlcy9nc3QtcGx1Z2lucy1nb29kLTAwMDgtbWF0cm9za2FkZW11eC1SZWZh Y3Rvci10cmFjay1wYXJzaW5nLW91dC1mcm9tLWFkZGluZy5wYXRjaDogQWRkZWQuCisgICAgICAg ICogZ3N0cmVhbWVyL3BhdGNoZXMvZ3N0LXBsdWdpbnMtZ29vZC0wMDA5LW1hdHJvc2thZGVtdXgt UGFyc2Utc3VjY2Vzc2l2ZS1UcmFja3MtZWxlbWVudHMucGF0Y2g6IEFkZGVkLgorCiAyMDE4LTEw LTI4ICBaYW4gRG9iZXJzZWsgIDx6ZG9iZXJzZWtAaWdhbGlhLmNvbT4KIAogICAgICAgICBbV1BF XSBBZGQgdGhlIFdlYktpdFZlcnNpb24uaCBoZWFkZXIKZGlmZiAtLWdpdCBhL1Rvb2xzL2dzdHJl YW1lci9wYXRjaGVzL2dzdC1wbHVnaW5zLWdvb2QtMDAwNy1tYXRyb3NrYWRlbXV4LUFsbG93LU1h dHJvc2thLWhlYWRlcnMtdG8tYmUtcmVhZC1tb3JlLnBhdGNoIGIvVG9vbHMvZ3N0cmVhbWVyL3Bh dGNoZXMvZ3N0LXBsdWdpbnMtZ29vZC0wMDA3LW1hdHJvc2thZGVtdXgtQWxsb3ctTWF0cm9za2Et aGVhZGVycy10by1iZS1yZWFkLW1vcmUucGF0Y2gKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXgg MDAwMDAwMDAwMDAuLmUwYzIzYzViNzgyCi0tLSAvZGV2L251bGwKKysrIGIvVG9vbHMvZ3N0cmVh bWVyL3BhdGNoZXMvZ3N0LXBsdWdpbnMtZ29vZC0wMDA3LW1hdHJvc2thZGVtdXgtQWxsb3ctTWF0 cm9za2EtaGVhZGVycy10by1iZS1yZWFkLW1vcmUucGF0Y2gKQEAgLTAsMCArMSw0NSBAQAorRnJv bSA5ZGM3ODU5MTg0ZDRiN2FkMWRkN2UyYjU0NzA0ZTk5NGRiYWNlMzI5IE1vbiBTZXAgMTcgMDA6 MDA6MDAgMjAwMQorRnJvbTogPT9VVEYtOD9xP0FsaWNpYT0yMEJveWE9MjBHYXJjPUMzPUFEYT89 IDxudHJyZ2NAZ21haWwuY29tPgorRGF0ZTogVGh1LCAzMCBOb3YgMjAxNyAyMDo0NDoyMyArMDEw MAorU3ViamVjdDogW1BBVENIIDcvOV0gbWF0cm9za2FkZW11eDogQWxsb3cgTWF0cm9za2EgaGVh ZGVycyB0byBiZSByZWFkIG1vcmUKKyB0aGFuIG9uY2UKKworVGhpcyBpcyBuZWNlc3NhcnkgZm9y IE1TRSwgd2hlcmUgYSBuZXcgTVNFIGluaXRpYWxpemF0aW9uIHNlZ21lbnQgbWF5IGJlCithcHBl bmRlZCBhdCBhbnkgcG9pbnQuIFRoZXNlIE1TRSBpbml0aWFsaXphdGlvbiBzZWdtZW50cyBjb25z aXN0IG9mIGFuCitlbnRpcmUgV2ViTSBmaWxlIHVudGlsIHRoZSBmaXJzdCBDbHVzdGVyIGVsZW1l bnQgKG5vdCBpbmNsdWRlZCkuIFsxXQorCitOb3RlIHRoYXQgdHJhY2sgZGVmaW5pdGlvbnMgYXJl IGlnbm9yZWQgb24gc3VjY2Vzc2l2ZSBoZWFkZXJzLCB0aGV5IG11c3QKK21hdGNoLCBidXQgdGhp cyBpcyBub3QgY2hlY2tlZCBieSBtYXRyb3NrYWRlbXV4IChsb29rIGZvcgorYCghZGVtdXgtPnRy YWNrc19wYXJzZWQpYCBpbiB0aGUgY29kZSkuCisKK1NvdXJjZSBwYWRzIGFyZSBub3QgYWx0ZXJl ZCB3aGVuIHRoZSBuZXcgaGVhZGVycyBhcmUgcmVhZC4KKworVGhpcyBwYXRjaCBoYXMgYmVlbiBz cGxpdHRlZCBmcm9tIHRoZSBvcmlnaW5hbCBwYXRjaCBmcm9tIGVvY2FuaGEgaW4gWzJdLgorCitb MV0gaHR0cHM6Ly93d3cudzMub3JnL1RSL21zZS1ieXRlLXN0cmVhbS1mb3JtYXQtd2VibS8KK1sy XSBodHRwczovL2J1ZzMzNDA4Mi5idWd6aWxsYS1hdHRhY2htZW50cy5nbm9tZS5vcmcvYXR0YWNo bWVudC5jZ2k/aWQ9MzYyMjEyCisKK2h0dHBzOi8vYnVnemlsbGEuZ25vbWUub3JnL3Nob3dfYnVn LmNnaT9pZD03OTMzMzMKKy0tLQorIGdzdC9tYXRyb3NrYS9tYXRyb3NrYS1kZW11eC5jIHwgNSAr KysrKworIDEgZmlsZSBjaGFuZ2VkLCA1IGluc2VydGlvbnMoKykKKworZGlmZiAtLWdpdCBhL2dz dC9tYXRyb3NrYS9tYXRyb3NrYS1kZW11eC5jIGIvZ3N0L21hdHJvc2thL21hdHJvc2thLWRlbXV4 LmMKK2luZGV4IGI3ZTEzYmI4MC4uMjRhNzI5NDg1IDEwMDY0NAorLS0tIGEvZ3N0L21hdHJvc2th L21hdHJvc2thLWRlbXV4LmMKKysrKyBiL2dzdC9tYXRyb3NrYS9tYXRyb3NrYS1kZW11eC5jCitA QCAtNDk4NCw2ICs0OTg0LDExIEBAIGdzdF9tYXRyb3NrYV9kZW11eF9wYXJzZV9pZCAoR3N0TWF0 cm9za2FEZW11eCAqIGRlbXV4LCBndWludDMyIGlkLAorICAgICBjYXNlIEdTVF9NQVRST1NLQV9S RUFEX1NUQVRFX0RBVEE6CisgICAgIGNhc2UgR1NUX01BVFJPU0tBX1JFQURfU1RBVEVfU0VFSzoK KyAgICAgICBzd2l0Y2ggKGlkKSB7CisrICAgICAgICBjYXNlIEdTVF9FQk1MX0lEX0hFQURFUjoK KysgICAgICAgICAgR1NUX1JFQURfQ0hFQ0sgKGdzdF9tYXRyb3NrYV9kZW11eF9mbHVzaCAoZGVt dXgsIHJlYWQpKTsKKysgICAgICAgICAgZGVtdXgtPmNvbW1vbi5zdGF0ZSA9IEdTVF9NQVRST1NL QV9SRUFEX1NUQVRFX1NFR01FTlQ7CisrICAgICAgICAgIGdzdF9tYXRyb3NrYV9kZW11eF9jaGVj a19zZWVrYWJpbGl0eSAoZGVtdXgpOworKyAgICAgICAgICBicmVhazsKKyAgICAgICAgIGNhc2Ug R1NUX01BVFJPU0tBX0lEX1NFR01FTlRJTkZPOgorICAgICAgICAgICBpZiAoIWRlbXV4LT5jb21t b24uc2VnbWVudGluZm9fcGFyc2VkKSB7CisgICAgICAgICAgICAgR1NUX1JFQURfQ0hFQ0sgKGdz dF9tYXRyb3NrYV9kZW11eF90YWtlIChkZW11eCwgcmVhZCwgJmVibWwpKTsKKy0tIAorMi4xNy4x CisKZGlmZiAtLWdpdCBhL1Rvb2xzL2dzdHJlYW1lci9wYXRjaGVzL2dzdC1wbHVnaW5zLWdvb2Qt MDAwOC1tYXRyb3NrYWRlbXV4LVJlZmFjdG9yLXRyYWNrLXBhcnNpbmctb3V0LWZyb20tYWRkaW5n LnBhdGNoIGIvVG9vbHMvZ3N0cmVhbWVyL3BhdGNoZXMvZ3N0LXBsdWdpbnMtZ29vZC0wMDA4LW1h dHJvc2thZGVtdXgtUmVmYWN0b3ItdHJhY2stcGFyc2luZy1vdXQtZnJvbS1hZGRpbmcucGF0Y2gK bmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAuLjZkYWY1YTI5YzFlCi0tLSAv ZGV2L251bGwKKysrIGIvVG9vbHMvZ3N0cmVhbWVyL3BhdGNoZXMvZ3N0LXBsdWdpbnMtZ29vZC0w MDA4LW1hdHJvc2thZGVtdXgtUmVmYWN0b3ItdHJhY2stcGFyc2luZy1vdXQtZnJvbS1hZGRpbmcu cGF0Y2gKQEAgLTAsMCArMSwyNjYgQEAKK0Zyb20gMWVmMDEzNTllNWFiMjY3ZWExMzI1M2NlYTY4 ODg2OTY5N2Y3ZmYwZCBNb24gU2VwIDE3IDAwOjAwOjAwIDIwMDEKK0Zyb206ID0/VVRGLTg/cT9B bGljaWE9MjBCb3lhPTIwR2FyYz1DMz1BRGE/PSA8YWJveWFAaWdhbGlhLmNvbT4KK0RhdGU6IE1v biwgMjQgU2VwIDIwMTggMTc6MjA6MTUgKzAyMDAKK1N1YmplY3Q6IFtQQVRDSF0gKGJhY2twb3J0 IGZvciAxLjQuMTMpIG1hdHJvc2thZGVtdXg6IFJlZmFjdG9yIHRyYWNrIHBhcnNpbmcKKyBvdXQg ZnJvbSBhZGRpbmcgdHJhY2tzCisKK1RoaXMgc3BsaXRzIGdzdF9tYXRyb3NrYV9kZW11eF9hZGRf c3RyZWFtKCkgaW50bzoKKworKiBnc3RfbWF0cm9za2FfZGVtdXhfcGFyc2Vfc3RyZWFtKCk6IHdp bGwgcmVhZCB0aGUgTWF0cm9za2EgYnl0ZXN0cmVhbQorICBhbmQgZmlsbCBhIEdzdE1hdHJvc2th VHJhY2tDb250ZXh0LgorCisqIGdzdF9tYXRyb3NrYV9kZW11eF9wYXJzZV90cmFja3MoKTogd2ls bCBjaGVjayB0aGVyZSBhcmUgbm8gcmVwZWF0ZWQKKyAgdHJhY2tzLgorCisqIGdzdF9tYXRyb3Nr YV9kZW11eF9hZGRfc3RyZWFtKCk6IGNyZWF0ZXMgYW5kIHNldHMgdXAgdGhlIHBhZCBmb3IgdGhl CisgIHRyYWNrLgorCitodHRwczovL2J1Z3ppbGxhLmdub21lLm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 NzkzMzMzCistLS0KKyBnc3QvbWF0cm9za2EvbWF0cm9za2EtZGVtdXguYyB8IDExNCArKysrKysr KysrKysrKysrKysrKystLS0tLS0tLS0tLS0tCisgMSBmaWxlIGNoYW5nZWQsIDcyIGluc2VydGlv bnMoKyksIDQyIGRlbGV0aW9ucygtKQorCitkaWZmIC0tZ2l0IGEvZ3N0L21hdHJvc2thL21hdHJv c2thLWRlbXV4LmMgYi9nc3QvbWF0cm9za2EvbWF0cm9za2EtZGVtdXguYworaW5kZXggM2YzMjll ZDZlLi43Yzg5OTBjZjQgMTAwNjQ0CistLS0gYS9nc3QvbWF0cm9za2EvbWF0cm9za2EtZGVtdXgu YworKysrIGIvZ3N0L21hdHJvc2thL21hdHJvc2thLWRlbXV4LmMKK0BAIC01NzUsMjEgKzU3NSwx NiBAQCBiZWFjaDoKKyB9CisgCisgc3RhdGljIEdzdEZsb3dSZXR1cm4KKy1nc3RfbWF0cm9za2Ff ZGVtdXhfYWRkX3N0cmVhbSAoR3N0TWF0cm9za2FEZW11eCAqIGRlbXV4LCBHc3RFYm1sUmVhZCAq IGVibWwpCisrZ3N0X21hdHJvc2thX2RlbXV4X3BhcnNlX3N0cmVhbSAoR3N0TWF0cm9za2FEZW11 eCAqIGRlbXV4LCBHc3RFYm1sUmVhZCAqIGVibWwsCisrICAgIEdzdE1hdHJvc2thVHJhY2tDb250 ZXh0ICoqIGRlc3RfY29udGV4dCkKKyB7CistICBHc3RFbGVtZW50Q2xhc3MgKmtsYXNzID0gR1NU X0VMRU1FTlRfR0VUX0NMQVNTIChkZW11eCk7CisgICBHc3RNYXRyb3NrYVRyYWNrQ29udGV4dCAq Y29udGV4dDsKKy0gIEdzdFBhZFRlbXBsYXRlICp0ZW1wbCA9IE5VTEw7CistICBHc3RTdHJlYW1G bGFncyBzdHJlYW1fZmxhZ3M7CisgICBHc3RDYXBzICpjYXBzID0gTlVMTDsKKyAgIEdzdFRhZ0xp c3QgKmNhY2hlZF90YWdsaXN0OworLSAgZ2NoYXIgKnBhZG5hbWUgPSBOVUxMOworICAgR3N0Rmxv d1JldHVybiByZXQ7CisgICBndWludDMyIGlkLCByaWZmX2ZvdXJjYyA9IDA7CisgICBndWludDE2 IHJpZmZfYXVkaW9fZm10ID0gMDsKKy0gIEdzdEV2ZW50ICpzdHJlYW1fc3RhcnQ7CisgICBnY2hh ciAqY29kZWMgPSBOVUxMOworLSAgZ2NoYXIgKnN0cmVhbV9pZDsKKyAKKyAgIERFQlVHX0VMRU1F TlRfU1RBUlQgKGRlbXV4LCBlYm1sLCAiVHJhY2tFbnRyeSIpOworIAorQEAgLTYwMiw4ICs1OTcs NiBAQCBnc3RfbWF0cm9za2FfZGVtdXhfYWRkX3N0cmVhbSAoR3N0TWF0cm9za2FEZW11eCAqIGRl bXV4LCBHc3RFYm1sUmVhZCAqIGVibWwpCisgICAvKiBhbGxvY2F0ZSBnZW5lcmljLi4uIGlmIHdl IGtub3cgdGhlIHR5cGUsIHdlJ2xsIGdfcmVuZXcoKQorICAgICogd2l0aCB0aGUgcHJlY2lzZSB0 eXBlICovCisgICBjb250ZXh0ID0gZ19uZXcwIChHc3RNYXRyb3NrYVRyYWNrQ29udGV4dCwgMSk7 CistICBnX3B0cl9hcnJheV9hZGQgKGRlbXV4LT5jb21tb24uc3JjLCBjb250ZXh0KTsKKy0gIGNv bnRleHQtPmluZGV4ID0gZGVtdXgtPmNvbW1vbi5udW1fc3RyZWFtczsKKyAgIGNvbnRleHQtPmlu ZGV4X3dyaXRlcl9pZCA9IC0xOworICAgY29udGV4dC0+dHlwZSA9IDA7ICAgICAgICAgICAgLyog bm8gdHlwZSB5ZXQgKi8KKyAgIGNvbnRleHQtPmRlZmF1bHRfZHVyYXRpb24gPSAwOworQEAgLTYy MCwxMCArNjEzLDkgQEAgZ3N0X21hdHJvc2thX2RlbXV4X2FkZF9zdHJlYW0gKEdzdE1hdHJvc2th RGVtdXggKiBkZW11eCwgR3N0RWJtbFJlYWQgKiBlYm1sKQorICAgY29udGV4dC0+ZHRzX29ubHkg PSBGQUxTRTsKKyAgIGNvbnRleHQtPmludHJhX29ubHkgPSBGQUxTRTsKKyAgIGNvbnRleHQtPnRh Z3MgPSBnc3RfdGFnX2xpc3RfbmV3X2VtcHR5ICgpOworLSAgZGVtdXgtPmNvbW1vbi5udW1fc3Ry ZWFtcysrOworLSAgZ19hc3NlcnQgKGRlbXV4LT5jb21tb24uc3JjLT5sZW4gPT0gZGVtdXgtPmNv bW1vbi5udW1fc3RyZWFtcyk7CisgCistICBHU1RfREVCVUdfT0JKRUNUIChkZW11eCwgIlN0cmVh bSBudW1iZXIgJWQiLCBjb250ZXh0LT5pbmRleCk7CisrICBHU1RfREVCVUdfT0JKRUNUIChkZW11 eCwgIlBhcnNpbmcgYSBUcmFja0VudHJ5ICglZCB0cmFja3MgcGFyc2VkIHNvIGZhcikiLAorKyAg ICAgIGRlbXV4LT5jb21tb24ubnVtX3N0cmVhbXMpOworIAorICAgLyogdHJ5IHJlYWRpbmcgdGhl IHRyYWNrZW50cnkgaGVhZGVycyAqLworICAgd2hpbGUgKHJldCA9PSBHU1RfRkxPV19PSyAmJiBn c3RfZWJtbF9yZWFkX2hhc19yZW1haW5pbmcgKGVibWwsIDEsIFRSVUUpKSB7CitAQCAtNjQyLDEy ICs2MzQsNiBAQCBnc3RfbWF0cm9za2FfZGVtdXhfYWRkX3N0cmVhbSAoR3N0TWF0cm9za2FEZW11 eCAqIGRlbXV4LCBHc3RFYm1sUmVhZCAqIGVibWwpCisgICAgICAgICAgIEdTVF9FUlJPUl9PQkpF Q1QgKGRlbXV4LCAiSW52YWxpZCBUcmFja051bWJlciAwIik7CisgICAgICAgICAgIHJldCA9IEdT VF9GTE9XX0VSUk9SOworICAgICAgICAgICBicmVhazsKKy0gICAgICAgIH0gZWxzZSBpZiAoIWdz dF9tYXRyb3NrYV9yZWFkX2NvbW1vbl90cmFja251bWJlcl91bmlxdWUgKCZkZW11eC0+Y29tbW9u LAorLSAgICAgICAgICAgICAgICBudW0pKSB7CistICAgICAgICAgIEdTVF9FUlJPUl9PQkpFQ1Qg KGRlbXV4LCAiVHJhY2tOdW1iZXIgJSIgR19HVUlOVDY0X0ZPUk1BVAorLSAgICAgICAgICAgICAg IiBpcyBub3QgdW5pcXVlIiwgbnVtKTsKKy0gICAgICAgICAgcmV0ID0gR1NUX0ZMT1dfRVJST1I7 CistICAgICAgICAgIGJyZWFrOworICAgICAgICAgfQorIAorICAgICAgICAgR1NUX0RFQlVHX09C SkVDVCAoZGVtdXgsICJUcmFja051bWJlcjogJSIgR19HVUlOVDY0X0ZPUk1BVCwgbnVtKTsKK0BA IC03MTQsOCArNzAwLDYgQEAgZ3N0X21hdHJvc2thX2RlbXV4X2FkZF9zdHJlYW0gKEdzdE1hdHJv c2thRGVtdXggKiBkZW11eCwgR3N0RWJtbFJlYWQgKiBlYm1sKQorICAgICAgICAgICAgIGNvbnRl eHQtPnR5cGUgPSAwOworICAgICAgICAgICAgIGJyZWFrOworICAgICAgICAgfQorLSAgICAgICAg Z19wdHJfYXJyYXlfaW5kZXggKGRlbXV4LT5jb21tb24uc3JjLCBkZW11eC0+Y29tbW9uLm51bV9z dHJlYW1zIC0gMSkKKy0gICAgICAgICAgICA9IGNvbnRleHQ7CisgICAgICAgICBicmVhazsKKyAg ICAgICB9CisgCitAQCAtNzM0LDggKzcxOCw2IEBAIGdzdF9tYXRyb3NrYV9kZW11eF9hZGRfc3Ry ZWFtIChHc3RNYXRyb3NrYURlbXV4ICogZGVtdXgsIEdzdEVibWxSZWFkICogZWJtbCkKKyAgICAg ICAgICAgYnJlYWs7CisgICAgICAgICB9CisgICAgICAgICB2aWRlb2NvbnRleHQgPSAoR3N0TWF0 cm9za2FUcmFja1ZpZGVvQ29udGV4dCAqKSBjb250ZXh0OworLSAgICAgICAgZ19wdHJfYXJyYXlf aW5kZXggKGRlbXV4LT5jb21tb24uc3JjLCBkZW11eC0+Y29tbW9uLm51bV9zdHJlYW1zIC0gMSkK Ky0gICAgICAgICAgICA9IGNvbnRleHQ7CisgCisgICAgICAgICB3aGlsZSAocmV0ID09IEdTVF9G TE9XX09LICYmCisgICAgICAgICAgICAgZ3N0X2VibWxfcmVhZF9oYXNfcmVtYWluaW5nIChlYm1s LCAxLCBUUlVFKSkgeworQEAgLTEwMTEsOCArOTkzLDYgQEAgZ3N0X21hdHJvc2thX2RlbXV4X2Fk ZF9zdHJlYW0gKEdzdE1hdHJvc2thRGVtdXggKiBkZW11eCwgR3N0RWJtbFJlYWQgKiBlYm1sKQor ICAgICAgICAgICBicmVhazsKKyAKKyAgICAgICAgIGF1ZGlvY29udGV4dCA9IChHc3RNYXRyb3Nr YVRyYWNrQXVkaW9Db250ZXh0ICopIGNvbnRleHQ7CistICAgICAgICBnX3B0cl9hcnJheV9pbmRl eCAoZGVtdXgtPmNvbW1vbi5zcmMsIGRlbXV4LT5jb21tb24ubnVtX3N0cmVhbXMgLSAxKQorLSAg ICAgICAgICAgID0gY29udGV4dDsKKyAKKyAgICAgICAgIHdoaWxlIChyZXQgPT0gR1NUX0ZMT1df T0sgJiYKKyAgICAgICAgICAgICBnc3RfZWJtbF9yZWFkX2hhc19yZW1haW5pbmcgKGVibWwsIDEs IFRSVUUpKSB7CitAQCAtMTM0MSwxMSArMTMyMSw5IEBAIGdzdF9tYXRyb3NrYV9kZW11eF9hZGRf c3RyZWFtIChHc3RNYXRyb3NrYURlbXV4ICogZGVtdXgsIEdzdEVibWxSZWFkICogZWJtbCkKKyAg ICAgaWYgKHJldCA9PSBHU1RfRkxPV19PSyB8fCByZXQgPT0gR1NUX0ZMT1dfRU9TKQorICAgICAg IEdTVF9XQVJOSU5HX09CSkVDVCAoZWJtbCwgIlVua25vd24gc3RyZWFtL2NvZGVjIGluIHRyYWNr IGVudHJ5IGhlYWRlciIpOworIAorLSAgICBkZW11eC0+Y29tbW9uLm51bV9zdHJlYW1zLS07Cist ICAgIGdfcHRyX2FycmF5X3JlbW92ZV9pbmRleCAoZGVtdXgtPmNvbW1vbi5zcmMsIGRlbXV4LT5j b21tb24ubnVtX3N0cmVhbXMpOworLSAgICBnX2Fzc2VydCAoZGVtdXgtPmNvbW1vbi5zcmMtPmxl biA9PSBkZW11eC0+Y29tbW9uLm51bV9zdHJlYW1zKTsKKyAgICAgZ3N0X21hdHJvc2thX3RyYWNr X2ZyZWUgKGNvbnRleHQpOworLQorKyAgICBjb250ZXh0ID0gTlVMTDsKKysgICAgKmRlc3RfY29u dGV4dCA9IE5VTEw7CisgICAgIHJldHVybiByZXQ7CisgICB9CisgCitAQCAtMTM1NiwxNCArMTMz NCwxMiBAQCBnc3RfbWF0cm9za2FfZGVtdXhfYWRkX3N0cmVhbSAoR3N0TWF0cm9za2FEZW11eCAq IGRlbXV4LCBHc3RFYm1sUmVhZCAqIGVibWwpCisgICBpZiAoY2FjaGVkX3RhZ2xpc3QpCisgICAg IGdzdF90YWdfbGlzdF9pbnNlcnQgKGNvbnRleHQtPnRhZ3MsIGNhY2hlZF90YWdsaXN0LCBHU1Rf VEFHX01FUkdFX0FQUEVORCk7CisgCistICAvKiBub3cgY3JlYXRlIHRoZSBHU3RyZWFtZXIgY29u bmVjdGl2aXR5ICovCisrICAvKiBjb21wdXRlIGNhcHMgKi8KKyAgIHN3aXRjaCAoY29udGV4dC0+ dHlwZSkgeworICAgICBjYXNlIEdTVF9NQVRST1NLQV9UUkFDS19UWVBFX1ZJREVPOnsKKyAgICAg ICBHc3RNYXRyb3NrYVRyYWNrVmlkZW9Db250ZXh0ICp2aWRlb2NvbnRleHQgPQorICAgICAgICAg ICAoR3N0TWF0cm9za2FUcmFja1ZpZGVvQ29udGV4dCAqKSBjb250ZXh0OworIAorLSAgICAgIHBh ZG5hbWUgPSBnX3N0cmR1cF9wcmludGYgKCJ2aWRlb18ldSIsIGRlbXV4LT5udW1fdl9zdHJlYW1z KyspOworLSAgICAgIHRlbXBsID0gZ3N0X2VsZW1lbnRfY2xhc3NfZ2V0X3BhZF90ZW1wbGF0ZSAo a2xhc3MsICJ2aWRlb18ldSIpOworICAgICAgIGNhcHMgPSBnc3RfbWF0cm9za2FfZGVtdXhfdmlk ZW9fY2FwcyAodmlkZW9jb250ZXh0LAorICAgICAgICAgICBjb250ZXh0LT5jb2RlY19pZCwgY29u dGV4dC0+Y29kZWNfcHJpdiwKKyAgICAgICAgICAgY29udGV4dC0+Y29kZWNfcHJpdl9zaXplLCAm Y29kZWMsICZyaWZmX2ZvdXJjYyk7CitAQCAtMTM4MSw4ICsxMzU3LDYgQEAgZ3N0X21hdHJvc2th X2RlbXV4X2FkZF9zdHJlYW0gKEdzdE1hdHJvc2thRGVtdXggKiBkZW11eCwgR3N0RWJtbFJlYWQg KiBlYm1sKQorICAgICAgIEdzdE1hdHJvc2thVHJhY2tBdWRpb0NvbnRleHQgKmF1ZGlvY29udGV4 dCA9CisgICAgICAgICAgIChHc3RNYXRyb3NrYVRyYWNrQXVkaW9Db250ZXh0ICopIGNvbnRleHQ7 CisgCistICAgICAgcGFkbmFtZSA9IGdfc3RyZHVwX3ByaW50ZiAoImF1ZGlvXyV1IiwgZGVtdXgt Pm51bV9hX3N0cmVhbXMrKyk7CistICAgICAgdGVtcGwgPSBnc3RfZWxlbWVudF9jbGFzc19nZXRf cGFkX3RlbXBsYXRlIChrbGFzcywgImF1ZGlvXyV1Iik7CisgICAgICAgY2FwcyA9IGdzdF9tYXRy b3NrYV9kZW11eF9hdWRpb19jYXBzIChhdWRpb2NvbnRleHQsCisgICAgICAgICAgIGNvbnRleHQt PmNvZGVjX2lkLCBjb250ZXh0LT5jb2RlY19wcml2LCBjb250ZXh0LT5jb2RlY19wcml2X3NpemUs CisgICAgICAgICAgICZjb2RlYywgJnJpZmZfYXVkaW9fZm10KTsKK0BAIC0xNDAwLDggKzEzNzQs NiBAQCBnc3RfbWF0cm9za2FfZGVtdXhfYWRkX3N0cmVhbSAoR3N0TWF0cm9za2FEZW11eCAqIGRl bXV4LCBHc3RFYm1sUmVhZCAqIGVibWwpCisgICAgICAgR3N0TWF0cm9za2FUcmFja1N1YnRpdGxl Q29udGV4dCAqc3VidGl0bGVjb250ZXh0ID0KKyAgICAgICAgICAgKEdzdE1hdHJvc2thVHJhY2tT dWJ0aXRsZUNvbnRleHQgKikgY29udGV4dDsKKyAKKy0gICAgICBwYWRuYW1lID0gZ19zdHJkdXBf cHJpbnRmICgic3VidGl0bGVfJXUiLCBkZW11eC0+bnVtX3Rfc3RyZWFtcysrKTsKKy0gICAgICB0 ZW1wbCA9IGdzdF9lbGVtZW50X2NsYXNzX2dldF9wYWRfdGVtcGxhdGUgKGtsYXNzLCAic3VidGl0 bGVfJXUiKTsKKyAgICAgICBjYXBzID0gZ3N0X21hdHJvc2thX2RlbXV4X3N1YnRpdGxlX2NhcHMg KHN1YnRpdGxlY29udGV4dCwKKyAgICAgICAgICAgY29udGV4dC0+Y29kZWNfaWQsIGNvbnRleHQt PmNvZGVjX3ByaXYsIGNvbnRleHQtPmNvZGVjX3ByaXZfc2l6ZSk7CisgICAgICAgYnJlYWs7CitA QCAtMTQ2OCw5ICsxNDQwLDU2IEBAIGdzdF9tYXRyb3NrYV9kZW11eF9hZGRfc3RyZWFtIChHc3RN YXRyb3NrYURlbXV4ICogZGVtdXgsIEdzdEVibWxSZWFkICogZWJtbCkKKyAgICAgICAgIGNvbnRl eHQtPnN0cmVhbV9oZWFkZXJzLCBjYXBzKTsKKyAgIH0KKyAKKysgIGNvbnRleHQtPmNhcHMgPSBj YXBzOworKworKyAgLyogdGFkYWFoISAqLworKyAgKmRlc3RfY29udGV4dCA9IGNvbnRleHQ7Cisr ICByZXR1cm4gcmV0OworK30KKysKKytzdGF0aWMgdm9pZAorK2dzdF9tYXRyb3NrYV9kZW11eF9h ZGRfc3RyZWFtIChHc3RNYXRyb3NrYURlbXV4ICogZGVtdXgsCisrICAgIEdzdE1hdHJvc2thVHJh Y2tDb250ZXh0ICogY29udGV4dCkKKyt7CisrICBHc3RFbGVtZW50Q2xhc3MgKmtsYXNzID0gR1NU X0VMRU1FTlRfR0VUX0NMQVNTIChkZW11eCk7CisrICBnY2hhciAqcGFkbmFtZSA9IE5VTEw7Cisr ICBHc3RQYWRUZW1wbGF0ZSAqdGVtcGwgPSBOVUxMOworKyAgR3N0U3RyZWFtRmxhZ3Mgc3RyZWFt X2ZsYWdzOworKworKyAgR3N0RXZlbnQgKnN0cmVhbV9zdGFydDsKKysKKysgIGdjaGFyICpzdHJl YW1faWQ7CisrCisrICBnX3B0cl9hcnJheV9hZGQgKGRlbXV4LT5jb21tb24uc3JjLCBjb250ZXh0 KTsKKysgIGNvbnRleHQtPmluZGV4ID0gZGVtdXgtPmNvbW1vbi5udW1fc3RyZWFtcysrOworKyAg Z19hc3NlcnQgKGRlbXV4LT5jb21tb24uc3JjLT5sZW4gPT0gZGVtdXgtPmNvbW1vbi5udW1fc3Ry ZWFtcyk7CisrICBnX3B0cl9hcnJheV9pbmRleCAoZGVtdXgtPmNvbW1vbi5zcmMsIGRlbXV4LT5j b21tb24ubnVtX3N0cmVhbXMgLSAxKSA9CisrICAgICAgY29udGV4dDsKKysKKysgIC8qIG5vdyBj cmVhdGUgdGhlIEdTdHJlYW1lciBjb25uZWN0aXZpdHkgKi8KKysgIHN3aXRjaCAoY29udGV4dC0+ dHlwZSkgeworKyAgICBjYXNlIEdTVF9NQVRST1NLQV9UUkFDS19UWVBFX1ZJREVPOgorKyAgICAg IHBhZG5hbWUgPSBnX3N0cmR1cF9wcmludGYgKCJ2aWRlb18ldSIsIGRlbXV4LT5udW1fdl9zdHJl YW1zKyspOworKyAgICAgIHRlbXBsID0gZ3N0X2VsZW1lbnRfY2xhc3NfZ2V0X3BhZF90ZW1wbGF0 ZSAoa2xhc3MsICJ2aWRlb18ldSIpOworKyAgICAgIGJyZWFrOworKworKyAgICBjYXNlIEdTVF9N QVRST1NLQV9UUkFDS19UWVBFX0FVRElPOgorKyAgICAgIHBhZG5hbWUgPSBnX3N0cmR1cF9wcmlu dGYgKCJhdWRpb18ldSIsIGRlbXV4LT5udW1fYV9zdHJlYW1zKyspOworKyAgICAgIHRlbXBsID0g Z3N0X2VsZW1lbnRfY2xhc3NfZ2V0X3BhZF90ZW1wbGF0ZSAoa2xhc3MsICJhdWRpb18ldSIpOwor KyAgICAgIGJyZWFrOworKworKyAgICBjYXNlIEdTVF9NQVRST1NLQV9UUkFDS19UWVBFX1NVQlRJ VExFOgorKyAgICAgIHBhZG5hbWUgPSBnX3N0cmR1cF9wcmludGYgKCJzdWJ0aXRsZV8ldSIsIGRl bXV4LT5udW1fdF9zdHJlYW1zKyspOworKyAgICAgIHRlbXBsID0gZ3N0X2VsZW1lbnRfY2xhc3Nf Z2V0X3BhZF90ZW1wbGF0ZSAoa2xhc3MsICJzdWJ0aXRsZV8ldSIpOworKyAgICAgIGJyZWFrOwor KworKyAgICBkZWZhdWx0OgorKyAgICAgIC8qIHdlIHNob3VsZCBhbHJlYWR5IGhhdmUgcXVpdCBi eSBub3cgKi8KKysgICAgICBnX2Fzc2VydF9ub3RfcmVhY2hlZCAoKTsKKysgIH0KKysKKyAgIC8q IHRoZSBwYWQgaW4gaGVyZSAqLworICAgY29udGV4dC0+cGFkID0gZ3N0X3BhZF9uZXdfZnJvbV90 ZW1wbGF0ZSAodGVtcGwsIHBhZG5hbWUpOworLSAgY29udGV4dC0+Y2FwcyA9IGNhcHM7CisgCisg ICBnc3RfcGFkX3NldF9ldmVudF9mdW5jdGlvbiAoY29udGV4dC0+cGFkLAorICAgICAgIEdTVF9E RUJVR19GVU5DUFRSIChnc3RfbWF0cm9za2FfZGVtdXhfaGFuZGxlX3NyY19ldmVudCkpOworQEAg LTE0NzgsNyArMTQ5Nyw3IEBAIGdzdF9tYXRyb3NrYV9kZW11eF9hZGRfc3RyZWFtIChHc3RNYXRy b3NrYURlbXV4ICogZGVtdXgsIEdzdEVibWxSZWFkICogZWJtbCkKKyAgICAgICBHU1RfREVCVUdf RlVOQ1BUUiAoZ3N0X21hdHJvc2thX2RlbXV4X2hhbmRsZV9zcmNfcXVlcnkpKTsKKyAKKyAgIEdT VF9JTkZPX09CSkVDVCAoZGVtdXgsICJBZGRpbmcgcGFkICclcycgd2l0aCBjYXBzICUiIEdTVF9Q VFJfRk9STUFULAorLSAgICAgIHBhZG5hbWUsIGNhcHMpOworKyAgICAgIHBhZG5hbWUsIGNvbnRl eHQtPmNhcHMpOworIAorICAgZ3N0X3BhZF9zZXRfZWxlbWVudF9wcml2YXRlIChjb250ZXh0LT5w YWQsIGNvbnRleHQpOworIAorQEAgLTE1NDMsOSArMTU2Miw2IEBAIGdzdF9tYXRyb3NrYV9kZW11 eF9hZGRfc3RyZWFtIChHc3RNYXRyb3NrYURlbXV4ICogZGVtdXgsIEdzdEVibWxSZWFkICogZWJt bCkKKyAgIGdzdF9mbG93X2NvbWJpbmVyX2FkZF9wYWQgKGRlbXV4LT5mbG93Y29tYmluZXIsIGNv bnRleHQtPnBhZCk7CisgCisgICBnX2ZyZWUgKHBhZG5hbWUpOworLQorLSAgLyogdGFkYWFoISAq LworLSAgcmV0dXJuIHJldDsKKyB9CisgCisgc3RhdGljIGdib29sZWFuCitAQCAtMjc2OCw5ICsy Nzg0LDIzIEBAIGdzdF9tYXRyb3NrYV9kZW11eF9wYXJzZV90cmFja3MgKEdzdE1hdHJvc2thRGVt dXggKiBkZW11eCwgR3N0RWJtbFJlYWQgKiBlYm1sKQorIAorICAgICBzd2l0Y2ggKGlkKSB7Cisg ICAgICAgICAvKiBvbmUgdHJhY2sgd2l0aGluIHRoZSAiYWxsLXRyYWNrcyIgaGVhZGVyICovCist ICAgICAgY2FzZSBHU1RfTUFUUk9TS0FfSURfVFJBQ0tFTlRSWToKKy0gICAgICAgIHJldCA9IGdz dF9tYXRyb3NrYV9kZW11eF9hZGRfc3RyZWFtIChkZW11eCwgZWJtbCk7CisrICAgICAgY2FzZSBH U1RfTUFUUk9TS0FfSURfVFJBQ0tFTlRSWTp7CisrICAgICAgICBHc3RNYXRyb3NrYVRyYWNrQ29u dGV4dCAqdHJhY2s7CisrICAgICAgICByZXQgPSBnc3RfbWF0cm9za2FfZGVtdXhfcGFyc2Vfc3Ry ZWFtIChkZW11eCwgZWJtbCwgJnRyYWNrKTsKKysgICAgICAgIGlmICh0cmFjayAhPSBOVUxMKSB7 CisrICAgICAgICAgIGlmIChnc3RfbWF0cm9za2FfcmVhZF9jb21tb25fdHJhY2tudW1iZXJfdW5p cXVlICgmZGVtdXgtPmNvbW1vbiwKKysgICAgICAgICAgICAgICAgICB0cmFjay0+bnVtKSkgewor KyAgICAgICAgICAgIGdzdF9tYXRyb3NrYV9kZW11eF9hZGRfc3RyZWFtIChkZW11eCwgdHJhY2sp OworKyAgICAgICAgICB9IGVsc2UgeworKyAgICAgICAgICAgIEdTVF9FUlJPUl9PQkpFQ1QgKGRl bXV4LAorKyAgICAgICAgICAgICAgICAiVHJhY2tOdW1iZXIgJSIgR19HVUlOVDY0X0ZPUk1BVCAi IGlzIG5vdCB1bmlxdWUiLCB0cmFjay0+bnVtKTsKKysgICAgICAgICAgICByZXQgPSBHU1RfRkxP V19FUlJPUjsKKysgICAgICAgICAgICBnc3RfbWF0cm9za2FfdHJhY2tfZnJlZSAodHJhY2spOwor KyAgICAgICAgICAgIHRyYWNrID0gTlVMTDsKKysgICAgICAgICAgfQorKyAgICAgICAgfQorICAg ICAgICAgYnJlYWs7CisrICAgICAgfQorIAorICAgICAgIGRlZmF1bHQ6CisgICAgICAgICByZXQg PSBnc3RfbWF0cm9za2FfcmVhZF9jb21tb25fcGFyc2Vfc2tpcCAoJmRlbXV4LT5jb21tb24sIGVi bWwsCistLSAKKzIuMTcuMQorCmRpZmYgLS1naXQgYS9Ub29scy9nc3RyZWFtZXIvcGF0Y2hlcy9n c3QtcGx1Z2lucy1nb29kLTAwMDktbWF0cm9za2FkZW11eC1QYXJzZS1zdWNjZXNzaXZlLVRyYWNr cy1lbGVtZW50cy5wYXRjaCBiL1Rvb2xzL2dzdHJlYW1lci9wYXRjaGVzL2dzdC1wbHVnaW5zLWdv b2QtMDAwOS1tYXRyb3NrYWRlbXV4LVBhcnNlLXN1Y2Nlc3NpdmUtVHJhY2tzLWVsZW1lbnRzLnBh dGNoCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwLi4xYWU2OTk5ZmFlZQot LS0gL2Rldi9udWxsCisrKyBiL1Rvb2xzL2dzdHJlYW1lci9wYXRjaGVzL2dzdC1wbHVnaW5zLWdv b2QtMDAwOS1tYXRyb3NrYWRlbXV4LVBhcnNlLXN1Y2Nlc3NpdmUtVHJhY2tzLWVsZW1lbnRzLnBh dGNoCkBAIC0wLDAgKzEsMTQ5IEBACitGcm9tIDBlNjAwNzZhMzkwZmQzZWY1M2QzNTA5NDBiMmM2 OTVmZjdiYmUwMDggTW9uIFNlcCAxNyAwMDowMDowMCAyMDAxCitGcm9tOiA9P1VURi04P3E/QWxp Y2lhPTIwQm95YT0yMEdhcmM9QzM9QURhPz0gPGFib3lhQGlnYWxpYS5jb20+CitEYXRlOiBGcmks IDIxIFNlcCAyMDE4IDIwOjM4OjAyICswMjAwCitTdWJqZWN0OiBbUEFUQ0ggOS85XSBtYXRyb3Nr YWRlbXV4OiBQYXJzZSBzdWNjZXNzaXZlIFRyYWNrcyBlbGVtZW50cworCitUaGlzIHBhdGNoIGFs bG93cyBtYXRyb3NrYWRlbXV4IHRvIHBhcnNlIGEgc2Vjb25kIFRyYWNrcyBlbGVtZW50LAorZXJy b3Jpbmcgb3V0IGlmIHRoZSB0cmFja3MgYXJlIG5vdCBjb21wYXRpYmxlIChkaWZmZXJlbnQgbnVt YmVyLCB0eXBlIG9yCitjb2RlYykgYW5kIGVtaXR0aW5nIG5ldyBjYXBzIGFuZCB0YWcgZXZlbnRz IHNob3VsZCB0aGV5IGhhdmUgY2hhbmdlZC4KKworaHR0cHM6Ly9idWd6aWxsYS5nbm9tZS5vcmcv c2hvd19idWcuY2dpP2lkPTc5MzMzMworLS0tCisgZ3N0L21hdHJvc2thL21hdHJvc2thLWRlbXV4 LmMgfCAxMTEgKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrLQorIDEgZmlsZSBjaGFu Z2VkLCAxMDkgaW5zZXJ0aW9ucygrKSwgMiBkZWxldGlvbnMoLSkKKworZGlmZiAtLWdpdCBhL2dz dC9tYXRyb3NrYS9tYXRyb3NrYS1kZW11eC5jIGIvZ3N0L21hdHJvc2thL21hdHJvc2thLWRlbXV4 LmMKK2luZGV4IDBlMjE1N2ExNS4uNzcxNzZmYjYyIDEwMDY0NAorLS0tIGEvZ3N0L21hdHJvc2th L21hdHJvc2thLWRlbXV4LmMKKysrKyBiL2dzdC9tYXRyb3NrYS9tYXRyb3NrYS1kZW11eC5jCitA QCAtMzEzMiw2ICszMTMyLDExMyBAQCBnc3RfbWF0cm9za2FfZGVtdXhfcGFyc2VfdHJhY2tzIChH c3RNYXRyb3NrYURlbXV4ICogZGVtdXgsIEdzdEVibWxSZWFkICogZWJtbCkKKyAgIHJldHVybiBy ZXQ7CisgfQorIAorK3N0YXRpYyBHc3RGbG93UmV0dXJuCisrZ3N0X21hdHJvc2thX2RlbXV4X3Vw ZGF0ZV90cmFja3MgKEdzdE1hdHJvc2thRGVtdXggKiBkZW11eCwgR3N0RWJtbFJlYWQgKiBlYm1s KQorK3sKKysgIEdzdEZsb3dSZXR1cm4gcmV0ID0gR1NUX0ZMT1dfT0s7CisrICBndWludCBudW1f dHJhY2tzX2ZvdW5kID0gMDsKKysgIGd1aW50MzIgaWQ7CisrCisrICBHU1RfSU5GT19PQkpFQ1Qg KGRlbXV4LCAiUmVwYXJzaW5nIFRyYWNrcyBlbGVtZW50Iik7CisrCisrICBERUJVR19FTEVNRU5U X1NUQVJUIChkZW11eCwgZWJtbCwgIlRyYWNrcyIpOworKworKyAgaWYgKChyZXQgPSBnc3RfZWJt bF9yZWFkX21hc3RlciAoZWJtbCwgJmlkKSkgIT0gR1NUX0ZMT1dfT0spIHsKKysgICAgREVCVUdf RUxFTUVOVF9TVE9QIChkZW11eCwgZWJtbCwgIlRyYWNrcyIsIHJldCk7CisrICAgIHJldHVybiBy ZXQ7CisrICB9CisrCisrICB3aGlsZSAocmV0ID09IEdTVF9GTE9XX09LICYmIGdzdF9lYm1sX3Jl YWRfaGFzX3JlbWFpbmluZyAoZWJtbCwgMSwgVFJVRSkpIHsKKysgICAgaWYgKChyZXQgPSBnc3Rf ZWJtbF9wZWVrX2lkIChlYm1sLCAmaWQpKSAhPSBHU1RfRkxPV19PSykKKysgICAgICBicmVhazsK KysKKysgICAgc3dpdGNoIChpZCkgeworKyAgICAgICAgLyogb25lIHRyYWNrIHdpdGhpbiB0aGUg ImFsbC10cmFja3MiIGhlYWRlciAqLworKyAgICAgIGNhc2UgR1NUX01BVFJPU0tBX0lEX1RSQUNL RU5UUlk6eworKyAgICAgICAgR3N0TWF0cm9za2FUcmFja0NvbnRleHQgKm5ld190cmFjazsKKysg ICAgICAgIGdpbnQgb2xkX3RyYWNrX2luZGV4OworKyAgICAgICAgR3N0TWF0cm9za2FUcmFja0Nv bnRleHQgKm9sZF90cmFjazsKKysgICAgICAgIHJldCA9IGdzdF9tYXRyb3NrYV9kZW11eF9wYXJz ZV9zdHJlYW0gKGRlbXV4LCBlYm1sLCAmbmV3X3RyYWNrKTsKKysgICAgICAgIGlmIChuZXdfdHJh Y2sgPT0gTlVMTCkKKysgICAgICAgICAgYnJlYWs7CisrICAgICAgICBudW1fdHJhY2tzX2ZvdW5k Kys7CisrCisrICAgICAgICBpZiAoZ3N0X21hdHJvc2thX3JlYWRfY29tbW9uX3RyYWNrbnVtYmVy X3VuaXF1ZSAoJmRlbXV4LT5jb21tb24sCisrICAgICAgICAgICAgICAgIG5ld190cmFjay0+bnVt KSkgeworKyAgICAgICAgICBHU1RfRVJST1JfT0JKRUNUIChkZW11eCwKKysgICAgICAgICAgICAg ICJVbmV4cGVjdGVkIG5ldyBUcmFja051bWJlcjogJSIgR19HVUlOVDY0X0ZPUk1BVCwgbmV3X3Ry YWNrLT5udW0pOworKyAgICAgICAgICBnb3RvIHRyYWNrX21pc21hdGNoX2Vycm9yOworKyAgICAg ICAgfQorKworKyAgICAgICAgb2xkX3RyYWNrX2luZGV4ID0KKysgICAgICAgICAgICBnc3RfbWF0 cm9za2FfcmVhZF9jb21tb25fc3RyZWFtX2Zyb21fbnVtICgmZGVtdXgtPmNvbW1vbiwKKysgICAg ICAgICAgICBuZXdfdHJhY2stPm51bSk7CisrICAgICAgICBnX2Fzc2VydCAob2xkX3RyYWNrX2lu ZGV4ICE9IC0xKTsKKysgICAgICAgIG9sZF90cmFjayA9IGdfcHRyX2FycmF5X2luZGV4IChkZW11 eC0+Y29tbW9uLnNyYywgb2xkX3RyYWNrX2luZGV4KTsKKysKKysgICAgICAgIGlmIChvbGRfdHJh Y2stPnR5cGUgIT0gbmV3X3RyYWNrLT50eXBlKSB7CisrICAgICAgICAgIEdTVF9FUlJPUl9PQkpF Q1QgKGRlbXV4LAorKyAgICAgICAgICAgICAgIk1pc21hdGNoIHJlcGFyc2luZyB0cmFjayAlIiBH X0dVSU5UNjRfRk9STUFUCisrICAgICAgICAgICAgICAiIG9uIHRyYWNrIHR5cGUuIEV4cGVjdGVk ICVkLCBmb3VuZCAlZCIsIG5ld190cmFjay0+bnVtLAorKyAgICAgICAgICAgICAgb2xkX3RyYWNr LT50eXBlLCBuZXdfdHJhY2stPnR5cGUpOworKyAgICAgICAgICBnb3RvIHRyYWNrX21pc21hdGNo X2Vycm9yOworKyAgICAgICAgfQorKworKyAgICAgICAgaWYgKGdfc3RyY21wMCAob2xkX3RyYWNr LT5jb2RlY19pZCwgbmV3X3RyYWNrLT5jb2RlY19pZCkgIT0gMCkgeworKyAgICAgICAgICBHU1Rf RVJST1JfT0JKRUNUIChkZW11eCwKKysgICAgICAgICAgICAgICJNaXNtYXRjaCByZXBhcnNpbmcg dHJhY2sgJSIgR19HVUlOVDY0X0ZPUk1BVAorKyAgICAgICAgICAgICAgIiBvbiBjb2RlYyBpZC4g RXhwZWN0ZWQgJyVzJywgZm91bmQgJyVzJyIsIG5ld190cmFjay0+bnVtLAorKyAgICAgICAgICAg ICAgb2xkX3RyYWNrLT5jb2RlY19pZCwgbmV3X3RyYWNrLT5jb2RlY19pZCk7CisrICAgICAgICAg IGdvdG8gdHJhY2tfbWlzbWF0Y2hfZXJyb3I7CisrICAgICAgICB9CisrCisrICAgICAgICAvKiBU aGUgbmV3IHRyYWNrIG1hdGNoZXMgdGhlIG9sZCB0cmFjay4gTm8gcHJvYmxlbXMgb24gb3VyIHNp ZGUuCisrICAgICAgICAgKiBMZXQncyBtYWtlIGl0IHJlcGxhY2UgdGhlIG9sZCB0cmFjay4gKi8K KysgICAgICAgIG5ld190cmFjay0+cGFkID0gb2xkX3RyYWNrLT5wYWQ7CisrICAgICAgICBuZXdf dHJhY2stPmluZGV4ID0gb2xkX3RyYWNrLT5pbmRleDsKKysgICAgICAgIG5ld190cmFjay0+cG9z ID0gb2xkX3RyYWNrLT5wb3M7CisrICAgICAgICBnX3B0cl9hcnJheV9pbmRleCAoZGVtdXgtPmNv bW1vbi5zcmMsIG9sZF90cmFja19pbmRleCkgPSBuZXdfdHJhY2s7CisrICAgICAgICBnc3RfcGFk X3NldF9lbGVtZW50X3ByaXZhdGUgKG5ld190cmFjay0+cGFkLCBuZXdfdHJhY2spOworKworKyAg ICAgICAgaWYgKCFnc3RfY2Fwc19pc19lcXVhbCAob2xkX3RyYWNrLT5jYXBzLCBuZXdfdHJhY2st PmNhcHMpKSB7CisrICAgICAgICAgIGdzdF9wYWRfc2V0X2NhcHMgKG5ld190cmFjay0+cGFkLCBu ZXdfdHJhY2stPmNhcHMpOworKyAgICAgICAgfQorKworKyAgICAgICAgaWYgKCFnc3RfdGFnX2xp c3RfaXNfZXF1YWwgKG9sZF90cmFjay0+dGFncywgbmV3X3RyYWNrLT50YWdzKSkgeworKyAgICAg ICAgICBHU1RfREVCVUdfT0JKRUNUIChvbGRfdHJhY2stPnBhZCwgIlNlbmRpbmcgdGFncyAlcDog JSIKKysgICAgICAgICAgICAgIEdTVF9QVFJfRk9STUFULCBuZXdfdHJhY2stPnRhZ3MsIG5ld190 cmFjay0+dGFncyk7CisrICAgICAgICAgIGdzdF9wYWRfcHVzaF9ldmVudCAobmV3X3RyYWNrLT5w YWQsCisrICAgICAgICAgICAgICBnc3RfZXZlbnRfbmV3X3RhZyAoZ3N0X3RhZ19saXN0X2NvcHkg KG5ld190cmFjay0+dGFncykpKTsKKysgICAgICAgIH0KKysKKysgICAgICAgIGdzdF9tYXRyb3Nr YV90cmFja19mcmVlIChvbGRfdHJhY2spOworKyAgICAgICAgYnJlYWs7CisrCisrICAgICAgdHJh Y2tfbWlzbWF0Y2hfZXJyb3I6CisrICAgICAgICBnc3RfbWF0cm9za2FfdHJhY2tfZnJlZSAobmV3 X3RyYWNrKTsKKysgICAgICAgIG5ld190cmFjayA9IE5VTEw7CisrICAgICAgICByZXQgPSBHU1Rf RkxPV19FUlJPUjsKKysgICAgICAgIGJyZWFrOworKyAgICAgIH0KKysKKysgICAgICBkZWZhdWx0 OgorKyAgICAgICAgcmV0ID0gZ3N0X21hdHJvc2thX3JlYWRfY29tbW9uX3BhcnNlX3NraXAgKCZk ZW11eC0+Y29tbW9uLCBlYm1sLAorKyAgICAgICAgICAgICJUcmFjayIsIGlkKTsKKysgICAgICAg IGJyZWFrOworKyAgICB9CisrICB9CisrICBERUJVR19FTEVNRU5UX1NUT1AgKGRlbXV4LCBlYm1s LCAiVHJhY2tzIiwgcmV0KTsKKysKKysgIGlmIChyZXQgIT0gR1NUX0ZMT1dfRVJST1IgJiYgZGVt dXgtPmNvbW1vbi5udW1fc3RyZWFtcyAhPSBudW1fdHJhY2tzX2ZvdW5kKSB7CisrICAgIEdTVF9F UlJPUl9PQkpFQ1QgKGRlbXV4LAorKyAgICAgICAgIk1pc21hdGNoIG9uIHRoZSBudW1iZXIgb2Yg dHJhY2tzLiBFeHBlY3RlZCAlZHUgdHJhY2tzLCBmb3VuZCAlZHUiLAorKyAgICAgICAgZGVtdXgt PmNvbW1vbi5udW1fc3RyZWFtcywgbnVtX3RyYWNrc19mb3VuZCk7CisrICAgIHJldCA9IEdTVF9G TE9XX0VSUk9SOworKyAgfQorKworKyAgcmV0dXJuIHJldDsKKyt9CisrCisgLyoKKyAgKiBSZWFk IHNpZ25lZC91bnNpZ25lZCAiRUJNTCIgbnVtYmVycy4KKyAgKiBSZXR1cm46IG51bWJlciBvZiBi eXRlcyBwcm9jZXNzZWQuCitAQCAtNTAzMSwxMSArNTEzOCwxMSBAQCBnc3RfbWF0cm9za2FfZGVt dXhfcGFyc2VfaWQgKEdzdE1hdHJvc2thRGVtdXggKiBkZW11eCwgZ3VpbnQzMiBpZCwKKyAgICAg ICAgICAgfQorICAgICAgICAgICBicmVhazsKKyAgICAgICAgIGNhc2UgR1NUX01BVFJPU0tBX0lE X1RSQUNLUzoKKysgICAgICAgICAgR1NUX1JFQURfQ0hFQ0sgKGdzdF9tYXRyb3NrYV9kZW11eF90 YWtlIChkZW11eCwgcmVhZCwgJmVibWwpKTsKKyAgICAgICAgICAgaWYgKCFkZW11eC0+dHJhY2tz X3BhcnNlZCkgeworLSAgICAgICAgICAgIEdTVF9SRUFEX0NIRUNLIChnc3RfbWF0cm9za2FfZGVt dXhfdGFrZSAoZGVtdXgsIHJlYWQsICZlYm1sKSk7CisgICAgICAgICAgICAgcmV0ID0gZ3N0X21h dHJvc2thX2RlbXV4X3BhcnNlX3RyYWNrcyAoZGVtdXgsICZlYm1sKTsKKyAgICAgICAgICAgfSBl bHNlIHsKKy0gICAgICAgICAgICBHU1RfUkVBRF9DSEVDSyAoZ3N0X21hdHJvc2thX2RlbXV4X2Zs dXNoIChkZW11eCwgcmVhZCkpOworKyAgICAgICAgICAgIHJldCA9IGdzdF9tYXRyb3NrYV9kZW11 eF91cGRhdGVfdHJhY2tzIChkZW11eCwgJmVibWwpOworICAgICAgICAgICB9CisgICAgICAgICAg IGJyZWFrOworICAgICAgICAgY2FzZSBHU1RfTUFUUk9TS0FfSURfQ0xVU1RFUjoKKy0tIAorMi4x Ny4xCisKZGlmZiAtLWdpdCBhL1Rvb2xzL2dzdHJlYW1lci9wYXRjaGVzL2dzdC1wbHVnaW5zLWdv b2QtMDAxMC1tYXRyb3NrYWRlbXV4LUVtaXQtbm8tbW9yZS1wYWRzLWFmdGVyLXBhcnNpbmctVHJh Y2tzLnBhdGNoIGIvVG9vbHMvZ3N0cmVhbWVyL3BhdGNoZXMvZ3N0LXBsdWdpbnMtZ29vZC0wMDEw LW1hdHJvc2thZGVtdXgtRW1pdC1uby1tb3JlLXBhZHMtYWZ0ZXItcGFyc2luZy1UcmFja3MucGF0 Y2gKaW5kZXggYWE1ZjcwNmFjOTEuLjViMjUwMjBiZjYwIDEwMDY0NAotLS0gYS9Ub29scy9nc3Ry ZWFtZXIvcGF0Y2hlcy9nc3QtcGx1Z2lucy1nb29kLTAwMTAtbWF0cm9za2FkZW11eC1FbWl0LW5v LW1vcmUtcGFkcy1hZnRlci1wYXJzaW5nLVRyYWNrcy5wYXRjaAorKysgYi9Ub29scy9nc3RyZWFt ZXIvcGF0Y2hlcy9nc3QtcGx1Z2lucy1nb29kLTAwMTAtbWF0cm9za2FkZW11eC1FbWl0LW5vLW1v cmUtcGFkcy1hZnRlci1wYXJzaW5nLVRyYWNrcy5wYXRjaApAQCAtMzUsOSArMzUsOSBAQCBpbmRl eCA3NzE3NmZiNjIuLjY4MzM4MGJiZiAxMDA2NDQKICAgIHJldHVybiByZXQ7CiAgfQogQEAgLTUx OTYsOCArNTE5OCw2IEBAIGdzdF9tYXRyb3NrYV9kZW11eF9wYXJzZV9pZCAoR3N0TWF0cm9za2FE ZW11eCAqIGRlbXV4LCBndWludDMyIGlkLAotICAgICAgICAgICAgICAgZGVtdXgtPmNvbW1vbi5v ZmZzZXQgPSBkZW11eC0+Zmlyc3RfY2x1c3Rlcl9vZmZzZXQ7CisgICAgICAgICAgICAgICAgICAg ICBHU1RfVElNRV9BUkdTIChkZW11eC0+Y29tbW9uLnNlZ21lbnQuZHVyYXRpb24pKTsKKyAgICAg ICAgICAgICAgIH0KICAgICAgICAgICAgICB9Ci0gCiAtICAgICAgICAgICAgR1NUX0RFQlVHX09C SkVDVCAoZGVtdXgsICJzaWduYWxpbmcgbm8gbW9yZSBwYWRzIik7CiAtICAgICAgICAgICAgZ3N0 X2VsZW1lbnRfbm9fbW9yZV9wYWRzIChHU1RfRUxFTUVOVCAoZGVtdXgpKTsKICAgICAgICAgICAg ICAvKiBzZW5kIGluaXRpYWwgc2VnbWVudCAtIHdlIHdhaXQgdGlsbCB3ZSBrbm93IHRoZSBmaXJz dAo=