From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Konstantin Shabanov Newsgroups: gmane.emacs.bugs Subject: bug#48354: [PATCH] Fix compat with latest mingw64-headers Date: Tue, 11 May 2021 12:59:47 +0000 Message-ID: Reply-To: Konstantin Shabanov Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="b1_fLO3CqUFVEBLCPPgFagVdvSAJmMKKOtUuetg4Rg" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="33040"; mail-complaints-to="usenet@ciao.gmane.io" To: 48354@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Tue May 11 17:02:38 2021 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 1lgTuA-0008Qp-9S for geb-bug-gnu-emacs@m.gmane-mx.org; Tue, 11 May 2021 17:02:38 +0200 Original-Received: from localhost ([::1]:39958 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lgTu9-00068e-B1 for geb-bug-gnu-emacs@m.gmane-mx.org; Tue, 11 May 2021 11:02:37 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:54128) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lgTtb-00062f-EQ for bug-gnu-emacs@gnu.org; Tue, 11 May 2021 11:02:05 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:53788) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lgTtb-000899-5q for bug-gnu-emacs@gnu.org; Tue, 11 May 2021 11:02:03 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lgTtb-0001HE-3O for bug-gnu-emacs@gnu.org; Tue, 11 May 2021 11:02:03 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Konstantin Shabanov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 11 May 2021 15:02:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 48354 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.16207453134870 (code B ref -1); Tue, 11 May 2021 15:02:02 +0000 Original-Received: (at submit) by debbugs.gnu.org; 11 May 2021 15:01:53 +0000 Original-Received: from localhost ([127.0.0.1]:37099 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lgTtQ-0001GT-Lr for submit@debbugs.gnu.org; Tue, 11 May 2021 11:01:53 -0400 Original-Received: from lists.gnu.org ([209.51.188.17]:52500) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lgRzU-0001Vu-VS for submit@debbugs.gnu.org; Tue, 11 May 2021 09:00:01 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:51160) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lgRzU-0006nP-LC for bug-gnu-emacs@gnu.org; Tue, 11 May 2021 09:00:00 -0400 Original-Received: from mail2.protonmail.ch ([185.70.40.22]:10373) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lgRzP-0000Ik-LS for bug-gnu-emacs@gnu.org; Tue, 11 May 2021 08:59:59 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=etehtsea.me; s=protonmail; t=1620737990; bh=2Ov9Lovn3OEUwL3JThZnrw5Ek8UnAbSnQK4tqC//VQk=; h=Date:To:From:Reply-To:Subject:From; b=p5GJOKYWq2r7t+lOZFb/vW7eTNHUIc5lENewvwZFGsb5hfi/lpm0aMqXUsVIAsQm+ GkT6j6In3zQAeztvoZ9aSKBaUw+E68j+vO3OqjES5ThIvJNVFi5DCbf8NRylOtwoKp 51o4IlYkm4SuyHpl99K2dqn9h8k9ATWKXHgF5c+I= Received-SPF: pass client-ip=185.70.40.22; envelope-from=mail@etehtsea.me; helo=mail2.protonmail.ch X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Mailman-Approved-At: Tue, 11 May 2021 11:01:51 -0400 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" Xref: news.gmane.io gmane.emacs.bugs:206253 Archived-At: This is a multi-part message in MIME format. --b1_fLO3CqUFVEBLCPPgFagVdvSAJmMKKOtUuetg4Rg Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable This commit to mingw-w64 broke compatibility with emacs-head because of the= OS_NT conflict: In file included from w32image.c:32: w32common.h:45:3: error: expected identifier before numeric constant 45 | OS_NT | ^~~~~ https://sourceforge.net/p/mingw-w64/mingw-w64/ci/dc7ef298837d4581200a3bed66= 0aed36818c1b00/ The series of patches in attachments should fix the issue: - the first one should cause the build to fail in the future instead of sil= ent overriding definition; - the second patch renames OS_9X to conform mingw-w64 naming; - the third actually fixes build failure (preserving backward compatibility= ); Best regards, Konstantin Shabanov --b1_fLO3CqUFVEBLCPPgFagVdvSAJmMKKOtUuetg4Rg Content-Type: application/octet-stream; name=0001-Reorder-headers-inclusion.patch Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename=0001-Reorder-headers-inclusion.patch RnJvbSBmZGM4MjQzOTQ3ODI4MjMzYzlkOTU5Y2JlYzBhMDk0NmZmMzc4OGNkIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBLb25zdGFudGluIFNoYWJhbm92IDxtYWlsQGV0ZWh0c2VhLm1l PgpEYXRlOiBUdWUsIDExIE1heSAyMDIxIDE4OjIwOjQ2ICswNzAwClN1YmplY3Q6IFtQQVRDSCAx LzNdIFJlb3JkZXIgaGVhZGVycyBpbmNsdXNpb24KCk90aGVyd2lzZSBpdCBnZXRzIG92ZXJyaWRl biBzaWxlbnRseSBpbnN0ZWFkIG9mIGJ1aWxkIGZhaWx1cmUgbGlrZQp0aGlzIG9uZSAoaW4gY2Fz ZSBvZiBnbG9iYWwgdmFyaWFibGVzIGNvbmZsaWN0KToKCkluIGZpbGUgaW5jbHVkZWQgZnJvbSB3 MzJpbWFnZS5jOjMyOgp3MzJjb21tb24uaDo0NTozOiBlcnJvcjogZXhwZWN0ZWQgaWRlbnRpZmll ciBiZWZvcmUgbnVtZXJpYyBjb25zdGFudAogICA0NSB8ICAgT1NfTlQKICAgICAgfCAgIF5+fn5+ Ci0tLQogc3JjL3czMmZucy5jIHwgNiArKystLS0KIDEgZmlsZSBjaGFuZ2VkLCAzIGluc2VydGlv bnMoKyksIDMgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvc3JjL3czMmZucy5jIGIvc3JjL3cz MmZucy5jCmluZGV4IDY2YmFlYWVjYmQuLjQzYmVlNjE0N2IgMTAwNjQ0Ci0tLSBhL3NyYy93MzJm bnMuYworKysgYi9zcmMvdzMyZm5zLmMKQEAgLTQxLDEzICs0MSwxMCBAQCAjZGVmaW5lIF9XSU4z Ml9XSU5OVCAweDA2MDAKICNpbmNsdWRlICJidWZmZXIuaCIKICNpbmNsdWRlICJrZXlib2FyZC5o IgogI2luY2x1ZGUgImJsb2NraW5wdXQuaCIKICNpbmNsdWRlICJjb2RpbmcuaCIKIAotI2luY2x1 ZGUgInczMmNvbW1vbi5oIgotI2luY2x1ZGUgInczMmluZXZ0LmgiCi0KICNpZmRlZiBXSU5ET1dT TlQKICNpbmNsdWRlIDxtYnN0cmluZy5oPgogI2luY2x1ZGUgPG1iY3R5cGUuaD4JLyogZm9yIF9n ZXRtYmNwICovCiAjZW5kaWYgLyogV0lORE9XU05UICovCiAKQEAgLTcxLDEwICs2OCwxMyBAQCAj ZGVmaW5lIF9XSU4zMl9XSU5OVCAweDA2MDAKIAogI2luY2x1ZGUgPGRsZ3MuaD4KICNpbmNsdWRl IDxpbW0uaD4KICNpbmNsdWRlIDx3aW5kb3dzeC5oPgogCisjaW5jbHVkZSAidzMyY29tbW9uLmgi CisjaW5jbHVkZSAidzMyaW5ldnQuaCIKKwogI2lmbmRlZiBGT0ZfTk9fQ09OTkVDVEVEX0VMRU1F TlRTCiAjZGVmaW5lIEZPRl9OT19DT05ORUNURURfRUxFTUVOVFMgMHgyMDAwCiAjZW5kaWYKIAog ZXh0ZXJuIGludCB3MzJfY29uc29sZV90b2dnbGVfbG9ja19rZXkgKGludCwgTGlzcF9PYmplY3Qp OwotLSAKMi4zMS4xCgo= --b1_fLO3CqUFVEBLCPPgFagVdvSAJmMKKOtUuetg4Rg Content-Type: application/octet-stream; name=0003-Fix-compatibility-with-the-latest-mingw64-headers.patch Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename=0003-Fix-compatibility-with-the-latest-mingw64-headers.patch RnJvbSBkZDkzNWQ5MTcwNzY1Mzg2NjI3ZmVlMGE3MjdhNjg4MDk1Y2I3MzQ0IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBLb25zdGFudGluIFNoYWJhbm92IDxtYWlsQGV0ZWh0c2VhLm1l PgpEYXRlOiBUdWUsIDExIE1heSAyMDIxIDE4OjQ0OjQ5ICswNzAwClN1YmplY3Q6IFtQQVRDSCAz LzNdIEZpeCBjb21wYXRpYmlsaXR5IHdpdGggdGhlIGxhdGVzdCBtaW5ndzY0LWhlYWRlcnMKCk9T X05UIHdhcyBpbnRyb2R1Y2VkIGluIG1pbmd3NjQtaGVhZGVycyBpdHNlbGYgYW5kIHN0YXJ0ZWQg dG8gY2F1c2UKYnVpbGQgZmFpbHVyZToKCkluIGZpbGUgaW5jbHVkZWQgZnJvbSB3MzJpbWFnZS5j OjMyOgp3MzJjb21tb24uaDo0NTozOiBlcnJvcjogZXhwZWN0ZWQgaWRlbnRpZmllciBiZWZvcmUg bnVtZXJpYyBjb25zdGFudAogICA0NSB8ICAgT1NfTlQKICAgICAgfCAgIF5+fn5+CgpUaGlzIGNo YW5nZSBpcyBleHBlY3RlZCB0byBiZSBiYWNrd2FyZCBjb21wYXRpYmxlLgotLS0KIHNyYy93MzJj b21tb24uaCB8IDExICsrKysrKystLS0tCiAxIGZpbGUgY2hhbmdlZCwgNyBpbnNlcnRpb25zKCsp LCA0IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL3NyYy93MzJjb21tb24uaCBiL3NyYy93MzJj b21tb24uaAppbmRleCA1M2IzMzc2ZjdjLi4wMGNhZjdlMzFjIDEwMDY0NAotLS0gYS9zcmMvdzMy Y29tbW9uLmgKKysrIGIvc3JjL3czMmNvbW1vbi5oCkBAIC0zOCwxNCArMzgsMTcgQEAgI2RlZmlu ZSBnZXRfdzMyX21pbm9yX3ZlcnNpb24oKSAgCXczMl9taW5vcl92ZXJzaW9uCiAKIGV4dGVybiBp bnQgICAgCSAgICAgIHczMl9tYWpvcl92ZXJzaW9uOwogZXh0ZXJuIGludCAgICAJICAgICAgdzMy X21pbm9yX3ZlcnNpb247CiBleHRlcm4gaW50ICAgIAkgICAgICB3MzJfYnVpbGRfbnVtYmVyOwog Ci1lbnVtIHsKLSAgT1NfV0lOOTVPUkdSRUFURVIgPSAxLAotICBPU19OVAotfTsKKyNpZm5kZWYg T1NfTlQKKyAgI2RlZmluZSBPU19OVCAxCisjZW5kaWYKKworI2lmbmRlZiBPU19XSU45NU9SR1JF QVRFUgorICAjZGVmaW5lIE9TX1dJTjk1T1JHUkVBVEVSIDIKKyNlbmRpZgogCiBleHRlcm4gaW50 IG9zX3N1YnR5cGU7CiAKIC8qIENhY2hlIHN5c3RlbSBpbmZvLCBlLmcuLCB0aGUgTlQgcGFnZSBz aXplLiAgKi8KIGV4dGVybiB2b2lkIGNhY2hlX3N5c3RlbV9pbmZvICh2b2lkKTsKLS0gCjIuMzEu MQoK --b1_fLO3CqUFVEBLCPPgFagVdvSAJmMKKOtUuetg4Rg Content-Type: application/octet-stream; name=0002-Rename-OS_9X-to-OS_WIN95ORGREATER.patch Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename=0002-Rename-OS_9X-to-OS_WIN95ORGREATER.patch RnJvbSA1NTE3ZTA5YzlkMjVmMDFjYmY0OWUxM2YxMTczODFkZjVlNjk4MDEyIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBLb25zdGFudGluIFNoYWJhbm92IDxtYWlsQGV0ZWh0c2VhLm1l PgpEYXRlOiBUdWUsIDExIE1heSAyMDIxIDE4OjI5OjA2ICswNzAwClN1YmplY3Q6IFtQQVRDSCAy LzNdIFJlbmFtZSBPU185WCB0byBPU19XSU45NU9SR1JFQVRFUgoKVW5pZnkgd2l0aCB0aGUgY3Vy cmVudCBtaW5ndzY0LWhlYWRlcnMKaHR0cHM6Ly9zb3VyY2Vmb3JnZS5uZXQvcC9taW5ndy13NjQv bWluZ3ctdzY0L2NpL2RjN2VmMjk4ODM3ZDQ1ODEyMDBhM2JlZDY2MGFlZDM2ODE4YzFiMDAvCi0t LQogc3JjL2R5bmxpYi5jICAgIHwgIDIgKy0KIHNyYy93MzIuYyAgICAgICB8ICA0ICsrLS0KIHNy Yy93MzJjb21tb24uaCB8ICAyICstCiBzcmMvdzMyZm5zLmMgICAgfCAxMCArKysrKy0tLS0tCiBz cmMvdzMyaGVhcC5jICAgfCAgNCArKy0tCiBzcmMvdzMybm90aWZ5LmMgfCAgMiArLQogc3JjL3cz MnByb2MuYyAgIHwgIDggKysrKy0tLS0KIHNyYy93MzJ0ZXJtLmMgICB8ICA0ICsrLS0KIHNyYy93 MzJ0ZXJtLmggICB8ICAyICstCiA5IGZpbGVzIGNoYW5nZWQsIDE5IGluc2VydGlvbnMoKyksIDE5 IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL3NyYy9keW5saWIuYyBiL3NyYy9keW5saWIuYwpp bmRleCAxMzM4ZTkxMDljLi4yZDI2M2ZiM2VjIDEwMDY0NAotLS0gYS9zcmMvZHlubGliLmMKKysr IGIvc3JjL2R5bmxpYi5jCkBAIC0xMzMsMTEgKzEzMywxMSBAQCBkeW5saWJfYWRkciAodm9pZCAo KmZ1bmNwdHIpICh2b2lkKSwgY29uc3QgY2hhciAqKmZuYW1lLCBjb25zdCBjaGFyICoqc3ltbmFt ZSkKICAgd2NoYXJfdCBtZm5fd1tNQVhfUEFUSF07CiAgIGNoYXIgbWZuX2FbTUFYX1BBVEhdOwog ICB2b2lkICphZGRyID0gKHZvaWQgKikgZnVuY3B0cjsKIAogICAvKiBTdGVwIDE6IEZpbmQgdGhl IGhhbmRsZSBvZiB0aGUgbW9kdWxlIHdoZXJlIEFERFIgbGl2ZXMuICAqLwotICBpZiAob3Nfc3Vi dHlwZSA9PSBPU185WAorICBpZiAob3Nfc3VidHlwZSA9PSBPU19XSU45NU9SR1JFQVRFUgogICAg ICAgLyogV2luZG93cyBOVCBmYW1pbHkgdmVyc2lvbiBiZWZvcmUgWFAgKHY1LjEpLiAgKi8KICAg ICAgIHx8ICgodzMyX21ham9yX3ZlcnNpb24gKyAodzMyX21pbm9yX3ZlcnNpb24gPiAwKSkgPCA2 KSkKICAgICB7CiAgICAgICBNRU1PUllfQkFTSUNfSU5GT1JNQVRJT04gbWJpOwogCmRpZmYgLS1n aXQgYS9zcmMvdzMyLmMgYi9zcmMvdzMyLmMKaW5kZXggNDY3ZTZjYjQyNy4uNjM1Yzg4MjQzMSAx MDA2NDQKLS0tIGEvc3JjL3czMi5jCisrKyBiL3NyYy93MzIuYwpAQCAtNDc0NSwxMSArNDc0NSwx MSBAQCBzeXNfcmVuYW1lX3JlcGxhY2UgKGNvbnN0IGNoYXIgKm9sZG5hbWUsIGNvbnN0IGNoYXIg Km5ld25hbWUsIEJPT0wgZm9yY2UpCiAgIHN0cmNweSAodGVtcCwgbWFwX3czMl9maWxlbmFtZSAo b2xkbmFtZSwgTlVMTCkpOwogCiAgIC8qIHZvbHVtZV9pbmZvIGlzIHNldCBpbmRpcmVjdGx5IGJ5 IG1hcF93MzJfZmlsZW5hbWUuICAqLwogICBvbGRuYW1lX2RldiA9IHZvbHVtZV9pbmZvLnNlcmlh bG51bTsKIAotICBpZiAob3Nfc3VidHlwZSA9PSBPU185WCkKKyAgaWYgKG9zX3N1YnR5cGUgPT0g T1NfV0lOOTVPUkdSRUFURVIpCiAgICAgewogICAgICAgY2hhciAqIG87CiAgICAgICBjaGFyICog cDsKICAgICAgIGludCAgICBpID0gMDsKICAgICAgIGNoYXIgb2xkbmFtZV9hW01BWF9QQVRIXTsK QEAgLTEwNDY2LDExICsxMDQ2NiwxMSBAQCBzaHV0ZG93bl9oYW5kbGVyIChEV09SRCB0eXBlKQog LyogT24gV2luZG93cyA5WCwgbG9hZCBVTklDT1dTLkRMTCBhbmQgcmV0dXJuIGl0cyBoYW5kbGUs IG9yIGRpZS4gIE9uCiAgICBOVCwgcmV0dXJuIGEgaGFuZGxlIHRvIEdESTMyLkRMTC4gICovCiBI QU5ETEUKIG1heWJlX2xvYWRfdW5pY293c19kbGwgKHZvaWQpCiB7Ci0gIGlmIChvc19zdWJ0eXBl ID09IE9TXzlYKQorICBpZiAob3Nfc3VidHlwZSA9PSBPU19XSU45NU9SR1JFQVRFUikKICAgICB7 CiAgICAgICBIQU5ETEUgcmV0ID0gTG9hZExpYnJhcnkgKCJVbmljb3dzLmRsbCIpOwogICAgICAg aWYgKHJldCkKIAl7CiAJICAvKiBUaGVzZSB0d28gZnVuY3Rpb25zIGFyZSBwcmVzZW50IG9uIFdp bmRvd3MgOVggYXMgc3R1YnMKZGlmZiAtLWdpdCBhL3NyYy93MzJjb21tb24uaCBiL3NyYy93MzJj b21tb24uaAppbmRleCBjYmUwNWM1ZDhkLi41M2IzMzc2ZjdjIDEwMDY0NAotLS0gYS9zcmMvdzMy Y29tbW9uLmgKKysrIGIvc3JjL3czMmNvbW1vbi5oCkBAIC0zOSwxMSArMzksMTEgQEAgI2RlZmlu ZSBnZXRfdzMyX21pbm9yX3ZlcnNpb24oKSAgCXczMl9taW5vcl92ZXJzaW9uCiBleHRlcm4gaW50 ICAgIAkgICAgICB3MzJfbWFqb3JfdmVyc2lvbjsKIGV4dGVybiBpbnQgICAgCSAgICAgIHczMl9t aW5vcl92ZXJzaW9uOwogZXh0ZXJuIGludCAgICAJICAgICAgdzMyX2J1aWxkX251bWJlcjsKIAog ZW51bSB7Ci0gIE9TXzlYID0gMSwKKyAgT1NfV0lOOTVPUkdSRUFURVIgPSAxLAogICBPU19OVAog fTsKIAogZXh0ZXJuIGludCBvc19zdWJ0eXBlOwogCmRpZmYgLS1naXQgYS9zcmMvdzMyZm5zLmMg Yi9zcmMvdzMyZm5zLmMKaW5kZXggNDNiZWU2MTQ3Yi4uMDJlZGQ4OTI5ZiAxMDA2NDQKLS0tIGEv c3JjL3czMmZucy5jCisrKyBiL3NyYy93MzJmbnMuYwpAQCAtNzk4OSwxMSArNzk4OSwxMSBAQCBE RUZVTiAoInN5c3RlbS1tb3ZlLWZpbGUtdG8tdHJhc2giLCBGc3lzdGVtX21vdmVfZmlsZV90b190 cmFzaCwKIAogICAgICAgcGF0aCA9IG1hcF93MzJfZmlsZW5hbWUgKFNTREFUQSAoZW5jb2RlZF9m aWxlKSwgTlVMTCk7CiAKICAgICAgIC8qIFRoZSBVbmljb2RlIHZlcnNpb24gb2YgU0hGaWxlT3Bl cmF0aW9uIGlzIG5vdCBzdXBwb3J0ZWQgb24KIAkgV2luZG93cyA5WC4gKi8KLSAgICAgIGlmICh3 MzJfdW5pY29kZV9maWxlbmFtZXMgJiYgb3Nfc3VidHlwZSAhPSBPU185WCkKKyAgICAgIGlmICh3 MzJfdW5pY29kZV9maWxlbmFtZXMgJiYgb3Nfc3VidHlwZSAhPSBPU19XSU45NU9SR1JFQVRFUikK IAl7CiAJICBTSEZJTEVPUFNUUlVDVFcgZmlsZV9vcF93OwogCSAgLyogV2UgbmVlZCBvbmUgbW9y ZSBlbGVtZW50IGJleW9uZCBNQVhfUEFUSCBiZWNhdXNlIHRoaXMgaXMKIAkgICAgIGEgbGlzdCBv ZiBmaWxlIG5hbWVzLCB3aXRoIHRoZSBsYXN0IGVsZW1lbnQgZG91YmxlLW51bGwKIAkgICAgIHRl cm1pbmF0ZWQuICovCkBAIC05MjkzLDIxICs5MjkzLDIxIEBAIERFRlVOICgiZGVmYXVsdC1wcmlu dGVyLW5hbWUiLCBGZGVmYXVsdF9wcmludGVyX25hbWUsIFNkZWZhdWx0X3ByaW50ZXJfbmFtZSwK ICAgc3RydG9rIChwbmFtZV9idWYsICIsIik7CiAgIC8qIFdlIHdhbnQgdG8ga25vdyBtb3JlIHRo YW4gdGhlIHByaW50ZXIgbmFtZSAqLwogICBpZiAoIU9wZW5QcmludGVyIChwbmFtZV9idWYsICZo UHJuLCBOVUxMKSkKICAgICByZXR1cm4gUW5pbDsKICAgLyogR2V0UHJpbnRlclcgaXMgbm90IHN1 cHBvcnRlZCBieSB1bmljb3dzLmRsbC4gICovCi0gIGlmICh3MzJfdW5pY29kZV9maWxlbmFtZXMg JiYgb3Nfc3VidHlwZSAhPSBPU185WCkKKyAgaWYgKHczMl91bmljb2RlX2ZpbGVuYW1lcyAmJiBv c19zdWJ0eXBlICE9IE9TX1dJTjk1T1JHUkVBVEVSKQogICAgIEdldFByaW50ZXJXIChoUHJuLCAy LCBOVUxMLCAwLCAmZHdOZWVkZWQpOwogICBlbHNlCiAgICAgR2V0UHJpbnRlckEgKGhQcm4sIDIs IE5VTEwsIDAsICZkd05lZWRlZCk7CiAgIGlmIChkd05lZWRlZCA9PSAwKQogICAgIHsKICAgICAg IENsb3NlUHJpbnRlciAoaFBybik7CiAgICAgICByZXR1cm4gUW5pbDsKICAgICB9CiAgIC8qIENh bGwgR2V0UHJpbnRlciBhZ2FpbiB3aXRoIGJpZyBlbm91Z2ggbWVtb3J5IGJsb2NrLiAgKi8KLSAg aWYgKHczMl91bmljb2RlX2ZpbGVuYW1lcyAmJiBvc19zdWJ0eXBlICE9IE9TXzlYKQorICBpZiAo dzMyX3VuaWNvZGVfZmlsZW5hbWVzICYmIG9zX3N1YnR5cGUgIT0gT1NfV0lOOTVPUkdSRUFURVIp CiAgICAgewogICAgICAgLyogQWxsb2NhdGUgbWVtb3J5IGZvciB0aGUgUFJJTlRFUl9JTkZPXzIg c3RydWN0LiAgKi8KICAgICAgIHBwaTJ3ID0geG1hbGxvYyAoZHdOZWVkZWQpOwogICAgICAgZXJy ID0gR2V0UHJpbnRlclcgKGhQcm4sIDIsIChMUEJZVEUpcHBpMncsIGR3TmVlZGVkLCAmZHdSZXR1 cm5lZCk7CiAgICAgICBDbG9zZVByaW50ZXIgKGhQcm4pOwpAQCAtOTQzOSwxMSArOTQzOSwxMSBA QCBjYWNoZV9zeXN0ZW1faW5mbyAodm9pZCkKICAgdmVyc2lvbi5kYXRhID0gR2V0VmVyc2lvbiAo KTsKICAgdzMyX21ham9yX3ZlcnNpb24gPSB2ZXJzaW9uLmluZm8ubWFqb3I7CiAgIHczMl9taW5v cl92ZXJzaW9uID0gdmVyc2lvbi5pbmZvLm1pbm9yOwogCiAgIGlmICh2ZXJzaW9uLmluZm8ucGxh dGZvcm0gJiAweDgwMDApCi0gICAgb3Nfc3VidHlwZSA9IE9TXzlYOworICAgIG9zX3N1YnR5cGUg PSBPU19XSU45NU9SR1JFQVRFUjsKICAgZWxzZQogICAgIG9zX3N1YnR5cGUgPSBPU19OVDsKIAog ICAvKiBDYWNoZSBwYWdlIHNpemUsIGFsbG9jYXRpb24gdW5pdCwgcHJvY2Vzc29yIHR5cGUsIGV0 Yy4gICovCiAgIEdldFN5c3RlbUluZm8gKCZzeXNpbmZvX2NhY2hlKTsKQEAgLTk0NTIsMTEgKzk0 NTIsMTEgQEAgY2FjaGVfc3lzdGVtX2luZm8gKHZvaWQpCiAgIC8qIENhY2hlIG9zIGluZm8uICAq LwogICBvc2luZm9fY2FjaGUuZHdPU1ZlcnNpb25JbmZvU2l6ZSA9IHNpemVvZiAoT1NWRVJTSU9O SU5GTyk7CiAgIEdldFZlcnNpb25FeCAoJm9zaW5mb19jYWNoZSk7CiAKICAgdzMyX2J1aWxkX251 bWJlciA9IG9zaW5mb19jYWNoZS5kd0J1aWxkTnVtYmVyOwotICBpZiAob3Nfc3VidHlwZSA9PSBP U185WCkKKyAgaWYgKG9zX3N1YnR5cGUgPT0gT1NfV0lOOTVPUkdSRUFURVIpCiAgICAgdzMyX2J1 aWxkX251bWJlciAmPSAweGZmZmY7CiAKICAgdzMyX251bV9tb3VzZV9idXR0b25zID0gR2V0U3lz dGVtTWV0cmljcyAoU01fQ01PVVNFQlVUVE9OUyk7CiB9CiAKZGlmZiAtLWdpdCBhL3NyYy93MzJo ZWFwLmMgYi9zcmMvdzMyaGVhcC5jCmluZGV4IGUwMDJmNzI2MDguLmM0Y2JjZDE0ZjggMTAwNjQ0 Ci0tLSBhL3NyYy93MzJoZWFwLmMKKysrIGIvc3JjL3czMmhlYXAuYwpAQCAtMjY3LDExICsyNjcs MTEgQEAgaW5pdF9oZWFwIChib29sIHVzZV9keW5hbWljX2hlYXApCiAJICAgIERlYlByaW50ICgo IkVuYWJsaW5nIExvdyBGcmFnbWVudGF0aW9uIEhlYXAgZmFpbGVkOiBlcnJvciAlbGRcbiIsCiAJ CSAgICAgICBHZXRMYXN0RXJyb3IgKCkpKTsKIAl9CiAjZW5kaWYKIAotICAgICAgaWYgKG9zX3N1 YnR5cGUgPT0gT1NfOVgpCisgICAgICBpZiAob3Nfc3VidHlwZSA9PSBPU19XSU45NU9SR1JFQVRF UikKICAgICAgICAgewogICAgICAgICAgIHRoZV9tYWxsb2NfZm4gPSBtYWxsb2NfYWZ0ZXJfZHVt cF85eDsKICAgICAgICAgICB0aGVfcmVhbGxvY19mbiA9IHJlYWxsb2NfYWZ0ZXJfZHVtcF85eDsK ICAgICAgICAgICB0aGVfZnJlZV9mbiA9IGZyZWVfYWZ0ZXJfZHVtcF85eDsKICAgICAgICAgfQpA QCAtMzEwLDExICszMTAsMTEgQEAgaW5pdF9oZWFwIChib29sIHVzZV9keW5hbWljX2hlYXApCiAJ ICBmcHJpbnRmIChzdGRlcnIsICJDYW5ub3QgYnVpbGQgRW1hY3Mgd2l0aG91dCBSdGxDcmVhdGVI ZWFwIGJlaW5nIGF2YWlsYWJsZTsgZXhpdGluZy5cbiIpOwogCSAgZXhpdCAoLTEpOwogCX0KICAg ICAgIGhlYXAgPSBzX3Bmbl9SdGxfQ3JlYXRlX0hlYXAgKDAsIGRhdGFfcmVnaW9uX2Jhc2UsIDAs IDAsIE5VTEwsICZwYXJhbXMpOwogCi0gICAgICBpZiAob3Nfc3VidHlwZSA9PSBPU185WCkKKyAg ICAgIGlmIChvc19zdWJ0eXBlID09IE9TX1dJTjk1T1JHUkVBVEVSKQogICAgICAgICB7CiAgICAg ICAgICAgZnByaW50ZiAoc3RkZXJyLCAiQ2Fubm90IGR1bXAgRW1hY3Mgb24gV2luZG93cyA5WDsg ZXhpdGluZy5cbiIpOwogICAgICAgICAgIGV4aXQgKC0xKTsKICAgICAgICAgfQogICAgICAgZWxz ZQpkaWZmIC0tZ2l0IGEvc3JjL3czMm5vdGlmeS5jIGIvc3JjL3czMm5vdGlmeS5jCmluZGV4IGI5 ZTkwNjMzOTIuLmE1MjU5NzljZDggMTAwNjQ0Ci0tLSBhL3NyYy93MzJub3RpZnkuYworKysgYi9z cmMvdzMybm90aWZ5LmMKQEAgLTU2NCwxMSArNTY0LDExIEBAIERFRlVOICgidzMybm90aWZ5LWFk ZC13YXRjaCIsIEZ3MzJub3RpZnlfYWRkX3dhdGNoLAogICBjaGFyICplcnJzdHI7CiAKICAgQ0hF Q0tfTElTVCAoZmlsdGVyKTsKIAogICAvKiBUaGUgdW5kZXJseWluZyBmZWF0dXJlcyBhcmUgYXZh aWxhYmxlIG9ubHkgc2luY2UgWFAuICAqLwotICBpZiAob3Nfc3VidHlwZSA9PSBPU185WAorICBp ZiAob3Nfc3VidHlwZSA9PSBPU19XSU45NU9SR1JFQVRFUgogICAgICAgfHwgKHczMl9tYWpvcl92 ZXJzaW9uID09IDUgJiYgdzMyX21pbm9yX3ZlcnNpb24gPCAxKSkKICAgICB7CiAgICAgICBlcnJu byA9IEVOT1NZUzsKICAgICAgIHJlcG9ydF9maWxlX25vdGlmeV9lcnJvciAoIldhdGNoaW5nIGZp bGVzeXN0ZW0gZXZlbnRzIGlzIG5vdCBzdXBwb3J0ZWQiLAogCQkJCVFuaWwpOwpkaWZmIC0tZ2l0 IGEvc3JjL3czMnByb2MuYyBiL3NyYy93MzJwcm9jLmMKaW5kZXggZmZhNTZlMTM1ZC4uMDgyZGQ2 MWY3NiAxMDA2NDQKLS0tIGEvc3JjL3czMnByb2MuYworKysgYi9zcmMvdzMycHJvYy5jCkBAIC02 MjEsMTEgKzYyMSwxMSBAQCBpbml0X3RpbWVycyAodm9pZCkKIHsKICAgLyogR2V0VGhyZWFkVGlt ZXMgaXMgbm90IGF2YWlsYWJsZSBvbiBhbGwgdmVyc2lvbnMgb2YgV2luZG93cywgc28KICAgICAg bmVlZCB0byBwcm9iZSBmb3IgaXRzIGF2YWlsYWJpbGl0eSBkeW5hbWljYWxseSwgYW5kIGNhbGwg aXQKICAgICAgdGhyb3VnaCBhIHBvaW50ZXIuICAqLwogICBzX3Bmbl9HZXRfVGhyZWFkX1RpbWVz ID0gTlVMTDsgLyogaW4gY2FzZSBkdW1wZWQgRW1hY3MgY29tZXMgd2l0aCBhIHZhbHVlICovCi0g IGlmIChvc19zdWJ0eXBlICE9IE9TXzlYKQorICBpZiAob3Nfc3VidHlwZSAhPSBPU19XSU45NU9S R1JFQVRFUikKICAgICBzX3Bmbl9HZXRfVGhyZWFkX1RpbWVzID0gKEdldFRocmVhZFRpbWVzX1By b2MpCiAgICAgICBnZXRfcHJvY19hZGRyIChHZXRNb2R1bGVIYW5kbGUgKCJrZXJuZWwzMi5kbGwi KSwgIkdldFRocmVhZFRpbWVzIik7CiAKICAgLyogTWFrZSBzdXJlIHdlIHN0YXJ0IHdpdGggemVy b2VkIG91dCBpdGltZXIgc3RydWN0dXJlcywgc2luY2UKICAgICAgZHVtcGluZyBtYXkgaGF2ZSBs ZWZ0IHRoZXJlIHRyYWNlcyBvZiB0aHJlYWRzIGxvbmcgZGVhZC4gICovCkBAIC0yNjUyLDExICsy NjUyLDExIEBAIGZpbmRfY2hpbGRfY29uc29sZSAoSFdORCBod25kLCBMUEFSQU0gYXJnKQogICAg IHsKICAgICAgIGNoYXIgd2luZG93X2NsYXNzWzMyXTsKIAogICAgICAgR2V0Q2xhc3NOYW1lICho d25kLCB3aW5kb3dfY2xhc3MsIHNpemVvZiAod2luZG93X2NsYXNzKSk7CiAgICAgICBpZiAoc3Ry Y21wICh3aW5kb3dfY2xhc3MsCi0JCSAgKG9zX3N1YnR5cGUgPT0gT1NfOVgpCisJCSAgKG9zX3N1 YnR5cGUgPT0gT1NfV0lOOTVPUkdSRUFURVIpCiAJCSAgPyAidHR5IgogCQkgIDogIkNvbnNvbGVX aW5kb3dDbGFzcyIpID09IDApCiAJewogCSAgY3AtPmh3bmQgPSBod25kOwogCSAgcmV0dXJuIEZB TFNFOwpAQCAtMjg3NiwxMSArMjg3NiwxMSBAQCBzeXNfa2lsbCAocGlkX3QgcGlkLCBpbnQgc2ln KQogICBlbHNlCiAgICAgewogICAgICAgaWYgKE5JTFAgKFZ3MzJfc3RhcnRfcHJvY2Vzc19zaGFy ZV9jb25zb2xlKSAmJiBjcCAmJiBjcC0+aHduZCkKIAl7CiAjaWYgMQotCSAgaWYgKG9zX3N1YnR5 cGUgPT0gT1NfOVgpCisJICBpZiAob3Nfc3VidHlwZSA9PSBPU19XSU45NU9SR1JFQVRFUikKIAkg ICAgewogLyoKICAgIEFub3RoZXIgcG9zc2liaWxpdHkgaXMgdG8gdHJ5IHRlcm1pbmF0aW5nIHRo ZSBWRE0gb3V0LXJpZ2h0IGJ5CiAgICBjYWxsaW5nIHRoZSBTaGVsbCBWeEQgKGlkIDB4MTcpIFY4 NiBpbnRlcmZhY2UsIGZ1bmN0aW9uICM0CiAgICAiU0hFTExfRGVzdHJveV9WTSIsIGllLgpAQCAt Mzc5MSwxMSArMzc5MSwxMSBAQCB3MzJfY29tcGFyZV9zdHJpbmdzIChjb25zdCBjaGFyICpzMSwg Y29uc3QgY2hhciAqczIsIGNoYXIgKmxvY25hbWUsCiAJICB8fCBzdHJjbXAgKGxvY25hbWUsICJQ T1NJWCIpID09IDApKQogICAgIHJldHVybiAoaWdub3JlX2Nhc2UgPyBzdHJpY21wIChzMSwgczIp IDogc3RyY21wIChzMSwgczIpKTsKIAogICBpZiAoIWdfYl9pbml0X2NvbXBhcmVfc3RyaW5nX3cp CiAgICAgewotICAgICAgaWYgKG9zX3N1YnR5cGUgPT0gT1NfOVgpCisgICAgICBpZiAob3Nfc3Vi dHlwZSA9PSBPU19XSU45NU9SR1JFQVRFUikKIAl7CiAJICBwQ29tcGFyZVN0cmluZ1cgPSAoQ29t cGFyZVN0cmluZ1dfUHJvYykKICAgICAgICAgICAgIGdldF9wcm9jX2FkZHIgKExvYWRMaWJyYXJ5 ICgiVW5pY293cy5kbGwiKSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiQ29t cGFyZVN0cmluZ1ciKTsKIAkgIGlmICghcENvbXBhcmVTdHJpbmdXKQpkaWZmIC0tZ2l0IGEvc3Jj L3czMnRlcm0uYyBiL3NyYy93MzJ0ZXJtLmMKaW5kZXggNGY5MTAyOTZlYy4uZTEzYjQwMmY3NSAx MDA2NDQKLS0tIGEvc3JjL3czMnRlcm0uYworKysgYi9zcmMvdzMydGVybS5jCkBAIC03NjM2LDEx ICs3NjM2LDExIEBAIHN5bXNfb2ZfdzMydGVybSAodm9pZCkKIHNwZWNpZmllZCBieSBgZmlsZS1u YW1lLWNvZGluZy1zeXN0ZW0nLgogCiBUaGlzIHZhcmlhYmxlIGlzIHNldCB0byBub24tbmlsIGJ5 IGRlZmF1bHQgd2hlbiBFbWFjcyBydW5zIG9uIFdpbmRvd3MKIHN5c3RlbXMgb2YgdGhlIE5UIGZh bWlseSwgaW5jbHVkaW5nIFcySywgWFAsIFZpc3RhLCBXaW5kb3dzIDcgYW5kCiBXaW5kb3dzIDgu ICBJdCBpcyBzZXQgdG8gbmlsIG9uIFdpbmRvd3MgOVguICAqLyk7Ci0gIGlmIChvc19zdWJ0eXBl ID09IE9TXzlYKQorICBpZiAob3Nfc3VidHlwZSA9PSBPU19XSU45NU9SR1JFQVRFUikKICAgICB3 MzJfdW5pY29kZV9maWxlbmFtZXMgPSAwOwogICBlbHNlCiAgICAgdzMyX3VuaWNvZGVfZmlsZW5h bWVzID0gMTsKIAogICBERUZWQVJfQk9PTCAoInczMi11c2UtbmF0aXZlLWltYWdlLUFQSSIsCkBA IC03NjUzLDExICs3NjUzLDExIEBAIHN5bXNfb2ZfdzMydGVybSAodm9pZCkKIGxpYnJhcnkgaXMg YXZhaWxhYmxlIG9ubHkgc2luY2UgVzJLLCB0aGVyZWZvcmUgdGhpcyB2YXJpYWJsZSBpcwogdW5j b25kaXRpb25hbGx5IHNldCB0byBuaWwgb24gb2xkZXIgc3lzdGVtcy4gICovKTsKIAogICAvKiBG b3Igbm93LCBkaXNhYmxlZCBieSBkZWZhdWx0LCBzaW5jZSB0aGlzIGlzIGFuIGV4cGVyaW1lbnRh bCBmZWF0dXJlLiAgKi8KICNpZiAwICYmIEhBVkVfTkFUSVZFX0lNQUdFX0FQSQotICBpZiAob3Nf c3VidHlwZSA9PSBPU185WCkKKyAgaWYgKG9zX3N1YnR5cGUgPT0gT1NfV0lOOTVPUkdSRUFURVIp CiAgICAgdzMyX3VzZV9uYXRpdmVfaW1hZ2VfYXBpID0gMDsKICAgZWxzZQogICAgIHczMl91c2Vf bmF0aXZlX2ltYWdlX2FwaSA9IDE7CiAjZWxzZQogICB3MzJfdXNlX25hdGl2ZV9pbWFnZV9hcGkg PSAwOwpkaWZmIC0tZ2l0IGEvc3JjL3czMnRlcm0uaCBiL3NyYy93MzJ0ZXJtLmgKaW5kZXggN2Qz NTFkZjg3MS4uYzM4YTViZjQ4NiAxMDA2NDQKLS0tIGEvc3JjL3czMnRlcm0uaAorKysgYi9zcmMv dzMydGVybS5oCkBAIC03NTksMTEgKzc1OSwxMSBAQCAjZGVmaW5lIEZJTEVfTk9USUZJQ0FUSU9O U19TSVpFIDE2Mzg0CiAjaWZkZWYgV0lORE9XU05UCiAvKiBLZXlib2FyZCBob29rcy4gICovCiBl eHRlcm4gdm9pZCBzZXR1cF93MzJfa2JkaG9vayAodm9pZCk7CiBleHRlcm4gdm9pZCByZW1vdmVf dzMyX2tiZGhvb2sgKHZvaWQpOwogZXh0ZXJuIGludCBjaGVja193MzJfd2lua2V5X3N0YXRlIChp bnQpOwotI2RlZmluZSB3MzJfa2JkaG9va19hY3RpdmUgKG9zX3N1YnR5cGUgIT0gT1NfOVgpCisj ZGVmaW5lIHczMl9rYmRob29rX2FjdGl2ZSAob3Nfc3VidHlwZSAhPSBPU19XSU45NU9SR1JFQVRF UikKICNlbHNlCiAjZGVmaW5lIHczMl9rYmRob29rX2FjdGl2ZSAwCiAjZW5kaWYKIAogLyogS2V5 cGFkIGNvbW1hbmQga2V5IHN1cHBvcnQuICBXMzIgZG9lc24ndCBoYXZlIHZpcnR1YWwga2V5cyBk ZWZpbmVkCi0tIAoyLjMxLjEKCg== --b1_fLO3CqUFVEBLCPPgFagVdvSAJmMKKOtUuetg4Rg--