From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Jim Porter Newsgroups: gmane.emacs.bugs Subject: bug#71666: 30.0.50; [PATCH] Fix zooming images with SHR Date: Wed, 19 Jun 2024 21:47:26 -0700 Message-ID: <3cdca8d0-9729-d8ae-5b3a-ed9473a2bef4@gmail.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------QJlqmnJouEiSfHGX4bewtGMy" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="36358"; mail-complaints-to="usenet@ciao.gmane.io" To: 71666@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Thu Jun 20 06:48:24 2024 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1sK9ig-0009Gg-VV for geb-bug-gnu-emacs@m.gmane-mx.org; Thu, 20 Jun 2024 06:48:23 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sK9iS-0007Cb-3T; Thu, 20 Jun 2024 00:48:08 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sK9iI-0007C2-VF for bug-gnu-emacs@gnu.org; Thu, 20 Jun 2024 00:47:59 -0400 Original-Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sK9iI-0000YH-Mp for bug-gnu-emacs@gnu.org; Thu, 20 Jun 2024 00:47:58 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sK9iM-00006h-94 for bug-gnu-emacs@gnu.org; Thu, 20 Jun 2024 00:48:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Jim Porter Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 20 Jun 2024 04:48:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 71666 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.1718858866377 (code B ref -1); Thu, 20 Jun 2024 04:48:02 +0000 Original-Received: (at submit) by debbugs.gnu.org; 20 Jun 2024 04:47:46 +0000 Original-Received: from localhost ([127.0.0.1]:43119 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sK9i5-00005z-1a for submit@debbugs.gnu.org; Thu, 20 Jun 2024 00:47:46 -0400 Original-Received: from lists.gnu.org ([209.51.188.17]:52592) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sK9i2-00005o-LL for submit@debbugs.gnu.org; Thu, 20 Jun 2024 00:47:43 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sK9hw-00079e-RB for bug-gnu-emacs@gnu.org; Thu, 20 Jun 2024 00:47:37 -0400 Original-Received: from mail-pf1-x433.google.com ([2607:f8b0:4864:20::433]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sK9ht-0000RE-Kz for bug-gnu-emacs@gnu.org; Thu, 20 Jun 2024 00:47:36 -0400 Original-Received: by mail-pf1-x433.google.com with SMTP id d2e1a72fcca58-70625e8860cso405796b3a.2 for ; Wed, 19 Jun 2024 21:47:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1718858848; x=1719463648; darn=gnu.org; h=subject:from:to:content-language:mime-version:date:message-id:from :to:cc:subject:date:message-id:reply-to; bh=NuvbqBcbDOanOUycMHwLsWAc1pbPA3RRSDWxZZyh5m0=; b=DaW8OsddnkPXsuZ7hmzChyMHZrzKR6Y631xXeF5Ym7zDP/DqQ32SQCK/XL5xUJeD2k w9w6ajOPYN8SjD/fAIGccSzv7baG5f4nC2W4Qhml1qEa1ja+ffBUDrU6VqMIkekV41cf +YxR4bgnmCM9BC/SW9lcujRMY4JI4ojvsm6vPqEO+GphTiRwvhXKUt7pErxKJ0yRS7F7 FixzetesKwQFe0Zu9tMiIZjWt1REc1u9HJbTQyVztYbc6LYNK3SB+mB2kFMTb403y/yg tbI9R5qwtM3vVtLwUuaxIlxJpoFwATqi4gc/UyLXSMbFAirblqrb6pS4tpCRDNvpPPCF yrJQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718858848; x=1719463648; h=subject:from:to:content-language:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=NuvbqBcbDOanOUycMHwLsWAc1pbPA3RRSDWxZZyh5m0=; b=HU2FEJcf4a7IOLNYDH5OoTXgH0xcg1zz5wltu/+dJgQ00qMeHjvC9mIa7+CRQSgTGj rMbkgBmtWQJUKO7Da++fePctmiTJdRB7oT+qq7qf47qm6icFmWmouapD5illEWSsO6Vq vEVte5XWtQoHF/S5+qS5DbD0rrVopFATnYWFwD623LEYZUE+E946Yswne2yrfOJpAWTo m573ygXBiqBOviR2Eb9imput11+chTLZY7ah9ZZM1ntRWSazB9KozyBrX0kmLxArvwPo ct0lfMBO8SNV+ym7C7tWoFF3WrzTiz4Uo2sbpsoX9YC83+VmUmcd/cFL1OFy876M9CDs ObSg== X-Gm-Message-State: AOJu0Yy3YQkLniZHfkUFfRB98Hk7mKIx4wO3mPG5hHsGbhkJv6LKalil pb+WH5GbVhGt/cLw/8Mu/ZnAco7OTsrNE84roKC3EdB7QhKozTzhH79W4Q== X-Google-Smtp-Source: AGHT+IFTpKBukeI52Z5ORjupKVGVGRc3bE7wqzOAD5ZRxxhCEvlrfxJwyHIPEWlE1QQ3E+gyGd9B+Q== X-Received: by 2002:a05:6a00:2e05:b0:705:95ce:cfd3 with SMTP id d2e1a72fcca58-70629cf66c7mr6187789b3a.31.1718858847738; Wed, 19 Jun 2024 21:47:27 -0700 (PDT) Original-Received: from [192.168.1.2] (syn-023-240-098-037.res.spectrum.com. [23.240.98.37]) by smtp.googlemail.com with ESMTPSA id d2e1a72fcca58-705ccb8d7f9sm11433310b3a.194.2024.06.19.21.47.26 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 19 Jun 2024 21:47:27 -0700 (PDT) X-Mozilla-News-Host: news://news.gmane.io:119 Content-Language: en-US Received-SPF: pass client-ip=2607:f8b0:4864:20::433; envelope-from=jporterbugs@gmail.com; helo=mail-pf1-x433.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.bugs:287524 Archived-At: This is a multi-part message in MIME format. --------------QJlqmnJouEiSfHGX4bewtGMy Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit To reproduce this, start from "emacs -Q -f eww" and then go to fsf.org. Move point over one of the larger images on the page, like the ones that say "Featured" above them, and press Z ('shr-zoom-image'). The result is that the image is duplicated, and the first slice gets pushed up onto the previous line. Attached is a patch to fix this, with regression tests. --------------QJlqmnJouEiSfHGX4bewtGMy Content-Type: text/plain; charset=UTF-8; name="0001-Fix-zooming-images-in-SHR.patch" Content-Disposition: attachment; filename="0001-Fix-zooming-images-in-SHR.patch" Content-Transfer-Encoding: base64 RnJvbSAwOWUyNTk4MTcwMGEzNDAwMWUzZWRjYWI2ZjhjYzNlYjBhNzE1ZDEyIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBKaW0gUG9ydGVyIDxqcG9ydGVyYnVnc0BnbWFpbC5j b20+CkRhdGU6IFdlZCwgMTkgSnVuIDIwMjQgMjA6NTk6NTkgLTA3MDAKU3ViamVjdDogW1BB VENIXSBGaXggem9vbWluZyBpbWFnZXMgaW4gU0hSCgpQcmV2aW91c2x5LCBmb3IgaW1hZ2Vz IHdpdGggbm8gYWx0LXRleHQsIHRoZSB6b29tZWQgaW1hZ2Ugd291bGRuJ3QgZ2V0CnByb3Bl cmx5IGluc2VydGVkLiAgRm9yIGltYWdlcyB3aXRoIGFsdC10ZXh0LCBib3RoIHRoZSB6b29t ZWQgYW5kCnVuem9vbWVkIGltYWdlIHdvdWxkIGJlIGRpc3BsYXllZCBhdCBvbmNlLgoKKiBs aXNwL25ldC9zaHIuZWwgKHNoci16b29tLWltYWdlKTogUmVpbXBsZW1lbnQgdXNpbmcKJ25l eHQvcHJldmlvdXMtc2luZ2xlLXByb3BlcnR5LWNoYW5nZScsIGFuZCBkb24ndCBib3RoZXIg ZGVsZXRpbmcgYW55IG9mCnRoZSB0ZXh0Lgooc2hyLWltYWdlLWZldGNoZWQpOiBEb24ndCBn aXZlIHNsaWNlZCBpbWFnZXMgYSBmYWNlLgooc2hyLXB1dC1pbWFnZSk6IEVuc3VyZSB3ZSBh bHdheXMgaGF2ZSBhIG5vbi1lbXB0eSBzdHJpbmcgdG8gcHV0IHRoZQppbWFnZSBvbi4gIEZv ciBzbGljZWQgaW1hZ2VzLCBqdXN0IHVzZSAiKiIsIHNpbmNlIHdlJ2xsIHJlcGVhdCBpdCwg c28gd2UKY2FuJ3QgcHJlc2VydmUgdGhlIG9yaWdpbmFsIGJ1ZmZlciB0ZXh0IGV4YWN0bHkg YW55d2F5Lgooc2hyLXRhZy1pbWcpOiBNb3ZlIHRoZSBwbGFjZWhvbGRlciBzcGFjZSBpbnNl cnRpb24gd2hlcmUgaXQgc2hvdWxkIGJlCmFuZCBleHBsYWluIHdoYXQgaXQncyBkb2luZy4K CiogdGVzdC9saXNwL25ldC9zaHItdGVzdHMuZWwgKHNoci10ZXN0LS1tYXgtd2FpdC10aW1l KQooc2hyLXRlc3Qtd2FpdC1mb3IpOiBOZXcgaGVscGVyIGZ1bmN0aW9ucy4KKHNoci10ZXN0 L3pvb20taW1hZ2UpOiBOZXcgdGVzdC4KLS0tCiBsaXNwL25ldC9zaHIuZWwgICAgICAgICAg ICB8IDk4ICsrKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tCiB0ZXN0L2xp c3AvbmV0L3Noci10ZXN0cy5lbCB8IDU4ICsrKysrKysrKysrKysrKysrKysrKysKIDIgZmls ZXMgY2hhbmdlZCwgMTA5IGluc2VydGlvbnMoKyksIDQ3IGRlbGV0aW9ucygtKQoKZGlmZiAt LWdpdCBhL2xpc3AvbmV0L3Noci5lbCBiL2xpc3AvbmV0L3Noci5lbAppbmRleCAxNGIzZjdh YTE2My4uYTkyNTI2YTllNGUgMTAwNjQ0Ci0tLSBhL2xpc3AvbmV0L3Noci5lbAorKysgYi9s aXNwL25ldC9zaHIuZWwKQEAgLTYwMCwzOCArNjAwLDM0IEBAIHNoci1pbnNlcnQtaW1hZ2UK IAkJICAgIHQpKSkpCiAKIChkZWZ1biBzaHItem9vbS1pbWFnZSAoKQotICAiVG9nZ2xlIHRo ZSBpbWFnZSBzaXplLgotVGhlIHNpemUgd2lsbCBiZSByb3RhdGVkIGJldHdlZW4gdGhlIGRl ZmF1bHQgc2l6ZSwgdGhlIG9yaWdpbmFsCi1zaXplLCBhbmQgZnVsbC1idWZmZXIgc2l6ZS4i CisgICJDeWNsZSB0aGUgaW1hZ2Ugc2l6ZS4KK1RoZSBzaXplIHdpbGwgY3ljbGUgdGhyb3Vn aCB0aGUgZGVmYXVsdCBzaXplLCB0aGUgb3JpZ2luYWwgc2l6ZSwgYW5kCitmdWxsLWJ1ZmZl ciBzaXplLiIKICAgKGludGVyYWN0aXZlKQotICAobGV0ICgodXJsIChnZXQtdGV4dC1wcm9w ZXJ0eSAocG9pbnQpICdpbWFnZS11cmwpKQotCShzaXplIChnZXQtdGV4dC1wcm9wZXJ0eSAo cG9pbnQpICdpbWFnZS1zaXplKSkKLQkoYnVmZmVyLXJlYWQtb25seSBuaWwpKQorICAobGV0 ICgodXJsIChnZXQtdGV4dC1wcm9wZXJ0eSAocG9pbnQpICdpbWFnZS11cmwpKSkKICAgICAo aWYgKG5vdCB1cmwpCiAJKG1lc3NhZ2UgIk5vIGltYWdlIHVuZGVyIHBvaW50IikKLSAgICAg IDs7IERlbGV0ZSB0aGUgb2xkIHBpY3R1cmUuCi0gICAgICAod2hpbGUgKGdldC10ZXh0LXBy b3BlcnR5IChwb2ludCkgJ2ltYWdlLXVybCkKLQkoZm9yd2FyZC1jaGFyIC0xKSkKLSAgICAg IChmb3J3YXJkLWNoYXIgMSkKLSAgICAgIChsZXQgKChzdGFydCAocG9pbnQpKSkKLQkod2hp bGUgKGdldC10ZXh0LXByb3BlcnR5IChwb2ludCkgJ2ltYWdlLXVybCkKLQkgIChmb3J3YXJk LWNoYXIgMSkpCi0JKGZvcndhcmQtY2hhciAtMSkKLQkocHV0LXRleHQtcHJvcGVydHkgc3Rh cnQgKHBvaW50KSAnZGlzcGxheSBuaWwpCi0JKHdoZW4gKD4gKC0gKHBvaW50KSBzdGFydCkg MikKLQkgIChkZWxldGUtcmVnaW9uIHN0YXJ0ICgxLSAocG9pbnQpKSkpKQotICAgICAgKG1l c3NhZ2UgIkluc2VydGluZyAlcy4uLiIgdXJsKQotICAgICAgKHVybC1yZXRyaWV2ZSB1cmwg IydzaHItaW1hZ2UtZmV0Y2hlZAotCQkgICAgKGxpc3QgKGN1cnJlbnQtYnVmZmVyKSAoMS0g KHBvaW50KSkgKHBvaW50LW1hcmtlcikKLQkJCSAgKGxpc3QgKGNvbnMgJ3NpemUKLQkJCQkg ICAgICAoY29uZCAoKG9yIChlcSBzaXplICdkZWZhdWx0KQotCQkJCQkJIChudWxsIHNpemUp KQotCQkJCQkgICAgICdvcmlnaW5hbCkKLQkJCQkJICAgICgoZXEgc2l6ZSAnb3JpZ2luYWwp Ci0JCQkJCSAgICAgJ2Z1bGwpCi0JCQkJCSAgICAoKGVxIHNpemUgJ2Z1bGwpCi0JCQkJCSAg ICAgJ2RlZmF1bHQpKSkpKQotCQkgICAgdCkpKSkKKyAgICAgIChsZXQqICgoZW5kIChvciAo bmV4dC1zaW5nbGUtcHJvcGVydHktY2hhbmdlIChwb2ludCkgJ2ltYWdlLXVybCkKKyAgICAg ICAgICAgICAgICAgICAgICAocG9pbnQtbWF4KSkpCisgICAgICAgICAgICAgKHN0YXJ0IChv ciAocHJldmlvdXMtc2luZ2xlLXByb3BlcnR5LWNoYW5nZSBlbmQgJ2ltYWdlLXVybCkKKyAg ICAgICAgICAgICAgICAgICAgICAgIChwb2ludC1taW4pKSkKKyAgICAgICAgICAgICAoc2l6 ZSAoZ2V0LXRleHQtcHJvcGVydHkgKHBvaW50KSAnaW1hZ2Utc2l6ZSkpCisgICAgICAgICAg ICAgKG5leHQtc2l6ZSAoY29uZCAoKG9yIChlcSBzaXplICdkZWZhdWx0KQorICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAobnVsbCBzaXplKSkKKyAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAnb3JpZ2luYWwpCisgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAoKGVxIHNpemUgJ29yaWdpbmFsKQorICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICdmdWxsKQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKChlcSBzaXplICdm dWxsKQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICdkZWZhdWx0KSkpCisgICAg ICAgICAgICAgKGJ1ZmZlci1yZWFkLW9ubHkgbmlsKSkKKyAgICAgICAgOzsgRGVsZXRlIHRo ZSBvbGQgcGljdHVyZS4KKyAgICAgICAgKHB1dC10ZXh0LXByb3BlcnR5IHN0YXJ0IGVuZCAn ZGlzcGxheSBuaWwpCisgICAgICAgIChtZXNzYWdlICJJbnNlcnRpbmcgJXMuLi4iIHVybCkK KyAgICAgICAgKHVybC1yZXRyaWV2ZSB1cmwgIydzaHItaW1hZ2UtZmV0Y2hlZAorICAgICAg ICAgICAgICAgICAgICAgIGAoLChjdXJyZW50LWJ1ZmZlcikgLHN0YXJ0CisgICAgICAgICAg ICAgICAgICAgICAgICAsKHNldC1tYXJrZXIgKG1ha2UtbWFya2VyKSBlbmQpCisgICAgICAg ICAgICAgICAgICAgICAgICAoKHNpemUgLiAsbmV4dC1zaXplKSkpCisgICAgICAgICAgICAg ICAgICAgICAgdCkpKSkpCiAKIDs7OyBVdGlsaXR5IGZ1bmN0aW9ucy4KIApAQCAtMTA3Mywx MSArMTA2OSwxOSBAQCBzaHItaW1hZ2UtZmV0Y2hlZAogCQkgIChkZWxldGUtcmVnaW9uIHN0 YXJ0IGVuZCkKIAkJICAoZ290by1jaGFyIHN0YXJ0KQogCQkgIChmdW5jYWxsIHNoci1wdXQt aW1hZ2UtZnVuY3Rpb24gZGF0YSBhbHQgZmxhZ3MpCi0JCSAgKHdoaWxlIHByb3BlcnRpZXMK LQkJICAgIChsZXQgKCh0eXBlIChwb3AgcHJvcGVydGllcykpCi0JCQkgICh2YWx1ZSAocG9w IHByb3BlcnRpZXMpKSkKLQkJICAgICAgKHVubGVzcyAobWVtcSB0eXBlICcoZGlzcGxheSBp bWFnZS1zaXplKSkKLQkJCShwdXQtdGV4dC1wcm9wZXJ0eSBzdGFydCAocG9pbnQpIHR5cGUg dmFsdWUpKSkpKSkpKSkpKQorICAgICAgICAgICAgICAgICAgKGxldCAoKHNsaWNlZC1pbWFn ZSAoYXNzcSAnc2xpY2UgKGdldC10ZXh0LXByb3BlcnR5CisgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgc3RhcnQgJ2Rpc3BsYXkpKSkpCisg ICAgICAgICAgICAgICAgICAgICh3aGlsZSBwcm9wZXJ0aWVzCisgICAgICAgICAgICAgICAg ICAgICAgKGxldCAoKHR5cGUgKHBvcCBwcm9wZXJ0aWVzKSkKKyAgICAgICAgICAgICAgICAg ICAgICAgICAgICAodmFsdWUgKHBvcCBwcm9wZXJ0aWVzKSkpCisgICAgICAgICAgICAgICAg ICAgICAgICAodW5sZXNzIChvciAobWVtcSB0eXBlICcoZGlzcGxheSBpbWFnZS1zaXplKSkK KyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIDs7IFNsaWNlZCBpbWFnZXMg c2hvdWxkbid0IGhhdmUgYQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg OzsgZmFjZTsgaWYgdGhlIGltYWdlcyBpcyBhIGxpbmssCisgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICA7OyB3ZSdkIGdldCB1bmRlcmxpbmVzIG9uIGV2ZXJ5CisgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICA7OyBzbGljZSEKKyAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIChhbmQgc2xpY2VkLWltYWdlIChlcSB0eXBlICdm YWNlKSkpCisgICAgICAgICAgICAgICAgICAgICAgICAgIChwdXQtdGV4dC1wcm9wZXJ0eQor ICAgICAgICAgICAgICAgICAgICAgICAgICAgc3RhcnQgKHBvaW50KSB0eXBlIHZhbHVlKSkp KSkpKSkpKSkpCiAgICAgKGtpbGwtYnVmZmVyIGltYWdlLWJ1ZmZlcikpKQogCiAoZGVmdW4g c2hyLWltYWdlLWZyb20tZGF0YSAoZGF0YSkKQEAgLTExNDQsNyArMTE0OCw4IEBAIHNoci1w dXQtaW1hZ2UKICAgICAgICAgICA7OyBwdXR0aW5nIGFueSBzcGFjZSBhZnRlciBpbmxpbmUg aW1hZ2VzLgogICAgICAgICAgIDs7IEFMVCBtYXkgYmUgbmlsIHdoZW4gdmlzaXRpbmcgaW1h Z2UgVVJMcyBpbiBld3cKICAgICAgICAgICA7OyAoYnVnIzY3NzY0KS4KLQkgIChzZXRxIGFs dCAoaWYgYWx0IChzdHJpbmctdHJpbSBhbHQpICIqIikpCisgICAgICAgICAgKHNldHEgYWx0 IChzdHJpbmctdHJpbSAob3IgYWx0ICIiKSkpCisgICAgICAgICAgKHdoZW4gKGxlbmd0aD0g YWx0IDApIChzZXRxIGFsdCAiKiIpKQogCSAgOzsgV2hlbiBpbnNlcnRpbmcgYmlnLWlzaCBw aWN0dXJlcywgcHV0IHRoZW0gYXQgdGhlCiAJICA7OyBiZWdpbm5pbmcgb2YgdGhlIGxpbmUu CiAJICAobGV0ICgoaW5saW5lIChzaHItLWlubGluZS1pbWFnZS1wIGltYWdlKSkpCkBAIC0x MTUzLDcgKzExNTgsMTEgQEAgc2hyLXB1dC1pbWFnZQogCQkoaW5zZXJ0ICJcbiIpKQogCSAg ICAobGV0ICgoaW1hZ2UtcG9zIChwb2ludCkpKQogCSAgICAgIChpZiAoZXEgc2l6ZSAnb3Jp Z2luYWwpCi0JCSAgKGluc2VydC1zbGljZWQtaW1hZ2UgaW1hZ2UgYWx0IG5pbCAyMCAxKQor ICAgICAgICAgICAgICAgICAgOzsgTm9ybWFsbHksIHdlIHRyeSB0byBrZWVwIHRoZSBidWZm ZXIgdGV4dCB0aGUgc2FtZQorICAgICAgICAgICAgICAgICAgOzsgYnkgcHJlc2VydmluZyBB TFQuICBXaXRoIGEgc2xpY2VkIGltYWdlLCB3ZSBoYXZlIHRvCisgICAgICAgICAgICAgICAg ICA7OyByZXBlYXQgdGhlIHRleHQgZm9yIGVhY2ggbGluZSwgc28gd2UgY2FuJ3QgZG8gdGhh dC4KKyAgICAgICAgICAgICAgICAgIDs7IEp1c3QgdXNlICIqIiBmb3IgdGhlIHN0cmluZyB0 byBpbnNlcnQgaW5zdGVhZC4KKyAgICAgICAgICAgICAgICAgIChpbnNlcnQtc2xpY2VkLWlt YWdlIGltYWdlICIqIiBuaWwgMjAgMSkKIAkJKGluc2VydC1pbWFnZSBpbWFnZSBhbHQpKQog CSAgICAgIChwdXQtdGV4dC1wcm9wZXJ0eSBzdGFydCAocG9pbnQpICdpbWFnZS1zaXplIHNp emUpCiAJICAgICAgKHdoZW4gKGFuZCAobm90IGlubGluZSkgc2hyLW1heC1pbmxpbmUtaW1h Z2Utc2l6ZSkKQEAgLTE4NTQsMTcgKzE4NjMsMTIgQEAgc2hyLXRhZy1pbWcKIAkgICAgKGxl dCAoKGZpbGUgKHVybC1jYWNoZS1jcmVhdGUtZmlsZW5hbWUgdXJsKSkpCiAJICAgICAgKHdo ZW4gKGZpbGUtZXhpc3RzLXAgZmlsZSkKIAkJKGRlbGV0ZS1maWxlIGZpbGUpKSkpCi0gICAg ICAgICAgKHdoZW4gKGltYWdlLXR5cGUtYXZhaWxhYmxlLXAgJ3N2ZykKLSAgICAgICAgICAg IChpbnNlcnQtaW1hZ2UKLSAgICAgICAgICAgICAoc2hyLW1ha2UtcGxhY2Vob2xkZXItaW1h Z2UgZG9tKQotICAgICAgICAgICAgIChvciAoc3RyaW5nLXRyaW0gYWx0KSAiIikpKQotCSAg OzsgUGFyYWRveGljYWxseSB0aGlzIHNwYWNlIGNhdXNlcyBzaHIgbm90IHRvIGluc2VydCBz cGFjZXMgYWZ0ZXIKLQkgIDs7IGlubGluZSBpbWFnZXMuIFNpbmNlIHRoZSBpbWFnZSBpcyB0 ZW1wb3JhcnkgaXQgc2VlbSBsaWtlIHRoZXJlCi0JICA7OyBzaG91bGQgYmUgbm8gZG93bnNp ZGUgdG8gbm90IGluc2VydGluZyBpdCBidXQgc2luY2UgSSBkb24ndAotCSAgOzsgdW5kZXJz dGFuZCB0aGUgY29kZSB3ZWxsIGFuZCBmb3IgdGhlIHNha2Ugb2YgYmFja3dhcmQgY29tcGF0 aWJpbGl0eQotCSAgOzsgd2UgcHJlc2VydmUgaXQgdW5sZXNzIHVzZXIgaGFzIHNldCBgc2hy LW1heC1pbmxpbmUtaW1hZ2Utc2l6ZScuCi0gICAgICAgICAgKHVubGVzcyBzaHItbWF4LWlu bGluZS1pbWFnZS1zaXplCi0JICAgICAgKGluc2VydCAiICIpKQorICAgICAgICAgIChpZiAo aW1hZ2UtdHlwZS1hdmFpbGFibGUtcCAnc3ZnKQorICAgICAgICAgICAgICAoaW5zZXJ0LWlt YWdlCisgICAgICAgICAgICAgICAoc2hyLW1ha2UtcGxhY2Vob2xkZXItaW1hZ2UgZG9tKQor ICAgICAgICAgICAgICAgKG9yIChzdHJpbmctdHJpbSBhbHQpICIiKSkKKyAgICAgICAgICAg IDs7IE5vIFNWRyBzdXBwb3J0LiAgSnVzdCB1c2UgYSBzcGFjZSBhcyBvdXIgcGxhY2Vob2xk ZXIuCisgICAgICAgICAgICAoaW5zZXJ0ICIgIikpCiAJICAodXJsLXF1ZXVlLXJldHJpZXZl CiAgICAgICAgICAgIHVybCAjJ3Noci1pbWFnZS1mZXRjaGVkCiAJICAgKGxpc3QgKGN1cnJl bnQtYnVmZmVyKSBzdGFydCAoc2V0LW1hcmtlciAobWFrZS1tYXJrZXIpIChwb2ludCkpCmRp ZmYgLS1naXQgYS90ZXN0L2xpc3AvbmV0L3Noci10ZXN0cy5lbCBiL3Rlc3QvbGlzcC9uZXQv c2hyLXRlc3RzLmVsCmluZGV4IDE3MTM4MDUzNDUwLi44NGQwMzA1OGRjOCAxMDA2NDQKLS0t IGEvdGVzdC9saXNwL25ldC9zaHItdGVzdHMuZWwKKysrIGIvdGVzdC9saXNwL25ldC9zaHIt dGVzdHMuZWwKQEAgLTI5LDYgKzI5LDIyIEBACiAKIChkZWNsYXJlLWZ1bmN0aW9uIGxpYnht bC1wYXJzZS1odG1sLXJlZ2lvbiAieG1sLmMiKQogCisoZGVmdmFyIHNoci10ZXN0LS1tYXgt d2FpdC10aW1lIDUKKyAgIlRoZSBtYXhpbXVtIGFtb3VudCBvZiB0aW1lIHRvIHdhaXQgZm9y IGEgY29uZGl0aW9uIHRvIHJlc29sdmUsIGluIHNlY29uZHMuCitTZWUgYHNoci10ZXN0LXdh aXQtZm9yJy4iKQorCisoZGVmdW4gc2hyLXRlc3Qtd2FpdC1mb3IgKHByZWRpY2F0ZSAmb3B0 aW9uYWwgbWVzc2FnZSkKKyAgIldhaXQgdW50aWwgUFJFRElDQVRFIHJldHVybnMgbm9uLW5p bC4KK0lmIHRoaXMgdGFrZXMgbG9uZ2VyIHRoYW4gYHNoci10ZXN0LS1tYXgtd2FpdC10aW1l JywgcmFpc2UgYW4gZXJyb3IuCitNRVNTQUdFIGlzIGFuIG9wdGlvbmFsIG1lc3NhZ2UgdG8g dXNlIGlmIHRoaXMgdGltZXMgb3V0LiIKKyAgKGxldCAoKHN0YXJ0IChjdXJyZW50LXRpbWUp KQorICAgICAgICAobWVzc2FnZSAob3IgbWVzc2FnZSAidGltZWQgb3V0IHdhaXRpbmcgZm9y IGNvbmRpdGlvbiIpKSkKKyAgICAod2hpbGUgKG5vdCAoZnVuY2FsbCBwcmVkaWNhdGUpKQor ICAgICAgKHdoZW4gKD4gKGZsb2F0LXRpbWUgKHRpbWUtc2luY2Ugc3RhcnQpKQorICAgICAg ICAgICAgICAgc2hyLXRlc3QtLW1heC13YWl0LXRpbWUpCisgICAgICAgIChlcnJvciBtZXNz YWdlKSkKKyAgICAgIChzaXQtZm9yIDAuMSkpKSkKKwogKGRlZnVuIHNoci10ZXN0LS1yZW5k ZXJpbmctY2hlY2sgKG5hbWUgJm9wdGlvbmFsIGNvbnRleHQpCiAgICJSZW5kZXIgTkFNRS5o dG1sIGFuZCBjb21wYXJlIGl0IHRvIE5BTUUudHh0LgogUmFpc2UgYSB0ZXN0IGZhaWx1cmUg aWYgdGhlIHJlbmRlcmVkIGJ1ZmZlciBkb2VzIG5vdCBtYXRjaCBOQU1FLnR4dC4KQEAgLTY4 LDYgKzg0LDggQEAgc2hyLXRlc3QtLXJlbmRlcmluZy1leHRyYS1jb25maWdzCiBUaGUgYHJl bmRlcmluZycgdGVzdGNhc2Ugd2lsbCB0ZXN0IE5BTUUgb25jZSB3aXRob3V0IGFsdGVyaW5n IGFueQogc2V0dGluZ3MsIHRoZW4gb25jZSBtb3JlIGZvciBlYWNoIChPUFRJT04gLiBWQUxV RSkgcGFpci4iKQogCis7OzsgVGVzdHM6CisKIChlcnQtZGVmdGVzdCByZW5kZXJpbmcgKCkK ICAgKHNraXAtdW5sZXNzIChmYm91bmRwICdsaWJ4bWwtcGFyc2UtaHRtbC1yZWdpb24pKQog ICAoZG9saXN0IChmaWxlIChkaXJlY3RvcnktZmlsZXMgKGVydC1yZXNvdXJjZS1kaXJlY3Rv cnkpIG5pbCAiXFwuaHRtbFxcJyIpKQpAQCAtMTE0LDYgKzEzMiw0NiBAQCBzaHItc3Jjc2V0 CiAgIChzaG91bGQgKGVxdWFsIChzaHItLXBhcnNlLXNyY3NldCAiaHR0cHM6Ly9leGFtcGxl Lm9yZy8xLDJcblxuIDEwdyAsIGh0dHBzOi8vZXhhbXBsZS5vcmcvMiAyMHcgICAgICAiKQog CSAgICAgICAgICcoKCJodHRwczovL2V4YW1wbGUub3JnLzIiIDIwKSAoImh0dHBzOi8vZXhh bXBsZS5vcmcvMSwyIiAxMCkpKSkpCiAKKyhlcnQtZGVmdGVzdCBzaHItdGVzdC96b29tLWlt YWdlICgpCisgICJUZXN0IHRoYXQgYHNoci16b29tLWltYWdlJyBwcm9wZXJseSByZXBsYWNl cyB0aGUgb3JpZ2luYWwgaW1hZ2UuIgorICAobGV0ICgoaW1hZ2UgKGV4cGFuZC1maWxlLW5h bWUgImRhdGEvaW1hZ2UvYmxhbmstMTAweDIwMC5wbmciCisgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAoZ2V0ZW52ICJFTUFDU19URVNUX0RJUkVDVE9SWSIpKSkpCisgICAg KGRvbGlzdCAoYWx0ICcobmlsICIiICJub3RoaW5nIHRvIHNlZSBoZXJlIikpCisgICAgICAo d2l0aC10ZW1wLWJ1ZmZlcgorICAgICAgICAoZXJ0LWluZm8gKChmb3JtYXQgImltYWdlIHdp dGggYWx0PSVTIiBhbHQpKQorICAgICAgICAgIChsZXQgKChhdHRycyAoaWYgYWx0IChmb3Jt YXQgIiBhbHQ9XCIlc1wiIiBhbHQpICIiKSkpCisgICAgICAgICAgICAoaW5zZXJ0IChmb3Jt YXQgIjxpbWcgc3JjPVwiZmlsZTovLyVzXCIgJXMiIGltYWdlIGF0dHJzKSkpCisgICAgICAg ICAgKGNsLWxldGYqICg7OyBQcmV0ZW5kIHdlJ3JlIGEgZ3JhcGhpY2FsIGRpc3BsYXkuCisg ICAgICAgICAgICAgICAgICAgICAoKHN5bWJvbC1mdW5jdGlvbiAnZGlzcGxheS1ncmFwaGlj LXApICMnYWx3YXlzKQorICAgICAgICAgICAgICAgICAgICAgKChzeW1ib2wtZnVuY3Rpb24g J3VybC1xdWV1ZS1yZXRyaWV2ZSkKKyAgICAgICAgICAgICAgICAgICAgICAobGFtYmRhICgm cmVzdCBhcmdzKQorICAgICAgICAgICAgICAgICAgICAgICAgKGFwcGx5ICMncnVuLWF0LXRp bWUgMCBuaWwgIyd1cmwtcmV0cmlldmUgYXJncykpKQorICAgICAgICAgICAgICAgICAgICAg KHB1dC1pbWFnZS1jYWxscyAwKQorICAgICAgICAgICAgICAgICAgICAgKHNoci1wdXQtaW1h Z2UtZnVuY3Rpb24KKyAgICAgICAgICAgICAgICAgICAgICAobGFtYmRhICgmcmVzdCBhcmdz KQorICAgICAgICAgICAgICAgICAgICAgICAgKGNsLWluY2YgcHV0LWltYWdlLWNhbGxzKQor ICAgICAgICAgICAgICAgICAgICAgICAgKGFwcGx5ICMnc2hyLXB1dC1pbWFnZSBhcmdzKSkp CisgICAgICAgICAgICAgICAgICAgICAoc2hyLXdpZHRoIDgwKQorICAgICAgICAgICAgICAg ICAgICAgKHNoci11c2UtZm9udHMgbmlsKQorICAgICAgICAgICAgICAgICAgICAgKHNoci1p bWFnZS1hbmltYXRlIG5pbCkKKyAgICAgICAgICAgICAgICAgICAgIChkb20gKGxpYnhtbC1w YXJzZS1odG1sLXJlZ2lvbiAocG9pbnQtbWluKSAocG9pbnQtbWF4KSkpKQorICAgICAgICAg ICAgOzsgUmVuZGVyIHRoZSBkb2N1bWVudC4KKyAgICAgICAgICAgIChlcmFzZS1idWZmZXIp CisgICAgICAgICAgICAoc2hyLWluc2VydC1kb2N1bWVudCBkb20pCisgICAgICAgICAgICAo c2hyLXRlc3Qtd2FpdC1mb3IgKGxhbWJkYSAoKSAoPSBwdXQtaW1hZ2UtY2FsbHMgMSkpKQor ICAgICAgICAgICAgOzsgTm93IHpvb20gdGhlIGltYWdlLgorICAgICAgICAgICAgKGdvdG8t Y2hhciAocG9pbnQtbWluKSkKKyAgICAgICAgICAgIChzaHItem9vbS1pbWFnZSkKKyAgICAg ICAgICAgIChzaHItdGVzdC13YWl0LWZvciAobGFtYmRhICgpICg9IHB1dC1pbWFnZS1jYWxs cyAyKSkpCisgICAgICAgICAgICA7OyBDaGVjayB0aGF0IHdlIGdvdCBhIHNsaWNlZCBpbWFn ZS4KKyAgICAgICAgICAgIChsZXQgKChzbGljZS1jb3VudCAwKSkKKyAgICAgICAgICAgICAg KGdvdG8tY2hhciAocG9pbnQtbWluKSkKKyAgICAgICAgICAgICAgKHdoaWxlLWxldCAoKHBv cyAobmV4dC1zaW5nbGUtcHJvcGVydHktY2hhbmdlIChwb2ludCkgJ2Rpc3BsYXkpKSkKKyAg ICAgICAgICAgICAgICAod2hlbi1sZXQgKChkaXNwbGF5IChnZXQtdGV4dC1wcm9wZXJ0eSBw b3MgJ2Rpc3BsYXkpKSkKKyAgICAgICAgICAgICAgICAgIChjbC1pbmNmIHNsaWNlLWNvdW50 KSkKKyAgICAgICAgICAgICAgICAoZ290by1jaGFyIHBvcykpCisgICAgICAgICAgICAgIChz aG91bGQgKD4gc2xpY2UtY291bnQgMSkpKSkpKSkpKQorCiAocmVxdWlyZSAnc2hyKQogCiA7 Ozsgc2hyLXRlc3RzLmVsIGVuZHMgaGVyZQotLSAKMi4yNS4xCgo= --------------QJlqmnJouEiSfHGX4bewtGMy--