From mboxrd@z Thu Jan 1 00:00:00 1970 From: julien lepiller Subject: update php Date: Fri, 17 Feb 2017 17:27:58 +0100 Message-ID: <8f6832f9733657f49554484ee4724000@lepiller.eu> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=_b007999627ab04a5c83f499094673587" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:53632) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1celOK-0002RP-T5 for guix-devel@gnu.org; Fri, 17 Feb 2017 11:28:19 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1celOH-0005I8-AE for guix-devel@gnu.org; Fri, 17 Feb 2017 11:28:16 -0500 Received: from dau94-h03-89-91-205-84.dsl.sta.abo.bbox.fr ([89.91.205.84]:48312 helo=skaro.lepiller.eu) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1celOG-0005E0-Lr for guix-devel@gnu.org; Fri, 17 Feb 2017 11:28:13 -0500 Received: from localhost (localhost [127.0.0.1]) by skaro.lepiller.eu (Postfix) with ESMTP id 6790680BDB for ; Fri, 17 Feb 2017 17:28:09 +0100 (CET) Received: from skaro.lepiller.eu ([127.0.0.1]) by localhost (lepiller.eu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id kJmoAmQ25Mtb for ; Fri, 17 Feb 2017 17:27:59 +0100 (CET) Received: from webmail.lepiller.eu (localhost [127.0.0.1]) by skaro.lepiller.eu (Postfix) with ESMTPA id C4DE37F8A4 for ; Fri, 17 Feb 2017 17:27:58 +0100 (CET) List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: guix-devel@gnu.org --=_b007999627ab04a5c83f499094673587 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=US-ASCII; format=flowed Hi, A new version of php has been released. I'm a bit confused by the way grafting works and as the gd update from last time is still not in master, gd-for-php will try to build using gd-2.2.3, which I don't want (2.2.4 fixes issues that would otherwise be detected by the php tests). I have no idea how to make it work correctly and will not be able to work on it this week-end, so feel free to do whatever is necessary to get this update. I have attached a patch that removes the graft so that gd is now 2.2.4 by default. Four more tests fail currently. Two of them are new tests on the same issues as already failing tests, and two of them seem to segfault because of a bug in the way Zend terminates. I could get this stack trace: #0 zend_hash_destroy (ht=0xfe6538 ) at /tmp/guix-build-php-7.1.2.drv-0/php-7.1.2/Zend/zend_hash.c:1249 #1 0x0000000000776921 in zm_shutdown_phpdbg (type=, module_number=) at /tmp/guix-build-php-7.1.2.drv-0/php-7.1.2/sapi/phpdbg/phpdbg.c:234 #2 0x00000000006d9333 in module_destructor (module=module@entry=0x10a44e0) at /tmp/guix-build-php-7.1.2.drv-0/php-7.1.2/Zend/zend_API.c:2499 #3 0x00000000006d23cc in module_destructor_zval (zv=) at /tmp/guix-build-php-7.1.2.drv-0/php-7.1.2/Zend/zend.c:632 #4 0x00000000006e4229 in _zend_hash_del_el_ex (prev=, p=, idx=, ht=) at /tmp/guix-build-php-7.1.2.drv-0/php-7.1.2/Zend/zend_hash.c:998 #5 _zend_hash_del_el (p=0x10738c0, idx=47, ht=0xfe30a0 ) at /tmp/guix-build-php-7.1.2.drv-0/php-7.1.2/Zend/zend_hash.c:1021 #6 zend_hash_graceful_reverse_destroy (ht=ht@entry=0xfe30a0 ) at /tmp/guix-build-php-7.1.2.drv-0/php-7.1.2/Zend/zend_hash.c:1477 #7 0x00000000006d781c in zend_destroy_modules () at /tmp/guix-build-php-7.1.2.drv-0/php-7.1.2/Zend/zend_API.c:1978 #8 0x00000000006d2eb5 in zend_shutdown () at /tmp/guix-build-php-7.1.2.drv-0/php-7.1.2/Zend/zend.c:871 #9 0x0000000000673acb in php_module_shutdown () at /tmp/guix-build-php-7.1.2.drv-0/php-7.1.2/main/main.c:2405 #10 0x0000000000444846 in main (argc=68, argv=0x7fffffffd3c8) at /tmp/guix-build-php-7.1.2.drv-0/php-7.1.2/sapi/phpdbg/phpdbg.c:2156 I didn't test the new php, but it seems to work in most cases so I think we can still update it. Another solution would be to try and build 7.0.16. --=_b007999627ab04a5c83f499094673587 Content-Transfer-Encoding: base64 Content-Type: text/x-diff; name=0001-gnu-php-Update-to-7.1.2.patch Content-Disposition: attachment; filename=0001-gnu-php-Update-to-7.1.2.patch; size=10734 RnJvbSA3OWRiMjU3M2ZjZjI4NDBjZDQ2M2U2NzUwNjM2MjU3NzFlNDExMjExIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBKdWxpZW4gTGVwaWxsZXIgPGp1bGllbkBsZXBpbGxlci5ldT4K RGF0ZTogVGh1LCAxNiBGZWIgMjAxNyAxNzo0Nzo1MSArMDEwMApTdWJqZWN0OiBbUEFUQ0hdIGdu dTogcGhwOiBVcGRhdGUgdG8gNy4xLjIuCgoqIGdudS9wYWNrYWdlcy9waHAuc2NtIChwaHApOiBV cGRhdGUgdG8gNy4xLjIuCi0tLQogZ251L2xvY2FsLm1rICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgfCAgIDEgKwogZ251L3BhY2thZ2VzL2dkLnNjbSAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgfCAgNDYgKysrLS0tLS0tCiAuLi4vcGF0Y2hlcy9nZC1waHAtNzM5 NjgtRml4LTEwOS1YQk0tcmVhZGluZy5wYXRjaCB8IDExMSArKysrKysrKysrKysrKysrKysrKysK IGdudS9wYWNrYWdlcy9waHAuc2NtICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHwgIDIw ICsrLS0KIDQgZmlsZXMgY2hhbmdlZCwgMTQwIGluc2VydGlvbnMoKyksIDM4IGRlbGV0aW9ucygt KQogY3JlYXRlIG1vZGUgMTAwNjQ0IGdudS9wYWNrYWdlcy9wYXRjaGVzL2dkLXBocC03Mzk2OC1G aXgtMTA5LVhCTS1yZWFkaW5nLnBhdGNoCgpkaWZmIC0tZ2l0IGEvZ251L2xvY2FsLm1rIGIvZ251 L2xvY2FsLm1rCmluZGV4IDA2MGRlMjUuLjdlNmRkMzEgMTAwNjQ0Ci0tLSBhL2dudS9sb2NhbC5t aworKysgYi9nbnUvbG9jYWwubWsKQEAgLTU3Niw2ICs1NzYsNyBAQCBkaXN0X3BhdGNoX0RBVEEg PQkJCQkJCVwKICAgJUQlL3BhY2thZ2VzL3BhdGNoZXMvZ2QtZml4LWdkMi1yZWFkLXRlc3QucGF0 Y2gJCVwKICAgJUQlL3BhY2thZ2VzL3BhdGNoZXMvZ2QtZml4LXRlc3RzLW9uLWk2ODYucGF0Y2gJ CVwKICAgJUQlL3BhY2thZ2VzL3BhdGNoZXMvZ2QtZml4LXRydWVjb2xvci1mb3JtYXQtY29ycmVj dGlvbi5wYXRjaAlcCisgICVEJS9wYWNrYWdlcy9wYXRjaGVzL2dkLXBocC03Mzk2OC1GaXgtMTA5 LVhCTS1yZWFkaW5nLnBhdGNoCQkJXAogICAlRCUvcGFja2FnZXMvcGF0Y2hlcy9nZWdsLUNWRS0y MDEyLTQ0MzMucGF0Y2gJCQlcCiAgICVEJS9wYWNrYWdlcy9wYXRjaGVzL2dlb2NsdWUtY29uZmln LnBhdGNoCQkJXAogICAlRCUvcGFja2FnZXMvcGF0Y2hlcy9naGMtZG9udC1wYXNzLWxpbmtlci1m bGFncy12aWEtcmVzcG9uc2UtZmlsZXMucGF0Y2gJXApkaWZmIC0tZ2l0IGEvZ251L3BhY2thZ2Vz L2dkLnNjbSBiL2dudS9wYWNrYWdlcy9nZC5zY20KaW5kZXggNzEzZjdhZS4uYjhmOTQ5NSAxMDA2 NDQKLS0tIGEvZ251L3BhY2thZ2VzL2dkLnNjbQorKysgYi9nbnUvcGFja2FnZXMvZ2Quc2NtCkBA IC0zNiwxMiArMzYsMTEgQEAKIChkZWZpbmUtcHVibGljIGdkCiAgIChwYWNrYWdlCiAgICAgKG5h bWUgImdkIikKLSAgICAocmVwbGFjZW1lbnQgZ2QtMi4yLjQpCiAKICAgICA7OyBOb3RlOiBXaXRo IGxpYmdkLm9yZyBub3cgcG9pbnRpbmcgdG8gZ2l0aHViLmNvbSwgZ2VudWluZSBvbGQKICAgICA7 OyB0YXJiYWxscyBhcmUgbm8gbG9uZ2VyIGF2YWlsYWJsZS4gIE5vdGFibHksIHZlcnNpb25zIDIu MC54IGFyZQogICAgIDs7IG1pc3NpbmcuCi0gICAgKHZlcnNpb24gIjIuMi4zIikKKyAgICAodmVy c2lvbiAiMi4yLjQiKQogCiAgICAgKHNvdXJjZSAob3JpZ2luCiAgICAgICAgICAgICAgKG1ldGhv ZCB1cmwtZmV0Y2gpCkBAIC01MCwxMCArNDksOCBAQAogICAgICAgICAgICAgICAgICAgIHZlcnNp b24gIi9saWJnZC0iIHZlcnNpb24gIi50YXIueHoiKSkKICAgICAgICAgICAgICAoc2hhMjU2CiAg ICAgICAgICAgICAgIChiYXNlMzIKLSAgICAgICAgICAgICAgICIwZzN4ejhqcHoxcGwyenptc3Nn bHJwYTlueGlhYTdybWNtdmdwYnJqejhrOWN5eW5xc3ZsIikpCi0gICAgICAgICAgICAgKHBhdGNo ZXMgKHNlYXJjaC1wYXRjaGVzICJnZC1DVkUtMjAxNi03NTY4LnBhdGNoIgotICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAiZ2QtQ1ZFLTIwMTYtODY3MC5wYXRjaCIKLSAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgImdkLWZpeC1nZDItcmVhZC10ZXN0LnBh dGNoIgorICAgICAgICAgICAgICAgIjFycDR2N24xZHEzOGI5MmtsN2drdnB2cXFrdzdudmRmbno2 ZDVraXA1a2xreGZraTZ6cWsiKSkKKyAgICAgICAgICAgICAocGF0Y2hlcyAoc2VhcmNoLXBhdGNo ZXMgImdkLWZpeC1nZDItcmVhZC10ZXN0LnBhdGNoIgogICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAiZ2QtZml4LXRlc3RzLW9uLWk2ODYucGF0Y2giKSkpKQogICAgIChidWls ZC1zeXN0ZW0gZ251LWJ1aWxkLXN5c3RlbSkKICAgICAobmF0aXZlLWlucHV0cwpAQCAtNjUsNiAr NjIsMTcgQEAKICAgICAocHJvcGFnYXRlZC1pbnB1dHMKICAgICAgYCgoImZvbnRjb25maWciICxm b250Y29uZmlnKQogICAgICAgICgibGlianBlZyIgLGxpYmpwZWcpKSkKKyAgICAoYXJndW1lbnRz CisgICAgIGAoIzpwaGFzZXMKKyAgICAgICAobW9kaWZ5LXBoYXNlcyAlc3RhbmRhcmQtcGhhc2Vz CisgICAgICAgICA7OyBUaGlzIHRlc3QgaXMga25vd24gdG8gZmFpbCBvbiBpNjg2LWxpbnV4Ogor ICAgICAgICAgOzsgaHR0cHM6Ly9naXRodWIuY29tL2xpYmdkL2xpYmdkL2lzc3Vlcy8zNTkKKyAg ICAgICAgIDs7IFRPRE8gUmVwbGFjZSB0aGlzIHN1YnN0aXR1dGlvbiB3aXRoIGFuIHVwc3RyZWFt IGJ1ZyBmaXguCisgICAgICAgICAoYWRkLWFmdGVyICd1bnBhY2sgJ2Rpc2FibGUtZmFpbGluZy10 ZXN0CisgICAgICAgICAgIChsYW1iZGEgXworICAgICAgICAgICAgIChzdWJzdGl0dXRlKiAidGVz dHMvZ2RpbWFnZWdyYXlzY2FsZS9iYXNpYy5jIgorICAgICAgICAgICAgICAgKCgicmV0dXJuIGdk TnVtRmFpbHVyZXNcXChcXCkiKQorICAgICAgICAgICAgICAgICAicmV0dXJuIDAiKSkpKSkpKQog ICAgIChob21lLXBhZ2UgImh0dHA6Ly93d3cubGliZ2Qub3JnLyIpCiAgICAgKHN5bm9wc2lzICJM aWJyYXJ5IGZvciB0aGUgZHluYW1pYyBjcmVhdGlvbiBvZiBpbWFnZXMgYnkgcHJvZ3JhbW1lcnMi KQogICAgIChkZXNjcmlwdGlvbgpAQCAtNzgsMzIgKzg2LDYgQEAgbW9zdCBjb21tb24gYXBwbGlj YXRpb25zIG9mIEdEIGludm9sdmUgd2Vic2l0ZSBkZXZlbG9wbWVudC4iKQogICAgICAgICAgICAg ICAgICAgICAgICAgICAgIlNlZSBDT1BZSU5HIGZpbGUgaW4gdGhlIGRpc3RyaWJ1dGlvbi4iKSkK ICAgICAocHJvcGVydGllcyAnKChjcGUtbmFtZSAuICJsaWJnZCIpKSkpKQogCi0oZGVmaW5lIGdk LTIuMi40Ci0gIChwYWNrYWdlCi0gICAgKGluaGVyaXQgZ2QpCi0gICAgKHZlcnNpb24gIjIuMi40 IikKLSAgICAoc291cmNlCi0gICAgICAob3JpZ2luCi0gICAgICAgIChtZXRob2QgdXJsLWZldGNo KQotICAgICAgICAodXJpIChzdHJpbmctYXBwZW5kICJodHRwczovL2dpdGh1Yi5jb20vbGliZ2Qv bGliZ2QvcmVsZWFzZXMvZG93bmxvYWQvIgotICAgICAgICAgICAgICAgICAgICAgICAgICAgICJn ZC0iIHZlcnNpb24gIi9saWJnZC0iIHZlcnNpb24gIi50YXIueHoiKSkKLSAgICAgICAgKHBhdGNo ZXMgKHNlYXJjaC1wYXRjaGVzICJnZC1maXgtZ2QyLXJlYWQtdGVzdC5wYXRjaCIKLSAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICJnZC1maXgtdGVzdHMtb24taTY4Ni5wYXRjaCIpKQot ICAgICAgICAoc2hhMjU2Ci0gICAgICAgICAoYmFzZTMyCi0gICAgICAgICAgIjFycDR2N24xZHEz OGI5MmtsN2drdnB2cXFrdzdudmRmbno2ZDVraXA1a2xreGZraTZ6cWsiKSkpKQotICAgIChhcmd1 bWVudHMKLSAgICAgYCgjOnBoYXNlcwotICAgICAgIChtb2RpZnktcGhhc2VzICVzdGFuZGFyZC1w aGFzZXMKLSAgICAgICAgIDs7IFRoaXMgdGVzdCBpcyBrbm93biB0byBmYWlsIG9uIGk2ODYtbGlu dXg6Ci0gICAgICAgICA7OyBodHRwczovL2dpdGh1Yi5jb20vbGliZ2QvbGliZ2QvaXNzdWVzLzM1 OQotICAgICAgICAgOzsgVE9ETyBSZXBsYWNlIHRoaXMgc3Vic3RpdHV0aW9uIHdpdGggYW4gdXBz dHJlYW0gYnVnIGZpeC4KLSAgICAgICAgIChhZGQtYWZ0ZXIgJ3VucGFjayAnZGlzYWJsZS1mYWls aW5nLXRlc3QKLSAgICAgICAgICAgKGxhbWJkYSBfCi0gICAgICAgICAgICAgKHN1YnN0aXR1dGUq ICJ0ZXN0cy9nZGltYWdlZ3JheXNjYWxlL2Jhc2ljLmMiCi0gICAgICAgICAgICAgICAoKCJyZXR1 cm4gZ2ROdW1GYWlsdXJlc1xcKFxcKSIpCi0gICAgICAgICAgICAgICAgICJyZXR1cm4gMCIpKSkp KSkpKSkKLQogKGRlZmluZS1wdWJsaWMgcGVybC1nZAogICAocGFja2FnZQogICAgIChuYW1lICJw ZXJsLWdkIikKZGlmZiAtLWdpdCBhL2dudS9wYWNrYWdlcy9wYXRjaGVzL2dkLXBocC03Mzk2OC1G aXgtMTA5LVhCTS1yZWFkaW5nLnBhdGNoIGIvZ251L3BhY2thZ2VzL3BhdGNoZXMvZ2QtcGhwLTcz OTY4LUZpeC0xMDktWEJNLXJlYWRpbmcucGF0Y2gKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXgg MDAwMDAwMC4uY2U2OWE3MwotLS0gL2Rldi9udWxsCisrKyBiL2dudS9wYWNrYWdlcy9wYXRjaGVz L2dkLXBocC03Mzk2OC1GaXgtMTA5LVhCTS1yZWFkaW5nLnBhdGNoCkBAIC0wLDAgKzEsMTExIEBA CitGcm9tIDA4MmM1NDQ0ODM4ZWEwZDg0ZjlmYjY0NDFhZWZkYjQ0ZDc4ZDliYmEgTW9uIFNlcCAx NyAwMDowMDowMCAyMDAxCitGcm9tOiAiQ2hyaXN0b3BoIE0uIEJlY2tlciIgPGNtYmVja2VyNjlA Z214LmRlPgorRGF0ZTogRnJpLCAyMCBKYW4gMjAxNyAyMjo0ODoyMCArMDEwMAorU3ViamVjdDog W1BBVENIXSBGaXggIzEwOTogWEJNIHJlYWRpbmcgZmFpbHMgd2l0aCBwcmludGVkIGVycm9yCisK K1doZW4gY2FsY3VsYXRpbmcgdGhlIG51bWJlciBvZiByZXF1aXJlZCBieXRlcyBvZiBhbiBYQk0g aW1hZ2UsIHdlIGhhdmUKK3RvIHRha2UgdGhlIGxpbmUgcGFkZGluZyBpbnRvIGFjY291bnQuCist LS0KKyBzcmMvZ2RfeGJtLmMgICAgICAgICAgICAgICAgICAgICB8ICAgMiArLQorIHRlc3RzL3hi bS9DTWFrZUxpc3RzLnR4dCAgICAgICAgIHwgICAxICsKKyB0ZXN0cy94Ym0vTWFrZW1vZHVsZS5h bSAgICAgICAgICB8ICAgNSArKysrLQorIHRlc3RzL3hibS9naXRodWJfYnVnXzEwOS5jICAgICAg IHwgIDM1ICsrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrCisgdGVzdHMveGJtL2dp dGh1Yl9idWdfMTA5LnhibSAgICAgfCAgIDUgKysrKysKKyA1IGZpbGVzIGNoYW5nZWQsIDQ3IGlu c2VydGlvbnMoKyksIDIgZGVsZXRpb25zKC0pCisgY3JlYXRlIG1vZGUgMTAwNjQ0IHRlc3RzL3hi bS9naXRodWJfYnVnXzEwOS5jCisgY3JlYXRlIG1vZGUgMTAwNjQ0IHRlc3RzL3hibS9naXRodWJf YnVnXzEwOS54Ym0KKyBjcmVhdGUgbW9kZSAxMDA2NDQgdGVzdHMveGJtL2dpdGh1Yl9idWdfMTA5 X2V4cC5wbmcKKworZGlmZiAtLWdpdCBhL3NyYy9nZF94Ym0uYyBiL3NyYy9nZF94Ym0uYworaW5k ZXggNWYwOWI1Ni4uYzJiYTJhZCAxMDA2NDQKKy0tLSBhL3NyYy9nZF94Ym0uYworKysrIGIvc3Jj L2dkX3hibS5jCitAQCAtMTA4LDcgKzEwOCw3IEBAIEJHRF9ERUNMQVJFKGdkSW1hZ2VQdHIpIGdk SW1hZ2VDcmVhdGVGcm9tWGJtKEZJTEUgKiBmZCkKKyAJCQkJbWF4X2JpdCA9IDMyNzY4OworIAkJ CX0KKyAJCQlpZiAobWF4X2JpdCkgeworLQkJCQlieXRlcyA9ICh3aWR0aCAqIGhlaWdodCAvIDgp ICsgMTsKKysgICAgICAgICAgICAgICAgYnl0ZXMgPSAod2lkdGggKyA3KSAvIDggKiBoZWlnaHQ7 CisgCQkJCWlmICghYnl0ZXMpIHsKKyAJCQkJCXJldHVybiAwOworIAkJCQl9CitkaWZmIC0tZ2l0 IGEvdGVzdHMveGJtL0NNYWtlTGlzdHMudHh0IGIvdGVzdHMveGJtL0NNYWtlTGlzdHMudHh0Citp bmRleCAxODNjZjVlLi4wODU3NmUwIDEwMDY0NAorLS0tIGEvdGVzdHMveGJtL0NNYWtlTGlzdHMu dHh0CisrKysgYi90ZXN0cy94Ym0vQ01ha2VMaXN0cy50eHQKK0BAIC0xLDQgKzEsNSBAQAorIExJ U1QoQVBQRU5EIFRFU1RTX0ZJTEVTCisrCWdpdGh1Yl9idWdfMTA5CisgCWdpdGh1Yl9idWdfMTcw CisgKQorIAorZGlmZiAtLWdpdCBhL3Rlc3RzL3hibS9NYWtlbW9kdWxlLmFtIGIvdGVzdHMveGJt L01ha2Vtb2R1bGUuYW0KK2luZGV4IGJhMWVhYmQuLjBmNWJlYjYgMTAwNjQ0CistLS0gYS90ZXN0 cy94Ym0vTWFrZW1vZHVsZS5hbQorKysrIGIvdGVzdHMveGJtL01ha2Vtb2R1bGUuYW0KK0BAIC0x LDUgKzEsOCBAQAorIGxpYmdkX3Rlc3RfcHJvZ3JhbXMgKz0gXAorKwl4Ym0vZ2l0aHViX2J1Z18x MDkgXAorIAl4Ym0vZ2l0aHViX2J1Z18xNzAKKyAKKyBFWFRSQV9ESVNUICs9IFwKKy0JeGJtL0NN YWtlTGlzdHMudHh0CisrCXhibS9DTWFrZUxpc3RzLnR4dCBcCisrCXhibS9naXRodWJfYnVnXzEw OS54Ym0gXAorKwl4Ym0vZ2l0aHViX2J1Z18xMDlfZXhwLnBuZworZGlmZiAtLWdpdCBhL3Rlc3Rz L3hibS9naXRodWJfYnVnXzEwOS5jIGIvdGVzdHMveGJtL2dpdGh1Yl9idWdfMTA5LmMKK25ldyBm aWxlIG1vZGUgMTAwNjQ0CitpbmRleCAwMDAwMDAwLi4xYTAyMGM2CistLS0gL2Rldi9udWxsCisr KysgYi90ZXN0cy94Ym0vZ2l0aHViX2J1Z18xMDkuYworQEAgLTAsMCArMSwzNSBAQAorKy8qKg0K KysgKiBUZXN0IHJlYWRpbmcgb2YgWEJNIGltYWdlcyB3aXRoIGEgd2lkdGggdGhhdCBpcyBub3Qg YSBtdWx0aXBsZSBvZiA4DQorKyAqDQorKyAqIFdlJ3JlIHJlYWRpbmcgc3VjaCBhbiBYQk0gaW1h Z2UsIGFuZCBjaGVjayB0aGF0IHdlIGdvdCB3aGF0IHdlJ3ZlIGV4cGVjdGVkLA0KKysgKiBpbnN0 ZWFkIG9mIGFuIGVycm9yIG1lc3NhZ2UuDQorKyAqDQorKyAqIFNlZSBhbHNvIDxodHRwczovL2dp dGh1Yi5jb20vbGliZ2QvbGliZ2QvaXNzdWVzLzEwOT4uDQorKyAqLw0KKysNCisrDQorKyNpbmNs dWRlICJnZC5oIg0KKysjaW5jbHVkZSAiZ2R0ZXN0LmgiDQorKw0KKysNCisraW50IG1haW4oKQ0K Kyt7DQorKyAgICBnZEltYWdlUHRyIGltOw0KKysgICAgRklMRSAqZnA7DQorKyAgICBjaGFyICpw YXRoOw0KKysNCisrICAgIGZwID0gZ2RUZXN0RmlsZU9wZW4yKCJ4Ym0iLCAiZ2l0aHViX2J1Z18x MDkueGJtIik7DQorKyAgICBpbSA9IGdkSW1hZ2VDcmVhdGVGcm9tWGJtKGZwKTsNCisrICAgIGZj bG9zZShmcCk7DQorKyAgICBnZFRlc3RBc3NlcnQoaW0gIT0gTlVMTCk7DQorKyAgICBnZFRlc3RB c3NlcnQoZ2RJbWFnZUdldFRydWVDb2xvclBpeGVsKGltLCAwLCAwKSA9PSAwKTsNCisrICAgIGdk VGVzdEFzc2VydChnZEltYWdlR2V0VHJ1ZUNvbG9yUGl4ZWwoaW0sIDAsIDEpID09IDB4ZmZmZmZm KTsNCisrDQorKyAgICBwYXRoID0gZ2RUZXN0RmlsZVBhdGgyKCJ4Ym0iLCAiZ2l0aHViX2J1Z18x MDlfZXhwLnBuZyIpOw0KKysgICAgZ2RBc3NlcnRJbWFnZUVxdWFsc1RvRmlsZShwYXRoLCBpbSk7 DQorKyAgICBnZEZyZWUocGF0aCk7DQorKw0KKysgICAgZ2RJbWFnZURlc3Ryb3koaW0pOw0KKysN CisrICAgIHJldHVybiBnZE51bUZhaWx1cmVzKCk7DQorK30NCitkaWZmIC0tZ2l0IGEvdGVzdHMv eGJtL2dpdGh1Yl9idWdfMTA5LnhibSBiL3Rlc3RzL3hibS9naXRodWJfYnVnXzEwOS54Ym0KK25l dyBmaWxlIG1vZGUgMTAwNjQ0CitpbmRleCAwMDAwMDAwLi5mNDI3ZDg2CistLS0gL2Rldi9udWxs CisrKysgYi90ZXN0cy94Ym0vZ2l0aHViX2J1Z18xMDkueGJtCitAQCAtMCwwICsxLDUgQEAKKysj ZGVmaW5lIHRlc3Rfd2lkdGggMTAKKysjZGVmaW5lIHRlc3RfaGVpZ2h0IDEwCisrc3RhdGljIHVu c2lnbmVkIGNoYXIgdGVzdF9iaXRzW10gPSB7CisrICAweEZGLCAweDAzLCAweDAwLCAweDAwLCAw eEZGLCAweDAzLCAweDAwLCAweDAwLCAweEZGLCAweDAzLCAweDAwLCAweDAwLCAKKysgIDB4RkYs IDB4MDMsIDB4MDAsIDB4MDAsIDB4RkYsIDB4MDMsIDB4MDAsIDB4MDB9OworCistLSAKKzIuNy40 CisKZGlmZiAtLWdpdCBhL2dudS9wYWNrYWdlcy9waHAuc2NtIGIvZ251L3BhY2thZ2VzL3BocC5z Y20KaW5kZXggYTg0ZmY0My4uMzNkOTI3NiAxMDA2NDQKLS0tIGEvZ251L3BhY2thZ2VzL3BocC5z Y20KKysrIGIvZ251L3BhY2thZ2VzL3BocC5zY20KQEAgLTUxLDIwICs1MSwyMCBAQAogICAjOnVz ZS1tb2R1bGUgKChndWl4IGxpY2Vuc2VzKSAjOnByZWZpeCBsaWNlbnNlOikpCiAKIDs7IFRoaXMg Zml4ZXMgUEhQIGJ1Z3MgNzMxNTUgYW5kIDczMTU5LiBSZW1vdmUgd2hlbiBnZAotOzsgaXMgdXBk YXRlZCB0byA+IDIuMi4zLgotKGRlZmluZSBnZC1mb3ItcGhwCis7OyBpcyB1cGRhdGVkIHRvID4g Mi4yLjQuCisoZGVmaW5lLXB1YmxpYyBnZC1mb3ItcGhwCiAgIChwYWNrYWdlIChpbmhlcml0IGdk KQorICAgICAgICAgICAobmFtZSAiZ2QtZm9yLXBocCIpCiAgICAgICAgICAgIChzb3VyY2UKICAg ICAgICAgICAgIChvcmlnaW4KICAgICAgICAgICAgICAgKGluaGVyaXQgKHBhY2thZ2Utc291cmNl IGdkKSkKICAgICAgICAgICAgICAgKHBhdGNoZXMgKHNlYXJjaC1wYXRjaGVzCi0gICAgICAgICAg ICAgICAgICAgICAgICAiZ2QtZml4LXRydWVjb2xvci1mb3JtYXQtY29ycmVjdGlvbi5wYXRjaCIK LSAgICAgICAgICAgICAgICAgICAgICAgICJnZC1maXgtY2h1bmstc2l6ZS1vbi1ib3VuZGFyaWVz LnBhdGNoIikpKSkpKQorICAgICAgICAgICAgICAgICAgICAgICAgImdkLXBocC03Mzk2OC1GaXgt MTA5LVhCTS1yZWFkaW5nLnBhdGNoIikpKSkpKQogCiAoZGVmaW5lLXB1YmxpYyBwaHAKICAgKHBh Y2thZ2UKICAgICAobmFtZSAicGhwIikKLSAgICAodmVyc2lvbiAiNy4wLjE0IikKKyAgICAodmVy c2lvbiAiNy4xLjIiKQogICAgIChob21lLXBhZ2UgImh0dHBzOi8vc2VjdXJlLnBocC5uZXQvIikK ICAgICAoc291cmNlIChvcmlnaW4KICAgICAgICAgICAgICAgKG1ldGhvZCB1cmwtZmV0Y2gpCkBA IC03Miw3ICs3Miw3IEBACiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbmFtZSAi LSIgdmVyc2lvbiAiLnRhci54eiIpKQogICAgICAgICAgICAgICAoc2hhMjU2CiAgICAgICAgICAg ICAgICAoYmFzZTMyCi0gICAgICAgICAgICAgICAgIjEyY2NnYnJmY2hndm1jZmI4OHJja25xN3ht cmYxOWM1eXNkcjR2OGp4azUxajlpenk3OGciKSkKKyAgICAgICAgICAgICAgICAiMHdnOW5nMjMw dzcyNHJwd3NyaGNnNHB3NDF4bTF4aHoweng3NmhhYW55eW1rejFzMDVmcSIpKQogICAgICAgICAg ICAgICAobW9kdWxlcyAnKChndWl4IGJ1aWxkIHV0aWxzKSkpCiAgICAgICAgICAgICAgIChzbmlw cGV0CiAgICAgICAgICAgICAgICAnKHdpdGgtZGlyZWN0b3J5LWV4Y3Vyc2lvbiAiZXh0IgpAQCAt MjA1LDYgKzIwNSwxMiBAQAogICAgICAgICAgICAgICAgICAgICAgICAgICJleHQvc3RhbmRhcmQv dGVzdHMvc3RyaW5ncy9zZXRsb2NhbGVfYmFzaWMzLnBocHQiCiAgICAgICAgICAgICAgICAgICAg ICAgICAgImV4dC9zdGFuZGFyZC90ZXN0cy9zdHJpbmdzL3NldGxvY2FsZV92YXJpYXRpb24xLnBo cHQiCiAKKyAgICAgICAgICAgICAgICAgICAgICAgICA7OyBYWFg6IFRoZXNlIHRlc3RzIGZhaWwu ICBUaGUgb3V0cHV0IGlzIGNvcnJlY3QsIGJ1dAorICAgICAgICAgICAgICAgICAgICAgICAgIDs7 IHRoZSB0ZXN0cyBzZWdmYXVsdCBhdCB0aGUgZW5kLiBUaGlzIHNlZW1zIHRvIGJlCisgICAgICAg ICAgICAgICAgICAgICAgICAgOzsgcmVsYXRlZCB0byBaZW5kIGNsb3NpbmcuCisgICAgICAgICAg ICAgICAgICAgICAgICAgInNhcGkvcGhwZGJnL3Rlc3RzL2luY2x1ZGVfb25jZS5waHB0IgorICAg ICAgICAgICAgICAgICAgICAgICAgICJzYXBpL3BocGRiZy90ZXN0cy9waHBkYmdfZ2V0X2V4ZWN1 dGFibGVfc3RyZWFtX3dyYXBwZXIucGhwdCIKKwogICAgICAgICAgICAgICAgICAgICAgICAgIDs7 IFhYWDogVGhlc2UgZ2QgdGVzdHMgZmFpbHMuICBMaWtlbHkgYmVjYXVzZSBvdXIgdmVyc2lvbgog ICAgICAgICAgICAgICAgICAgICAgICAgIDs7IGlzIGRpZmZlcmVudCBmcm9tIHRoZSAocGF0Y2hl ZCkgYnVuZGxlZCBvbmUuCiAgICAgICAgICAgICAgICAgICAgICAgICAgOzsgSGVyZSwgZ2QgcXVp dHMgaW1tZWRpYXRlbHkgYWZ0ZXIgImZhdGFsIGxpYnBuZyBlcnJvciI7IHdoaWxlIHRoZQpAQCAt MjU4LDggKzI2NCwxMCBAQAogICAgICAgICAgICAgICAgICAgICAgICAgICJleHQvZ2QvdGVzdHMv YnVnNDMwNzMucGhwdCIKICAgICAgICAgICAgICAgICAgICAgICAgICA7OyBpbWFnZXR0ZnRleHQo KSByZXR1cm5zIHdyb25nIGNvb3JkaW5hdGVzLgogICAgICAgICAgICAgICAgICAgICAgICAgICJl eHQvZ2QvdGVzdHMvYnVnNDg3MzIucGhwdCIKKyAgICAgICAgICAgICAgICAgICAgICAgICAiZXh0 L2dkL3Rlc3RzL2J1ZzQ4NzMyLW1iLnBocHQiCiAgICAgICAgICAgICAgICAgICAgICAgICAgOzsg U2ltaWxhcmx5IGZvciBpbWFnZWZ0YmJveCgpLgogICAgICAgICAgICAgICAgICAgICAgICAgICJl eHQvZ2QvdGVzdHMvYnVnNDg4MDEucGhwdCIKKyAgICAgICAgICAgICAgICAgICAgICAgICAiZXh0 L2dkL3Rlc3RzL2J1ZzQ4ODAxLW1iLnBocHQiCiAgICAgICAgICAgICAgICAgICAgICAgICAgOzsg RGlmZmVyZW50IGV4cGVjdGVkIG91dHB1dCBmcm9tIGltYWdlY29sb3JhbGxvY2F0ZSgpLgogICAg ICAgICAgICAgICAgICAgICAgICAgICJleHQvZ2QvdGVzdHMvYnVnNTM1MDQucGhwdCIKICAgICAg ICAgICAgICAgICAgICAgICAgICA7OyBXcm9uZyBpbWFnZSBzaXplIGFmdGVyIHNjYWxpbmcgYW4g aW1hZ2UuCi0tIAoyLjcuNAoK --=_b007999627ab04a5c83f499094673587--