Received: from malur.postgresql.org ([217.196.149.56]) by arkaria.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.89) (envelope-from ) id 1iksRP-0007S0-Iw for pgsql-hackers@arkaria.postgresql.org; Fri, 27 Dec 2019 16:26:20 +0000 Received: from localhost ([127.0.0.1] helo=malur.postgresql.org) by malur.postgresql.org with esmtp (Exim 4.89) (envelope-from ) id 1iksRN-0001Rc-Gd for pgsql-hackers@arkaria.postgresql.org; Fri, 27 Dec 2019 16:26:17 +0000 Received: from makus.postgresql.org ([2001:4800:3e1:1::229]) by malur.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.89) (envelope-from ) id 1iksRM-0001RV-7J for pgsql-hackers@lists.postgresql.org; Fri, 27 Dec 2019 16:26:17 +0000 Received: from [66.111.4.29] (helo=out5-smtp.messagingengine.com) by makus.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1iksRI-0003x1-L1 for pgsql-hackers@postgresql.org; Fri, 27 Dec 2019 16:26:14 +0000 Received: from compute7.internal (compute7.nyi.internal [10.202.2.47]) by mailout.nyi.internal (Postfix) with ESMTP id BEBCE21DC1 for ; Fri, 27 Dec 2019 11:26:01 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute7.internal (MEProxy); Fri, 27 Dec 2019 11:26:01 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-type:date:from:message-id :mime-version:subject:to:x-me-proxy:x-me-proxy:x-me-sender :x-me-sender:x-sasl-enc; s=fm1; bh=z8rMh6xEUy/9x1w7rrcQbrBYTQchz RK/p28m+H1pa7k=; b=KdYE1AIwRCIS+dKB2NJehYlkB9NbmUE06c1wHhe0+7Q3o vFcIuIlVOa5JoIuExVSD3HAknNXFKeL5mWohgkLt2X8U7iOzckrah8HgsMClpQNF U3nowyePGQb9M4Uo496m+tonW6N4TUPXvblNgIvn6AqmZIqAjhzwppCLqHUqMw/j B1eBfIfrGGJZhjNxhIbVNKwKpT1dVEdpWo3B0i77JbF+PLei/ZSB1DrxIbsZSSow iFd0qMxufg+zKdBl2m1fcYYRTWQ6LBDgbldBxLyDT/9WlNzZw1/4rJ4QjqD41SEf lwpxnt19aTfevZkoUX+gSMn2qTsosd8h1xMGojXVw== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedufedrvddvkedgkeejucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefvhffuohfkffgfgggtsehmtderre dtfeejnecuhfhrohhmpefrvghtvghrucfgihhsvghnthhrrghuthcuoehpvghtvghrrdgv ihhsvghnthhrrghuthesvdhnughquhgrughrrghnthdrtghomheqnecuffhomhgrihhnpe dvnhguqhhurggurhgrnhhtrdgtohhmnecukfhppeelfedrvdegfedrudekjedrudeggeen ucfrrghrrghmpehmrghilhhfrhhomhepphgvthgvrhdrvghishgvnhhtrhgruhhtsedvnh guqhhurggurhgrnhhtrdgtohhmnecuvehluhhsthgvrhfuihiivgeptd X-ME-Proxy: Received: from april.pezone.net (p5df3bb90.dip0.t-ipconnect.de [93.243.187.144]) by mail.messagingengine.com (Postfix) with ESMTPA id AD33D8005B for ; Fri, 27 Dec 2019 11:26:00 -0500 (EST) To: pgsql-hackers From: Peter Eisentraut Subject: Remove libpq.rc, use win32ver.rc for libpq Organization: 2ndQuadrant Message-ID: Date: Fri, 27 Dec 2019 17:25:58 +0100 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.14; rv:52.0) Gecko/20100101 Thunderbird/52.9.1 MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="------------1D6171C6806A4A76F425DD75" Content-Language: en-US X-Host-Lookup-Failed: Reverse DNS lookup failed for 66.111.4.29 (deferred) List-Id: List-Help: List-Subscribe: List-Post: List-Owner: List-Archive: Precedence: bulk This is a multi-part message in MIME format. --------------1D6171C6806A4A76F425DD75 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit I was wondering why we have a separate libpq.rc for libpq and use win32ver.rc for all other components. I suspect this is also a leftover from the now-removed client-only Windows build. With a bit of tweaking we can use win32ver.rc for libpq as well and remove a bit of duplicative code. I have tested this patch with MSVC and MinGW. I've also added some comments and a documentation link to be able to understand this business a bit better. -- Peter Eisentraut http://www.2ndQuadrant.com/ PostgreSQL Development, 24x7 Support, Remote DBA, Training & Services --------------1D6171C6806A4A76F425DD75 Content-Type: text/plain; charset=UTF-8; x-mac-type="0"; x-mac-creator="0"; name="0001-Remove-libpq.rc-use-win32ver.rc-for-libpq.patch" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="0001-Remove-libpq.rc-use-win32ver.rc-for-libpq.patch" RnJvbSAzZGM2Njk1OTQxNWU5MWQzMTM4NTFiZDZkYjVjYjI3MWM1ZDlhYzJkIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBQZXRlciBFaXNlbnRyYXV0IDxwZXRlckBlaXNlbnRy YXV0Lm9yZz4KRGF0ZTogRnJpLCAyNyBEZWMgMjAxOSAxNzoxNzoxNCArMDEwMApTdWJqZWN0 OiBbUEFUQ0hdIFJlbW92ZSBsaWJwcS5yYywgdXNlIHdpbjMydmVyLnJjIGZvciBsaWJwcQoK Rm9yIGhpc3RvcmljYWwgcmVhc29ucywgbGlicHEgdXNlZCBhIHNlcGFyYXRlIGxpYnBxLnJj IGZpbGUgZm9yIHRoZQpXaW5kb3dzIGJ1aWxkcyB3aGlsZSBhbGwgb3RoZXIgY29tcG9uZW50 cyB1c2UgYSBjb21tb24gZmlsZQp3aW4zMnZlci5yYy4gIFdpdGggYSBiaXQgb2YgdHdlYWtp bmcsIHRoZSBsaWJwcSBidWlsZCBjYW4gYWxzbyB1c2UgdGhlCndpbjMydmVyLnJjIGZpbGUu ICBUaGlzIHJlbW92ZXMgYSBiaXQgb2YgZHVwbGljYXRpdmUgY29kZS4KLS0tCiBzcmMvYmlu L3BnZXZlbnQvTWFrZWZpbGUgICAgICAgICB8ICAxIC0KIHNyYy9pbnRlcmZhY2VzL2xpYnBx Ly5naXRpZ25vcmUgIHwgIDEgLQogc3JjL2ludGVyZmFjZXMvbGlicHEvTWFrZWZpbGUgICAg fCAxNSArKysrLS0tLS0tLS0tLS0KIHNyYy9pbnRlcmZhY2VzL2xpYnBxL2xpYnBxLnJjLmlu IHwgMzEgLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogc3JjL21ha2VmaWxlcy9N YWtlZmlsZS53aW4zMiAgICAgfCAxNyArKysrKysrKysrKy0tLS0tLQogc3JjL3BvcnQvd2lu MzJ2ZXIucmMgICAgICAgICAgICAgfCAxMCArKysrKysrLS0tCiBzcmMvdG9vbHMvY29weXJp Z2h0LnBsICAgICAgICAgICB8ICAxIC0KIHNyYy90b29scy9tc3ZjL01rdmNidWlsZC5wbSAg ICAgIHwgIDIgLS0KIHNyYy90b29scy9tc3ZjL1Byb2plY3QucG0gICAgICAgIHwgIDggKysr KysrKysKIHNyYy90b29scy9tc3ZjL1NvbHV0aW9uLnBtICAgICAgIHwgMjEgLS0tLS0tLS0t LS0tLS0tLS0tLS0tCiBzcmMvdG9vbHMvbXN2Yy9jbGVhbi5iYXQgICAgICAgICB8ICAxIC0K IHNyYy90b29scy92ZXJzaW9uX3N0YW1wLnBsICAgICAgIHwgIDcgLS0tLS0tLQogMTIgZmls ZXMgY2hhbmdlZCwgMzAgaW5zZXJ0aW9ucygrKSwgODUgZGVsZXRpb25zKC0pCiBkZWxldGUg bW9kZSAxMDA2NDQgc3JjL2ludGVyZmFjZXMvbGlicHEvbGlicHEucmMuaW4KCmRpZmYgLS1n aXQgYS9zcmMvYmluL3BnZXZlbnQvTWFrZWZpbGUgYi9zcmMvYmluL3BnZXZlbnQvTWFrZWZp bGUKaW5kZXggMzJiN2Q3NjU4OS4uYjZlOGQ2MjUxMSAxMDA2NDQKLS0tIGEvc3JjL2Jpbi9w Z2V2ZW50L01ha2VmaWxlCisrKyBiL3NyYy9iaW4vcGdldmVudC9NYWtlZmlsZQpAQCAtOSw3 ICs5LDYgQEAKIFBHRklMRURFU0MgPSAiRXZlbnRsb2cgbWVzc2FnZSBmb3JtYXR0ZXIiCiBQ R0FQUElDT049d2luMzIKIAotUEdGSUxFU0hMSUIgPSAxCiBzdWJkaXIgPSBzcmMvYmluL3Bn ZXZlbnQKIHRvcF9idWlsZGRpciA9IC4uLy4uLy4uCiBpbmNsdWRlICQodG9wX2J1aWxkZGly KS9zcmMvTWFrZWZpbGUuZ2xvYmFsCmRpZmYgLS1naXQgYS9zcmMvaW50ZXJmYWNlcy9saWJw cS8uZ2l0aWdub3JlIGIvc3JjL2ludGVyZmFjZXMvbGlicHEvLmdpdGlnbm9yZQppbmRleCA5 YmUzMzhkZWM4Li43YjQzOGYzNzY1IDEwMDY0NAotLS0gYS9zcmMvaW50ZXJmYWNlcy9saWJw cS8uZ2l0aWdub3JlCisrKyBiL3NyYy9pbnRlcmZhY2VzL2xpYnBxLy5naXRpZ25vcmUKQEAg LTEsNSArMSw0IEBACiAvZXhwb3J0cy5saXN0Ci0vbGlicHEucmMKICMgLmMgZmlsZXMgdGhh dCBhcmUgc3ltbGlua2VkIGluIGZyb20gZWxzZXdoZXJlCiAvZW5jbmFtZXMuYwogL3djaGFy LmMKZGlmZiAtLWdpdCBhL3NyYy9pbnRlcmZhY2VzL2xpYnBxL01ha2VmaWxlIGIvc3JjL2lu dGVyZmFjZXMvbGlicHEvTWFrZWZpbGUKaW5kZXggM2Q1Njc3NGZlNi4uNzZmMjJiMTk5MSAx MDA2NDQKLS0tIGEvc3JjL2ludGVyZmFjZXMvbGlicHEvTWFrZWZpbGUKKysrIGIvc3JjL2lu dGVyZmFjZXMvbGlicHEvTWFrZWZpbGUKQEAgLTE0LDYgKzE0LDggQEAgdG9wX2J1aWxkZGly ID0gLi4vLi4vLi4KIGluY2x1ZGUgJCh0b3BfYnVpbGRkaXIpL3NyYy9NYWtlZmlsZS5nbG9i YWwKIAogCitQR0ZJTEVERVNDID0gIlBvc3RncmVTUUwgQWNjZXNzIExpYnJhcnkiCisKICMg c2hhcmVkIGxpYnJhcnkgcGFyYW1ldGVycwogTkFNRT0gcHEKIFNPX01BSk9SX1ZFUlNJT049 IDUKQEAgLTI4LDYgKzMwLDcgQEAgZW5kaWYKICMgdGhlIGNvbmRpdGlvbmFsIGFkZGl0aW9u cyBvZiBmaWxlcyB0byBPQkpTLCB1cGRhdGUgTWt2Y2J1aWxkLnBtIHRvIG1hdGNoLgogCiBP QkpTID0gXAorCSQoV0lOMzJSRVMpIFwKIAlmZS1hdXRoLXNjcmFtLm8gXAogCWZlLWNvbm5l Y3QubyBcCiAJZmUtZXhlYy5vIFwKQEAgLTY1LDEyICs2OCw4IEBAIGVuZGlmCiAKIGlmZXEg KCQoUE9SVE5BTUUpLCB3aW4zMikKIE9CSlMgKz0gXAotCWxpYnBxcmMubyBcCiAJd2luMzIu bwogCi1saWJwcXJjLm86IGxpYnBxLnJjCi0JJChXSU5EUkVTKSAtaSAkPCAtbyAkQAotCiBp ZmVxICgkKGVuYWJsZV90aHJlYWRfc2FmZXR5KSwgeWVzKQogT0JKUyArPSBwdGhyZWFkLXdp bjMyLm8KIGVuZGlmCkBAIC0xMTMsMTIgKzExMiw2IEBAIGVuY25hbWVzLmMgd2NoYXIuYzog JSA6ICQoYmFja2VuZF9zcmMpL3V0aWxzL21iLyUKIAlybSAtZiAkQCAmJiAkKExOX1MpICQ8 IC4KIAogCi1saWJwcS5yYzogbGlicHEucmMuaW4KLQlzZWQgLWUgJ3MvXChWRVJTSU9OLipc KSwwICokJC9cMSwnYGRhdGUgJysleSVqJyB8IHNlZCAncy9eMCovLydgJy8nICQ8ID4kQAot Ci0jIERlcGVuZCBvbiBNYWtlZmlsZS5nbG9iYWwgdG8gZm9yY2UgcmVidWlsZCBvbiByZS1y dW4gb2YgY29uZmlndXJlLgotbGlicHEucmM6ICQodG9wX2J1aWxkZGlyKS9zcmMvTWFrZWZp bGUuZ2xvYmFsCi0KICMgTWFrZSBkZXBlbmRlbmNpZXMgb24gcGdfY29uZmlnX3BhdGhzLmgg dmlzaWJsZSwgdG9vLgogZmUtY29ubmVjdC5vOiBmZS1jb25uZWN0LmMgJCh0b3BfYnVpbGRk aXIpL3NyYy9wb3J0L3BnX2NvbmZpZ19wYXRocy5oCiBmZS1taXNjLm86IGZlLW1pc2MuYyAk KHRvcF9idWlsZGRpcikvc3JjL3BvcnQvcGdfY29uZmlnX3BhdGhzLmgKQEAgLTE0OCw3ICsx NDEsNyBAQCB1bmluc3RhbGw6IHVuaW5zdGFsbC1saWIKIAogY2xlYW4gZGlzdGNsZWFuOiBj bGVhbi1saWIKIAkkKE1BS0UpIC1DIHRlc3QgJEAKLQlybSAtZiAkKE9CSlMpIHB0aHJlYWQu aCBsaWJwcS5yYworCXJtIC1mICQoT0JKUykgcHRocmVhZC5oCiAjIE1pZ2h0IGJlIGxlZnQg b3ZlciBmcm9tIGEgV2luMzIgY2xpZW50LW9ubHkgYnVpbGQKIAlybSAtZiBwZ19jb25maWdf cGF0aHMuaAogIyBSZW1vdmUgZmlsZXMgd2UgKG1heSBoYXZlKSBzeW1saW5rZWQgaW4gZnJv bSBvdGhlciBwbGFjZXMKZGlmZiAtLWdpdCBhL3NyYy9pbnRlcmZhY2VzL2xpYnBxL2xpYnBx LnJjLmluIGIvc3JjL2ludGVyZmFjZXMvbGlicHEvbGlicHEucmMuaW4KZGVsZXRlZCBmaWxl IG1vZGUgMTAwNjQ0CmluZGV4IDg5NjY1MWE0MTEuLjAwMDAwMDAwMDAKLS0tIGEvc3JjL2lu dGVyZmFjZXMvbGlicHEvbGlicHEucmMuaW4KKysrIC9kZXYvbnVsbApAQCAtMSwzMSArMCww IEBACi0jaW5jbHVkZSA8d2ludmVyLmg+Ci0KLVZTX1ZFUlNJT05fSU5GTyBWRVJTSU9OSU5G TwotIEZJTEVWRVJTSU9OIDEzLDAsMCwwCi0gUFJPRFVDVFZFUlNJT04gMTMsMCwwLDAKLSBG SUxFRkxBR1NNQVNLIDB4M2ZMCi0gRklMRUZMQUdTIDAKLSBGSUxFT1MgVk9TX19XSU5ET1dT MzIKLSBGSUxFVFlQRSBWRlRfRExMCi0gRklMRVNVQlRZUEUgMHgwTAotQkVHSU4KLSAgICBC TE9DSyAiU3RyaW5nRmlsZUluZm8iCi0gICAgQkVHSU4KLSAgICAgICAgQkxPQ0sgIjA0MDkw NEIwIgotICAgICAgICBCRUdJTgotICAgICAgICAgICAgVkFMVUUgIkNvbXBhbnlOYW1lIiwg IlwwIgotICAgICAgICAgICAgVkFMVUUgIkZpbGVEZXNjcmlwdGlvbiIsICJQb3N0Z3JlU1FM IEFjY2VzcyBMaWJyYXJ5XDAiCi0gICAgICAgICAgICBWQUxVRSAiRmlsZVZlcnNpb24iLCAi MTMuMFwwIgotICAgICAgICAgICAgVkFMVUUgIkludGVybmFsTmFtZSIsICJsaWJwcVwwIgot ICAgICAgICAgICAgVkFMVUUgIkxlZ2FsQ29weXJpZ2h0IiwgIkNvcHlyaWdodCAoQykgMjAx OVwwIgotICAgICAgICAgICAgVkFMVUUgIkxlZ2FsVHJhZGVtYXJrcyIsICJcMCIKLSAgICAg ICAgICAgIFZBTFVFICJPcmlnaW5hbEZpbGVuYW1lIiwgImxpYnBxLmRsbFwwIgotICAgICAg ICAgICAgVkFMVUUgIlByb2R1Y3ROYW1lIiwgIlBvc3RncmVTUUxcMCIKLSAgICAgICAgICAg IFZBTFVFICJQcm9kdWN0VmVyc2lvbiIsICIxMy4wXDAiCi0gICAgICAgIEVORAotICAgIEVO RAotICAgIEJMT0NLICJWYXJGaWxlSW5mbyIKLSAgICBCRUdJTgotICAgICAgICBWQUxVRSAi VHJhbnNsYXRpb24iLCAweDQwOSwgMTIwMAotICAgIEVORAotRU5ECmRpZmYgLS1naXQgYS9z cmMvbWFrZWZpbGVzL01ha2VmaWxlLndpbjMyIGIvc3JjL21ha2VmaWxlcy9NYWtlZmlsZS53 aW4zMgppbmRleCA4YTdkNmZmZjNlLi5lNzJjYjJkYjBlIDEwMDY0NAotLS0gYS9zcmMvbWFr ZWZpbGVzL01ha2VmaWxlLndpbjMyCisrKyBiL3NyYy9tYWtlZmlsZXMvTWFrZWZpbGUud2lu MzIKQEAgLTU2LDExICs1Niw3IEBAIGVuZGlmCiAjIEJ1aWxkIHJ1bGVzIHRvIGFkZCB2ZXJz aW9uaW5mbyByZXNvdXJjZXMgdG8gd2luMzIgYmluYXJpZXMKIAogV0lOMzJSRVMgKz0gd2lu MzJ2ZXIubwotaWZlcSAoJChQR0ZJTEVTSExJQiksMSkKLVBHRlRZUEUgPSBWRlRfRExMCi1l bHNlCi1QR0ZUWVBFID0gVkZUX0FQUAotZW5kaWYKK1BHRlRZUEUgPSAkKGlmICQoc2hsaWIp LFZGVF9ETEwsVkZUX0FQUCkKIGlmbmVxICgsJChQR0FQUElDT04pKQogUEdJQ09TVFIgPSAk KHN1YnN0IC8sXC8sSURJX0lDT04gSUNPTiBcIiQodG9wX2J1aWxkZGlyKS9zcmMvcG9ydC8k KFBHQVBQSUNPTikuaWNvXCIpCiBlbmRpZgpAQCAtNzEsNyArNjcsMTYgQEAgZW5kaWYKICMg c2lnbmFsIHdpbjMydmVyLnJjIGF2YWlsYWJpbGl0eSB0byB0aGUgZGxsIGJ1aWxkIHJ1bGUg YmVsb3cuCiBpZm5kZWYgUEdYUwogd2luMzJ2ZXIucmM6ICQodG9wX3NyY2Rpcikvc3JjL3Bv cnQvd2luMzJ2ZXIucmMKLQlzZWQgLWUgJ3M7RklMRURFU0M7JChQR0ZJTEVERVNDKTsnIC1l ICdzO1ZGVF9BUFA7JChQR0ZUWVBFKTsnIC1lICdzO19JQ09fOyQoUEdJQ09TVFIpOycgLWUg J3M7XChWRVJTSU9OLipcKSwwICokJDtcMSwnYGRhdGUgJysleSVqJyB8IHNlZCAncy9eMCov LydgJzsnICQ8ID4kQAorCXNlZCAtZSAncztGSUxFREVTQzskKFBHRklMRURFU0MpOycgXAor CSAgICAtZSAncztWRlRfQVBQOyQoUEdGVFlQRSk7JyBcCisJICAgIC1lICdzO19JQ09fOyQo UEdJQ09TVFIpOycgXAorCSAgICAtZSAncztcKFZFUlNJT04uKlwpLDAgKiQkO1wxLCdgZGF0 ZSAnKyV5JWonIHwgc2VkICdzL14wKi8vJ2AnOycgXAorCSAgICAtZSAnL19JTlRFUk5BTF9O QU1FXy8kKGlmICQoc2hsaWIpLHM7X0lOVEVSTkFMX05BTUVfOyIkKGJhc2VuYW1lICQoc2hs aWIpKSI7LGQpJyBcCisJICAgIC1lICcvX09SSUdJTkFMX05BTUVfLyQoaWYgJChzaGxpYiks cztfT1JJR0lOQUxfTkFNRV87IiQoc2hsaWIpIjssZCknIFwKKwkgICQ8ID4kQAorCisjIERl cGVuZCBvbiBNYWtlZmlsZS5nbG9iYWwgdG8gZm9yY2UgcmVidWlsZCBvbiByZS1ydW4gb2Yg Y29uZmlndXJlLgord2luMzJ2ZXIucmM6ICQodG9wX2J1aWxkZGlyKS9zcmMvTWFrZWZpbGUu Z2xvYmFsCiBlbmRpZgogCiB3aW4zMnZlci5vOiB3aW4zMnZlci5yYwpkaWZmIC0tZ2l0IGEv c3JjL3BvcnQvd2luMzJ2ZXIucmMgYi9zcmMvcG9ydC93aW4zMnZlci5yYwppbmRleCA1NjMx ZWU5MTQyLi4wMjA0NTI3NWNkIDEwMDY0NAotLS0gYS9zcmMvcG9ydC93aW4zMnZlci5yYwor KysgYi9zcmMvcG9ydC93aW4zMnZlci5yYwpAQCAtMSwxMCArMSwxMiBAQAogI2luY2x1ZGUg PHdpbnZlci5oPgogI2luY2x1ZGUgInBnX2NvbmZpZy5oIgogCisvLyBodHRwczovL2RvY3Mu bWljcm9zb2Z0LmNvbS9lbi11cy93aW5kb3dzL3dpbjMyL21lbnVyYy92ZXJzaW9uaW5mby1y ZXNvdXJjZQorCiBWU19WRVJTSU9OX0lORk8gVkVSU0lPTklORk8KICBGSUxFVkVSU0lPTiAg ICAxMywwLDAsMAogIFBST0RVQ1RWRVJTSU9OIDEzLDAsMCwwCi0gRklMRUZMQUdTTUFTSyAg MHgxN0wKKyBGSUxFRkxBR1NNQVNLICBWU19GRklfRklMRUZMQUdTTUFTSwogIEZJTEVGTEFH UyAgICAgIDB4MEwKICBGSUxFT1MgICAgICAgICBWT1NfTlRfV0lORE9XUzMyCiAgRklMRVRZ UEUJVkZUX0FQUApAQCAtMTIsMTkgKzE0LDIxIEBAIFZTX1ZFUlNJT05fSU5GTyBWRVJTSU9O SU5GTwogQkVHSU4KICBCTE9DSyAiU3RyaW5nRmlsZUluZm8iCiAgQkVHSU4KLSAgQkxPQ0sg IjAwMDAwNGIwIgorICBCTE9DSyAiMDQwOTA0QjAiCQkJLy8gVS5TLiBFbmdsaXNoLCBVbmlj b2RlCiAgIEJFR0lOCiAgICBWQUxVRSAiQ29tcGFueU5hbWUiLCAgICAgICJQb3N0Z3JlU1FM IEdsb2JhbCBEZXZlbG9wbWVudCBHcm91cCIKICAgIFZBTFVFICJGaWxlRGVzY3JpcHRpb24i LCAgRklMRURFU0MKICAgIFZBTFVFICJGaWxlVmVyc2lvbiIsICAgICAgUEdfVkVSU0lPTgor ICAgVkFMVUUgIkludGVybmFsTmFtZSIsICAgICBfSU5URVJOQUxfTkFNRV8KICAgIFZBTFVF ICJMZWdhbENvcHlyaWdodCIsICJQb3J0aW9ucyBDb3B5cmlnaHQgKGMpIDE5OTYtMjAxOSwg UG9zdGdyZVNRTCBHbG9iYWwgRGV2ZWxvcG1lbnQgR3JvdXAuIFBvcnRpb25zIENvcHlyaWdo dCAoYykgMTk5NCwgUmVnZW50cyBvZiB0aGUgVW5pdmVyc2l0eSBvZiBDYWxpZm9ybmlhLiIK KyAgIFZBTFVFICJPcmlnaW5hbEZpbGVOYW1lIiwgX09SSUdJTkFMX05BTUVfCiAgICBWQUxV RSAiUHJvZHVjdE5hbWUiLCAgICAgICJQb3N0Z3JlU1FMIgogICAgVkFMVUUgIlByb2R1Y3RW ZXJzaW9uIiwgICBQR19WRVJTSU9OCiAgIEVORAogIEVORAogIEJMT0NLICJWYXJGaWxlSW5m byIKICBCRUdJTgotICBWQUxVRSAiVHJhbnNsYXRpb24iLCAweDAsIDEyMDAKKyAgVkFMVUUg IlRyYW5zbGF0aW9uIiwgMHgwNDA5LCAxMjAwCS8vIFUuUy4gRW5nbGlzaCwgVW5pY29kZQog IEVORAogRU5ECiAKZGlmZiAtLWdpdCBhL3NyYy90b29scy9jb3B5cmlnaHQucGwgYi9zcmMv dG9vbHMvY29weXJpZ2h0LnBsCmluZGV4IGUwYTc0NWY5ZTUuLmZiYzE1ZWVlN2EgMTAwNzU1 Ci0tLSBhL3NyYy90b29scy9jb3B5cmlnaHQucGwKKysrIGIvc3JjL3Rvb2xzL2NvcHlyaWdo dC5wbApAQCAtNjYsNiArNjYsNSBAQCBzdWIgd2FudGVkCiB9CiAKIHByaW50ICJNYW51YWxs eSB1cGRhdGU6XG4iOwotcHJpbnQgIiAgLi9zcmMvaW50ZXJmYWNlcy9saWJwcS9saWJwcS5y Yy5pbiBpbiBoZWFkXG4iOwogcHJpbnQgIiAgLi9kb2Mvc3JjL3NnbWwvbGVnYWwuc2dtbCBp biBoZWFkIGFuZCBiYWNrIGJyYW5jaGVzXG4iOwogcHJpbnQgIiAgLi9DT1BZUklHSFQgaW4g YmFjayBicmFuY2hlc1xuIjsKZGlmZiAtLWdpdCBhL3NyYy90b29scy9tc3ZjL01rdmNidWls ZC5wbSBiL3NyYy90b29scy9tc3ZjL01rdmNidWlsZC5wbQppbmRleCAzZDZlZjBkZTg0Li5m NmFiMGQ1MjhiIDEwMDY0NAotLS0gYS9zcmMvdG9vbHMvbXN2Yy9Na3ZjYnVpbGQucG0KKysr IGIvc3JjL3Rvb2xzL21zdmMvTWt2Y2J1aWxkLnBtCkBAIC0yNTAsOCArMjUwLDYgQEAgc3Vi IG1rdmNidWlsZAogCSRsaWJwcS0+QWRkTGlicmFyeSgnd3MyXzMyLmxpYicpOwogCSRsaWJw cS0+QWRkTGlicmFyeSgnd2xkYXAzMi5saWInKSBpZiAoJHNvbHV0aW9uLT57b3B0aW9uc30t PntsZGFwfSk7CiAJJGxpYnBxLT5Vc2VEZWYoJ3NyYy9pbnRlcmZhY2VzL2xpYnBxL2xpYnBx ZGxsLmRlZicpOwotCSRsaWJwcS0+UmVwbGFjZUZpbGUoJ3NyYy9pbnRlcmZhY2VzL2xpYnBx L2xpYnBxcmMuYycsCi0JCSdzcmMvaW50ZXJmYWNlcy9saWJwcS9saWJwcS5yYycpOwogCSRs aWJwcS0+QWRkUmVmZXJlbmNlKCRsaWJwZ2NvbW1vbiwgJGxpYnBncG9ydCk7CiAKIAkjIFRo ZSBPQkpTIHNjcmFwZXIgZG9lc24ndCBrbm93IGFib3V0IGlmZGVmcywgc28gcmVtb3ZlIGFw cHJvcHJpYXRlIGZpbGVzCmRpZmYgLS1naXQgYS9zcmMvdG9vbHMvbXN2Yy9Qcm9qZWN0LnBt IGIvc3JjL3Rvb2xzL21zdmMvUHJvamVjdC5wbQppbmRleCAxNmE3MzQwYjIyLi43ZDI1NzA0 ZTJjIDEwMDY0NAotLS0gYS9zcmMvdG9vbHMvbXN2Yy9Qcm9qZWN0LnBtCisrKyBiL3NyYy90 b29scy9tc3ZjL1Byb2plY3QucG0KQEAgLTMzOCw2ICszMzgsMTQgQEAgc3ViIEFkZFJlc291 cmNlRmlsZQogCQkJaWYgKCRzZWxmLT57dHlwZX0gZXEgImRsbCIpCiAJCQl7CiAJCQkJcy9W RlRfQVBQL1ZGVF9ETEwvZ207CisJCQkJbXkgJG5hbWUgPSAkc2VsZi0+e25hbWV9OworCQkJ CXMvX0lOVEVSTkFMX05BTUVfLyIkbmFtZSIvOworCQkJCXMvX09SSUdJTkFMX05BTUVfLyIk bmFtZS5kbGwiLzsKKwkJCX0KKwkJCWVsc2UKKwkJCXsKKwkJCQkvX0lOVEVSTkFMX05BTUVf LyAmJiBuZXh0OworCQkJCS9fT1JJR0lOQUxfTkFNRV8vICYmIG5leHQ7CiAJCQl9CiAJCQlw cmludCAkbyAkXzsKIAkJfQpkaWZmIC0tZ2l0IGEvc3JjL3Rvb2xzL21zdmMvU29sdXRpb24u cG0gYi9zcmMvdG9vbHMvbXN2Yy9Tb2x1dGlvbi5wbQppbmRleCA5MDliZGVkNTkyLi5iZTAy YmQ0NTI0IDEwMDY0NAotLS0gYS9zcmMvdG9vbHMvbXN2Yy9Tb2x1dGlvbi5wbQorKysgYi9z cmMvdG9vbHMvbXN2Yy9Tb2x1dGlvbi5wbQpAQCAtNjY4LDI3ICs2NjgsNiBAQCBzdWIgR2Vu ZXJhdGVGaWxlcwogCQkpOwogCX0KIAotCWlmIChJc05ld2VyKAotCQkJJ3NyYy9pbnRlcmZh Y2VzL2xpYnBxL2xpYnBxLnJjJywKLQkJCSdzcmMvaW50ZXJmYWNlcy9saWJwcS9saWJwcS5y Yy5pbicpKQotCXsKLQkJcHJpbnQgIkdlbmVyYXRpbmcgbGlicHEucmMuLi5cbiI7Ci0JCW15 ICgkc2VjLCAkbWluLCAkaG91ciwgJG1kYXksICRtb24sICR5ZWFyLCAkd2RheSwgJHlkYXks ICRpc2RzdCkgPQotCQkgIGxvY2FsdGltZSh0aW1lKTsKLQkJbXkgJGQgPSAoJHllYXIgLSAx MDApIC4gIiR5ZGF5IjsKLQkJb3BlbihteSAkaSwgJzwnLCAnc3JjL2ludGVyZmFjZXMvbGli cHEvbGlicHEucmMuaW4nKQotCQkgIHx8IGNvbmZlc3MgIkNvdWxkIG5vdCBvcGVuIGxpYnBx LnJjLmluIjsKLQkJb3BlbihteSAkbywgJz4nLCAnc3JjL2ludGVyZmFjZXMvbGlicHEvbGli cHEucmMnKQotCQkgIHx8IGNvbmZlc3MgIkNvdWxkIG5vdCBvcGVuIGxpYnBxLnJjIjsKLQkJ d2hpbGUgKDwkaT4pCi0JCXsKLQkJCXMvKFZFUlNJT04uKiksMC8kMSwkZC87Ci0JCQlwcmlu dCAkbyAkXzsKLQkJfQotCQljbG9zZSgkaSk7Ci0JCWNsb3NlKCRvKTsKLQl9Ci0KIAlpZiAo SXNOZXdlcignc3JjL2Jpbi9wc3FsL3NxbF9oZWxwLmgnLCAnc3JjL2Jpbi9wc3FsL2NyZWF0 ZV9oZWxwLnBsJykpCiAJewogCQlwcmludCAiR2VuZXJhdGluZyBzcWxfaGVscC5oLi4uXG4i OwpkaWZmIC0tZ2l0IGEvc3JjL3Rvb2xzL21zdmMvY2xlYW4uYmF0IGIvc3JjL3Rvb2xzL21z dmMvY2xlYW4uYmF0CmluZGV4IGQwMzRlYzU3NjUuLjIzNWRlOTMyNTMgMTAwNzU1Ci0tLSBh L3NyYy90b29scy9tc3ZjL2NsZWFuLmJhdAorKysgYi9zcmMvdG9vbHMvbXN2Yy9jbGVhbi5i YXQKQEAgLTg5LDcgKzg5LDYgQEAgaWYgJURJU1QlPT0xIGlmIGV4aXN0IHNyY1xiYWNrZW5k XHJlcGxpY2F0aW9uXHN5bmNyZXBfc2Nhbm5lci5jIGRlbCAvcSBzcmNcYmFja2UKIGlmICVE SVNUJT09MSBpZiBleGlzdCBzcmNcYmFja2VuZFxyZXBsaWNhdGlvblxzeW5jcmVwX2dyYW0u YyBkZWwgL3Egc3JjXGJhY2tlbmRccmVwbGljYXRpb25cc3luY3JlcF9ncmFtLmMKIAogCi1p ZiBleGlzdCBzcmNcaW50ZXJmYWNlc1xsaWJwcVxsaWJwcS5yYyBkZWwgL3Egc3JjXGludGVy ZmFjZXNcbGlicHFcbGlicHEucmMKIGlmIGV4aXN0IHNyY1xpbnRlcmZhY2VzXGxpYnBxXGxp YnBxZGxsLmRlZiBkZWwgL3Egc3JjXGludGVyZmFjZXNcbGlicHFcbGlicHFkbGwuZGVmCiBp ZiBleGlzdCBzcmNcaW50ZXJmYWNlc1xlY3BnXGNvbXBhdGxpYlxjb21wYXRsaWIuZGVmIGRl bCAvcSBzcmNcaW50ZXJmYWNlc1xlY3BnXGNvbXBhdGxpYlxjb21wYXRsaWIuZGVmCiBpZiBl eGlzdCBzcmNcaW50ZXJmYWNlc1xlY3BnXGVjcGdsaWJcZWNwZ2xpYi5kZWYgZGVsIC9xIHNy Y1xpbnRlcmZhY2VzXGVjcGdcZWNwZ2xpYlxlY3BnbGliLmRlZgpkaWZmIC0tZ2l0IGEvc3Jj L3Rvb2xzL3ZlcnNpb25fc3RhbXAucGwgYi9zcmMvdG9vbHMvdmVyc2lvbl9zdGFtcC5wbApp bmRleCA1MDg5ODU0OTdmLi45ZjdjYjkxZjJlIDEwMDc1NQotLS0gYS9zcmMvdG9vbHMvdmVy c2lvbl9zdGFtcC5wbAorKysgYi9zcmMvdG9vbHMvdmVyc2lvbl9zdGFtcC5wbApAQCAtMTAy LDEzICsxMDIsNiBAQAogCSItZSAncy9BQ19JTklUKFxcW1Bvc3RncmVTUUxcXF0sIFxcW1sw LTlhLXouXSpcXF0vQUNfSU5JVChbUG9zdGdyZVNRTF0sIFskZnVsbHZlcnNpb25dLyciCiAp OwogCi1zZWRfZmlsZSgic3JjL2ludGVyZmFjZXMvbGlicHEvbGlicHEucmMuaW4iLAotCSIt ZSAncy9GSUxFVkVSU0lPTiBbMC05XSosWzAtOV0qLFswLTldKiwwL0ZJTEVWRVJTSU9OICRt YWpvcnZlcnNpb24sMCwkbnVtZXJpY21pbm9yLDAvJyAiCi0JICAuICItZSAncy9QUk9EVUNU VkVSU0lPTiBbMC05XSosWzAtOV0qLFswLTldKiwwL1BST0RVQ1RWRVJTSU9OICRtYWpvcnZl cnNpb24sMCwkbnVtZXJpY21pbm9yLDAvJyAiCi0JICAuICItZSAncy9WQUxVRSBcIkZpbGVW ZXJzaW9uXCIsIFwiWzAtOS5dKi9WQUxVRSBcIkZpbGVWZXJzaW9uXCIsIFwiJG51bWVyaWN2 ZXJzaW9uLycgIgotCSAgLiAiLWUgJ3MvVkFMVUUgXCJQcm9kdWN0VmVyc2lvblwiLCBcIlsw LTkuXSovVkFMVUUgXCJQcm9kdWN0VmVyc2lvblwiLCBcIiRudW1lcmljdmVyc2lvbi8nIgot KTsKLQogc2VkX2ZpbGUoInNyYy9wb3J0L3dpbjMydmVyLnJjIiwKIAkiLWUgJ3MvRklMRVZF UlNJT04gICAgWzAtOV0qLFswLTldKixbMC05XSosMC9GSUxFVkVSU0lPTiAgICAkbWFqb3J2 ZXJzaW9uLDAsJG51bWVyaWNtaW5vciwwLycgIgogCSAgLiAiLWUgJ3MvUFJPRFVDVFZFUlNJ T04gWzAtOV0qLFswLTldKixbMC05XSosMC9QUk9EVUNUVkVSU0lPTiAkbWFqb3J2ZXJzaW9u LDAsJG51bWVyaWNtaW5vciwwLyciCi0tIAoyLjI0LjEKCg== --------------1D6171C6806A4A76F425DD75--