From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Trevor Murphy Newsgroups: gmane.emacs.bugs Subject: bug#73862: [PATCH] Add `header-line-active` and `header-line-inactive` faces. Date: Sun, 10 Nov 2024 22:11:30 -0800 Message-ID: References: <87y12lo9hb.fsf@gmail.com> <86a5epakma.fsf@gnu.org> <86ttcgn3ww.fsf@gnu.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="000000000000aaccda06269cfbec" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="38928"; mail-complaints-to="usenet@ciao.gmane.io" Cc: 73862@debbugs.gnu.org To: Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Mon Nov 11 07:14:25 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 1tANgu-000A0J-M0 for geb-bug-gnu-emacs@m.gmane-mx.org; Mon, 11 Nov 2024 07:14:24 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tANgc-0000rc-Lm; Mon, 11 Nov 2024 01:14:06 -0500 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 1tANgY-0000rF-EQ for bug-gnu-emacs@gnu.org; Mon, 11 Nov 2024 01:14:02 -0500 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 1tANgY-0006Ch-5c for bug-gnu-emacs@gnu.org; Mon, 11 Nov 2024 01:14:02 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=Date:From:In-Reply-To:References:MIME-Version:To:Subject; bh=qAQvK2+KRgZ4Cdew6AHKsO7sT6NF0tsKHS0HZxxzWA8=; b=VdDGPPJsVbanb5HJGGzbdPysfNcyCDR4ZUfU57sn+giXo0+F/OgrCxPjuEHx64MSZJQNphJIps1fL/IPDpyguNMl1nZadsQIKSrOemVk49vua4VVMs4vPmTSbHkfdFZdeqaiElvwMs0raDWz8ZVMMTwVzOmbUsB3H+8XcBEiezLzsga2ftFQ/1+gPY1QrHOoSKrISDYfOs9IVPCyLMbkVcyCWmVLaOhGgBaGJouWzroiBllw99+XdjU29NrUrnngIBfwnRoswX3Su3X3A2qe+erVfvP2NWjzy6UpJxp77Az2c8C4+mrYMMFaJRdtl+RP51bP4xahkJzxnsOSEbhmYw==; Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tANgY-0005LJ-09 for bug-gnu-emacs@gnu.org; Mon, 11 Nov 2024 01:14:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Trevor Murphy Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 11 Nov 2024 06:14:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 73862 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 73862-submit@debbugs.gnu.org id=B73862.173130560420468 (code B ref 73862); Mon, 11 Nov 2024 06:14:01 +0000 Original-Received: (at 73862) by debbugs.gnu.org; 11 Nov 2024 06:13:24 +0000 Original-Received: from localhost ([127.0.0.1]:57564 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tANfv-0005K3-Gz for submit@debbugs.gnu.org; Mon, 11 Nov 2024 01:13:24 -0500 Original-Received: from mail-ed1-f50.google.com ([209.85.208.50]:59821) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tANfs-0005Ju-93 for 73862@debbugs.gnu.org; Mon, 11 Nov 2024 01:13:21 -0500 Original-Received: by mail-ed1-f50.google.com with SMTP id 4fb4d7f45d1cf-5c9388a00cfso5340455a12.3 for <73862@debbugs.gnu.org>; Sun, 10 Nov 2024 22:13:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1731305539; x=1731910339; darn=debbugs.gnu.org; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=7BEm9KNQLPWXydwA58fDUwony8D5/3BerctP2Ltd+Fo=; b=BTSyKjWyndy4r1wKd7bcnVZYrlpO4kwe1ZK3c2cgi45Hgkb19chb4Pank6CCilsFDX QZACam0IFvDgSxfgnchgw3P3Z+z5wC+h+I5obr27OJuAYh53d7+fXG8kQqeznrEz5v5L I3SDQ60UQu5d9qpdJt0DTa8JlOUj+cO4ujf72KWWaPdSEm7ccW0UtipOUHI4yCT+zgpg efVDiw3n4kL/QVBl52iXpD6iWRDt4DQJ4gfCGKcqMfO05gOyrCxZGKXaKE2LAqkbxlk/ qth0AaiNEP/MldXqRnvq3TtgXv7ucoXpRq9LILYteTk7+JiECYeU9Ms1wgsQN9nHlTy1 A8Gw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1731305539; x=1731910339; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=7BEm9KNQLPWXydwA58fDUwony8D5/3BerctP2Ltd+Fo=; b=jy934AnWIfVVfiepXRAoke26YzQqougOWm7lpBuO4E3KdySnikGvO17qzh5zWyZBxA zgbTMfjhVk03NItStSyBwOaIg5HYQF96GPjkqXu5jrcN21+E1U17gQLY3tZc9Ja9/WlZ vd/x5SJoFWWKIYiMZqnYjA8AzcreQO4ASEX6ca6hko/g8kjP8V7nP+GDZH7NMXMMB9BL WOD+jGFk6uQpIt7kix2u2LsxCAf6PA9S+Uhr638U4Kr1bMpQ+VkEX/nZCuGxsNiTORKg 8mACFp+rWemtI3fA1CfWnsz7RzKZQKqz62La6Replh1JN/E5Oqiv1tQW3Hx1T4ctxNyM VS7A== X-Gm-Message-State: AOJu0Yw20IzODqXu+rXgcPkX2wn4GPXPIGfQbXGoSogpLCxHHyf1kq8S s9P6ikY40iV/+YrqC6mm4t8kS2CYmRF8retdGQWkNlvVvHguOkWtpLMUcTsraD9IFpFjbWV3V6L K7eRbiVirjnO6eyhUPootSs+uzF1k8zPA X-Google-Smtp-Source: AGHT+IE8D9ypNWU5NH4ZlwqvYASCfEmH5xsCgallvcqUyhlVpCDh2B1+82qwObtzDIBl4D4eOpn7oe4nq+ohfzqSECw= X-Received: by 2002:a05:6402:40d2:b0:5cf:9e5:7d1a with SMTP id 4fb4d7f45d1cf-5cf0a2fad8emr8509224a12.1.1731305539249; Sun, 10 Nov 2024 22:12:19 -0800 (PST) In-Reply-To: <86ttcgn3ww.fsf@gnu.org> 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:295216 Archived-At: --000000000000aaccda06269cfbec Content-Type: multipart/alternative; boundary="000000000000aaccd006269cfbea" --000000000000aaccd006269cfbea Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Hi! Thanks for your patience, attached please find the updated patch. I've added documentation and a NEWS entry modeled off of similar commits. When I put together the original patch I included a non-trivial value for the default header-line-inactive (copied from mode-line-inactive) as a visual indicator for the new face. Happy to take it out. In this updated patch, header-line-inactive just inherits from header-line. I tested by looking at selected and not-selected Info buffers with emacs -Q both patched and unpatched, in both graphical and terminal. On Sat, Nov 9, 2024 at 1:37=E2=80=AFAM Eli Zaretskii wrote: > > Cc: 73862@debbugs.gnu.org > > Date: Sun, 27 Oct 2024 12:46:53 +0200 > > From: Eli Zaretskii > > > > > From: trevor.m.murphy@gmail.com > > > Date: Fri, 18 Oct 2024 05:56:32 -0700 > > > > > > Over the years I've put more and more information into the header > line, and at some point I wanted to get that quick visual indicator of > selected vs non-selected windows when I glanced at the header as I alread= y > got from the mode line. > > > > > > This was surprisingly hard to achieve! For a few years I used an ugl= y > `buffer-list-update-hook` hack. Then a few months ago I got adventurous > and found that it actually wasn't as hard as I'd feared to hack these int= o > the C source. > > > > > > The new faces both inherit from the current `header-line` face, so > there shouldn't be any visible impact if users don't customize the new > faces. For cases like mine it's easy to customize header-line-inactive t= o > inherit from mode-line-inactive. > > > > > > Thanks in advance for your attention and feedback, > > > > Thanks. This changeset needs the appropriate changes in the Emacs > > user manual (which lists the standard faces in "Standard Faces"), and > > also a NEWS entry that announces the change. > > > > Also, did you verify that modes which use header-line and customize > > the header-line face still work as before after this change, both when > > the window is selected and non-selected? > > Ping! Trevor, could you please answer the above question, and provide > an updated patch with documentation changes? I'd like to install this > as soon as these issues are resolved. > --=20 Trevor Murphy --000000000000aaccd006269cfbea Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
Hi!=C2=A0 Thanks for your patience, attached please f= ind the updated patch.=C2=A0 I've added documentation and a NEWS entry = modeled off of similar commits.=C2=A0=C2=A0

When I= put together the original patch I included a non-trivial value for the def= ault header-line-inactive (copied from mode-line-inactive) as a visual indi= cator for the new face.=C2=A0 Happy to take it out.=C2=A0 In this updated p= atch, header-line-inactive just inherits from header-line.=C2=A0 I tested b= y looking at selected and not-selected Info buffers with emacs -Q both patc= hed and unpatched, in both graphical and terminal.

On Sat, Nov 9, = 2024 at 1:37=E2=80=AFAM Eli Zaretskii <e= liz@gnu.org> wrote:
> Cc: 73862@debbugs.gnu.org
> Date: Sun, 27 Oct 2024 12:46:53 +0200
> From: Eli Zaretskii <eliz@gnu.org>
>
> > From: trevor.m.murphy@gmail.com
> > Date: Fri, 18 Oct 2024 05:56:32 -0700
> >
> > Over the years I've put more and more information into the he= ader line, and at some point I wanted to get that quick visual indicator of= selected vs non-selected windows when I glanced at the header as I already= got from the mode line.
> >
> > This was surprisingly hard to achieve!=C2=A0 For a few years I us= ed an ugly `buffer-list-update-hook` hack.=C2=A0 Then a few months ago I go= t adventurous and found that it actually wasn't as hard as I'd fear= ed to hack these into the C source.
> >
> > The new faces both inherit from the current `header-line` face, s= o there shouldn't be any visible impact if users don't customize th= e new faces.=C2=A0 For cases like mine it's easy to customize header-li= ne-inactive to inherit from mode-line-inactive.
> >
> > Thanks in advance for your attention and feedback,
>
> Thanks.=C2=A0 This changeset needs the appropriate changes in the Emac= s
> user manual (which lists the standard faces in "Standard Faces&qu= ot;), and
> also a NEWS entry that announces the change.
>
> Also, did you verify that modes which use header-line and customize > the header-line face still work as before after this change, both when=
> the window is selected and non-selected?

Ping! Trevor, could you please answer the above question, and provide
an updated patch with documentation changes?=C2=A0 I'd like to install = this
as soon as these issues are resolved.


--
Trevor Murphy
--000000000000aaccd006269cfbea-- --000000000000aaccda06269cfbec Content-Type: text/x-patch; charset="US-ASCII"; name="0001-Add-new-header-line-active-and-header-line-inactive-.patch" Content-Disposition: attachment; filename="0001-Add-new-header-line-active-and-header-line-inactive-.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_m3cmjhuz0 RnJvbSBmZWQxNzllNjZiNTIxZDMwZTlhN2YzOTMyMzBjZTEwNTczMzAyOTczIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBUcmV2b3IgTXVycGh5IDx0cmV2b3IubS5tdXJwaHlAZ21haWwu Y29tPgpEYXRlOiBUaHUsIDE3IE9jdCAyMDI0IDE1OjUxOjE0IC0wNzAwClN1YmplY3Q6IFtQQVRD SF0gQWRkIG5ldyBgaGVhZGVyLWxpbmUtYWN0aXZlYCBhbmQgYGhlYWRlci1saW5lLWluYWN0aXZl YAogZmFjZXMuCgpUaGlzIGlzIGFsbCBpbnRlbmRlZCB0byBwYXJhbGxlbCB0aGUgbW9kZS1saW5l LWFjdGl2ZSBhbmQKbW9kZS1saW5lLWluYWN0aXZlIGRpc3RpbmN0aW9uLgoKKiBkb2MvZW1hY3Mv ZGlzcGxheS50ZXhpIChTdGFuZGFyZCBGYWNlcyk6IERvY3VtZW50IHRoZSBuZXcgZmFjZXMuCgoq IGxpc3AvZmFjZXMuZWwgKGhlYWRlci1saW5lLWFjdGl2ZSwgaGVhZGVyLWxpbmUtaW5hY3RpdmUp OiBOZXcgZmFjZXMuCgoqIHNyYy9kaXNwZXh0ZXJuLmggKENVUlJFTlRfSEVBREVSX0xJTkVfQUNU SVZFX0ZBQ0VfSURfMywKQ1VSUkVOVF9IRUFERVJfTElORV9BQ1RJVkVfRkFDRV9JRCk6IG5ldyBt YWNyb3MgYmFzZWQgb24gbW9kZSBsaW5lCmVxdWl2YWxlbnRzCihmYWNlX2lkKTogbmV3IGZhY2Ug SURzCiogc3JjL3hkaXNwLmMgKHdpbmRvd19ib3hfaGVpZ2h0LCBwb3NfdmlzaWJsZV9wLCBpbml0 X2l0ZXJhdG9yLAp3aW5kb3dfdGV4dF9waXhlbF9zaXplLCBkaXNwbGF5X21vZGVfbGluZXMsIGRp c3BsYXlfbW9kZV9saW5lLApmb3JtYXQtbW9kZS1saW5lKTogcmVwbGFjZSBhbGwgdXNlcyBvZiBI RUFERVJfTElORV9GQUNFX0lEIHdpdGggZWl0aGVyCmEgbmV3IG1hY3JvIG9yIHRoZSBuZXcgZmFj ZSBJRHMKKiBzcmMveGZhY2VzLmMgKHN5bXNfb2ZfeGZhY2VzKTogbmV3IGxpc3Agc3ltYm9scwoo bG9va3VwX2Jhc2ljX2ZhY2UsIHJlYWxpemVfYmFzaWNfZmFjZXMpOiBtYXAgbmV3IGZhY2UgSURz IHRvIHRoZWlyIGxpc3AKc3ltYm9scwotLS0KIGRvYy9lbWFjcy9kaXNwbGF5LnRleGkgfCAxNiAr KysrKysrKysrKysrKysKIGV0Yy9ORVdTICAgICAgICAgICAgICAgfCAgNSArKysrKwogbGlzcC9m YWNlcy5lbCAgICAgICAgICB8IDE1ICsrKysrKysrKysrKysrCiBzcmMvZGlzcGV4dGVybi5oICAg ICAgIHwgMzMgKysrKysrKysrKysrKysrKysrKysrKysrKysrKystLQogc3JjL3hkaXNwLmMgICAg ICAgICAgICB8IDQ1ICsrKysrKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLQog c3JjL3hmYWNlcy5jICAgICAgICAgICB8ICA4ICsrKysrKy0tCiA2IGZpbGVzIGNoYW5nZWQsIDk5 IGluc2VydGlvbnMoKyksIDIzIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RvYy9lbWFjcy9k aXNwbGF5LnRleGkgYi9kb2MvZW1hY3MvZGlzcGxheS50ZXhpCmluZGV4IDg4NTIwODc0YzhlLi4y MmNkMzE2ZjgzNiAxMDA2NDQKLS0tIGEvZG9jL2VtYWNzL2Rpc3BsYXkudGV4aQorKysgYi9kb2Mv ZW1hY3MvZGlzcGxheS50ZXhpCkBAIC03ODIsNiArNzgyLDIyIEBAIGF0IHRoZSB0b3Agb2YgYSB3 aW5kb3cganVzdCBhcyB0aGUgbW9kZSBsaW5lIGFwcGVhcnMgYXQgdGhlIGJvdHRvbS4KIE1vc3Qg d2luZG93cyBkbyBub3QgaGF2ZSBhIGhlYWRlciBsaW5lLS0tb25seSBzb21lIHNwZWNpYWwgbW9k ZXMsIHN1Y2gKIEluZm8gbW9kZSwgY3JlYXRlIG9uZS4KIAorVGhlIEBjb2Rle2hlYWRlci1saW5l LWFjdGl2ZX0gYW5kIEBjb2Rle2hlYWRlci1saW5lLWluYWN0aXZlfSBmYWNlcyAod2hpY2gKK2Fy ZSB0aGUgb25lcyB1c2VkIG9uIHRoZSBoZWFkZXIgbGluZXMpIGluaGVyaXQgZnJvbSB0aGlzIGZh Y2UuCisKK0BpdGVtIGhlYWRlci1saW5lLWFjdGl2ZQorQGNpbmRleCBmYWNlcyBmb3IgaGVhZGVy IGxpbmVzCitMaWtlIEBjb2Rle2hlYWRlci1saW5lfSwgYnV0IHVzZWQgZm9yIHRoZSBoZWFkZXIg bGluZSBvZiB0aGUgY3VycmVudGx5CitzZWxlY3RlZCB3aW5kb3cuICBUaGlzIGZhY2UgaW5oZXJp dHMgZnJvbSBAY29kZXtoZWFkZXItbGluZX0sIHNvIGNoYW5nZXMKK2luIHRoYXQgZmFjZSBhZmZl Y3QgaGVhZGVyIGxpbmVzIGluIGFsbCB3aW5kb3dzLgorCitAaXRlbSBoZWFkZXItbGluZS1pbmFj dGl2ZQorQGNpbmRleCBAY29kZXtoZWFkZXItbGluZS1pbmFjdGl2ZX0gZmFjZQorTGlrZSBAY29k ZXtoZWFkZXItbGluZX0sIGJ1dCB1c2VkIGZvciBoZWFkZXIgbGluZXMgb2YgdGhlIHdpbmRvd3Mg b3RoZXIKK3RoYW4gdGhlIHNlbGVjdGVkIG9uZSAoaWYgdGhvc2Ugd2luZG93cyBoYXZlIGEgaGVh ZGVyIGxpbmUpLiAgVGhpcyBmYWNlCitpbmhlcml0cyBmcm9tIEBjb2Rle2hlYWRlci1saW5lfSwg c28gY2hhbmdlcyBpbiB0aGF0IGZhY2UgYWZmZWN0IGhlYWRlcgorbGluZXMgaW4gYWxsIHdpbmRv d3MuCisKIEBpdGVtIGhlYWRlci1saW5lLWhpZ2hsaWdodAogQGNpbmRleCBAY29kZXtoZWFkZXIt bGluZS1oaWdobGlnaHR9IGZhY2UKIFNpbWlsYXIgdG8gQGNvZGV7aGlnaGxpZ2h0fSBhbmQgQGNv ZGV7bW9kZS1saW5lLWhpZ2hsaWdodH0sIGJ1dCB1c2VkCmRpZmYgLS1naXQgYS9ldGMvTkVXUyBi L2V0Yy9ORVdTCmluZGV4IGE4ZWNlNWMzZGM5Li5iMDM5MGU1OTdkMCAxMDA2NDQKLS0tIGEvZXRj L05FV1MKKysrIGIvZXRjL05FV1MKQEAgLTE1MCw2ICsxNTAsMTEgQEAgS2lsbGVkIGJ1ZmZlcnMg c3RvcmVkIGluIGEgcmVnaXN0ZXIgdXNpbmcgJ2J1ZmZlci10by1yZWdpc3RlcicgYXJlCiBhdXRv bWF0aWNhbGx5IGNvbnZlcnRlZCB0byBhIGZpbGUtcXVlcnkgdmFsdWUgaWYgdGhlIGJ1ZmZlciB3 YXMgdmlzaXRpbmcKIGEgZmlsZS4KIAorKiogTmV3IGZhY2UgJ2hlYWRlci1saW5lLWFjdGl2ZScu CitUaGlzIGluaGVyaXRzIGZyb20gdGhlICdoZWFkZXItbGluZScgZmFjZSwgYnV0IGlzIHRoZSBm YWNlIGFjdHVhbGx5IHVzZWQKK29uIHRoZSBoZWFkZXIgbGluZXMgKGFsb25nIHdpdGggJ2hlYWRl ci1saW5lLWluYWN0aXZlJykuCisKKysrKwogDAogKiBFZGl0aW5nIENoYW5nZXMgaW4gRW1hY3Mg MzEuMQogCmRpZmYgLS1naXQgYS9saXNwL2ZhY2VzLmVsIGIvbGlzcC9mYWNlcy5lbAppbmRleCAy MWMzZTY2M2M2ZS4uZGQ4NTM3NmRlMjQgMTAwNjQ0Ci0tLSBhL2xpc3AvZmFjZXMuZWwKKysrIGIv bGlzcC9mYWNlcy5lbApAQCAtMjgyMSw2ICsyODIxLDIxIEBAIFVzZSB0aGUgZmFjZSBgbW9kZS1s aW5lLWhpZ2hsaWdodCcgZm9yIGZlYXR1cmVzIHRoYXQgY2FuIGJlIHNlbGVjdGVkLiIKICAgOnZl cnNpb24gIjI4LjEiCiAgIDpncm91cCAnYmFzaWMtZmFjZXMpCiAKKyhkZWZmYWNlIGhlYWRlci1s aW5lLWFjdGl2ZQorICAnKCh0IDppbmhlcml0IGhlYWRlci1saW5lKSkKKyAgIkZhY2UgZm9yIHRo ZSBzZWxlY3RlZCBoZWFkZXIgbGluZS4KK1RoaXMgaW5oZXJpdHMgZnJvbSB0aGUgYGhlYWRlci1s aW5lJyBmYWNlLiIKKyAgOnZlcnNpb24gIjI5LjUiCisgIDpncm91cCAnbW9kZS1saW5lLWZhY2Vz CisgIDpncm91cCAnYmFzaWMtZmFjZXMpCisKKyhkZWZmYWNlIGhlYWRlci1saW5lLWluYWN0aXZl CisgICcoKHQgOmluaGVyaXQgaGVhZGVyLWxpbmUpKQorICAiQmFzaWMgaGVhZGVyIGxpbmUgZmFj ZSBmb3Igbm9uLXNlbGVjdGVkIHdpbmRvd3MuIgorICA6dmVyc2lvbiAiMjkuNSIKKyAgOmdyb3Vw ICdtb2RlLWxpbmUtZmFjZXMKKyAgOmdyb3VwICdiYXNpYy1mYWNlcykKKwogKGRlZmZhY2UgdmVy dGljYWwtYm9yZGVyCiAgICcoKCgodHlwZSB0dHkpKSA6aW5oZXJpdCBtb2RlLWxpbmUtaW5hY3Rp dmUpKQogICAiRmFjZSB1c2VkIGZvciB2ZXJ0aWNhbCB3aW5kb3cgZGl2aWRlcnMgb24gdHR5cy4i CmRpZmYgLS1naXQgYS9zcmMvZGlzcGV4dGVybi5oIGIvc3JjL2Rpc3BleHRlcm4uaAppbmRleCBj YzI0OGE0NDcyZS4uMGQ0YzBhNmM2N2UgMTAwNjQ0Ci0tLSBhL3NyYy9kaXNwZXh0ZXJuLmgKKysr IGIvc3JjL2Rpc3BleHRlcm4uaApAQCAtMTU2MSw2ICsxNTYxLDM0IEBAIHN0cnVjdCBnbHlwaF9z dHJpbmcKIAkgOiBlc3RpbWF0ZV9tb2RlX2xpbmVfaGVpZ2h0CQkJCQlcCiAJIChYRlJBTUUgKChX KS0+ZnJhbWUpLCBDVVJSRU5UX01PREVfTElORV9BQ1RJVkVfRkFDRV9JRCAoVykpKSkpCiAKKy8q IFJldHVybiB0aGUgZGVzaXJlZCBmYWNlIGlkIGZvciB0aGUgaGVhZGVyIGxpbmUgb2YgYSB3aW5k b3csIGRlcGVuZGluZworICAgb24gd2hldGhlciB0aGUgd2luZG93IGlzIHNlbGVjdGVkIG9yIG5v dCwgb3IgaWYgdGhlIHdpbmRvdyBpcyB0aGUKKyAgIHNjcm9sbGluZyB3aW5kb3cgZm9yIHRoZSBj dXJyZW50bHkgYWN0aXZlIG1pbmlidWZmZXIgd2luZG93LgorCisgICBEdWUgdG8gdGhlIHdheSBk aXNwbGF5X21vZGVfbGluZXMgbWFuaXB1bGF0ZXMgd2l0aCB0aGUgY29udGVudHMgb2YKKyAgIHNl bGVjdGVkX3dpbmRvdywgdGhpcyBtYWNybyBuZWVkcyB0aHJlZSBhcmd1bWVudHM6IFNFTFcgd2hp Y2ggaXMKKyAgIGNvbXBhcmVkIGFnYWluc3QgdGhlIGN1cnJlbnQgdmFsdWUgb2Ygc2VsZWN0ZWRf d2luZG93LCBNQlcgd2hpY2ggaXMKKyAgIGNvbXBhcmVkIGFnYWluc3QgbWluaWJ1Zl93aW5kb3cg KGlmIFNFTFcgZG9lc24ndCBtYXRjaCksIGFuZCBTQ1JXCisgICB3aGljaCBpcyBjb21wYXJlZCBh Z2FpbnN0IG1pbmlidWZfc2VsZWN0ZWRfd2luZG93IChpZiBNQlcgbWF0Y2hlcykuICAqLworCisj ZGVmaW5lIENVUlJFTlRfSEVBREVSX0xJTkVfQUNUSVZFX0ZBQ0VfSURfMyhTRUxXLCBNQlcsIFND UlcpICAgIAlcCisgICAgICgoIW1vZGVfbGluZV9pbl9ub25fc2VsZWN0ZWRfd2luZG93cwkJCVwK KyAgICAgICB8fCAoU0VMVykgPT0gWFdJTkRPVyAoc2VsZWN0ZWRfd2luZG93KQkJCVwKKyAgICAg ICB8fCAobWluaWJ1Zl9sZXZlbCA+IDAJCQkJCVwKKyAgICAgICAgICAgJiYgIU5JTFAgKG1pbmli dWZfc2VsZWN0ZWRfd2luZG93KQkJCVwKKyAgICAgICAgICAgJiYgKE1CVykgPT0gWFdJTkRPVyAo bWluaWJ1Zl93aW5kb3cpCQkJXAorICAgICAgICAgICAmJiAoU0NSVykgPT0gWFdJTkRPVyAobWlu aWJ1Zl9zZWxlY3RlZF93aW5kb3cpKSkJXAorICAgICAgPyBIRUFERVJfTElORV9BQ1RJVkVfRkFD RV9JRAkJCQlcCisgICAgICA6IEhFQURFUl9MSU5FX0lOQUNUSVZFX0ZBQ0VfSUQpCisKKworLyog UmV0dXJuIHRoZSBkZXNpcmVkIGZhY2UgaWQgZm9yIHRoZSBoZWFkZXIgbGluZSBvZiB3aW5kb3cg Vy4gICovCisKKyNkZWZpbmUgQ1VSUkVOVF9IRUFERVJfTElORV9BQ1RJVkVfRkFDRV9JRChXKQkJ XAorCSBDVVJSRU5UX0hFQURFUl9MSU5FX0FDVElWRV9GQUNFX0lEXzMoVywgXAorCQkJCQkgICAg WFdJTkRPVyAoc2VsZWN0ZWRfd2luZG93KSwgXAorCQkJCQkgICAgVykKKwogLyogUmV0dXJuIHRo ZSBjdXJyZW50IGhlaWdodCBvZiB0aGUgaGVhZGVyIGxpbmUgb2Ygd2luZG93IFcuICBJZiBub3Qg a25vd24KICAgIGZyb20gVy0+aGVhZGVyX2xpbmVfaGVpZ2h0LCBsb29rIGF0IFcncyBjdXJyZW50 IGdseXBoIG1hdHJpeCwgb3IgcmV0dXJuCiAgICBhbiBlc3RpbWF0aW9uIGJhc2VkIG9uIHRoZSBo ZWlnaHQgb2YgdGhlIGZvbnQgb2YgdGhlIGZhY2UgYGhlYWRlci1saW5lJy4gICovCkBAIC0xNTcy LDcgKzE2MDAsNyBAQCBzdHJ1Y3QgZ2x5cGhfc3RyaW5nCiAgICAgICA9IChNQVRSSVhfSEVBREVS X0xJTkVfSEVJR0hUICgoVyktPmN1cnJlbnRfbWF0cml4KQlcCiAJID8gTUFUUklYX0hFQURFUl9M SU5FX0hFSUdIVCAoKFcpLT5jdXJyZW50X21hdHJpeCkJXAogCSA6IGVzdGltYXRlX21vZGVfbGlu ZV9oZWlnaHQJCQkJXAotCSAgICAgKFhGUkFNRSAoKFcpLT5mcmFtZSksIEhFQURFUl9MSU5FX0ZB Q0VfSUQpKSkpCisJIChYRlJBTUUgKChXKS0+ZnJhbWUpLCBDVVJSRU5UX0hFQURFUl9MSU5FX0FD VElWRV9GQUNFX0lEIChXKSkpKSkKIAogLyogUmV0dXJuIHRoZSBjdXJyZW50IGhlaWdodCBvZiB0 aGUgdGFiIGxpbmUgb2Ygd2luZG93IFcuICBJZiBub3Qga25vd24KICAgIGZyb20gVy0+dGFiX2xp bmVfaGVpZ2h0LCBsb29rIGF0IFcncyBjdXJyZW50IGdseXBoIG1hdHJpeCwgb3IgcmV0dXJuCkBA IC0xODkzLDcgKzE5MjEsOCBAQCBlbnVtIGZhY2VfaWQKICAgTU9ERV9MSU5FX0lOQUNUSVZFX0ZB Q0VfSUQsCiAgIFRPT0xfQkFSX0ZBQ0VfSUQsCiAgIEZSSU5HRV9GQUNFX0lELAotICBIRUFERVJf TElORV9GQUNFX0lELAorICBIRUFERVJfTElORV9BQ1RJVkVfRkFDRV9JRCwKKyAgSEVBREVSX0xJ TkVfSU5BQ1RJVkVfRkFDRV9JRCwKICAgU0NST0xMX0JBUl9GQUNFX0lELAogICBCT1JERVJfRkFD RV9JRCwKICAgQ1VSU09SX0ZBQ0VfSUQsCmRpZmYgLS1naXQgYS9zcmMveGRpc3AuYyBiL3NyYy94 ZGlzcC5jCmluZGV4IGM3NGU4MWEzOTMzLi45OGJjMTU3Yzc4OSAxMDA2NDQKLS0tIGEvc3JjL3hk aXNwLmMKKysrIGIvc3JjL3hkaXNwLmMKQEAgLTEzNTgsNyArMTM1OCw3IEBAIHdpbmRvd19ib3hf aGVpZ2h0IChzdHJ1Y3Qgd2luZG93ICp3KQogCSAgaWYgKGhsX3JvdyAmJiBobF9yb3ctPm1vZGVf bGluZV9wKQogCSAgICBoZWlnaHQgLT0gaGxfcm93LT5oZWlnaHQ7CiAJICBlbHNlCi0JICAgIGhl aWdodCAtPSBlc3RpbWF0ZV9tb2RlX2xpbmVfaGVpZ2h0IChmLCBIRUFERVJfTElORV9GQUNFX0lE KTsKKwkgICAgaGVpZ2h0IC09IGVzdGltYXRlX21vZGVfbGluZV9oZWlnaHQgKGYsIENVUlJFTlRf SEVBREVSX0xJTkVfQUNUSVZFX0ZBQ0VfSUQgKHcpKTsKIAl9CiAgICAgfQogCkBAIC0xNzUzLDcg KzE3NTMsNyBAQCBwb3NfdmlzaWJsZV9wIChzdHJ1Y3Qgd2luZG93ICp3LCBwdHJkaWZmX3QgY2hh cnBvcywgaW50ICp4LCBpbnQgKnksCiAJPSB3aW5kb3dfcGFyYW1ldGVyICh3LCBRaGVhZGVyX2xp bmVfZm9ybWF0KTsKIAogICAgICAgdy0+aGVhZGVyX2xpbmVfaGVpZ2h0Ci0JPSBkaXNwbGF5X21v ZGVfbGluZSAodywgSEVBREVSX0xJTkVfRkFDRV9JRCwKKwk9IGRpc3BsYXlfbW9kZV9saW5lICh3 LCBDVVJSRU5UX0hFQURFUl9MSU5FX0FDVElWRV9GQUNFX0lEICh3KSwKIAkJCSAgICAgTklMUCAo d2luZG93X2hlYWRlcl9saW5lX2Zvcm1hdCkKIAkJCSAgICAgPyBCVkFSIChjdXJyZW50X2J1ZmZl ciwgaGVhZGVyX2xpbmVfZm9ybWF0KQogCQkJICAgICA6IHdpbmRvd19oZWFkZXJfbGluZV9mb3Jt YXQpOwpAQCAtMzE5NywxMyArMzE5NywxNCBAQCBDSEVDS19XSU5ET1dfRU5EIChzdHJ1Y3Qgd2lu ZG93ICp3KQogCiAgICBCQVNFX0ZBQ0VfSUQgaXMgdGhlIGlkIG9mIGEgYmFzZSBmYWNlIHRvIHVz ZS4gIEl0IG11c3QgYmUgb25lIG9mCiAgICBERUZBVUxUX0ZBQ0VfSUQgZm9yIG5vcm1hbCB0ZXh0 LCBNT0RFX0xJTkVfQUNUSVZFX0ZBQ0VfSUQsCi0gICBNT0RFX0xJTkVfSU5BQ1RJVkVfRkFDRV9J RCwgb3IgSEVBREVSX0xJTkVfRkFDRV9JRCBmb3IgZGlzcGxheWluZwotICAgbW9kZSBsaW5lcywg b3IgVE9PTF9CQVJfRkFDRV9JRCBmb3IgZGlzcGxheWluZyB0aGUgdG9vbC1iYXIuCisgICBNT0RF X0xJTkVfSU5BQ1RJVkVfRkFDRV9JRCwgSEVBREVSX0xJTkVfQUNUSVZFX0ZBQ0VfSUQsIG9yCisg ICBIRUFERVJfTElORV9JTkFDVElWRV9GQUNFX0lEIGZvciBkaXNwbGF5aW5nIG1vZGUgbGluZXMs IG9yCisgICBUT09MX0JBUl9GQUNFX0lEIGZvciBkaXNwbGF5aW5nIHRoZSB0b29sLWJhci4KIAog ICAgSWYgUk9XIGlzIG51bGwgYW5kIEJBU0VfRkFDRV9JRCBpcyBlcXVhbCB0byBNT0RFX0xJTkVf QUNUSVZFX0ZBQ0VfSUQsCi0gICBNT0RFX0xJTkVfSU5BQ1RJVkVfRkFDRV9JRCwgb3IgSEVBREVS X0xJTkVfRkFDRV9JRCwgdGhlIGl0ZXJhdG9yCi0gICB3aWxsIGJlIGluaXRpYWxpemVkIHRvIHVz ZSB0aGUgY29ycmVzcG9uZGluZyBtb2RlIGxpbmUgZ2x5cGggcm93IG9mCi0gICB0aGUgZGVzaXJl ZCBtYXRyaXggb2YgVy4gICovCisgICBNT0RFX0xJTkVfSU5BQ1RJVkVfRkFDRV9JRCwgSEVBREVS X0xJTkVfQUNUSVZFX0ZBQ0VfSUQsIG9yCisgICBIRUFERVJfTElORV9JTkFDVElWRV9GQUNFX0lE IHRoZSBpdGVyYXRvciB3aWxsIGJlIGluaXRpYWxpemVkIHRvIHVzZQorICAgdGhlIGNvcnJlc3Bv bmRpbmcgbW9kZSBsaW5lIGdseXBoIHJvdyBvZiB0aGUgZGVzaXJlZCBtYXRyaXggb2YgVy4gICov CiAKIHZvaWQKIGluaXRfaXRlcmF0b3IgKHN0cnVjdCBpdCAqaXQsIHN0cnVjdCB3aW5kb3cgKncs CkBAIC0zMjUxLDcgKzMyNTIsOCBAQCBpbml0X2l0ZXJhdG9yIChzdHJ1Y3QgaXQgKml0LCBzdHJ1 Y3Qgd2luZG93ICp3LAogCXJvdyA9IE1BVFJJWF9NT0RFX0xJTkVfUk9XICh3LT5kZXNpcmVkX21h dHJpeCk7CiAgICAgICBlbHNlIGlmIChiYXNlX2ZhY2VfaWQgPT0gVEFCX0xJTkVfRkFDRV9JRCkK IAlyb3cgPSBNQVRSSVhfVEFCX0xJTkVfUk9XICh3LT5kZXNpcmVkX21hdHJpeCk7Ci0gICAgICBl bHNlIGlmIChiYXNlX2ZhY2VfaWQgPT0gSEVBREVSX0xJTkVfRkFDRV9JRCkKKyAgICAgIGVsc2Ug aWYgKGJhc2VfZmFjZV9pZCA9PSBIRUFERVJfTElORV9BQ1RJVkVfRkFDRV9JRAorCSAgICAgICB8 fCBiYXNlX2ZhY2VfaWQgPT0gSEVBREVSX0xJTkVfSU5BQ1RJVkVfRkFDRV9JRCkKIAl7CiAJICAv KiBIZWFkZXIgbGluZSByb3cgZGVwZW5kcyBvbiB3aGV0aGVyIHRhYiBsaW5lIGlzIGVuYWJsZWQu ICAqLwogCSAgdy0+ZGVzaXJlZF9tYXRyaXgtPnRhYl9saW5lX3AgPSB3aW5kb3dfd2FudHNfdGFi X2xpbmUgKHcpOwpAQCAtMTE4NTQsNyArMTE4NTYsNyBAQCB3aW5kb3dfdGV4dF9waXhlbF9zaXpl IChMaXNwX09iamVjdCB3aW5kb3csIExpc3BfT2JqZWN0IGZyb20sIExpc3BfT2JqZWN0IHRvLAog ICAgICAgTGlzcF9PYmplY3Qgd2luZG93X2hlYWRlcl9saW5lX2Zvcm1hdAogCT0gd2luZG93X3Bh cmFtZXRlciAodywgUWhlYWRlcl9saW5lX2Zvcm1hdCk7CiAKLSAgICAgIHkgPSB5ICsgZGlzcGxh eV9tb2RlX2xpbmUgKHcsIEhFQURFUl9MSU5FX0ZBQ0VfSUQsCisgICAgICB5ID0geSArIGRpc3Bs YXlfbW9kZV9saW5lICh3LCBDVVJSRU5UX0hFQURFUl9MSU5FX0FDVElWRV9GQUNFX0lEICh3KSwK IAkJCQkgTklMUCAod2luZG93X2hlYWRlcl9saW5lX2Zvcm1hdCkKIAkJCQkgPyBCVkFSIChjdXJy ZW50X2J1ZmZlciwgaGVhZGVyX2xpbmVfZm9ybWF0KQogCQkJCSA6IHdpbmRvd19oZWFkZXJfbGlu ZV9mb3JtYXQpOwpAQCAtMjc0NTMsMTEgKzI3NDU1LDExIEBAIGRpc3BsYXlfbW9kZV9saW5lcyAo c3RydWN0IHdpbmRvdyAqdykKICAgbGluZV9udW1iZXJfZGlzcGxheWVkID0gZmFsc2U7CiAgIHct PmNvbHVtbl9udW1iZXJfZGlzcGxheWVkID0gLTE7CiAKKyAgc3RydWN0IHdpbmRvdyAqc2VsX3cg PSBYV0lORE9XIChvbGRfc2VsZWN0ZWRfd2luZG93KTsKICAgaWYgKHdpbmRvd193YW50c19tb2Rl X2xpbmUgKHcpKQogICAgIHsKICAgICAgIExpc3BfT2JqZWN0IHdpbmRvd19tb2RlX2xpbmVfZm9y bWF0CiAJPSB3aW5kb3dfcGFyYW1ldGVyICh3LCBRbW9kZV9saW5lX2Zvcm1hdCk7Ci0gICAgICBz dHJ1Y3Qgd2luZG93ICpzZWxfdyA9IFhXSU5ET1cgKG9sZF9zZWxlY3RlZF93aW5kb3cpOwogCiAg ICAgICAvKiBTZWxlY3QgbW9kZSBsaW5lIGZhY2UgYmFzZWQgb24gdGhlIHJlYWwgc2VsZWN0ZWQg d2luZG93LiAgKi8KICAgICAgIGRpc3BsYXlfbW9kZV9saW5lICh3LApAQCAtMjc0ODUsNyArMjc0 ODcsNyBAQCBkaXNwbGF5X21vZGVfbGluZXMgKHN0cnVjdCB3aW5kb3cgKncpCiAgICAgICBMaXNw X09iamVjdCB3aW5kb3dfaGVhZGVyX2xpbmVfZm9ybWF0CiAJPSB3aW5kb3dfcGFyYW1ldGVyICh3 LCBRaGVhZGVyX2xpbmVfZm9ybWF0KTsKIAotICAgICAgZGlzcGxheV9tb2RlX2xpbmUgKHcsIEhF QURFUl9MSU5FX0ZBQ0VfSUQsCisgICAgICBkaXNwbGF5X21vZGVfbGluZSAodywgQ1VSUkVOVF9I RUFERVJfTElORV9BQ1RJVkVfRkFDRV9JRF8zIChzZWxfdywgc2VsX3csIHcpLAogCQkJIE5JTFAg KHdpbmRvd19oZWFkZXJfbGluZV9mb3JtYXQpCiAJCQkgPyBCVkFSIChjdXJyZW50X2J1ZmZlciwg aGVhZGVyX2xpbmVfZm9ybWF0KQogCQkJIDogd2luZG93X2hlYWRlcl9saW5lX2Zvcm1hdCk7CkBA IC0yNzUwMCwxMSArMjc1MDIsMTIgQEAgZGlzcGxheV9tb2RlX2xpbmVzIChzdHJ1Y3Qgd2luZG93 ICp3KQogfQogCiAKLS8qIERpc3BsYXkgbW9kZSBvciBoZWFkZXIvdGFiIGxpbmUgb2Ygd2luZG93 IFcuICBGQUNFX0lEIHNwZWNpZmllcwotICAgd2hpY2ggbGluZSB0byBkaXNwbGF5OyBpdCBpcyBl aXRoZXIgTU9ERV9MSU5FX0FDVElWRV9GQUNFX0lELAotICAgSEVBREVSX0xJTkVfRkFDRV9JRCBv ciBUQUJfTElORV9GQUNFX0lELiAgRk9STUFUIGlzIHRoZQotICAgbW9kZS9oZWFkZXIvdGFiIGxp bmUgZm9ybWF0IHRvIGRpc3BsYXkuICBWYWx1ZSBpcyB0aGUgcGl4ZWwgaGVpZ2h0Ci0gICBvZiB0 aGUgbW9kZS9oZWFkZXIvdGFiIGxpbmUgZGlzcGxheWVkLiAgKi8KKy8qIERpc3BsYXkgbW9kZSBv ciBoZWFkZXIvdGFiIGxpbmUgb2Ygd2luZG93IFcuICBGQUNFX0lEIHNwZWNpZmllcyB3aGljaAor ICAgbGluZSB0byBkaXNwbGF5OyBpdCBpcyBlaXRoZXIgTU9ERV9MSU5FX0FDVElWRV9GQUNFX0lE LAorICAgSEVBREVSX0xJTkVfQUNUSVZFX0ZBQ0VfSUQsIEhFQURFUl9MSU5FX0lOQUNUSVZFX0ZB Q0VfSUQsIG9yCisgICBUQUJfTElORV9GQUNFX0lELiAgRk9STUFUIGlzIHRoZSBtb2RlL2hlYWRl ci90YWIgbGluZSBmb3JtYXQgdG8KKyAgIGRpc3BsYXkuICBWYWx1ZSBpcyB0aGUgcGl4ZWwgaGVp Z2h0IG9mIHRoZSBtb2RlL2hlYWRlci90YWIgbGluZQorICAgZGlzcGxheWVkLiAgKi8KIAogc3Rh dGljIGludAogZGlzcGxheV9tb2RlX2xpbmUgKHN0cnVjdCB3aW5kb3cgKncsIGVudW0gZmFjZV9p ZCBmYWNlX2lkLCBMaXNwX09iamVjdCBmb3JtYXQpCkBAIC0yNzUyNSw3ICsyNzUyOCw4IEBAIGRp c3BsYXlfbW9kZV9saW5lIChzdHJ1Y3Qgd2luZG93ICp3LCBlbnVtIGZhY2VfaWQgZmFjZV9pZCwg TGlzcF9PYmplY3QgZm9ybWF0KQogICAgICAgaXQuZ2x5cGhfcm93LT50YWJfbGluZV9wID0gdHJ1 ZTsKICAgICAgIHctPmRlc2lyZWRfbWF0cml4LT50YWJfbGluZV9wID0gdHJ1ZTsKICAgICB9Ci0g IGVsc2UgaWYgKGZhY2VfaWQgPT0gSEVBREVSX0xJTkVfRkFDRV9JRCkKKyAgZWxzZSBpZiAoZmFj ZV9pZCA9PSBIRUFERVJfTElORV9BQ1RJVkVfRkFDRV9JRAorCSAgIHx8IGZhY2VfaWQgPT0gSEVB REVSX0xJTkVfSU5BQ1RJVkVfRkFDRV9JRCkKICAgICB3LT5kZXNpcmVkX21hdHJpeC0+aGVhZGVy X2xpbmVfcCA9IHRydWU7CiAKICAgLyogRklYTUU6IFRoaXMgc2hvdWxkIGJlIGNvbnRyb2xsZWQg YnkgYSB1c2VyIG9wdGlvbi4gIEJ1dApAQCAtMjc1NDQsNyArMjc1NDgsOSBAQCBkaXNwbGF5X21v ZGVfbGluZSAoc3RydWN0IHdpbmRvdyAqdywgZW51bSBmYWNlX2lkIGZhY2VfaWQsIExpc3BfT2Jq ZWN0IGZvcm1hdCkKICAgcmVjb3JkX3Vud2luZF9zYXZlX21hdGNoX2RhdGEgKCk7CiAKICAgaWYg KE5JTFAgKFZtb2RlX2xpbmVfY29tcGFjdCkKLSAgICAgIHx8IGZhY2VfaWQgPT0gSEVBREVSX0xJ TkVfRkFDRV9JRCB8fCBmYWNlX2lkID09IFRBQl9MSU5FX0ZBQ0VfSUQpCisgICAgICB8fCBmYWNl X2lkID09IEhFQURFUl9MSU5FX0FDVElWRV9GQUNFX0lECisgICAgICB8fCBmYWNlX2lkID09IEhF QURFUl9MSU5FX0lOQUNUSVZFX0ZBQ0VfSUQKKyAgICAgIHx8IGZhY2VfaWQgPT0gVEFCX0xJTkVf RkFDRV9JRCkKICAgICB7CiAgICAgICBtb2RlX2xpbmVfdGFyZ2V0ID0gTU9ERV9MSU5FX0RJU1BM QVk7CiAgICAgICBkaXNwbGF5X21vZGVfZWxlbWVudCAoJml0LCAwLCAwLCAwLCBmb3JtYXQsIFFu aWwsIGZhbHNlKTsKQEAgLTI4MzEzLDcgKzI4MzE5LDggQEAgYXJlIHRoZSBzZWxlY3RlZCB3aW5k b3cgYW5kIHRoZSBXSU5ET1cncyBidWZmZXIpLiAgKi8pCiAJCSAgICAgICA/IE1PREVfTElORV9B Q1RJVkVfRkFDRV9JRCA6IE1PREVfTElORV9JTkFDVElWRV9GQUNFX0lEKQogICAgIDogRVEgKGZh Y2UsIFFtb2RlX2xpbmVfYWN0aXZlKSA/IE1PREVfTElORV9BQ1RJVkVfRkFDRV9JRAogICAgIDog RVEgKGZhY2UsIFFtb2RlX2xpbmVfaW5hY3RpdmUpID8gTU9ERV9MSU5FX0lOQUNUSVZFX0ZBQ0Vf SUQKLSAgICA6IEVRIChmYWNlLCBRaGVhZGVyX2xpbmUpID8gSEVBREVSX0xJTkVfRkFDRV9JRAor ICAgIDogRVEgKGZhY2UsIFFoZWFkZXJfbGluZV9hY3RpdmUpID8gSEVBREVSX0xJTkVfQUNUSVZF X0ZBQ0VfSUQKKyAgICA6IEVRIChmYWNlLCBRaGVhZGVyX2xpbmVfaW5hY3RpdmUpID8gSEVBREVS X0xJTkVfSU5BQ1RJVkVfRkFDRV9JRAogICAgIDogRVEgKGZhY2UsIFF0YWJfbGluZSkgPyBUQUJf TElORV9GQUNFX0lECiAgICAgOiBFUSAoZmFjZSwgUXRhYl9iYXIpID8gVEFCX0JBUl9GQUNFX0lE CiAgICAgOiBFUSAoZmFjZSwgUXRvb2xfYmFyKSA/IFRPT0xfQkFSX0ZBQ0VfSUQKZGlmZiAtLWdp dCBhL3NyYy94ZmFjZXMuYyBiL3NyYy94ZmFjZXMuYwppbmRleCBlMjQ4Mjc5ZTliNy4uZjYyNjQ4 MDJmYTQgMTAwNjQ0Ci0tLSBhL3NyYy94ZmFjZXMuYworKysgYi9zcmMveGZhY2VzLmMKQEAgLTUx MTcsNyArNTExNyw4IEBAIGxvb2t1cF9iYXNpY19mYWNlIChzdHJ1Y3Qgd2luZG93ICp3LCBzdHJ1 Y3QgZnJhbWUgKmYsIGludCBmYWNlX2lkKQogICAgIGNhc2UgREVGQVVMVF9GQUNFX0lEOgkJbmFt ZSA9IFFkZWZhdWx0OwkJYnJlYWs7CiAgICAgY2FzZSBNT0RFX0xJTkVfQUNUSVZFX0ZBQ0VfSUQ6 CW5hbWUgPSBRbW9kZV9saW5lX2FjdGl2ZTsgICAgICAJYnJlYWs7CiAgICAgY2FzZSBNT0RFX0xJ TkVfSU5BQ1RJVkVfRkFDRV9JRDoJbmFtZSA9IFFtb2RlX2xpbmVfaW5hY3RpdmU7CWJyZWFrOwot ICAgIGNhc2UgSEVBREVSX0xJTkVfRkFDRV9JRDoJCW5hbWUgPSBRaGVhZGVyX2xpbmU7CQlicmVh azsKKyAgICBjYXNlIEhFQURFUl9MSU5FX0FDVElWRV9GQUNFX0lEOgluYW1lID0gUWhlYWRlcl9s aW5lX2FjdGl2ZTsJYnJlYWs7CisgICAgY2FzZSBIRUFERVJfTElORV9JTkFDVElWRV9GQUNFX0lE OgluYW1lID0gUWhlYWRlcl9saW5lX2luYWN0aXZlOwlicmVhazsKICAgICBjYXNlIFRBQl9MSU5F X0ZBQ0VfSUQ6CQluYW1lID0gUXRhYl9saW5lOwkJYnJlYWs7CiAgICAgY2FzZSBUQUJfQkFSX0ZB Q0VfSUQ6CQluYW1lID0gUXRhYl9iYXI7CQlicmVhazsKICAgICBjYXNlIFRPT0xfQkFSX0ZBQ0Vf SUQ6CQluYW1lID0gUXRvb2xfYmFyOwkJYnJlYWs7CkBAIC01ODY3LDcgKzU4NjgsOCBAQCByZWFs aXplX2Jhc2ljX2ZhY2VzIChzdHJ1Y3QgZnJhbWUgKmYpCiAgICAgICByZWFsaXplX25hbWVkX2Zh Y2UgKGYsIFFtb2RlX2xpbmVfaW5hY3RpdmUsIE1PREVfTElORV9JTkFDVElWRV9GQUNFX0lEKTsK ICAgICAgIHJlYWxpemVfbmFtZWRfZmFjZSAoZiwgUXRvb2xfYmFyLCBUT09MX0JBUl9GQUNFX0lE KTsKICAgICAgIHJlYWxpemVfbmFtZWRfZmFjZSAoZiwgUWZyaW5nZSwgRlJJTkdFX0ZBQ0VfSUQp OwotICAgICAgcmVhbGl6ZV9uYW1lZF9mYWNlIChmLCBRaGVhZGVyX2xpbmUsIEhFQURFUl9MSU5F X0ZBQ0VfSUQpOworICAgICAgcmVhbGl6ZV9uYW1lZF9mYWNlIChmLCBRaGVhZGVyX2xpbmVfYWN0 aXZlLCBIRUFERVJfTElORV9BQ1RJVkVfRkFDRV9JRCk7CisgICAgICByZWFsaXplX25hbWVkX2Zh Y2UgKGYsIFFoZWFkZXJfbGluZV9pbmFjdGl2ZSwgSEVBREVSX0xJTkVfSU5BQ1RJVkVfRkFDRV9J RCk7CiAgICAgICByZWFsaXplX25hbWVkX2ZhY2UgKGYsIFFzY3JvbGxfYmFyLCBTQ1JPTExfQkFS X0ZBQ0VfSUQpOwogICAgICAgcmVhbGl6ZV9uYW1lZF9mYWNlIChmLCBRYm9yZGVyLCBCT1JERVJf RkFDRV9JRCk7CiAgICAgICByZWFsaXplX25hbWVkX2ZhY2UgKGYsIFFjdXJzb3IsIENVUlNPUl9G QUNFX0lEKTsKQEAgLTc0MzgsNiArNzQ0MCw4IEBAIHN5bXNfb2ZfeGZhY2VzICh2b2lkKQogICBE RUZTWU0gKFFmcmluZ2UsICJmcmluZ2UiKTsKICAgREVGU1lNIChRdGFiX2xpbmUsICJ0YWItbGlu ZSIpOwogICBERUZTWU0gKFFoZWFkZXJfbGluZSwgImhlYWRlci1saW5lIik7CisgIERFRlNZTSAo UWhlYWRlcl9saW5lX2luYWN0aXZlLCAiaGVhZGVyLWxpbmUtaW5hY3RpdmUiKTsKKyAgREVGU1lN IChRaGVhZGVyX2xpbmVfYWN0aXZlLCAiaGVhZGVyLWxpbmUtYWN0aXZlIik7CiAgIERFRlNZTSAo UXNjcm9sbF9iYXIsICJzY3JvbGwtYmFyIik7CiAgIERFRlNZTSAoUW1lbnUsICJtZW51Iik7CiAg IERFRlNZTSAoUWN1cnNvciwgImN1cnNvciIpOwotLSAKMi40Ny4wCgo= --000000000000aaccda06269cfbec--