Received: from malur.postgresql.org ([217.196.149.56]) by arkaria.postgresql.org with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1tLICK-00DvNm-MW for pgsql-hackers@arkaria.postgresql.org; Wed, 11 Dec 2024 08:35:56 +0000 Received: from localhost ([127.0.0.1] helo=malur.postgresql.org) by malur.postgresql.org with esmtp (Exim 4.94.2) (envelope-from ) id 1tLICH-00EFfT-Af for pgsql-hackers@arkaria.postgresql.org; Wed, 11 Dec 2024 08:35:54 +0000 Received: from magus.postgresql.org ([2a02:c0:301:0:ffff::29]) by malur.postgresql.org with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1tLICG-00EFfK-UN for pgsql-hackers@lists.postgresql.org; Wed, 11 Dec 2024 08:35:54 +0000 Received: from mail-pl1-x630.google.com ([2607:f8b0:4864:20::630]) by magus.postgresql.org with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.94.2) (envelope-from ) id 1tLICE-002E2u-At for pgsql-hackers@postgresql.org; Wed, 11 Dec 2024 08:35:53 +0000 Received: by mail-pl1-x630.google.com with SMTP id d9443c01a7336-2166360285dso25919925ad.1 for ; Wed, 11 Dec 2024 00:35:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1733906148; x=1734510948; darn=postgresql.org; h=subject:from:content-language:to:user-agent:mime-version:date :message-id:from:to:cc:subject:date:message-id:reply-to; bh=fL8bD2unWLfegNo9ygrlfEJxs81Ibi9wwDjsuFagtAI=; b=Bc72sS740HDTaz1TWMTNaG1rQQCVCnVQBN52Ml38Q7Z5UB0HatzMWoJutPPOYoMIl4 JYRKrM8S4EV3BfSUzD8VpIK6EnuR1qqQ5v69yU7I5sxoXvqu8es+hCioMfs53p2dKTkH 84WEe0PKbjStU+8VQ+zfKQRh42u5ABaogRtGB78FUYkRl11j0Kjan3k/rCp/RPGdjCbA 0Y9W+ni/tY5D4NL5G170zOiyaClgJI7E6AmH7PEMMq4EK312CH25HQR0o5xBXZ/NarMa HgYVdhj/on0D0sk/tE7XYlQ805+lKr3fNtdeyFP5asFfIW7lvyBYU5lyYByyDPjzx/Hc etug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1733906148; x=1734510948; h=subject:from:content-language:to:user-agent:mime-version:date :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=fL8bD2unWLfegNo9ygrlfEJxs81Ibi9wwDjsuFagtAI=; b=R/rSxhPrecTGSX7BHmiuko8P34xyas9mU5lHlF/Cs8h1zSCtrY6ASc2WhopLPUuusY /JrsPwbi9eV8yzIaRm3H2gVtFjughULGLqKVolZy4pkIFFyqlKn+v6R3zsdG3BF58HNV NmI9dMpWYHAB94die3gSNDK3ABuwqVSBbm/bya0A4F9wgsuJaeI/GmljfxGxvNF+fw6r oxJ8uqcst+zYZVXOpJUaY3nmJoTTICdVONVbRYxbYhvBEhKt9111jFZ6fD/qUvL0MPjo lzBtIpME5FE9xgmzu56prCzInoSKJ2J62qsHBLmn5nOzN4p3korFR+PJrSMGcDDNAwSt aK9Q== X-Gm-Message-State: AOJu0YyKBRV73beEOF+pVbY/JB00WYEM5EISwIEiK0BIW7aH0U8ABRKr eNqtLfkbHf8NcLKeRhjAtbMATAbQxZgL7va3vhSK39g+PGmsiBFX98E3tGbQ X-Gm-Gg: ASbGncuYDOfavxHNzZz/6WyJDourf3WgG71Ur+y78/C2a5IQNZG4ffVA/29fjbFSHs0 fs4otDcj4pAVu24TGsLCayB9lPHAHxrliKBbY3q+qqhHLEaoazoNpEKOV/K5Znqb/crE5YW51BO DhqPmVVMmjr9nk8As652liH1CeKgp7s9tYH4MZ+XmxAj0ENGmRKsroT/9K9lL6vhCkjmSre2AD5 uiDumDsTwdiXcmhs+YEZGIxDewYe2uS36RZ41nNceFRn82hqakKLFkf+TgTotgHBs3Ly6j+dsH+ 4n3A+c6yGLXDmSfjXro28C0cMyK7ZVA= X-Google-Smtp-Source: AGHT+IET0t2MLBOjiOBYhQk2K8dQ2JDXDOa+MkNTDzBbyuQlIBzJzRbHg9iFVyXZdjN1YGpF5cJCcQ== X-Received: by 2002:a17:903:2282:b0:215:b5c6:9ee8 with SMTP id d9443c01a7336-2177839835cmr32074165ad.7.1733906148290; Wed, 11 Dec 2024 00:35:48 -0800 (PST) Received: from [192.168.1.50] (cm-171-100-79-18.revip10.asianet.co.th. [171.100.79.18]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-21625a0b842sm75110325ad.34.2024.12.11.00.35.45 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 11 Dec 2024 00:35:47 -0800 (PST) Content-Type: multipart/mixed; boundary="------------1WzSpuuBfj50kz9pHcLyWjxw" Message-ID: Date: Wed, 11 Dec 2024 15:35:43 +0700 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird To: PostgreSQL-development Content-Language: en-US From: Andrei Lepikhov Subject: Add Postgres module info List-Id: List-Help: List-Subscribe: List-Post: List-Owner: List-Archive: Archived-At: Precedence: bulk This is a multi-part message in MIME format. --------------1WzSpuuBfj50kz9pHcLyWjxw Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Hi, I would like to propose the module_info structure, which aims to let extension maintainers sew some data into the binary file. Being included in the module code, this information remains unchanged and is available for reading by a backend. As I see, this question was already debated during the introduction of PG_MODULE_MAGIC [1], and developers didn't add such data because the practical case wasn't obvious. Right now, when multiple extensions are maintained and used in installations constantly, we have enough information to continue this discussion. The idea was initially born with the support of the extension, which had a stable UI and frequently changing library code. To answer customer requests, it was necessary to know the specific version of the code to reproduce the situation in a test environment. That required introducing a file naming rule and a specific exported variable into the module code. However, this is not a sufficient guarantee of version determination and complicates the technical process when supporting many extensions obtained from different sources. Another example is a library without an installation script at all - see auto_explain. Without a 'CREATE EXTENSION' call, we don't have an option to find out the library's version. It would be much easier if the Postgres catalogue contained a function, for example, module_info(module_name), which would allow you to determine the file's full path and name containing the desired module in the psql console and its version. On the other hand, the Omnigres project (author Yurii Rashkovski) also came up with the idea of ​​​​module versioning, although it does this externally out of the Postgres core. When designing this code, I also adopted ideas from this repository. So, let me propose a patch that introduces this tiny feature: the maintainer can add the PG_MODULE_INFO macro to the library code, and Postgres reads it on the module's load. There is a question of how much information makes sense to add to the module. For now, each time I prepare extensions to release, I have to add the extension name (to avoid issues with file naming/renaming) and the version. Format of the version storage? Do we need a separate minor version number? It is a subject to debate. [1] https://www.postgresql.org/message-id/flat/20060507211705.GB3808%40svana.org -- regards, Andrei Lepikhov --------------1WzSpuuBfj50kz9pHcLyWjxw Content-Type: text/plain; charset=UTF-8; name="v0-0001-Introduce-MODULE_INFO-macro.patch" Content-Disposition: attachment; filename="v0-0001-Introduce-MODULE_INFO-macro.patch" Content-Transfer-Encoding: base64 RnJvbSA1NmQ0YTBkYWRkMzJhNjAxZDUyZWQ1OWIzODkzNWEzNmExNzVmNjM1IE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiAiQW5kcmVpIFYuIExlcGlraG92IiA8bGVwaWhvdkBn bWFpbC5jb20+CkRhdGU6IFR1ZSwgMTkgTm92IDIwMjQgMTg6NDU6MzYgKzA3MDAKU3ViamVj dDogW1BBVENIIHYwXSBJbnRyb2R1Y2UgTU9EVUxFX0lORk8gbWFjcm8uCgpUaGlzIG9wdGlv bmFsIG1hY3JvIGFsbG93cyBkeW5hbWljYWxseSBsb2FkZWQgc2hhcmVkIGxpYnJhcmllcyAo bW9kdWxlcykKYSBzdGFuZGFyZCB3YXkgdG8gaW5jb3Jwb3JhdGUgdmVyc2lvbiBhbmQgbmFt ZSBkYXRhLiBUaGUgaW50cm9kdWNlZCBjYXRhbG9ndWUKcm91dGluZSBtb2R1bGVfaW5mbyBj YW4gYmUgdXNlZCB0byBmaW5kIHRoaXMgbW9kdWxlIGJ5IG5hbWUgYW5kIGNoZWNrCnRoZSB2 ZXJzaW9uLiBJdCBtYWtlcyB1c2VycyBpbmRlcGVuZGVudCBmcm9tIGZpbGUgbmFtaW5nIGNv bnZlbnRpb25zLgoKV2l0aCBhIGdyb3dpbmcgbnVtYmVyIG9mIFBvc3RncmVzIGNvcmUgaG9v a3MgYW5kIHRoZSBpbnRyb2R1Y3Rpb24gb2YgbmFtZWQgRFNNCnNlZ21lbnRzLCB0aGUgbnVt YmVyIG9mIG1vZHVsZXMgdGhhdCBkb24ndCBuZWVkIHRvIGJlIGxvYWRlZCBvbiBzdGFydHVw IG1heQpncm93IGZhc3QuIE1vcmVvdmVyLCBpbiBtYW55IGNhc2VzIHJlbGF0ZWQgdG8gcXVl cnkgdHJlZSB0cmFuc2Zvcm1hdGlvbiBvcgpleHRyYSBwYXRoIHJlY29tbWVuZGF0aW9uLCBz dWNoIG1vZHVsZXMgbWlnaHQgbm90IG5lZWQgZGF0YWJhc2Ugb2JqZWN0cyBleGNlcHQKR1VD cyAtIHNlZSBhdXRvX2V4cGxhaW4gYXMgYW4gZXhhbXBsZS4gVGhhdCBtZWFucyB0aGV5IGRv bid0IG5lZWQgdG8gZXhlY3V0ZQp0aGUgJ0NSRUFURSBFWFRFTlNJT04nIHN0YXRlbWVudCBh dCBhbGwgYW5kIGRvbid0IGhhdmUgYSByZWNvcmQgaW4KdGhlIHBnX2V4dGVuc2lvbiB0YWJs ZS4gU3VjaCBhIHRyaWNrIHByb3ZpZGVzIG11Y2ggZmxleGliaWxpdHksIGluY2x1ZGluZwph biBvbmxpbmUgdXBncmFkZSBhbmQgbWF5IGJlY29tZSB3aWRlc3ByZWFkLgoKSW4gYWRkaXRp b24sIGl0IGlzIGFsc28gY29udmVuaWVudCBpbiBzdXBwb3J0IHRvIGJlIHN1cmUgdGhhdCB0 aGUgaW5zdGFsbGF0aW9uCihvciBhdCBsZWFzdCB0aGUgYmFja2VuZCkgaW5jbHVkZXMgYSBz cGVjaWZpYyB2ZXJzaW9uIG9mIHRoZSBtb2R1bGUuIEV2ZW4gaWYKYSBtb2R1bGUgaGFzIGFu IGluc3RhbGxhdGlvbiBzY3JpcHQsIGl0IGlzIG5vdCByYXJlIHRoYXQgaXQgcHJvdmlkZXMK YW4gaW1wbGVtZW50YXRpb24gZm9yIGEgcmFuZ2Ugb2YgVUkgcm91dGluZSB2ZXJzaW9ucy4g SXQgbWFrZXMgc2Vuc2UgdG8gZW5zdXJlCndoaWNoIHNwZWNpZmljIHZlcnNpb24gb2YgdGhl IGNvZGUgaXMgdXNlZC4KCkRpc2N1c3Npb25zIFsxLDJdIGFscmVhZHkgbWVudGlvbmVkIG1v ZHVsZS1pbmZvIHN0dWZmLCBidXQgYXQgdGhhdCB0aW1lLApleHRlbnNpYmlsaXR5IHRlY2hu aXF1ZXMgYW5kIGV4dGVuc2lvbiBwb3B1bGFyaXR5IHdlcmUgbG93LCBhbmQgaXQgd2Fzbid0 Cm5lY2Vzc2FyeSB0byBwcm92aWRlIHRoYXQgZGF0YS4KClsxXSBodHRwczovL3d3dy5wb3N0 Z3Jlc3FsLm9yZy9tZXNzYWdlLWlkL2ZsYXQvMjAwNjA1MDcyMTE3MDUuR0IzODA4JTQwc3Zh bmEub3JnClsyXSBodHRwczovL3d3dy5wb3N0Z3Jlc3FsLm9yZy9tZXNzYWdlLWlkL2ZsYXQv MjAwNTExMDYxNjI2NTguMzRjMzFkNTclNDB0aHVuZGVyLmxvZ2ljYWxjaGFvcy5vcmcKLS0t CiBjb250cmliL2F1dG9fZXhwbGFpbi9hdXRvX2V4cGxhaW4uYyAgICAgICAgICAgfCAgMiAr CiBjb250cmliL2F1dG9fZXhwbGFpbi90LzAwMV9hdXRvX2V4cGxhaW4ucGwgICAgfCAgOSAr KysKIGNvbnRyaWIvcGdfcHJld2FybS90LzAwMV9iYXNpYy5wbCAgICAgICAgICAgICB8IDEw ICsrLQogLi4uL3BnX3N0YXRfc3RhdGVtZW50cy9wZ19zdGF0X3N0YXRlbWVudHMuYyAgIHwg IDEgKwogc3JjL2JhY2tlbmQvdXRpbHMvZm1nci9kZm1nci5jICAgICAgICAgICAgICAgIHwg NzMgKysrKysrKysrKysrKysrKysrLQogc3JjL2luY2x1ZGUvY2F0YWxvZy9wZ19wcm9jLmRh dCAgICAgICAgICAgICAgIHwgIDYgKysKIHNyYy9pbmNsdWRlL2ZtZ3IuaCAgICAgICAgICAg ICAgICAgICAgICAgICAgICB8IDE4ICsrKysrCiA3IGZpbGVzIGNoYW5nZWQsIDExNyBpbnNl cnRpb25zKCspLCAyIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2NvbnRyaWIvYXV0b19l eHBsYWluL2F1dG9fZXhwbGFpbi5jIGIvY29udHJpYi9hdXRvX2V4cGxhaW4vYXV0b19leHBs YWluLmMKaW5kZXggNjIzYTY3NGY5OS4uZjQxMTBlYjFhYSAxMDA2NDQKLS0tIGEvY29udHJp Yi9hdXRvX2V4cGxhaW4vYXV0b19leHBsYWluLmMKKysrIGIvY29udHJpYi9hdXRvX2V4cGxh aW4vYXV0b19leHBsYWluLmMKQEAgLTIyLDYgKzIyLDggQEAKIAogUEdfTU9EVUxFX01BR0lD OwogCitQR19NT0RVTEVfSU5GTygiYXV0b19leHBsYWluIiwgMTAwMDAwMCk7CisKIC8qIEdV QyB2YXJpYWJsZXMgKi8KIHN0YXRpYyBpbnQJYXV0b19leHBsYWluX2xvZ19taW5fZHVyYXRp b24gPSAtMTsgLyogbXNlYyBvciAtMSAqLwogc3RhdGljIGludAlhdXRvX2V4cGxhaW5fbG9n X3BhcmFtZXRlcl9tYXhfbGVuZ3RoID0gLTE7IC8qIGJ5dGVzIG9yIC0xICovCmRpZmYgLS1n aXQgYS9jb250cmliL2F1dG9fZXhwbGFpbi90LzAwMV9hdXRvX2V4cGxhaW4ucGwgYi9jb250 cmliL2F1dG9fZXhwbGFpbi90LzAwMV9hdXRvX2V4cGxhaW4ucGwKaW5kZXggMGU1YjM0YWZh OS4uZDYwYzJjYmJmMSAxMDA2NDQKLS0tIGEvY29udHJpYi9hdXRvX2V4cGxhaW4vdC8wMDFf YXV0b19leHBsYWluLnBsCisrKyBiL2NvbnRyaWIvYXV0b19leHBsYWluL3QvMDAxX2F1dG9f ZXhwbGFpbi5wbApAQCAtNTMsNiArNTMsMTUgQEAgbGlrZSgKIAlxci9TZXEgU2NhbiBvbiBw Z19jbGFzcy8sCiAJInNlcXVlbnRpYWwgc2NhbiBsb2dnZWQsIHRleHQgbW9kZSIpOwogCisk bG9nX2NvbnRlbnRzID0gJG5vZGUtPnNhZmVfcHNxbCgKKwkicG9zdGdyZXMiLCBxe1NFTEVD VCBzdWJzdHJpbmcobGlibmFtZSwgJ2F1dG9fZXhwbGFpbicpLHZlcnNpb24KKwkJCQkgIEZS T00gbW9kdWxlX2luZm8oJ2F1dG9fZXhwbGFpbicpO30pOworCitsaWtlKAorCSRsb2dfY29u dGVudHMsCisJcXIvYXV0b19leHBsYWlufDEwMDAwMDAvLAorCSJDaGVjayBtb2R1bGUgdmVy c2lvbiIpOworCiAjIFByZXBhcmVkIHF1ZXJ5LgogJGxvZ19jb250ZW50cyA9IHF1ZXJ5X2xv Zygkbm9kZSwKIAlxe1BSRVBBUkUgZ2V0X3Byb2MobmFtZSkgQVMgU0VMRUNUICogRlJPTSBw Z19wcm9jIFdIRVJFIHByb25hbWUgPSAkMTsgRVhFQ1VURSBnZXRfcHJvYygnaW50NHBsJyk7 fQpkaWZmIC0tZ2l0IGEvY29udHJpYi9wZ19wcmV3YXJtL3QvMDAxX2Jhc2ljLnBsIGIvY29u dHJpYi9wZ19wcmV3YXJtL3QvMDAxX2Jhc2ljLnBsCmluZGV4IDgyNWQzNDQ4ZWUuLjE0MWI4 YjdkN2QgMTAwNjQ0Ci0tLSBhL2NvbnRyaWIvcGdfcHJld2FybS90LzAwMV9iYXNpYy5wbAor KysgYi9jb250cmliL3BnX3ByZXdhcm0vdC8wMDFfYmFzaWMucGwKQEAgLTI1LDggKzI1LDE2 IEBAICRub2RlLT5zYWZlX3BzcWwoInBvc3RncmVzIiwKIAkgIC4gIkNSRUFURSBUQUJMRSB0 ZXN0KGMxIGludCk7XG4iCiAJICAuICJJTlNFUlQgSU5UTyB0ZXN0IFNFTEVDVCBnZW5lcmF0 ZV9zZXJpZXMoMSwgMTAwKTsiKTsKIAotIyB0ZXN0IHJlYWQgbW9kZQorIyB0ZXN0IGVtcHR5 IG1vZHVsZSBpbmZvCiBteSAkcmVzdWx0ID0KKyAgJG5vZGUtPnNhZmVfcHNxbCgicG9zdGdy ZXMiLCAiU0VMRUNUICogRlJPTSBtb2R1bGVfaW5mbygnZmFrZV9tb2R1bGUnKTsiKTsKK2xp a2UoJHJlc3VsdCwgcXIvfC8sICdSZXR1cm4gbnVsbCBpZiBtb2R1bGUgZG9lcyBub3QgZXhp c3QnKTsKKyRyZXN1bHQgPQorICAkbm9kZS0+c2FmZV9wc3FsKCJwb3N0Z3JlcyIsICJTRUxF Q1QgKiBGUk9NIG1vZHVsZV9pbmZvKCdwZ19wcmV3YXJtJyk7Iik7CitsaWtlKCRyZXN1bHQs IHFyL3wvLCAnUmV0dXJuIG51bGwgaWYgbW9kdWxlIGRvZXMgbm90IHByb3ZpZGUgYW4gaW5m bycpOworCisjIHRlc3QgcmVhZCBtb2RlCiskcmVzdWx0ID0KICAgJG5vZGUtPnNhZmVfcHNx bCgicG9zdGdyZXMiLCAiU0VMRUNUIHBnX3ByZXdhcm0oJ3Rlc3QnLCAncmVhZCcpOyIpOwog bGlrZSgkcmVzdWx0LCBxci9eWzEtOV1bMC05XSokLywgJ3JlYWQgbW9kZSBzdWNjZWVkZWQn KTsKIApkaWZmIC0tZ2l0IGEvY29udHJpYi9wZ19zdGF0X3N0YXRlbWVudHMvcGdfc3RhdF9z dGF0ZW1lbnRzLmMgYi9jb250cmliL3BnX3N0YXRfc3RhdGVtZW50cy9wZ19zdGF0X3N0YXRl bWVudHMuYwppbmRleCA0OWM2NTdiM2UwLi4wYWZkMjMyMTFhIDEwMDY0NAotLS0gYS9jb250 cmliL3BnX3N0YXRfc3RhdGVtZW50cy9wZ19zdGF0X3N0YXRlbWVudHMuYworKysgYi9jb250 cmliL3BnX3N0YXRfc3RhdGVtZW50cy9wZ19zdGF0X3N0YXRlbWVudHMuYwpAQCAtNzIsNiAr NzIsNyBAQAogI2luY2x1ZGUgInV0aWxzL3RpbWVzdGFtcC5oIgogCiBQR19NT0RVTEVfTUFH SUM7CitQR19NT0RVTEVfSU5GTygicGdfc3RhdF9zdGF0ZW1lbnRzIiwgMDEwMDAwKTsKIAog LyogTG9jYXRpb24gb2YgcGVybWFuZW50IHN0YXRzIGZpbGUgKHZhbGlkIHdoZW4gZGF0YWJh c2UgaXMgc2h1dCBkb3duKSAqLwogI2RlZmluZSBQR1NTX0RVTVBfRklMRQlQR1NUQVRfU1RB VF9QRVJNQU5FTlRfRElSRUNUT1JZICIvcGdfc3RhdF9zdGF0ZW1lbnRzLnN0YXQiCmRpZmYg LS1naXQgYS9zcmMvYmFja2VuZC91dGlscy9mbWdyL2RmbWdyLmMgYi9zcmMvYmFja2VuZC91 dGlscy9mbWdyL2RmbWdyLmMKaW5kZXggYzdhYTc4OWI1MS4uNTkzMWMzMDUwMiAxMDA2NDQK LS0tIGEvc3JjL2JhY2tlbmQvdXRpbHMvZm1nci9kZm1nci5jCisrKyBiL3NyYy9iYWNrZW5k L3V0aWxzL2ZtZ3IvZGZtZ3IuYwpAQCAtMzEsMTAgKzMxLDEyIEBACiAjZW5kaWYJCQkJCQkJ LyogIVdJTjMyICovCiAKICNpbmNsdWRlICJmbWdyLmgiCisjaW5jbHVkZSAiZnVuY2FwaS5o IgogI2luY2x1ZGUgImxpYi9zdHJpbmdpbmZvLmgiCiAjaW5jbHVkZSAibWlzY2FkbWluLmgi CiAjaW5jbHVkZSAic3RvcmFnZS9mZC5oIgogI2luY2x1ZGUgInN0b3JhZ2Uvc2htZW0uaCIK KyNpbmNsdWRlICJ1dGlscy9idWlsdGlucy5oIgogI2luY2x1ZGUgInV0aWxzL2hzZWFyY2gu aCIKIAogCkBAIC02MSw3ICs2Myw5IEBAIHR5cGVkZWYgc3RydWN0IGRmX2ZpbGVzCiAJaW5v X3QJCWlub2RlOwkJCS8qIElub2RlIG51bWJlciBvZiBmaWxlICovCiAjZW5kaWYKIAl2b2lk CSAgICpoYW5kbGU7CQkJLyogYSBoYW5kbGUgZm9yIHBnX2RsKiBmdW5jdGlvbnMgKi8KLQlj aGFyCQlmaWxlbmFtZVtGTEVYSUJMRV9BUlJBWV9NRU1CRVJdOwkvKiBGdWxsIHBhdGhuYW1l IG9mIGZpbGUgKi8KKwljaGFyCQluYW1lW05BTUVEQVRBTEVOXTsKKwlpbnQJCQl2ZXJzaW9u OworCWNoYXIJCWZpbGVuYW1lWzI1Nl07CS8qIEZ1bGwgcGF0aG5hbWUgb2YgZmlsZSAqLwog fSBEeW5hbWljRmlsZUxpc3Q7CiAKIHN0YXRpYyBEeW5hbWljRmlsZUxpc3QgKmZpbGVfbGlz dCA9IE5VTEw7CkBAIC0xODUsNiArMTg5LDcgQEAgaW50ZXJuYWxfbG9hZF9saWJyYXJ5KGNv bnN0IGNoYXIgKmxpYm5hbWUpCiB7CiAJRHluYW1pY0ZpbGVMaXN0ICpmaWxlX3NjYW5uZXI7 CiAJUEdNb2R1bGVNYWdpY0Z1bmN0aW9uIG1hZ2ljX2Z1bmM7CisJUEdNb2R1bGVJbmZvRnVu Y3Rpb24gbWluZm9fZnVuYzsKIAljaGFyCSAgICpsb2FkX2Vycm9yOwogCXN0cnVjdCBzdGF0 IHN0YXRfYnVmOwogCVBHX2luaXRfdAlQR19pbml0OwpAQCAtMjgxLDYgKzI4NiwyNiBAQCBp bnRlcm5hbF9sb2FkX2xpYnJhcnkoY29uc3QgY2hhciAqbGlibmFtZSkKIAkJCQkJIGVycmhp bnQoIkV4dGVuc2lvbiBsaWJyYXJpZXMgYXJlIHJlcXVpcmVkIHRvIHVzZSB0aGUgUEdfTU9E VUxFX01BR0lDIG1hY3JvLiIpKSk7CiAJCX0KIAorCQkvKgorCQkgKiBNb2R1bGUgaW5mbyBp cyBhbiBvcHRpb25hbCBibG9jay4gVGhlIFBHX01PRFVMRV9NQUdJQyBtYWNoaW5lcnkKKwkJ ICogYWxyZWFkeSBjaGVja2VkIGNvbXBhdGliaWxpdHkgb2YgdGhlIG1vZHVsZSBhbmQgdGhl IGNvcmUgY29kZXMuIFNvLAorCQkgKiB3ZSBkb2Vzbid0IG5lZWQgdG8gYmUgdG9vIGNhcmVm dWwgaGVyZS4KKwkJICovCisJCW1pbmZvX2Z1bmMgPSAoUEdNb2R1bGVJbmZvRnVuY3Rpb24p CisJCQlkbHN5bShmaWxlX3NjYW5uZXItPmhhbmRsZSwgUEdfTU9EVUxFSU5GT19GVU5DVElP Tl9OQU1FX1NUUklORyk7CisJCWlmIChtaW5mb19mdW5jKQorCQl7CisJCQljb25zdCBwZ19t aW5mb19zdHJ1Y3QgKm1pbmZvID0gKCptaW5mb19mdW5jKSAoKTsKKworCQkJZmlsZV9zY2Fu bmVyLT52ZXJzaW9uID0gbWluZm8tPnZlcjsKKwkJCXN0cmNweShmaWxlX3NjYW5uZXItPm5h bWUsIG1pbmZvLT5uYW1lKTsKKwkJfQorCQllbHNlCisJCXsKKwkJCS8qIFRoYXQgbWVhbnMg dGhlIGxpYnJhcnkgZG9lc24ndCBwcm92aWRlIG1vZHVsZSBpbmZvIHNvIGZhci4gKi8KKwkJ CWZpbGVfc2Nhbm5lci0+dmVyc2lvbiA9IC0xOworCQl9CisKIAkJLyoKIAkJICogSWYgdGhl IGxpYnJhcnkgaGFzIGEgX1BHX2luaXQoKSBmdW5jdGlvbiwgY2FsbCBpdC4KIAkJICovCkBA IC02ODUsMyArNzEwLDQ5IEBAIFJlc3RvcmVMaWJyYXJ5U3RhdGUoY2hhciAqc3RhcnRfYWRk cmVzcykKIAkJc3RhcnRfYWRkcmVzcyArPSBzdHJsZW4oc3RhcnRfYWRkcmVzcykgKyAxOwog CX0KIH0KKworRGF0dW0KK21vZHVsZV9pbmZvKFBHX0ZVTkNUSU9OX0FSR1MpCit7CisJRnVu Y0NhbGxDb250ZXh0CSAgICpmdW5jY3R4OworCU1lbW9yeUNvbnRleHQJCW9sZGNvbnRleHQ7 CisJY2hhcgkJCSAgICptb2R1bGVfbmFtZSA9IHRleHRfdG9fY3N0cmluZyhQR19HRVRBUkdf VEVYVF9QUCgwKSk7CisJRHluYW1pY0ZpbGVMaXN0CSAgICpmaWxlX3NjYW5uZXI7CisJVHVw bGVEZXNjCQkJdHVwZGVzYzsKKwlMaXN0CQkJICAgKm1vZGxzdCA9IE5JTDsKKwlEYXR1bQkJ CQlyZXN1bHQ7CisJRGF0dW0JCQkJdmFsdWVzWzJdOworCWJvb2wJCQkJaXNudWxsWzJdID0g ezAsMH07CisKKwlpZiAoU1JGX0lTX0ZJUlNUQ0FMTCgpKQorCXsKKwkJZnVuY2N0eCA9IFNS Rl9GSVJTVENBTExfSU5JVCgpOworCQlvbGRjb250ZXh0ID0gTWVtb3J5Q29udGV4dFN3aXRj aFRvKGZ1bmNjdHgtPm11bHRpX2NhbGxfbWVtb3J5X2N0eCk7CisKKwkJaWYgKGdldF9jYWxs X3Jlc3VsdF90eXBlKGZjaW5mbywgTlVMTCwgJnR1cGRlc2MpICE9IFRZUEVGVU5DX0NPTVBP U0lURSkKKwkJCWVsb2coRVJST1IsICJyZXR1cm4gdHlwZSBtdXN0IGJlIGEgcm93IHR5cGUi KTsKKworCQlmb3IgKGZpbGVfc2Nhbm5lciA9IGZpbGVfbGlzdDsgZmlsZV9zY2FubmVyICE9 IE5VTEw7CisJCQlmaWxlX3NjYW5uZXIgPSBmaWxlX3NjYW5uZXItPm5leHQpCisJCXsKKwkJ CWlmIChzdHJjbXAobW9kdWxlX25hbWUsIGZpbGVfc2Nhbm5lci0+bmFtZSkgPT0gMCkKKwkJ CQltb2Rsc3QgPSBsYXBwZW5kKG1vZGxzdCwgZmlsZV9zY2FubmVyKTsKKwkJfQorCisJCU1l bW9yeUNvbnRleHRTd2l0Y2hUbyhvbGRjb250ZXh0KTsKKwl9CisKKwlmdW5jY3R4ID0gU1JG X1BFUkNBTExfU0VUVVAoKTsKKworCWlmIChtb2Rsc3QgIT0gTklMKQorCXsKKwkJZmlsZV9z Y2FubmVyID0gKER5bmFtaWNGaWxlTGlzdCAqKSBsbGFzdChtb2Rsc3QpOworCQl2YWx1ZXNb MF0gPSBDU3RyaW5nR2V0VGV4dERhdHVtKGZpbGVfc2Nhbm5lci0+ZmlsZW5hbWUpOworCQl2 YWx1ZXNbMV0gPSBJbnQzMkdldERhdHVtKGZpbGVfc2Nhbm5lci0+dmVyc2lvbik7CisJCXJl c3VsdCA9IEhlYXBUdXBsZUdldERhdHVtKGhlYXBfZm9ybV90dXBsZSh0dXBkZXNjLCB2YWx1 ZXMsIGlzbnVsbCkpOworCQltb2Rsc3QgPSBsaXN0X2RlbGV0ZV9sYXN0KG1vZGxzdCk7CisJ CVNSRl9SRVRVUk5fTkVYVChmdW5jY3R4LCByZXN1bHQpOworCX0KKwllbHNlCisJCVNSRl9S RVRVUk5fRE9ORShmdW5jY3R4KTsKK30KZGlmZiAtLWdpdCBhL3NyYy9pbmNsdWRlL2NhdGFs b2cvcGdfcHJvYy5kYXQgYi9zcmMvaW5jbHVkZS9jYXRhbG9nL3BnX3Byb2MuZGF0CmluZGV4 IGNiYmU4YWNkMzguLjlmMzdjNGZjMWUgMTAwNjQ0Ci0tLSBhL3NyYy9pbmNsdWRlL2NhdGFs b2cvcGdfcHJvYy5kYXQKKysrIGIvc3JjL2luY2x1ZGUvY2F0YWxvZy9wZ19wcm9jLmRhdApA QCAtMjYzLDYgKzI2MywxMiBAQAogeyBvaWQgPT4gJzg5JywgZGVzY3IgPT4gJ1Bvc3RncmVT UUwgdmVyc2lvbiBzdHJpbmcnLAogICBwcm9uYW1lID0+ICd2ZXJzaW9uJywgcHJvdm9sYXRp bGUgPT4gJ3MnLCBwcm9yZXR0eXBlID0+ICd0ZXh0JywKICAgcHJvYXJndHlwZXMgPT4gJycs IHByb3NyYyA9PiAncGdzcWxfdmVyc2lvbicgfSwKK3sgb2lkID0+ICcxMTEnLCBkZXNjciA9 PiAnTW9kdWxlIEluZm8nLAorICBwcm9uYW1lID0+ICdtb2R1bGVfaW5mbycsIHByb3ZvbGF0 aWxlID0+ICdzJywgcHJvcmV0dHlwZSA9PiAncmVjb3JkJywKKyAgcHJvcmV0c2V0ID0+ICd0 JywgcHJvYXJndHlwZXMgPT4gJ3RleHQnLCBwcm9hbGxhcmd0eXBlcyA9PiAne3RleHQsdGV4 dCxpbnQ0fScsCisgIHByb2FyZ21vZGVzID0+ICd7aSxvLG99JywKKyAgcHJvYXJnbmFtZXMg PT4gJ3ttb2R1bGVfbmFtZSxsaWJuYW1lLHZlcnNpb259JywKKyAgcHJvc3JjID0+ICdtb2R1 bGVfaW5mbycgfSwKIAogeyBvaWQgPT4gJzg2JywgZGVzY3IgPT4gJ0kvTycsCiAgIHByb25h bWUgPT4gJ3BnX2RkbF9jb21tYW5kX2luJywgcHJvcmV0dHlwZSA9PiAncGdfZGRsX2NvbW1h bmQnLApkaWZmIC0tZ2l0IGEvc3JjL2luY2x1ZGUvZm1nci5oIGIvc3JjL2luY2x1ZGUvZm1n ci5oCmluZGV4IDFlMzc5NWRlNGEuLjIxYjE4NmExN2UgMTAwNjQ0Ci0tLSBhL3NyYy9pbmNs dWRlL2ZtZ3IuaAorKysgYi9zcmMvaW5jbHVkZS9mbWdyLmgKQEAgLTQ4Myw2ICs0ODMsMTIg QEAgdHlwZWRlZiBzdHJ1Y3QKIAlGTUdSX0FCSV9FWFRSQSwgXAogfQogCit0eXBlZGVmIHN0 cnVjdCBwZ19taW5mb19zdHJ1Y3QKK3sKKwljaGFyCW5hbWVbTkFNRURBVEFMRU5dOworCWlu dDMyCXZlcjsKK30gcGdfbWluZm9fc3RydWN0OworCiBTdGF0aWNBc3NlcnREZWNsKHNpemVv ZihGTUdSX0FCSV9FWFRSQSkgPD0gc2l6ZW9mKCgoUGdfbWFnaWNfc3RydWN0ICopIDApLT5h YmlfZXh0cmEpLAogCQkJCSAiRk1HUl9BQklfRVhUUkEgdG9vIGxvbmciKTsKIApAQCAtNDky LDggKzQ5OCwxMiBAQCBTdGF0aWNBc3NlcnREZWNsKHNpemVvZihGTUdSX0FCSV9FWFRSQSkg PD0gc2l6ZW9mKCgoUGdfbWFnaWNfc3RydWN0ICopIDApLT5hYmlfZQogICovCiB0eXBlZGVm IGNvbnN0IFBnX21hZ2ljX3N0cnVjdCAqKCpQR01vZHVsZU1hZ2ljRnVuY3Rpb24pICh2b2lk KTsKIAordHlwZWRlZiBjb25zdCBwZ19taW5mb19zdHJ1Y3QgKigqUEdNb2R1bGVJbmZvRnVu Y3Rpb24pICh2b2lkKTsKKwogI2RlZmluZSBQR19NQUdJQ19GVU5DVElPTl9OQU1FIFBnX21h Z2ljX2Z1bmMKICNkZWZpbmUgUEdfTUFHSUNfRlVOQ1RJT05fTkFNRV9TVFJJTkcgIlBnX21h Z2ljX2Z1bmMiCisjZGVmaW5lIFBHX01PRFVMRUlORk9fRlVOQ1RJT05fTkFNRSBwZ19tb2R1 bGVfaW5mbworI2RlZmluZSBQR19NT0RVTEVJTkZPX0ZVTkNUSU9OX05BTUVfU1RSSU5HICJw Z19tb2R1bGVfaW5mbyIKIAogI2RlZmluZSBQR19NT0RVTEVfTUFHSUMgXAogZXh0ZXJuIFBH RExMRVhQT1JUIGNvbnN0IFBnX21hZ2ljX3N0cnVjdCAqUEdfTUFHSUNfRlVOQ1RJT05fTkFN RSh2b2lkKTsgXApAQCAtNTA1LDYgKzUxNSwxNCBAQCBQR19NQUdJQ19GVU5DVElPTl9OQU1F KHZvaWQpIFwKIH0gXAogZXh0ZXJuIGludCBub19zdWNoX3ZhcmlhYmxlCiAKKyNkZWZpbmUg UEdfTU9EVUxFX0lORk8obW9kdWxlbmFtZSwgdmVyc2lvbikgXAorZXh0ZXJuIFBHRExMRVhQ T1JUIGNvbnN0IHBnX21pbmZvX3N0cnVjdCAqUEdfTU9EVUxFSU5GT19GVU5DVElPTl9OQU1F KHZvaWQpOyBcCitjb25zdCBwZ19taW5mb19zdHJ1Y3QgKiBcCitQR19NT0RVTEVJTkZPX0ZV TkNUSU9OX05BTUUodm9pZCkgXAoreyBcCisJc3RhdGljIGNvbnN0IHBnX21pbmZvX3N0cnVj dCBtb2R1bGVfaW5mbyA9IHttb2R1bGVuYW1lLCB2ZXJzaW9ufTsgXAorCXJldHVybiAmbW9k dWxlX2luZm87IFwKK30gXAogCiAvKi0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KICAqCQlTdXBwb3J0 IHJvdXRpbmVzIGFuZCBtYWNyb3MgZm9yIGNhbGxlcnMgb2YgZm1nci1jb21wYXRpYmxlIGZ1 bmN0aW9ucwotLSAKMi40Ny4xCgo= --------------1WzSpuuBfj50kz9pHcLyWjxw--