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.92) (envelope-from ) id 1jBD4d-0002ia-Il for pgsql-hackers@arkaria.postgresql.org; Mon, 09 Mar 2020 07:43:39 +0000 Received: from localhost ([127.0.0.1] helo=malur.postgresql.org) by malur.postgresql.org with esmtp (Exim 4.89) (envelope-from ) id 1jBD4a-0001yn-9G for pgsql-hackers@arkaria.postgresql.org; Mon, 09 Mar 2020 07:43:36 +0000 Received: from magus.postgresql.org ([2a02:c0:301:0:ffff::29]) by malur.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.89) (envelope-from ) id 1jBD4Z-0001yg-VF for pgsql-hackers@lists.postgresql.org; Mon, 09 Mar 2020 07:43:36 +0000 Received: from wout4-smtp.messagingengine.com ([64.147.123.20]) by magus.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1jBD4W-0000c1-Jo for pgsql-hackers@postgresql.org; Mon, 09 Mar 2020 07:43:35 +0000 Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.west.internal (Postfix) with ESMTP id 6DA4F546; Mon, 9 Mar 2020 03:43:28 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute1.internal (MEProxy); Mon, 09 Mar 2020 03:43:28 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=XZt4P0 zX4yqUJ1UADuZkIxoHs3TQP66Q+yOyTCHWm2I=; b=UVrt/8+RHN54JPNIX0b6RG TQpy8dlxOFO/y2MRQDX/4JDgx1nd0vsuI8dMjH87cC9jdmU/zPZN5Pnbl6DWp44m kdN1eT92Hpeb3xllnv2WTgyl8MbgLbLjq/8P0hi3LYAOmhI+wLW/SuwF68S6lwBn xdttQjEgxTcN0Gm371p7qa0b7/OwU7S+QexgS/L9Nhyu3u0PS/YjSecRxkTOCGGd StPvq9cUjfbVe9/V8+63LhvqdieSl4cdeX6yhf+dIDq9vD6ErJmnAFmN44rfLnjE lVQXX0QzjOS5MnN3wqr/YaU9DUMh6jj94S7ub+1Z9hDYiw6ZjCiwjjX6us5tcc+A == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedugedruddujedgudduvdcutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecunecujfgurhepuffvfhfhohfkffgfgggjtgesmh dtreertdefjeenucfhrhhomheprfgvthgvrhcugfhishgvnhhtrhgruhhtuceophgvthgv rhdrvghishgvnhhtrhgruhhtsedvnhguqhhurggurhgrnhhtrdgtohhmqeenucffohhmrg hinhepvdhnughquhgrughrrghnthdrtghomhenucfkphepleefrddvgedvrddvudefrddv gedunecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepph gvthgvrhdrvghishgvnhhtrhgruhhtsedvnhguqhhurggurhgrnhhtrdgtohhm X-ME-Proxy: Received: from april.pezone.net (p5df2d5f1.dip0.t-ipconnect.de [93.242.213.241]) by mail.messagingengine.com (Postfix) with ESMTPA id B0F22328005E; Mon, 9 Mar 2020 03:43:26 -0400 (EDT) Subject: Re: Remove win32ver.rc from version_stamp.pl To: Tom Lane References: <1ee46ac4-a9b2-4531-bf54-5ec2e374634d@2ndquadrant.com> <10989.1583103086@sss.pgh.pa.us> Cc: pgsql-hackers From: Peter Eisentraut Organization: 2ndQuadrant Message-ID: <5599e5cb-7d07-c4fc-24f9-273c4b7a2eec@2ndquadrant.com> Date: Mon, 9 Mar 2020 08:43:25 +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 In-Reply-To: <10989.1583103086@sss.pgh.pa.us> Content-Type: multipart/mixed; boundary="------------24D4217B354DCB4D8ADD700A" Content-Language: en-US List-Id: List-Help: List-Subscribe: List-Post: List-Owner: List-Archive: Precedence: bulk This is a multi-part message in MIME format. --------------24D4217B354DCB4D8ADD700A Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit On 2020-03-01 23:51, Tom Lane wrote: > In general, while I'm on board with the idea, I wonder whether it > wouldn't be smarter to keep on defining PG_MAJORVERSION as a string, > and just add PG_MAJORVERSION_NUM alongside of it. This would > eliminate some hunks from the patch in places where it's more > convenient to have the version as a string, and it would avoid > what could otherwise be a pretty painful cross-version incompatibility > for extensions. We already provide PG_VERSION in both forms, so > I don't see any inconsistency in doing likewise for PG_MAJORVERSION. Agreed. Here is another patch. -- Peter Eisentraut http://www.2ndQuadrant.com/ PostgreSQL Development, 24x7 Support, Remote DBA, Training & Services --------------24D4217B354DCB4D8ADD700A Content-Type: text/plain; charset=UTF-8; x-mac-type="0"; x-mac-creator="0"; name="v2-0001-Remove-win32ver.rc-from-version_stamp.pl.patch" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="v2-0001-Remove-win32ver.rc-from-version_stamp.pl.patch" RnJvbSAwNzcwYzZlZjY3Yjc4MjA4NzkxZTQ2M2Y0NDUzMTc1ZTJkMTUyNzUwIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBQZXRlciBFaXNlbnRyYXV0IDxwZXRlckBlaXNlbnRy YXV0Lm9yZz4KRGF0ZTogTW9uLCA5IE1hciAyMDIwIDA4OjQyOjAyICswMTAwClN1YmplY3Q6 IFtQQVRDSCB2Ml0gUmVtb3ZlIHdpbjMydmVyLnJjIGZyb20gdmVyc2lvbl9zdGFtcC5wbAoK VGhpcyByZW1vdmVzIGFub3RoZXIgcmVsaWMgZnJvbSB0aGUgb2xkIG5tYWtlLWJhc2VkIFdp bmRvd3MgYnVpbGQuCnZlcnNpb25fc3RhbXAucGwgcHV0IHZlcnNpb24gbnVtYmVyIGluZm9y bWF0aW9uIGludG8gd2luMzJ2ZXIucmMuICBCdXQKd2luMzJ2ZXIucmMgYWxyZWFkeSBnZXRz IG90aGVyIHZlcnNpb24gbnVtYmVyIGluZm9ybWF0aW9uIGZyb20gdGhlCnByZXByb2Nlc3Nv ciBhdCBidWlsZCB0aW1lLCBzbyBpdCB3b3VsZCBtYWtlIG1vcmUgc2Vuc2UgaWYgYWxsIHZl cnNpb24KbnVtYmVyIGluZm9ybWF0aW9uIHdvdWxkIGJlIGhhbmRsZWQgaW4gdGhlIHNhbWUg d2F5IGFuZCB3ZSBkb24ndCBoYXZlCnR3byBwbGFjZXMgdGhhdCBkbyBpdC4KCldoYXQgd2Ug bmVlZCBmb3IgdGhpcyBpcyBoYXZpbmcgdGhlIG1ham9yIHZlcnNpb24gbnVtYmVyIGFuZCB0 aGUgbWlub3IKdmVyc2lvbiBudW1iZXIgYXMgc2VwYXJhdGUgaW50ZWdlciBzeW1ib2xzLiAg Qm90aCBjb25maWd1cmUgYW5kClNvbHV0aW9uLnBtIGFscmVhZHkgaGF2ZSB0aGF0IGxvZ2lj LCBiZWNhdXNlIHRoZXkgY29tcHV0ZQpQR19WRVJTSU9OX05VTS4gIFNvIHdlIGp1c3Qga2Vl cCBhbGwgdGhlIGxvZ2ljIHRoZXJlIG5vdy4gIFB1dCB0aGUKbWlub3IgdmVyc2lvbiBudW1i ZXIgaW50byBhIG5ldyBzeW1ib2wgUEdfTUlOT1JWRVJTSU9OX05VTS4gIEFsc28sIGFkZAph IHN5bWJvbCBQR19NQUpPUlZFUlNJT05fTlVNLCB3aGljaCBpcyBhIG51bWJlciwgYWxvbmdz aWRlIHRoZQpleGlzdGluZyBQR19NQUpPUlZFUlNJT04sIHdoaWNoIGlzIGEgc3RyaW5nLgoK RGlzY3Vzc2lvbjogaHR0cHM6Ly93d3cucG9zdGdyZXNxbC5vcmcvbWVzc2FnZS1pZC9mbGF0 LzFlZTQ2YWM0LWE5YjItNDUzMS1iZjU0LTVlYzJlMzc0NjM0ZEAybmRxdWFkcmFudC5jb20K LS0tCiBjb25maWd1cmUgICAgICAgICAgICAgICAgICB8IDE1ICsrKysrKysrKysrKystLQog Y29uZmlndXJlLmluICAgICAgICAgICAgICAgfCAgNyArKysrKy0tCiBzcmMvaW5jbHVkZS9w Z19jb25maWcuaC5pbiB8ICA2ICsrKysrKwogc3JjL3BvcnQvd2luMzJ2ZXIucmMgICAgICAg fCAgNCArKy0tCiBzcmMvdG9vbHMvbXN2Yy9Tb2x1dGlvbi5wbSB8IDE2ICsrKysrKysrKy0t LS0tLS0KIHNyYy90b29scy92ZXJzaW9uX3N0YW1wLnBsIHwgMTQgKy0tLS0tLS0tLS0tLS0K IDYgZmlsZXMgY2hhbmdlZCwgMzYgaW5zZXJ0aW9ucygrKSwgMjYgZGVsZXRpb25zKC0pCgpk aWZmIC0tZ2l0IGEvY29uZmlndXJlIGIvY29uZmlndXJlCmluZGV4IDQ1ZGJlYjRkMTkuLmQ2 ZDNmMjZkMDMgMTAwNzU1Ci0tLSBhL2NvbmZpZ3VyZQorKysgYi9jb25maWd1cmUKQEAgLTI4 MDUsNiArMjgwNSw4IEBAIF9BQ0VPRgogCiAKIFBHX01BSk9SVkVSU0lPTj1gZXhwciAiJFBB Q0tBR0VfVkVSU0lPTiIgOiAnXChbMC05XVswLTldKlwpJ2AKK1BHX01JTk9SVkVSU0lPTj1g ZXhwciAiJFBBQ0tBR0VfVkVSU0lPTiIgOiAnLipcLlwoWzAtOV1bMC05XSpcKSdgCit0ZXN0 IC1uICIkUEdfTUlOT1JWRVJTSU9OIiB8fCBQR19NSU5PUlZFUlNJT049MAogCiAKIGNhdCA+ PmNvbmZkZWZzLmggPDxfQUNFT0YKQEAgLTI4MTIsNiArMjgxNCwxNiBAQCBjYXQgPj5jb25m ZGVmcy5oIDw8X0FDRU9GCiBfQUNFT0YKIAogCitjYXQgPj5jb25mZGVmcy5oIDw8X0FDRU9G CisjZGVmaW5lIFBHX01BSk9SVkVSU0lPTl9OVU0gJFBHX01BSk9SVkVSU0lPTgorX0FDRU9G CisKKworY2F0ID4+Y29uZmRlZnMuaCA8PF9BQ0VPRgorI2RlZmluZSBQR19NSU5PUlZFUlNJ T05fTlVNICRQR19NSU5PUlZFUlNJT04KK19BQ0VPRgorCisKIAogCiAKQEAgLTE4ODc1LDgg KzE4ODg3LDcgQEAgX0FDRU9GCiAKICMgU3VwcGx5IGEgbnVtZXJpYyB2ZXJzaW9uIHN0cmlu ZyBmb3IgdXNlIGJ5IDNyZCBwYXJ0eSBhZGQtb25zCiAjIGF3ayAtRiBpcyBhIHJlZ2V4IG9u IHNvbWUgcGxhdGZvcm1zLCBhbmQgbm90IG9uIG90aGVycywgc28gbWFrZSAiLiIgYSB0YWIK LVBHX1ZFUlNJT05fTlVNPSJgZWNobyAiJFBBQ0tBR0VfVkVSU0lPTiIgfCBzZWQgJ3MvW0Et WmEtel0uKiQvLycgfAotdHIgJy4nICcJJyB8CitQR19WRVJTSU9OX05VTT0iYGVjaG8gIiRQ R19NQUpPUlZFUlNJT04JJFBHX01JTk9SVkVSU0lPTiIgfAogJEFXSyAne3ByaW50ZiAiJWQl MDRkIiwgJDEsICQyfSdgIgogCiBjYXQgPj5jb25mZGVmcy5oIDw8X0FDRU9GCmRpZmYgLS1n aXQgYS9jb25maWd1cmUuaW4gYi9jb25maWd1cmUuaW4KaW5kZXggMjJmMDk2YTVhYy4uNzg5 MDJmYjYwZCAxMDA2NDQKLS0tIGEvY29uZmlndXJlLmluCisrKyBiL2NvbmZpZ3VyZS5pbgpA QCAtMzAsOCArMzAsMTIgQEAgQUNfUFJFRklYX0RFRkFVTFQoL3Vzci9sb2NhbC9wZ3NxbCkK IEFDX0RFRklORV9VTlFVT1RFRChDT05GSUdVUkVfQVJHUywgWyIkYWNfY29uZmlndXJlX2Fy Z3MiXSwgW1NhdmVkIGFyZ3VtZW50cyBmcm9tIGNvbmZpZ3VyZV0pCiAKIFtQR19NQUpPUlZF UlNJT049YGV4cHIgIiRQQUNLQUdFX1ZFUlNJT04iIDogJ1woWzAtOV1bMC05XSpcKSdgXQor W1BHX01JTk9SVkVSU0lPTj1gZXhwciAiJFBBQ0tBR0VfVkVSU0lPTiIgOiAnLipcLlwoWzAt OV1bMC05XSpcKSdgXQordGVzdCAtbiAiJFBHX01JTk9SVkVSU0lPTiIgfHwgUEdfTUlOT1JW RVJTSU9OPTAKIEFDX1NVQlNUKFBHX01BSk9SVkVSU0lPTikKIEFDX0RFRklORV9VTlFVT1RF RChQR19NQUpPUlZFUlNJT04sICIkUEdfTUFKT1JWRVJTSU9OIiwgW1Bvc3RncmVTUUwgbWFq b3IgdmVyc2lvbiBhcyBhIHN0cmluZ10pCitBQ19ERUZJTkVfVU5RVU9URUQoUEdfTUFKT1JW RVJTSU9OX05VTSwgJFBHX01BSk9SVkVSU0lPTiwgW1Bvc3RncmVTUUwgbWFqb3IgdmVyc2lv biBudW1iZXJdKQorQUNfREVGSU5FX1VOUVVPVEVEKFBHX01JTk9SVkVSU0lPTl9OVU0sICRQ R19NSU5PUlZFUlNJT04sIFtQb3N0Z3JlU1FMIG1pbm9yIHZlcnNpb24gbnVtYmVyXSkKIAog UEdBQ19BUkdfUkVRKHdpdGgsIGV4dHJhLXZlcnNpb24sIFtTVFJJTkddLCBbYXBwZW5kIFNU UklORyB0byB2ZXJzaW9uXSwKICAgICAgICAgICAgICBbUEdfVkVSU0lPTj0iJFBBQ0tBR0Vf VkVSU0lPTiR3aXRodmFsIl0sCkBAIC0yMzE4LDggKzIzMjIsNyBAQCBBQ19ERUZJTkVfVU5R VU9URUQoUEdfVkVSU0lPTl9TVFIsCiAKICMgU3VwcGx5IGEgbnVtZXJpYyB2ZXJzaW9uIHN0 cmluZyBmb3IgdXNlIGJ5IDNyZCBwYXJ0eSBhZGQtb25zCiAjIGF3ayAtRiBpcyBhIHJlZ2V4 IG9uIHNvbWUgcGxhdGZvcm1zLCBhbmQgbm90IG9uIG90aGVycywgc28gbWFrZSAiLiIgYSB0 YWIKLVtQR19WRVJTSU9OX05VTT0iYGVjaG8gIiRQQUNLQUdFX1ZFUlNJT04iIHwgc2VkICdz L1tBLVphLXpdLiokLy8nIHwKLXRyICcuJyAnCScgfAorW1BHX1ZFUlNJT05fTlVNPSJgZWNo byAiJFBHX01BSk9SVkVSU0lPTgkkUEdfTUlOT1JWRVJTSU9OIiB8CiAkQVdLICd7cHJpbnRm ICIlZCUwNGQiLCAkMSwgJDJ9J2AiXQogQUNfREVGSU5FX1VOUVVPVEVEKFBHX1ZFUlNJT05f TlVNLCAkUEdfVkVSU0lPTl9OVU0sIFtQb3N0Z3JlU1FMIHZlcnNpb24gYXMgYSBudW1iZXJd KQogQUNfU1VCU1QoUEdfVkVSU0lPTl9OVU0pCmRpZmYgLS1naXQgYS9zcmMvaW5jbHVkZS9w Z19jb25maWcuaC5pbiBiL3NyYy9pbmNsdWRlL3BnX2NvbmZpZy5oLmluCmluZGV4IGQ3NThk ZmQzNmUuLjQxYWQyMDkzODAgMTAwNjQ0Ci0tLSBhL3NyYy9pbmNsdWRlL3BnX2NvbmZpZy5o LmluCisrKyBiL3NyYy9pbmNsdWRlL3BnX2NvbmZpZy5oLmluCkBAIC03ODAsNiArNzgwLDEy IEBACiAvKiBQb3N0Z3JlU1FMIG1ham9yIHZlcnNpb24gYXMgYSBzdHJpbmcgKi8KICN1bmRl ZiBQR19NQUpPUlZFUlNJT04KIAorLyogUG9zdGdyZVNRTCBtYWpvciB2ZXJzaW9uIG51bWJl ciAqLworI3VuZGVmIFBHX01BSk9SVkVSU0lPTl9OVU0KKworLyogUG9zdGdyZVNRTCBtaW5v ciB2ZXJzaW9uIG51bWJlciAqLworI3VuZGVmIFBHX01JTk9SVkVSU0lPTl9OVU0KKwogLyog RGVmaW5lIHRvIGJlc3QgcHJpbnRmIGZvcm1hdCBhcmNoZXR5cGUsIHVzdWFsbHkgZ251X3By aW50ZiBpZiBhdmFpbGFibGUuICovCiAjdW5kZWYgUEdfUFJJTlRGX0FUVFJJQlVURQogCmRp ZmYgLS1naXQgYS9zcmMvcG9ydC93aW4zMnZlci5yYyBiL3NyYy9wb3J0L3dpbjMydmVyLnJj CmluZGV4IDdiODhkNGIzNmYuLjU4MzRiMzFkZGMgMTAwNjQ0Ci0tLSBhL3NyYy9wb3J0L3dp bjMydmVyLnJjCisrKyBiL3NyYy9wb3J0L3dpbjMydmVyLnJjCkBAIC00LDggKzQsOCBAQAog Ly8gaHR0cHM6Ly9kb2NzLm1pY3Jvc29mdC5jb20vZW4tdXMvd2luZG93cy93aW4zMi9tZW51 cmMvdmVyc2lvbmluZm8tcmVzb3VyY2UKIAogVlNfVkVSU0lPTl9JTkZPIFZFUlNJT05JTkZP Ci0gRklMRVZFUlNJT04gICAgMTMsMCwwLDAKLSBQUk9EVUNUVkVSU0lPTiAxMywwLDAsMAor IEZJTEVWRVJTSU9OICAgIFBHX01BSk9SVkVSU0lPTl9OVU0sMCxQR19NSU5PUlZFUlNJT05f TlVNLDAKKyBQUk9EVUNUVkVSU0lPTiBQR19NQUpPUlZFUlNJT05fTlVNLDAsUEdfTUlOT1JW RVJTSU9OX05VTSwwCiAgRklMRUZMQUdTTUFTSyAgVlNfRkZJX0ZJTEVGTEFHU01BU0sKICBG SUxFRkxBR1MgICAgICAweDBMCiAgRklMRU9TICAgICAgICAgVk9TX05UX1dJTkRPV1MzMgpk aWZmIC0tZ2l0IGEvc3JjL3Rvb2xzL21zdmMvU29sdXRpb24ucG0gYi9zcmMvdG9vbHMvbXN2 Yy9Tb2x1dGlvbi5wbQppbmRleCA0MjQ0YTRhOGFjLi4zNGQxZjYxZGJhIDEwMDY0NAotLS0g YS9zcmMvdG9vbHMvbXN2Yy9Tb2x1dGlvbi5wbQorKysgYi9zcmMvdG9vbHMvbXN2Yy9Tb2x1 dGlvbi5wbQpAQCAtMTksNyArMTksNiBAQCBzdWIgX25ldwogCW15ICRzZWxmICAgICAgPSB7 CiAJCXByb2plY3RzICAgICAgICAgICAgICAgICAgID0+IHt9LAogCQlvcHRpb25zICAgICAg ICAgICAgICAgICAgICA9PiAkb3B0aW9ucywKLQkJbnVtdmVyICAgICAgICAgICAgICAgICAg ICAgPT4gJycsCiAJCVZpc3VhbFN0dWRpb1ZlcnNpb24gICAgICAgID0+IHVuZGVmLAogCQlN aW5pbXVtVmlzdWFsU3R1ZGlvVmVyc2lvbiA9PiB1bmRlZiwKIAkJdmN2ZXIgICAgICAgICAg ICAgICAgICAgICAgPT4gdW5kZWYsCkBAIC0xNTEsNiArMTUwLDcgQEAgc3ViIEdlbmVyYXRl RmlsZXMKIAlteSAkcGFja2FnZV92ZXJzaW9uOwogCW15ICRwYWNrYWdlX2J1Z3JlcG9ydDsK IAlteSAkcGFja2FnZV91cmw7CisJbXkgKCRtYWpvcnZlciwgJG1pbm9ydmVyKTsKIAogCSMg UGFyc2UgY29uZmlndXJlLmluIHRvIGdldCB2ZXJzaW9uIG51bWJlcnMKIAlvcGVuKG15ICRj LCAnPCcsICJjb25maWd1cmUuaW4iKQpAQCAtMTcxLDggKzE3MSw4IEBAIHN1YiBHZW5lcmF0 ZUZpbGVzCiAJCQl7CiAJCQkJY29uZmVzcyAiQmFkIGZvcm1hdCBvZiB2ZXJzaW9uOiAkc2Vs Zi0+e3N0cnZlcn1cbiI7CiAJCQl9Ci0JCQkkc2VsZi0+e251bXZlcn0gPSBzcHJpbnRmKCIl ZCUwNGQiLCAkMSwgJDIgPyAkMiA6IDApOwotCQkJJHNlbGYtPnttYWpvcnZlcn0gPSBzcHJp bnRmKCIlZCIsICQxKTsKKwkJCSRtYWpvcnZlciA9IHNwcmludGYoIiVkIiwgJDEpOworCQkJ JG1pbm9ydmVyID0gc3ByaW50ZigiJWQiLCAkMiA/ICQyIDogMCk7CiAJCX0KIAl9CiAJY2xv c2UoJGMpOwpAQCAtNDQwLDExICs0NDAsMTMgQEAgc3ViIEdlbmVyYXRlRmlsZXMKIAkJUEdf SU5UMTI4X1RZUEUgICAgICA9PiB1bmRlZiwKIAkJUEdfSU5UNjRfVFlQRSAgICAgICA9PiAn bG9uZyBsb25nIGludCcsCiAJCVBHX0tSQl9TUlZOQU0gICAgICAgPT4gcXF7InBvc3RncmVz In0sCi0JCVBHX01BSk9SVkVSU0lPTiAgICAgPT4gcXF7IiRzZWxmLT57bWFqb3J2ZXJ9In0s CisJCVBHX01BSk9SVkVSU0lPTiAgICAgPT4gcXF7IiRtYWpvcnZlciJ9LAorCQlQR19NQUpP UlZFUlNJT05fTlVNID0+ICRtYWpvcnZlciwKKwkJUEdfTUlOT1JWRVJTSU9OX05VTSA9PiAk bWlub3J2ZXIsCiAJCVBHX1BSSU5URl9BVFRSSUJVVEUgPT4gdW5kZWYsCiAJCVBHX1VTRV9T VERCT09MICAgICAgPT4gMSwKIAkJUEdfVkVSU0lPTiAgICAgICAgICA9PiBxcXsiJHBhY2th Z2VfdmVyc2lvbiRleHRyYXZlciJ9LAotCQlQR19WRVJTSU9OX05VTSAgICAgID0+ICRzZWxm LT57bnVtdmVyfSwKKwkJUEdfVkVSU0lPTl9OVU0gICAgICA9PiBzcHJpbnRmKCIlZCUwNGQi LCAkbWFqb3J2ZXIsICRtaW5vcnZlciksCiAJCVBHX1ZFUlNJT05fU1RSID0+CiAJCSAgcXF7 IlBvc3RncmVTUUwgJHBhY2thZ2VfdmVyc2lvbiRleHRyYXZlciwgY29tcGlsZWQgYnkgVmlz dWFsIEMrKyBidWlsZCAiIENwcEFzU3RyaW5nMihfTVNDX1ZFUikgIiwgJGJpdHMtYml0In0s CiAJCVBST0ZJTEVfUElEX0RJUiAgICAgICAgID0+IHVuZGVmLApAQCAtNzc4LDcgKzc4MCw3 IEBAIEVPRgogCQljaGRpcignc3JjL2JhY2tlbmQvY2F0YWxvZycpOwogCQlteSAkYmtpX3Ny Y3MgPSBqb2luKCcgLi4vLi4vLi4vc3JjL2luY2x1ZGUvY2F0YWxvZy8nLCBAYmtpX3NyY3Mp OwogCQlzeXN0ZW0oCi0JCQkicGVybCBnZW5ia2kucGwgLS1pbmNsdWRlLXBhdGggLi4vLi4v Li4vc3JjL2luY2x1ZGUvIC0tc2V0LXZlcnNpb249JHNlbGYtPnttYWpvcnZlcn0gJGJraV9z cmNzIgorCQkJInBlcmwgZ2VuYmtpLnBsIC0taW5jbHVkZS1wYXRoIC4uLy4uLy4uL3NyYy9p bmNsdWRlLyAtLXNldC12ZXJzaW9uPSRtYWpvcnZlciAkYmtpX3NyY3MiCiAJCSk7CiAJCW9w ZW4obXkgJGYsICc+JywgJ2JraS1zdGFtcCcpCiAJCSAgfHwgY29uZmVzcyAiQ291bGQgbm90 IHRvdWNoIGJraS1zdGFtcCI7CkBAIC04MTMsNyArODE1LDcgQEAgRU9GCiAJICB8fCBjcm9h ayAiQ291bGQgbm90IHdyaXRlIHRvIHZlcnNpb24uc2dtbFxuIjsKIAlwcmludCAkbyA8PEVP RjsKIDwhRU5USVRZIHZlcnNpb24gIiRwYWNrYWdlX3ZlcnNpb24iPgotPCFFTlRJVFkgbWFq b3J2ZXJzaW9uICIkc2VsZi0+e21ham9ydmVyfSI+Cis8IUVOVElUWSBtYWpvcnZlcnNpb24g IiRtYWpvcnZlciI+CiBFT0YKIAljbG9zZSgkbyk7CiAJcmV0dXJuOwpkaWZmIC0tZ2l0IGEv c3JjL3Rvb2xzL3ZlcnNpb25fc3RhbXAucGwgYi9zcmMvdG9vbHMvdmVyc2lvbl9zdGFtcC5w bAppbmRleCBkOGFiOGQ5ZGU4Li5jYjU5YWQyMzRhIDEwMDc1NQotLS0gYS9zcmMvdG9vbHMv dmVyc2lvbl9zdGFtcC5wbAorKysgYi9zcmMvdG9vbHMvdmVyc2lvbl9zdGFtcC5wbApAQCAt MzAsMzIgKzMwLDI3IEBACiBteSAkbWlub3IgPSBzaGlmdDsKIGRlZmluZWQoJG1pbm9yKSB8 fCBkaWUgIiQwOiBtaXNzaW5nIHJlcXVpcmVkIGFyZ3VtZW50OiBtaW5vci12ZXJzaW9uXG4i OwogCi1teSAoJGRvdG5lZWRlZCwgJG51bWVyaWNtaW5vcik7CitteSAoJGRvdG5lZWRlZCk7 CiAKIGlmICgkbWlub3IgPX4gbS9eXGQrJC8pCiB7CiAJJGRvdG5lZWRlZCAgICA9IDE7Ci0J JG51bWVyaWNtaW5vciA9ICRtaW5vcjsKIH0KIGVsc2lmICgkbWlub3IgZXEgImRldmVsIikK IHsKIAkkZG90bmVlZGVkICAgID0gMDsKLQkkbnVtZXJpY21pbm9yID0gMDsKIH0KIGVsc2lm ICgkbWlub3IgPX4gbS9eYWxwaGFcZCskLykKIHsKIAkkZG90bmVlZGVkICAgID0gMDsKLQkk bnVtZXJpY21pbm9yID0gMDsKIH0KIGVsc2lmICgkbWlub3IgPX4gbS9eYmV0YVxkKyQvKQog ewogCSRkb3RuZWVkZWQgICAgPSAwOwotCSRudW1lcmljbWlub3IgPSAwOwogfQogZWxzaWYg KCRtaW5vciA9fiBtL15yY1xkKyQvKQogewogCSRkb3RuZWVkZWQgICAgPSAwOwotCSRudW1l cmljbWlub3IgPSAwOwogfQogZWxzZQogewpAQCAtNzMsOCArNjgsNiBAQAogewogCSRmdWxs dmVyc2lvbiA9ICRtYWpvcnZlcnNpb24gLiAkbWlub3I7CiB9Ci1teSAkbnVtZXJpY3ZlcnNp b24gPSAkbWFqb3J2ZXJzaW9uIC4gIi4iIC4gJG51bWVyaWNtaW5vcjsKLW15ICRwYWRudW1l cmljdmVyc2lvbiA9IHNwcmludGYoIiVkJTA0ZCIsICRtYWpvcnZlcnNpb24sICRudW1lcmlj bWlub3IpOwogCiAjIEdldCB0aGUgYXV0b2NvbmYgdmVyc2lvbiBudW1iZXIgZm9yIGV2ZW50 dWFsIG5hZyBtZXNzYWdlCiAjICh0aGlzIGFsc28gZW5zdXJlcyB3ZSdyZSBpbiB0aGUgcmln aHQgZGlyZWN0b3J5KQpAQCAtMTAyLDExICs5NSw2IEBACiAJIi1lICdzL0FDX0lOSVQoXFxb UG9zdGdyZVNRTFxcXSwgXFxbWzAtOWEtei5dKlxcXS9BQ19JTklUKFtQb3N0Z3JlU1FMXSwg WyRmdWxsdmVyc2lvbl0vJyIKICk7CiAKLXNlZF9maWxlKCJzcmMvcG9ydC93aW4zMnZlci5y YyIsCi0JIi1lICdzL0ZJTEVWRVJTSU9OICAgIFswLTldKixbMC05XSosWzAtOV0qLDAvRklM RVZFUlNJT04gICAgJG1ham9ydmVyc2lvbiwwLCRudW1lcmljbWlub3IsMC8nICIKLQkgIC4g Ii1lICdzL1BST0RVQ1RWRVJTSU9OIFswLTldKixbMC05XSosWzAtOV0qLDAvUFJPRFVDVFZF UlNJT04gJG1ham9ydmVyc2lvbiwwLCRudW1lcmljbWlub3IsMC8nIgotKTsKLQogcHJpbnQg IlN0YW1wZWQgdGhlc2UgZmlsZXMgd2l0aCB2ZXJzaW9uIG51bWJlciAkZnVsbHZlcnNpb246 XG4kZml4ZWRmaWxlcyI7CiBwcmludCAiRG9uJ3QgZm9yZ2V0IHRvIHJ1biBhdXRvY29uZiAk YWNvbmZ2ZXIgYmVmb3JlIGNvbW1pdHRpbmcuXG4iOwogCi0tIAoyLjI1LjAKCg== --------------24D4217B354DCB4D8ADD700A--