From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id IQs2EqAfoGABvAAAgWs5BA (envelope-from ) for ; Sat, 15 May 2021 21:23:12 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id wKNNDaAfoGDIOAAA1q6Kng (envelope-from ) for ; Sat, 15 May 2021 19:23:12 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id C0160A9C1 for ; Sat, 15 May 2021 21:23:11 +0200 (CEST) Received: from localhost ([::1]:58288 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lhzsU-0004d1-Vw for larch@yhetil.org; Sat, 15 May 2021 15:23:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38134) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lhzsM-0004ct-HF for guix-patches@gnu.org; Sat, 15 May 2021 15:23:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:37717) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lhzsM-0004os-9f for guix-patches@gnu.org; Sat, 15 May 2021 15:23:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lhzsM-00059Z-5G for guix-patches@gnu.org; Sat, 15 May 2021 15:23:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47898] [PATCH] [core-updates] Add option --xpath0 to xmllint from libxml2 Resent-From: david larsson Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 15 May 2021 19:23:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47898 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Marius Bakke Cc: 47898@debbugs.gnu.org Received: via spool by 47898-submit@debbugs.gnu.org id=B47898.162110652719731 (code B ref 47898); Sat, 15 May 2021 19:23:02 +0000 Received: (at 47898) by debbugs.gnu.org; 15 May 2021 19:22:07 +0000 Received: from localhost ([127.0.0.1]:49263 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lhzrT-00058B-18 for submit@debbugs.gnu.org; Sat, 15 May 2021 15:22:07 -0400 Received: from server0.selfhosted.xyz ([217.64.149.7]:54532) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lhzrQ-00057f-05 for 47898@debbugs.gnu.org; Sat, 15 May 2021 15:22:05 -0400 Received: from server0.selfhosted.xyz (localhost [127.0.0.1]) by server0.selfhosted.xyz (Postfix) with ESMTP id D03351DDC05F; Sat, 15 May 2021 21:21:50 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=selfhosted.xyz; s=dkim; t=1621106518; bh=OMpR/Uy9sCVQrfwX2BP+ot83Ce5BaFHgC1Cg+JqImd4=; h=Date:From:To:Cc:Subject:In-Reply-To:References; b=kz7QTY11cDeBQVbY+2jGq3TnMfnjWjTkeUHNz+QjH129lkYTBv8wyYF/IpiV6WIYb Eywp8Qs0/BYbSbRNW/z+xX82axkCgiSqNZD4bCLjiopz6EhNUgDOVrV56hbYsfcpMc JJKrhMnxgZ/s6nK8RnWQEBDkE82inboCMuQtvaltCBG2l7Yjrw+FqUAEN0HyFqNuIw JiDUdLeNyNmYPnvdHXdFGerGtqRK33RF2CX5JFuNnG257jz5OYoyeaWFIElJEX3JrN brImCRNg3mk3vYjvDrIvpO8RvK1hR7Sc3l9GhNFFI8i3PYhprrsYFPUriT6tbWiqA9 fFl3stt69bsKw== X-Fuglu-Suspect: f778b17ef0d14950b0cc48945e1194be X-Fuglu-Spamstatus: NO Received: from webmail.selfhosted.xyz (office.selfhosted.xyz [192.168.1.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: mail@selfhosted.xyz) by server0.selfhosted.xyz (Postfix) with ESMTPSA; Sat, 15 May 2021 21:21:50 +0200 (CEST) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=_2129c2004fb75f55b92d445f6ce019ce" Date: Sat, 15 May 2021 21:21:50 +0200 From: david larsson In-Reply-To: <875yzkht7g.fsf@gnu.org> References: <20aec8da67d18b52e5a166f45cab40b2@selfhosted.xyz> <87eeeaiz5h.fsf@gnu.org> <48c1517d3239d55826324aa8f2bc9d4d@selfhosted.xyz> <87bl9eiwx5.fsf@gnu.org> <80bc8f6c73d5aa423cf906d59bbcd43e@selfhosted.xyz> <875yzkht7g.fsf@gnu.org> Message-ID: <2f7a02b8290c9728644a9d2c2caad0b9@selfhosted.xyz> X-Sender: david.larsson@selfhosted.xyz X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1621106591; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:in-reply-to:in-reply-to:references:references: list-id:list-help:list-unsubscribe:list-subscribe:list-post: dkim-signature; bh=OMpR/Uy9sCVQrfwX2BP+ot83Ce5BaFHgC1Cg+JqImd4=; b=prOTnDA/u+ieXLYNhnJ47TknGWc2iYdC/hnxKs/sbu3ATTq2epW6W0ddISFxv/9z2U7F/9 rJJ5moX87whaNNVhprRtdeI5HspN8rEtbvgdAKgcgZtAqiSCuS25IaFTS0XLoxh6LorqIF 4pBUmoezN+yCswTrRHGpX6/oT3ybPEuMd52jIhvZW0yiGmL4zx8iw4GaTKsS2GhEj6NBRA 7/yOnlw604c4FEUnv9/ssgyE3Haf154X6R6Qwg84cPuZrnrpUzBFIpYyGwX3k9jLZGMQ+f aoGl/8u1bT2pmj+WmKURtXsK/Aae+wZpue/n9EXg23jfoQG72iyXgyeNhmDe6g== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1621106591; a=rsa-sha256; cv=none; b=Hvu5+2wcykrq6rCp1QOOQabu77NLIcTbGXuZnizgq5EJTbw7ukSG3UTzh2qhxiCj1wrRtE KK1voMlGpVoMF1RRJyjXtT23NAwa9lwl5a2d3DFKsEzr/e/xjjpblZyOXf+116PqE9AT7P TxZoomQfQUwN0XfhyRX40L66C9O9x9xGp/km867TjH07WSfIS7so3CT1Ih/pvHltz7OEJx x4lUM4SbCyNZkbk9HfcKfBBpbD6GKm882Y1nihIP2hnAmuRs36DnHGxPA6iMdgenvC2JMo fZnpE3xc+Z8+8EMaM1cyInYlZ9h12ixnmZXpiGjuGtXHyDZbJrFUYOen1cUeBw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=selfhosted.xyz header.s=dkim header.b=kz7QTY11; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: -1.25 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=selfhosted.xyz header.s=dkim header.b=kz7QTY11; dmarc=fail reason="SPF not aligned (relaxed)" header.from=selfhosted.xyz (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: C0160A9C1 X-Spam-Score: -1.25 X-Migadu-Scanner: scn0.migadu.com X-TUID: 950El6Q/AvUe --=_2129c2004fb75f55b92d445f6ce019ce Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=US-ASCII; format=flowed > Please also register this patch in gnu/local.mk. Can you also add your > copyright at the top of xml.scm? Done! > > [...] > >> +(define-public libxml2-xpath0 >> + (package >> + (name "libxml2-xpath0") >> + (version "2.9.10") >> + (source (origin >> + (method url-fetch) >> + (uri (string-append "ftp://xmlsoft.org/libxml2/libxml2-" >> + version ".tar.gz")) >> + (sha256 >> + (base32 >> + >> "07xynh8hcxb2yb1fs051xrgszjvj37wnxvxgsj10rzmqzy9y3zma")) >> + (patches (list (search-patch >> "libxml2-Add-option-xpath0.patch"))))) > > You can inherit another record in Scheme to avoid duplicating all the > fields. Then the package can be shortened to: > > (define-public libxml2-xpath0 > (package/inherit libxml2 > (name "libxml2-xpath0") > (source (origin > (inherit (package-source libxml2)) > (patches (append (search-patches > "libxml2-Add-option-xpath0.patch") > (origin-patches (package-source > libxml2)))))) > (description > "..."))) > > We should fill out that description to mention how it differs from the > regular libxml2. Can you give it a try? I can make the other changes > on your behalf, but not sure what to write. > > Thanks, > Marius Hi, new patch attached. There's a lint warning though: "libxml2-xpath0@2.9.10: no updater for libxml2-xpath0". I don't know what it means, maybe it should be fixed before committing? Best regards, David --=_2129c2004fb75f55b92d445f6ce019ce Content-Transfer-Encoding: base64 Content-Type: text/x-diff; name=0001-gnu-libxml2-xpath0-New-package-with-patch-for-xpath0.patch Content-Disposition: attachment; filename=0001-gnu-libxml2-xpath0-New-package-with-patch-for-xpath0.patch; size=7970 RnJvbSA3MGM3YTQxOWYwNjAyNTY3OTU3MzdhN2RjNzEyMmJmYmNkNDU2YWU2IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBEYXZpZCBMYXJzc29uIDxkYXZpZC5sYXJzc29uQHNlbGZob3N0 ZWQueHl6PgpEYXRlOiBTYXQsIDE1IE1heSAyMDIxIDIwOjUyOjUwICswMjAwClN1YmplY3Q6IFtQ QVRDSF0gZ251OiBsaWJ4bWwyLXhwYXRoMDogTmV3IHBhY2thZ2Ugd2l0aCBwYXRjaCBmb3IgeHBh dGgwIG9wdGlvbgogdG8geG1sbGludC4KCiogZ251L3BhY2thZ2VzL3BhdGNoZXMvbGlieG1sMi14 cGF0aDAtQWRkLW9wdGlvbi14cGF0aDAucGF0Y2g6IE5ldyBmaWxlLi4uCiogZ251L2xvY2FsLm1r OiByZWdpc3RlciBpdC4KKiBnbnUvcGFja2FnZXMveG1sLnNjbSAobGlieG1sMi14cGF0aDApIFtz b3VyY2VdOiAuLi5hcHBseSBpdC4KLS0tCiBnbnUvbG9jYWwubWsgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgfCAgIDEgKwogLi4uL2xpYnhtbDIteHBhdGgwLUFkZC1vcHRpb24teHBh dGgwLnBhdGNoICAgIHwgMTM5ICsrKysrKysrKysrKysrKysrKwogZ251L3BhY2thZ2VzL3htbC5z Y20gICAgICAgICAgICAgICAgICAgICAgICAgIHwgIDE0ICsrCiAzIGZpbGVzIGNoYW5nZWQsIDE1 NCBpbnNlcnRpb25zKCspCiBjcmVhdGUgbW9kZSAxMDA2NDQgZ251L3BhY2thZ2VzL3BhdGNoZXMv bGlieG1sMi14cGF0aDAtQWRkLW9wdGlvbi14cGF0aDAucGF0Y2gKCmRpZmYgLS1naXQgYS9nbnUv bG9jYWwubWsgYi9nbnUvbG9jYWwubWsKaW5kZXggYzNiMDI3NDk0NS4uZDNlOGJhZjE3ZSAxMDA2 NDQKLS0tIGEvZ251L2xvY2FsLm1rCisrKyBiL2dudS9sb2NhbC5tawpAQCAtMTM2Niw2ICsxMzY2 LDcgQEAgZGlzdF9wYXRjaF9EQVRBID0JCQkJCQlcCiAgICVEJS9wYWNrYWdlcy9wYXRjaGVzL2xp YnV0aWxzLXJlbW92ZS1kYW1hZ2luZy1pbmNsdWRlcy5wYXRjaAlcCiAgICVEJS9wYWNrYWdlcy9w YXRjaGVzL2xpYnZkcGF1LXZhLWdsLXVuYnVuZGxlLnBhdGNoCQlcCiAgICVEJS9wYWNrYWdlcy9w YXRjaGVzL2xpYnZweC1DVkUtMjAxNi0yODE4LnBhdGNoCQlcCisgICVEJS9wYWNrYWdlcy9wYXRj aGVzL2xpYnhtbDIteHBhdGgwLUFkZC1vcHRpb24teHBhdGgwLnBhdGNoCVwKICAgJUQlL3BhY2th Z2VzL3BhdGNoZXMvbGlieHNsdC1nZW5lcmF0ZWQtaWRzLnBhdGNoCQlcCiAgICVEJS9wYWNrYWdl cy9wYXRjaGVzL2xpYnh0LWd1aXgtc2VhcmNoLXBhdGhzLnBhdGNoCQlcCiAgICVEJS9wYWNrYWdl cy9wYXRjaGVzL2xpZXJvbGlicmUtY2hlY2stdW5hbGlnbmVkLWFjY2Vzcy5wYXRjaAlcCmRpZmYg LS1naXQgYS9nbnUvcGFja2FnZXMvcGF0Y2hlcy9saWJ4bWwyLXhwYXRoMC1BZGQtb3B0aW9uLXhw YXRoMC5wYXRjaCBiL2dudS9wYWNrYWdlcy9wYXRjaGVzL2xpYnhtbDIteHBhdGgwLUFkZC1vcHRp b24teHBhdGgwLnBhdGNoCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAuLjMz MzczNzRhOGMKLS0tIC9kZXYvbnVsbAorKysgYi9nbnUvcGFja2FnZXMvcGF0Y2hlcy9saWJ4bWwy LXhwYXRoMC1BZGQtb3B0aW9uLXhwYXRoMC5wYXRjaApAQCAtMCwwICsxLDEzOSBAQAorRnJvbSBl MWRmNzQzMzI5YmRmZDk0ZmJmZGVhMTgzMDNjNWM2YzZmZTEzNDAzIE1vbiBTZXAgMTcgMDA6MDA6 MDAgMjAwMQorRnJvbTogbWV0aHVzZWxhaC0wIDxkYXZpZC5sYXJzc29uQHNlbGZob3N0ZWQueHl6 PgorRGF0ZTogVGh1LCAxIEFwciAyMDIxIDA4OjMzOjU2ICswMjAwCitTdWJqZWN0OiBbUEFUQ0hd IEFkZCBvcHRpb24gLS14cGF0aDAKKworLS0tCisgZG9jL3htbGxpbnQueG1sIHwgMTYgKysrKysr KysrKysrKysrKworIHhtbGxpbnQuYyAgICAgICB8IDMyICsrKysrKysrKysrKysrKysrKysrKysr LS0tLS0tLS0tCisgMiBmaWxlcyBjaGFuZ2VkLCAzOSBpbnNlcnRpb25zKCspLCA5IGRlbGV0aW9u cygtKQorCitkaWZmIC0tZ2l0IGEvZG9jL3htbGxpbnQueG1sIGIvZG9jL3htbGxpbnQueG1sCitp bmRleCAxMDA4MTc5Yi4uZmNkYzIzN2UgMTAwNjQ0CistLS0gYS9kb2MveG1sbGludC54bWwKKysr KyBiL2RvYy94bWxsaW50LnhtbAorQEAgLTcwLDYgKzcwLDcgQEAKKyAJCQk8YXJnIGNob2ljZT0i cGxhaW4iPjxvcHRpb24+LS1kZWJ1Zzwvb3B0aW9uPjwvYXJnPgorIAkJCTxhcmcgY2hvaWNlPSJw bGFpbiI+PG9wdGlvbj4tLXNoZWxsPC9vcHRpb24+PC9hcmc+CisgCQkJPGFyZyBjaG9pY2U9InBs YWluIj48b3B0aW9uPi0teHBhdGggIjxyZXBsYWNlYWJsZSBjbGFzcz0ib3B0aW9uIj5YUGF0aF9l eHByZXNzaW9uPC9yZXBsYWNlYWJsZT4iPC9vcHRpb24+PC9hcmc+CisrCQkJPGFyZyBjaG9pY2U9 InBsYWluIj48b3B0aW9uPi0teHBhdGgwICI8cmVwbGFjZWFibGUgY2xhc3M9Im9wdGlvbiI+WFBh dGhfZXhwcmVzc2lvbjwvcmVwbGFjZWFibGU+Ijwvb3B0aW9uPjwvYXJnPgorIAkJCTxhcmcgY2hv aWNlPSJwbGFpbiI+PG9wdGlvbj4tLWRlYnVnZW50PC9vcHRpb24+PC9hcmc+CisgCQkJPGFyZyBj aG9pY2U9InBsYWluIj48b3B0aW9uPi0tY29weTwvb3B0aW9uPjwvYXJnPgorIAkJCTxhcmcgY2hv aWNlPSJwbGFpbiI+PG9wdGlvbj4tLXJlY292ZXI8L29wdGlvbj48L2FyZz4KK0BAIC01MzcsNiAr NTM4LDIxIEBACisgCQkJbm9kZSBzZXQgaXMgc2VyaWFsaXplZCBpbiBmdWxsIGluIHRoZSBvdXRw dXQuIEluIGNhc2UKKyAJCQlvZiBhbiBlbXB0eSBub2RlIHNldCB0aGUgIlhQYXRoIHNldCBpcyBl bXB0eSIgcmVzdWx0CisgCQkJd2lsbCBiZSBzaG93biBhbmQgYW4gZXJyb3IgZXhpdCBjb2RlIHdp bGwgYmUgcmV0dXJuZWQuCisrCQkJUmVzdWx0cyBhcmUgc2VwYXJhdGVkIGJ5IHRoZSBuZXdsaW5l IGNoYXJhY3Rlci4KKysJCTwvcGFyYT4KKysJPC9saXN0aXRlbT4KKysJCTwvdmFybGlzdGVudHJ5 PgorKworKwkJPHZhcmxpc3RlbnRyeT4KKysJPHRlcm0+PG9wdGlvbj4tLXhwYXRoMCAiPHJlcGxh Y2VhYmxlIGNsYXNzPSJvcHRpb24iPlhQYXRoX2V4cHJlc3Npb248L3JlcGxhY2VhYmxlPiI8L29w dGlvbj48L3Rlcm0+CisrCTxsaXN0aXRlbT4KKysJCTxwYXJhPgorKwkJCVJ1biBhbiBYUGF0aCBl eHByZXNzaW9uIGdpdmVuIGFzIGFyZ3VtZW50IGFuZCBwcmludCB0aGUKKysJCQlyZXN1bHQuIElu IGNhc2Ugb2YgYSBub2Rlc2V0IHJlc3VsdCwgZWFjaCBub2RlIGluIHRoZQorKwkJCW5vZGUgc2V0 IGlzIHNlcmlhbGl6ZWQgaW4gZnVsbCBpbiB0aGUgb3V0cHV0LiBJbiBjYXNlCisrCQkJb2YgYW4g ZW1wdHkgbm9kZSBzZXQgdGhlICJYUGF0aCBzZXQgaXMgZW1wdHkiIHJlc3VsdAorKwkJCXdpbGwg YmUgc2hvd24gYW5kIGFuIGVycm9yIGV4aXQgY29kZSB3aWxsIGJlIHJldHVybmVkLgorKwkJCVJl c3VsdHMgYXJlIHNlcGFyYXRlZCBieSB0aGUgbnVsbCBjaGFyYWN0ZXIuCisgCQk8L3BhcmE+Cisg CTwvbGlzdGl0ZW0+CisgCQk8L3Zhcmxpc3RlbnRyeT4KK2RpZmYgLS1naXQgYS94bWxsaW50LmMg Yi94bWxsaW50LmMKK2luZGV4IDZjYTFiZjU0Li5hNjBlMWY0ZiAxMDA2NDQKKy0tLSBhL3htbGxp bnQuYworKysrIGIveG1sbGludC5jCitAQCAtMTk0LDYgKzE5NCw3IEBAIHN0YXRpYyBpbnQgc2F4 MSA9IDA7CisgI2VuZGlmIC8qIExJQlhNTF9TQVgxX0VOQUJMRUQgKi8KKyAjaWZkZWYgTElCWE1M X1hQQVRIX0VOQUJMRUQKKyBzdGF0aWMgY29uc3QgY2hhciAqeHBhdGhxdWVyeSA9IE5VTEw7Cisr c3RhdGljIGNvbnN0IGNoYXIgKnhwYXRoc2VwID0gIlxuIjsKKyAjZW5kaWYKKyBzdGF0aWMgaW50 IG9wdGlvbnMgPSBYTUxfUEFSU0VfQ09NUEFDVCB8IFhNTF9QQVJTRV9CSUdfTElORVM7Cisgc3Rh dGljIGludCBzYXggPSAwOworQEAgLTIwOTUsNyArMjA5Niw3IEBAIHN0YXRpYyB2b2lkIGRvWFBh dGhEdW1wKHhtbFhQYXRoT2JqZWN0UHRyIGN1cikgeworICAgICAgICAgICAgIGZvciAoaSA9IDA7 aSA8IGN1ci0+bm9kZXNldHZhbC0+bm9kZU5yO2krKykgeworICAgICAgICAgICAgICAgICBub2Rl ID0gY3VyLT5ub2Rlc2V0dmFsLT5ub2RlVGFiW2ldOworICAgICAgICAgICAgICAgICB4bWxOb2Rl RHVtcE91dHB1dChidWYsIE5VTEwsIG5vZGUsIDAsIDAsIE5VTEwpOworLSAgICAgICAgICAgICAg ICB4bWxPdXRwdXRCdWZmZXJXcml0ZShidWYsIDEsICJcbiIpOworKwkJeG1sT3V0cHV0QnVmZmVy V3JpdGUoYnVmLCAxLCB4cGF0aHNlcCk7CisgICAgICAgICAgICAgfQorICAgICAgICAgICAgIHht bE91dHB1dEJ1ZmZlckNsb3NlKGJ1Zik7CisgI2Vsc2UKK0BAIC0yMTA0LDI3ICsyMTA1LDI3IEBA IHN0YXRpYyB2b2lkIGRvWFBhdGhEdW1wKHhtbFhQYXRoT2JqZWN0UHRyIGN1cikgeworIAkgICAg YnJlYWs7CisgICAgICAgICB9CisgICAgICAgICBjYXNlIFhQQVRIX0JPT0xFQU46CistCSAgICBp ZiAoY3VyLT5ib29sdmFsKSBwcmludGYoInRydWVcbiIpOworLQkgICAgZWxzZSBwcmludGYoImZh bHNlXG4iKTsKKysJICAgIGlmIChjdXItPmJvb2x2YWwpIHByaW50ZigidHJ1ZSVzIiwgeHBhdGhz ZXApOworKwkgICAgZWxzZSBwcmludGYoImZhbHNlJXMiLCB4cGF0aHNlcCk7CisgCSAgICBicmVh azsKKyAgICAgICAgIGNhc2UgWFBBVEhfTlVNQkVSOgorIAkgICAgc3dpdGNoICh4bWxYUGF0aElz SW5mKGN1ci0+ZmxvYXR2YWwpKSB7CisgCSAgICBjYXNlIDE6CistCQlwcmludGYoIkluZmluaXR5 XG4iKTsKKysJICAgICAgICBwcmludGYoIkluZmluaXR5JXMiLCB4cGF0aHNlcCk7CisgCQlicmVh azsKKyAJICAgIGNhc2UgLTE6CistCQlwcmludGYoIi1JbmZpbml0eVxuIik7CisrCSAgICAgICAg cHJpbnRmKCItSW5maW5pdHklcyIsIHhwYXRoc2VwKTsKKyAJCWJyZWFrOworIAkgICAgZGVmYXVs dDoKKyAJCWlmICh4bWxYUGF0aElzTmFOKGN1ci0+ZmxvYXR2YWwpKSB7CistCQkgICAgcHJpbnRm KCJOYU5cbiIpOworKwkJICAgIHByaW50ZigiTmFOJXMiLCB4cGF0aHNlcCk7CisgCQl9IGVsc2Ug eworLQkJICAgIHByaW50ZigiJTBnXG4iLCBjdXItPmZsb2F0dmFsKTsKKysJCSAgICBwcmludGYo IiUwZyVzIiwgY3VyLT5mbG9hdHZhbCwgeHBhdGhzZXApOworIAkJfQorIAkgICAgfQorIAkgICAg YnJlYWs7CisgICAgICAgICBjYXNlIFhQQVRIX1NUUklORzoKKy0JICAgIHByaW50ZigiJXNcbiIs IChjb25zdCBjaGFyICopIGN1ci0+c3RyaW5ndmFsKTsKKysJICAgIHByaW50ZigiJXMlcyIsIChj b25zdCBjaGFyICopIGN1ci0+c3RyaW5ndmFsLCB4cGF0aHNlcCk7CisgCSAgICBicmVhazsKKyAg ICAgICAgIGNhc2UgWFBBVEhfVU5ERUZJTkVEOgorIAkgICAgZnByaW50ZihzdGRlcnIsICJYUGF0 aCBPYmplY3QgaXMgdW5pbml0aWFsaXplZFxuIik7CitAQCAtMzA5OCw3ICszMDk5LDggQEAgc3Rh dGljIHZvaWQgdXNhZ2UoRklMRSAqZiwgY29uc3QgY2hhciAqbmFtZSkgeworICAgICBmcHJpbnRm KGYsICJcdC0tc2F4OiBkbyBub3QgYnVpbGQgYSB0cmVlIGJ1dCB3b3JrIGp1c3QgYXQgdGhlIFNB WCBsZXZlbFxuIik7CisgICAgIGZwcmludGYoZiwgIlx0LS1vbGR4bWwxMDogdXNlIFhNTC0xLjAg cGFyc2luZyBydWxlcyBiZWZvcmUgdGhlIDV0aCBlZGl0aW9uXG4iKTsKKyAjaWZkZWYgTElCWE1M X1hQQVRIX0VOQUJMRUQKKy0gICAgZnByaW50ZihmLCAiXHQtLXhwYXRoIGV4cHI6IGV2YWx1YXRl IHRoZSBYUGF0aCBleHByZXNzaW9uLCBpbXBseSAtLW5vb3V0XG4iKTsKKysgICAgZnByaW50Zihm LCAiXHQtLXhwYXRoIGV4cHI6IGV2YWx1YXRlIHRoZSBYUGF0aCBleHByZXNzaW9uLCByZXN1bHRz IGFyZSBzZXBhcmF0ZWQgYnkgXFxuLCBpbXBseSAtLW5vb3V0XG4iKTsKKysgICAgZnByaW50Zihm LCAiXHQtLXhwYXRoMCBleHByOiBldmFsdWF0ZSB0aGUgWFBhdGggZXhwcmVzc2lvbiwgcmVzdWx0 cyBhcmUgc2VwYXJhdGVkIGJ5IFxcMCwgaW1wbHkgLS1ub291dFxuIik7CisgI2VuZGlmCisgCisg ICAgIGZwcmludGYoZiwgIlxuTGlieG1sIHByb2plY3QgaG9tZSBwYWdlOiBodHRwOi8veG1sc29m dC5vcmcvXG4iKTsKK0BAIC0zNDgwLDYgKzM0ODIsMTMgQEAgbWFpbihpbnQgYXJnYywgY2hhciAq KmFyZ3YpIHsKKyAJICAgIGkrKzsKKyAJICAgIG5vb3V0Kys7CisgCSAgICB4cGF0aHF1ZXJ5ID0g YXJndltpXTsKKysJICAgIHhwYXRoc2VwID0gIlxuIjsKKysgICAgICAgIH0gZWxzZSBpZiAoKCFz dHJjbXAoYXJndltpXSwgIi14cGF0aDAiKSkgfHwKKysgICAgICAgICAgICAgICAgICAgKCFzdHJj bXAoYXJndltpXSwgIi0teHBhdGgwIikpKSB7CisrCSAgICBpKys7CisrCSAgICBub291dCsrOwor KwkgICAgeHBhdGhxdWVyeSA9IGFyZ3ZbaV07CisrCSAgICB4cGF0aHNlcCA9ICJcMCI7CisgI2Vu ZGlmCisgCX0gZWxzZSBpZiAoKCFzdHJjbXAoYXJndltpXSwgIi1vbGR4bWwxMCIpKSB8fAorIAkg ICAgICAgICAgICghc3RyY21wKGFyZ3ZbaV0sICItLW9sZHhtbDEwIikpKSB7CitAQCAtMzcxMiw2 ICszNzIxLDExIEBAIG1haW4oaW50IGFyZ2MsIGNoYXIgKiphcmd2KSB7CisgCSAgICBpKys7Cisg CSAgICBjb250aW51ZTsKKyAJfQorKyAgICAgICAgaWYgKCghc3RyY21wKGFyZ3ZbaV0sICIteHBh dGgwIikpIHx8CisrCSAgICAoIXN0cmNtcChhcmd2W2ldLCAiLS14cGF0aDAiKSkpIHsKKysJICAg IGkrKzsKKysJICAgIGNvbnRpbnVlOworKwl9CisgI2VuZGlmCisgCWlmICgodGltaW5nKSAmJiAo cmVwZWF0KSkKKyAJICAgIHN0YXJ0VGltZXIoKTsKKy0tIAorMi4zMC4yCisKZGlmZiAtLWdpdCBh L2dudS9wYWNrYWdlcy94bWwuc2NtIGIvZ251L3BhY2thZ2VzL3htbC5zY20KaW5kZXggOTMxNjk4 YTU3NS4uMjg2MDFmMGQwOSAxMDA2NDQKLS0tIGEvZ251L3BhY2thZ2VzL3htbC5zY20KKysrIGIv Z251L3BhY2thZ2VzL3htbC5zY20KQEAgLTMxLDYgKzMxLDcgQEAKIDs7OyBDb3B5cmlnaHQgwqkg MjAyMSBKdWxpZW4gTGVwaWxsZXIgPGp1bGllbkBsZXBpbGxlci5ldT4KIDs7OyBDb3B5cmlnaHQg wqkgMjAyMSBGZWxpeCBHcnViZXIgPGZlbGdydUBwb3N0ZW8ubmV0PgogOzs7IENvcHlyaWdodCDC qSAyMDIxIEd1aWxsYXVtZSBMZSBWYWlsbGFudCA8Z2x2QHBvc3Rlby5uZXQ+Cis7OzsgQ29weXJp Z2h0IMKpIDIwMjEgRGF2aWQgTGFyc3NvbiA8ZGF2aWQubGFyc3NvbkBzZWxmaG9zdGVkLnh5ej4K IDs7OwogOzs7IFRoaXMgZmlsZSBpcyBwYXJ0IG9mIEdOVSBHdWl4LgogOzs7CkBAIC0yMTgsNiAr MjE5LDE5IEBAIGhpZXJhcmNoaWNhbCBmb3JtIHdpdGggdmFyaWFibGUgZmllbGQgbGVuZ3Rocy4i KQogcHJvamVjdCAoYnV0IGl0IGlzIHVzYWJsZSBvdXRzaWRlIG9mIHRoZSBHbm9tZSBwbGF0Zm9y bSkuIikKICAgICAobGljZW5zZSBsaWNlbnNlOngxMSkpKQogCisoZGVmaW5lLXB1YmxpYyBsaWJ4 bWwyLXhwYXRoMAorICAocGFja2FnZS9pbmhlcml0IGxpYnhtbDIKKyAgICAobmFtZSAibGlieG1s Mi14cGF0aDAiKQorICAgIChzb3VyY2UgKG9yaWdpbgorICAgICAgICAgICAgICAoaW5oZXJpdCAo cGFja2FnZS1zb3VyY2UgbGlieG1sMikpCisgICAgICAgICAgICAgIChwYXRjaGVzIChhcHBlbmQg KHNlYXJjaC1wYXRjaGVzCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICJsaWJ4bWwy LXhwYXRoMC1BZGQtb3B0aW9uLXhwYXRoMC5wYXRjaCIpCisgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgKG9yaWdpbi1wYXRjaGVzIChwYWNrYWdlLXNvdXJjZSBsaWJ4bWwyKSkpKSkpCisg ICAgKGRlc2NyaXB0aW9uCisgICAgICJMaWJ4bWwyLXhwYXRoMCBpcyBsaWtlIGxpYnhtbDIgYnV0 IHdpdGggYSBwYXRjaCBhcHBsaWVkIHRoYXQKK3Byb3ZpZGVzIGFuIC0teHBhdGgwIG9wdGlvbiB0 byB4bWxsaW50IHRoYXQgZW5hYmxlcyBpdCB0byBvdXRwdXQgeHBhdGgKK3Jlc3VsdHMgd2l0aCBh IG51bGwgZGVsaW1pdGVyIikpKQorCiAoZGVmaW5lLXB1YmxpYyBsaWJ4bHN4d3JpdGVyCiAgIChw YWNrYWdlCiAgICAgKG5hbWUgImxpYnhsc3h3cml0ZXIiKQotLSAKMi4zMS4wCgo= --=_2129c2004fb75f55b92d445f6ce019ce--