From unknown Tue Jun 24 06:51:38 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#47898 <47898@debbugs.gnu.org> To: bug#47898 <47898@debbugs.gnu.org> Subject: Status: [PATCH] [core-updates] Add option --xpath0 to xmllint from libxml2 Reply-To: bug#47898 <47898@debbugs.gnu.org> Date: Tue, 24 Jun 2025 13:51:38 +0000 retitle 47898 [PATCH] [core-updates] Add option --xpath0 to xmllint from li= bxml2 reassign 47898 guix-patches submitter 47898 david larsson severity 47898 normal tag 47898 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Mon Apr 19 14:49:15 2021 Received: (at submit) by debbugs.gnu.org; 19 Apr 2021 18:49:15 +0000 Received: from localhost ([127.0.0.1]:52078 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lYYxL-0000CG-IG for submit@debbugs.gnu.org; Mon, 19 Apr 2021 14:49:15 -0400 Received: from lists.gnu.org ([209.51.188.17]:50306) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lYYxG-0000C5-Sl for submit@debbugs.gnu.org; Mon, 19 Apr 2021 14:49:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41930) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lYYxG-0008RR-81 for guix-patches@gnu.org; Mon, 19 Apr 2021 14:49:06 -0400 Received: from server0.selfhosted.xyz ([217.64.149.7]:41520) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lYYxD-0005ha-A5 for guix-patches@gnu.org; Mon, 19 Apr 2021 14:49:05 -0400 Received: from server0.selfhosted.xyz (localhost [127.0.0.1]) by server0.selfhosted.xyz (Postfix) with ESMTP id 774481D40118 for ; Mon, 19 Apr 2021 20:48:47 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=selfhosted.xyz; s=dkim; t=1618858133; bh=0Oe4gdJQXyre2wMmvk/lPPyI7Ueu1zM9CBJ5m9TB93U=; h=Date:From:To:Subject; b=WA6lMnwYiVEV+TflkdoRzAgBWjsrNHdBpbDHJ684P29l8xBunyRGVUODr+1DHdpp6 1iUwaIhjDqFW+nmxG3wvTptGwUMj9ugQ3kQrgmVgtl9p8bfdRuvlmD006J4SfCBO4k xiHGOfw/Ztptp0m7KVyRqNqdsuJXL8YaEC2yBvF6Sh9g8X++kr/Nw+Yd0BknA7wfRN etxlPoXEu2izUMNaVouES1oOSqa5jtSaLrUnbLZIVsVl1UzJDXGntFznqTK6d8G1DW dB0XVlh+gQ14jiCoF8+fUZkRNikEk3AaIgKgDEPoAdWCTJnDFbsXg/yHGAWikp+PH/ 81i66q+vLbrww== X-Fuglu-Suspect: 289d4ab83d0f44bc978c971a664bca6d 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 for ; Mon, 19 Apr 2021 20:48:47 +0200 (CEST) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=_3126a06c316eb76e4e7f708570d4b89e" Date: Mon, 19 Apr 2021 20:48:47 +0200 From: david larsson To: guix-patches@gnu.org Subject: [PATCH] [core-updates] Add option --xpath0 to xmllint from libxml2 Message-ID: <20aec8da67d18b52e5a166f45cab40b2@selfhosted.xyz> X-Sender: david.larsson@selfhosted.xyz Received-SPF: pass client-ip=217.64.149.7; envelope-from=david.larsson@selfhosted.xyz; helo=server0.selfhosted.xyz X-Spam_score_int: -16 X-Spam_score: -1.7 X-Spam_bar: - X-Spam_report: (-1.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FROM_SUSPICIOUS_NTLD=0.001, FROM_SUSPICIOUS_NTLD_FP=0.661, PDS_OTHER_BAD_TLD=1.999, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-Spam-Score: 1.3 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Hi! This patch adds the option to separate xpath results from xmllint by a null delimiter when using the --xpath0 option-flag. It is something that's been asked for for a long time by users on stackov [...] Content analysis details: (1.3 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 2.0 PDS_OTHER_BAD_TLD Untrustworthy TLDs [URI: selfhosted.xyz (xyz)] 0.9 SPF_FAIL SPF: sender does not match SPF record (fail) [SPF failed: Please see http://www.openspf.org/Why?s=mfrom; id=david.larsson%40selfhosted.xyz; ip=209.51.188.17; r=debbugs.gnu.org] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 0.0 RCVD_IN_MSPIKE_H4 RBL: Very Good reputation (+4) [209.51.188.17 listed in wl.mailspike.net] -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at https://www.dnswl.org/, medium trust [209.51.188.17 listed in list.dnswl.org] 0.0 FROM_SUSPICIOUS_NTLD From abused NTLD 0.7 FROM_SUSPICIOUS_NTLD_FP From abused NTLD 0.0 RCVD_IN_MSPIKE_WL Mailspike good senders X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.4 (/) --=_3126a06c316eb76e4e7f708570d4b89e Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=US-ASCII; format=flowed Hi! This patch adds the option to separate xpath results from xmllint by a null delimiter when using the --xpath0 option-flag. It is something that's been asked for for a long time by users on stackoverflow and merge-attempts have been made to upstream without success. Examples: - https://gitlab.gnome.org/GNOME/libxml2/-/issues/227 - https://gitlab.gnome.org/GNOME/libxml2/-/merge_requests/8 Best regards, David --=_3126a06c316eb76e4e7f708570d4b89e Content-Transfer-Encoding: base64 Content-Type: text/x-diff; name=0001-gnu-libxml2-Add-patch-for-xpath0-option-to-xmllint.patch Content-Disposition: attachment; filename=0001-gnu-libxml2-Add-patch-for-xpath0-option-to-xmllint.patch; size=6647 RnJvbSA3MTRhNmEyNmRhNTVmN2UwNmM5NGQzZDJiYjI5NjViOWQyZjgzMmRhIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBEYXZpZCBMYXJzc29uIDxkYXZpZC5sYXJzc29uQHNlbGZob3N0 ZWQueHl6PgpEYXRlOiBNb24sIDE5IEFwciAyMDIxIDIwOjM5OjIzICswMjAwClN1YmplY3Q6IFtQ QVRDSF0gZ251OiBsaWJ4bWwyOiBBZGQgcGF0Y2ggZm9yIHhwYXRoMCBvcHRpb24gdG8geG1sbGlu dC4KCiogZ251L3BhY2thZ2VzL3BhdGNoZXMvbGlieG1sMi1BZGQtb3B0aW9uLXhwYXRoMC5wYXRj aDogTmV3IGZpbGUuLi4KKiBnbnUvcGFja2FnZXMveG1sLnNjbSAobGlieG1sMikgW3NvdXJjZV06 IC4uLmFkZCBpdC4KLS0tCiAuLi4vcGF0Y2hlcy9saWJ4bWwyLUFkZC1vcHRpb24teHBhdGgwLnBh dGNoICAgfCAxMzkgKysrKysrKysrKysrKysrKysrCiBnbnUvcGFja2FnZXMveG1sLnNjbSAgICAg ICAgICAgICAgICAgICAgICAgICAgfCAgIDMgKy0KIDIgZmlsZXMgY2hhbmdlZCwgMTQxIGluc2Vy dGlvbnMoKyksIDEgZGVsZXRpb24oLSkKIGNyZWF0ZSBtb2RlIDEwMDY0NCBnbnUvcGFja2FnZXMv cGF0Y2hlcy9saWJ4bWwyLUFkZC1vcHRpb24teHBhdGgwLnBhdGNoCgpkaWZmIC0tZ2l0IGEvZ251 L3BhY2thZ2VzL3BhdGNoZXMvbGlieG1sMi1BZGQtb3B0aW9uLXhwYXRoMC5wYXRjaCBiL2dudS9w YWNrYWdlcy9wYXRjaGVzL2xpYnhtbDItQWRkLW9wdGlvbi14cGF0aDAucGF0Y2gKbmV3IGZpbGUg bW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMC4uMzMzNzM3NGE4YwotLS0gL2Rldi9udWxsCisr KyBiL2dudS9wYWNrYWdlcy9wYXRjaGVzL2xpYnhtbDItQWRkLW9wdGlvbi14cGF0aDAucGF0Y2gK QEAgLTAsMCArMSwxMzkgQEAKK0Zyb20gZTFkZjc0MzMyOWJkZmQ5NGZiZmRlYTE4MzAzYzVjNmM2 ZmUxMzQwMyBNb24gU2VwIDE3IDAwOjAwOjAwIDIwMDEKK0Zyb206IG1ldGh1c2VsYWgtMCA8ZGF2 aWQubGFyc3NvbkBzZWxmaG9zdGVkLnh5ej4KK0RhdGU6IFRodSwgMSBBcHIgMjAyMSAwODozMzo1 NiArMDIwMAorU3ViamVjdDogW1BBVENIXSBBZGQgb3B0aW9uIC0teHBhdGgwCisKKy0tLQorIGRv Yy94bWxsaW50LnhtbCB8IDE2ICsrKysrKysrKysrKysrKysKKyB4bWxsaW50LmMgICAgICAgfCAz MiArKysrKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLQorIDIgZmlsZXMgY2hhbmdlZCwgMzkg aW5zZXJ0aW9ucygrKSwgOSBkZWxldGlvbnMoLSkKKworZGlmZiAtLWdpdCBhL2RvYy94bWxsaW50 LnhtbCBiL2RvYy94bWxsaW50LnhtbAoraW5kZXggMTAwODE3OWIuLmZjZGMyMzdlIDEwMDY0NAor LS0tIGEvZG9jL3htbGxpbnQueG1sCisrKysgYi9kb2MveG1sbGludC54bWwKK0BAIC03MCw2ICs3 MCw3IEBACisgCQkJPGFyZyBjaG9pY2U9InBsYWluIj48b3B0aW9uPi0tZGVidWc8L29wdGlvbj48 L2FyZz4KKyAJCQk8YXJnIGNob2ljZT0icGxhaW4iPjxvcHRpb24+LS1zaGVsbDwvb3B0aW9uPjwv YXJnPgorIAkJCTxhcmcgY2hvaWNlPSJwbGFpbiI+PG9wdGlvbj4tLXhwYXRoICI8cmVwbGFjZWFi bGUgY2xhc3M9Im9wdGlvbiI+WFBhdGhfZXhwcmVzc2lvbjwvcmVwbGFjZWFibGU+Ijwvb3B0aW9u PjwvYXJnPgorKwkJCTxhcmcgY2hvaWNlPSJwbGFpbiI+PG9wdGlvbj4tLXhwYXRoMCAiPHJlcGxh Y2VhYmxlIGNsYXNzPSJvcHRpb24iPlhQYXRoX2V4cHJlc3Npb248L3JlcGxhY2VhYmxlPiI8L29w dGlvbj48L2FyZz4KKyAJCQk8YXJnIGNob2ljZT0icGxhaW4iPjxvcHRpb24+LS1kZWJ1Z2VudDwv b3B0aW9uPjwvYXJnPgorIAkJCTxhcmcgY2hvaWNlPSJwbGFpbiI+PG9wdGlvbj4tLWNvcHk8L29w dGlvbj48L2FyZz4KKyAJCQk8YXJnIGNob2ljZT0icGxhaW4iPjxvcHRpb24+LS1yZWNvdmVyPC9v cHRpb24+PC9hcmc+CitAQCAtNTM3LDYgKzUzOCwyMSBAQAorIAkJCW5vZGUgc2V0IGlzIHNlcmlh bGl6ZWQgaW4gZnVsbCBpbiB0aGUgb3V0cHV0LiBJbiBjYXNlCisgCQkJb2YgYW4gZW1wdHkgbm9k ZSBzZXQgdGhlICJYUGF0aCBzZXQgaXMgZW1wdHkiIHJlc3VsdAorIAkJCXdpbGwgYmUgc2hvd24g YW5kIGFuIGVycm9yIGV4aXQgY29kZSB3aWxsIGJlIHJldHVybmVkLgorKwkJCVJlc3VsdHMgYXJl IHNlcGFyYXRlZCBieSB0aGUgbmV3bGluZSBjaGFyYWN0ZXIuCisrCQk8L3BhcmE+CisrCTwvbGlz dGl0ZW0+CisrCQk8L3Zhcmxpc3RlbnRyeT4KKysKKysJCTx2YXJsaXN0ZW50cnk+CisrCTx0ZXJt PjxvcHRpb24+LS14cGF0aDAgIjxyZXBsYWNlYWJsZSBjbGFzcz0ib3B0aW9uIj5YUGF0aF9leHBy ZXNzaW9uPC9yZXBsYWNlYWJsZT4iPC9vcHRpb24+PC90ZXJtPgorKwk8bGlzdGl0ZW0+CisrCQk8 cGFyYT4KKysJCQlSdW4gYW4gWFBhdGggZXhwcmVzc2lvbiBnaXZlbiBhcyBhcmd1bWVudCBhbmQg cHJpbnQgdGhlCisrCQkJcmVzdWx0LiBJbiBjYXNlIG9mIGEgbm9kZXNldCByZXN1bHQsIGVhY2gg bm9kZSBpbiB0aGUKKysJCQlub2RlIHNldCBpcyBzZXJpYWxpemVkIGluIGZ1bGwgaW4gdGhlIG91 dHB1dC4gSW4gY2FzZQorKwkJCW9mIGFuIGVtcHR5IG5vZGUgc2V0IHRoZSAiWFBhdGggc2V0IGlz IGVtcHR5IiByZXN1bHQKKysJCQl3aWxsIGJlIHNob3duIGFuZCBhbiBlcnJvciBleGl0IGNvZGUg d2lsbCBiZSByZXR1cm5lZC4KKysJCQlSZXN1bHRzIGFyZSBzZXBhcmF0ZWQgYnkgdGhlIG51bGwg Y2hhcmFjdGVyLgorIAkJPC9wYXJhPgorIAk8L2xpc3RpdGVtPgorIAkJPC92YXJsaXN0ZW50cnk+ CitkaWZmIC0tZ2l0IGEveG1sbGludC5jIGIveG1sbGludC5jCitpbmRleCA2Y2ExYmY1NC4uYTYw ZTFmNGYgMTAwNjQ0CistLS0gYS94bWxsaW50LmMKKysrKyBiL3htbGxpbnQuYworQEAgLTE5NCw2 ICsxOTQsNyBAQCBzdGF0aWMgaW50IHNheDEgPSAwOworICNlbmRpZiAvKiBMSUJYTUxfU0FYMV9F TkFCTEVEICovCisgI2lmZGVmIExJQlhNTF9YUEFUSF9FTkFCTEVECisgc3RhdGljIGNvbnN0IGNo YXIgKnhwYXRocXVlcnkgPSBOVUxMOworK3N0YXRpYyBjb25zdCBjaGFyICp4cGF0aHNlcCA9ICJc biI7CisgI2VuZGlmCisgc3RhdGljIGludCBvcHRpb25zID0gWE1MX1BBUlNFX0NPTVBBQ1QgfCBY TUxfUEFSU0VfQklHX0xJTkVTOworIHN0YXRpYyBpbnQgc2F4ID0gMDsKK0BAIC0yMDk1LDcgKzIw OTYsNyBAQCBzdGF0aWMgdm9pZCBkb1hQYXRoRHVtcCh4bWxYUGF0aE9iamVjdFB0ciBjdXIpIHsK KyAgICAgICAgICAgICBmb3IgKGkgPSAwO2kgPCBjdXItPm5vZGVzZXR2YWwtPm5vZGVOcjtpKysp IHsKKyAgICAgICAgICAgICAgICAgbm9kZSA9IGN1ci0+bm9kZXNldHZhbC0+bm9kZVRhYltpXTsK KyAgICAgICAgICAgICAgICAgeG1sTm9kZUR1bXBPdXRwdXQoYnVmLCBOVUxMLCBub2RlLCAwLCAw LCBOVUxMKTsKKy0gICAgICAgICAgICAgICAgeG1sT3V0cHV0QnVmZmVyV3JpdGUoYnVmLCAxLCAi XG4iKTsKKysJCXhtbE91dHB1dEJ1ZmZlcldyaXRlKGJ1ZiwgMSwgeHBhdGhzZXApOworICAgICAg ICAgICAgIH0KKyAgICAgICAgICAgICB4bWxPdXRwdXRCdWZmZXJDbG9zZShidWYpOworICNlbHNl CitAQCAtMjEwNCwyNyArMjEwNSwyNyBAQCBzdGF0aWMgdm9pZCBkb1hQYXRoRHVtcCh4bWxYUGF0 aE9iamVjdFB0ciBjdXIpIHsKKyAJICAgIGJyZWFrOworICAgICAgICAgfQorICAgICAgICAgY2Fz ZSBYUEFUSF9CT09MRUFOOgorLQkgICAgaWYgKGN1ci0+Ym9vbHZhbCkgcHJpbnRmKCJ0cnVlXG4i KTsKKy0JICAgIGVsc2UgcHJpbnRmKCJmYWxzZVxuIik7CisrCSAgICBpZiAoY3VyLT5ib29sdmFs KSBwcmludGYoInRydWUlcyIsIHhwYXRoc2VwKTsKKysJICAgIGVsc2UgcHJpbnRmKCJmYWxzZSVz IiwgeHBhdGhzZXApOworIAkgICAgYnJlYWs7CisgICAgICAgICBjYXNlIFhQQVRIX05VTUJFUjoK KyAJICAgIHN3aXRjaCAoeG1sWFBhdGhJc0luZihjdXItPmZsb2F0dmFsKSkgeworIAkgICAgY2Fz ZSAxOgorLQkJcHJpbnRmKCJJbmZpbml0eVxuIik7CisrCSAgICAgICAgcHJpbnRmKCJJbmZpbml0 eSVzIiwgeHBhdGhzZXApOworIAkJYnJlYWs7CisgCSAgICBjYXNlIC0xOgorLQkJcHJpbnRmKCIt SW5maW5pdHlcbiIpOworKwkgICAgICAgIHByaW50ZigiLUluZmluaXR5JXMiLCB4cGF0aHNlcCk7 CisgCQlicmVhazsKKyAJICAgIGRlZmF1bHQ6CisgCQlpZiAoeG1sWFBhdGhJc05hTihjdXItPmZs b2F0dmFsKSkgeworLQkJICAgIHByaW50ZigiTmFOXG4iKTsKKysJCSAgICBwcmludGYoIk5hTiVz IiwgeHBhdGhzZXApOworIAkJfSBlbHNlIHsKKy0JCSAgICBwcmludGYoIiUwZ1xuIiwgY3VyLT5m bG9hdHZhbCk7CisrCQkgICAgcHJpbnRmKCIlMGclcyIsIGN1ci0+ZmxvYXR2YWwsIHhwYXRoc2Vw KTsKKyAJCX0KKyAJICAgIH0KKyAJICAgIGJyZWFrOworICAgICAgICAgY2FzZSBYUEFUSF9TVFJJ Tkc6CistCSAgICBwcmludGYoIiVzXG4iLCAoY29uc3QgY2hhciAqKSBjdXItPnN0cmluZ3ZhbCk7 CisrCSAgICBwcmludGYoIiVzJXMiLCAoY29uc3QgY2hhciAqKSBjdXItPnN0cmluZ3ZhbCwgeHBh dGhzZXApOworIAkgICAgYnJlYWs7CisgICAgICAgICBjYXNlIFhQQVRIX1VOREVGSU5FRDoKKyAJ ICAgIGZwcmludGYoc3RkZXJyLCAiWFBhdGggT2JqZWN0IGlzIHVuaW5pdGlhbGl6ZWRcbiIpOwor QEAgLTMwOTgsNyArMzA5OSw4IEBAIHN0YXRpYyB2b2lkIHVzYWdlKEZJTEUgKmYsIGNvbnN0IGNo YXIgKm5hbWUpIHsKKyAgICAgZnByaW50ZihmLCAiXHQtLXNheDogZG8gbm90IGJ1aWxkIGEgdHJl ZSBidXQgd29yayBqdXN0IGF0IHRoZSBTQVggbGV2ZWxcbiIpOworICAgICBmcHJpbnRmKGYsICJc dC0tb2xkeG1sMTA6IHVzZSBYTUwtMS4wIHBhcnNpbmcgcnVsZXMgYmVmb3JlIHRoZSA1dGggZWRp dGlvblxuIik7CisgI2lmZGVmIExJQlhNTF9YUEFUSF9FTkFCTEVECistICAgIGZwcmludGYoZiwg Ilx0LS14cGF0aCBleHByOiBldmFsdWF0ZSB0aGUgWFBhdGggZXhwcmVzc2lvbiwgaW1wbHkgLS1u b291dFxuIik7CisrICAgIGZwcmludGYoZiwgIlx0LS14cGF0aCBleHByOiBldmFsdWF0ZSB0aGUg WFBhdGggZXhwcmVzc2lvbiwgcmVzdWx0cyBhcmUgc2VwYXJhdGVkIGJ5IFxcbiwgaW1wbHkgLS1u b291dFxuIik7CisrICAgIGZwcmludGYoZiwgIlx0LS14cGF0aDAgZXhwcjogZXZhbHVhdGUgdGhl IFhQYXRoIGV4cHJlc3Npb24sIHJlc3VsdHMgYXJlIHNlcGFyYXRlZCBieSBcXDAsIGltcGx5IC0t bm9vdXRcbiIpOworICNlbmRpZgorIAorICAgICBmcHJpbnRmKGYsICJcbkxpYnhtbCBwcm9qZWN0 IGhvbWUgcGFnZTogaHR0cDovL3htbHNvZnQub3JnL1xuIik7CitAQCAtMzQ4MCw2ICszNDgyLDEz IEBAIG1haW4oaW50IGFyZ2MsIGNoYXIgKiphcmd2KSB7CisgCSAgICBpKys7CisgCSAgICBub291 dCsrOworIAkgICAgeHBhdGhxdWVyeSA9IGFyZ3ZbaV07CisrCSAgICB4cGF0aHNlcCA9ICJcbiI7 CisrICAgICAgICB9IGVsc2UgaWYgKCghc3RyY21wKGFyZ3ZbaV0sICIteHBhdGgwIikpIHx8Cisr ICAgICAgICAgICAgICAgICAgICghc3RyY21wKGFyZ3ZbaV0sICItLXhwYXRoMCIpKSkgeworKwkg ICAgaSsrOworKwkgICAgbm9vdXQrKzsKKysJICAgIHhwYXRocXVlcnkgPSBhcmd2W2ldOworKwkg ICAgeHBhdGhzZXAgPSAiXDAiOworICNlbmRpZgorIAl9IGVsc2UgaWYgKCghc3RyY21wKGFyZ3Zb aV0sICItb2xkeG1sMTAiKSkgfHwKKyAJICAgICAgICAgICAoIXN0cmNtcChhcmd2W2ldLCAiLS1v bGR4bWwxMCIpKSkgeworQEAgLTM3MTIsNiArMzcyMSwxMSBAQCBtYWluKGludCBhcmdjLCBjaGFy ICoqYXJndikgeworIAkgICAgaSsrOworIAkgICAgY29udGludWU7CisgCX0KKysgICAgICAgIGlm ICgoIXN0cmNtcChhcmd2W2ldLCAiLXhwYXRoMCIpKSB8fAorKwkgICAgKCFzdHJjbXAoYXJndltp XSwgIi0teHBhdGgwIikpKSB7CisrCSAgICBpKys7CisrCSAgICBjb250aW51ZTsKKysJfQorICNl bmRpZgorIAlpZiAoKHRpbWluZykgJiYgKHJlcGVhdCkpCisgCSAgICBzdGFydFRpbWVyKCk7Cist LSAKKzIuMzAuMgorCmRpZmYgLS1naXQgYS9nbnUvcGFja2FnZXMveG1sLnNjbSBiL2dudS9wYWNr YWdlcy94bWwuc2NtCmluZGV4IGFkNWYzNWVmMWUuLmQ2YTliNDZlMWQgMTAwNjQ0Ci0tLSBhL2du dS9wYWNrYWdlcy94bWwuc2NtCisrKyBiL2dudS9wYWNrYWdlcy94bWwuc2NtCkBAIC0xNzcsNyAr MTc3LDggQEAgaGllcmFyY2hpY2FsIGZvcm0gd2l0aCB2YXJpYWJsZSBmaWVsZCBsZW5ndGhzLiIp CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB2ZXJzaW9uICIudGFyLmd6IikpCiAg ICAgICAgICAgICAgKHNoYTI1NgogICAgICAgICAgICAgICAoYmFzZTMyCi0gICAgICAgICAgICAg ICAiMDd4eW5oOGhjeGIyeWIxZnMwNTF4cmdzemp2ajM3d254dnhnc2oxMHJ6bXF6eTl5M3ptYSIp KSkpCisgICAgICAgICAgICAgICAiMDd4eW5oOGhjeGIyeWIxZnMwNTF4cmdzemp2ajM3d254dnhn c2oxMHJ6bXF6eTl5M3ptYSIpKQorICAgICAgICAgICAgIChwYXRjaGVzIChsaXN0IChzZWFyY2gt cGF0Y2ggImxpYnhtbDItQWRkLW9wdGlvbi14cGF0aDAucGF0Y2giKSkpKSkKICAgICAoYnVpbGQt c3lzdGVtIGdudS1idWlsZC1zeXN0ZW0pCiAgICAgKG91dHB1dHMgJygib3V0IiAic3RhdGljIiAi ZG9jIikpCiAgICAgKGFyZ3VtZW50cwotLSAKMi4zMC4yCgo= --=_3126a06c316eb76e4e7f708570d4b89e-- From debbugs-submit-bounces@debbugs.gnu.org Thu May 13 08:41:59 2021 Received: (at 47898) by debbugs.gnu.org; 13 May 2021 12:41:59 +0000 Received: from localhost ([127.0.0.1]:41603 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lhAf9-0007pE-FA for submit@debbugs.gnu.org; Thu, 13 May 2021 08:41:59 -0400 Received: from eggs.gnu.org ([209.51.188.92]:53104) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lhAf8-0007p0-0B for 47898@debbugs.gnu.org; Thu, 13 May 2021 08:41:58 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:41668) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lhAez-0004jH-Bk; Thu, 13 May 2021 08:41:49 -0400 Received: from host-37-191-231-185.lynet.no ([37.191.231.185]:37036 helo=localhost) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lhAey-0000aE-SU; Thu, 13 May 2021 08:41:49 -0400 From: Marius Bakke To: david larsson , 47898@debbugs.gnu.org Subject: Re: [bug#47898] [PATCH] [core-updates] Add option --xpath0 to xmllint from libxml2 In-Reply-To: <20aec8da67d18b52e5a166f45cab40b2@selfhosted.xyz> References: <20aec8da67d18b52e5a166f45cab40b2@selfhosted.xyz> Date: Thu, 13 May 2021 14:41:46 +0200 Message-ID: <87eeeaiz5h.fsf@gnu.org> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.3 (/) X-Debbugs-Envelope-To: 47898 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.3 (-) --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable david larsson skriver: > Hi! > This patch adds the option to separate xpath results from xmllint by a=20 > null delimiter when using the --xpath0 option-flag. It is something=20 > that's been asked for for a long time by users on stackoverflow and=20 > merge-attempts have been made to upstream without success. > > Examples: > - https://gitlab.gnome.org/GNOME/libxml2/-/issues/227 > - https://gitlab.gnome.org/GNOME/libxml2/-/merge_requests/8 I'm reluctant to take a patch that has been rejected upstream, especially for a core package such as libxml2. Porting can be time-consuming which delays security updates, and we'll have situations where something "works on Guix" but not elsewhere (or vice versa). Will adding it as a separate package be sufficient? We could call it "xmllint-xpath0" or similar and make it clear that it's just libxml2 with a patched xmllint in the description. Thoughts? --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iIUEARYKAC0WIQRNTknu3zbaMQ2ddzTocYulkRQQdwUCYJ0eig8cbWFyaXVzQGdu dS5vcmcACgkQ6HGLpZEUEHfApQEAk6EMXLEkfBWhoRiU/ww+Z3pXlzmdBJArQ/4u wBuSbOAA/iTqT8W3lfj+VaEHqzIWCOI3bqAkvacO8l58uxExK6UO =Myx0 -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Thu May 13 09:21:58 2021 Received: (at 47898) by debbugs.gnu.org; 13 May 2021 13:21:58 +0000 Received: from localhost ([127.0.0.1]:41682 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lhBHq-0000N5-B8 for submit@debbugs.gnu.org; Thu, 13 May 2021 09:21:58 -0400 Received: from server0.selfhosted.xyz ([217.64.149.7]:60546) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lhBHm-0000Mr-TJ for 47898@debbugs.gnu.org; Thu, 13 May 2021 09:21:57 -0400 Received: from server0.selfhosted.xyz (localhost [127.0.0.1]) by server0.selfhosted.xyz (Postfix) with ESMTP id 34A961DCEEDA; Thu, 13 May 2021 15:21:42 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=selfhosted.xyz; s=dkim; t=1620912108; bh=Z/EnZFVhY5a+m9c/KQyRbXz8FVSy5IfucAVlSHqob3U=; h=Date:From:To:Cc:Subject:In-Reply-To:References; b=QE0wfdM2CDyCQvfRVUs6Eh+ob2n0lLok2t8DGgOZvouVWiHdSBc6fsHoDYXoL6YkT 00u5cFGaJAYVzwEifplSWVRHglwqYy4rrinxoTwaiRqqnu4LprEKBLbHIBlGcJsTa/ YBLE6xfwra1hdg0GyBIQ7CIp0RJHBFadlHFrWBVX18q5pOJdh/u7G8mybMoQj5G4HN 3YxvlY3uMUTCME2YrvVjVnMvfiZkkqmWfjMY95rrYVPUImZOXEHtxO2iWAQJDf/Xeu 3ET6IFyJsY3IeisshgN27qZoueQN/2WwUFI+ISDlrVWWx0h3fjTcLEYB8PAS7iRnv6 etTp3ZLk4/OPw== X-Fuglu-Suspect: f8c51a8aa3744e02bd228db92440e0e2 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; Thu, 13 May 2021 15:21:42 +0200 (CEST) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII; format=flowed Content-Transfer-Encoding: 7bit Date: Thu, 13 May 2021 15:21:41 +0200 From: david larsson To: Marius Bakke Subject: Re: [bug#47898] [PATCH] [core-updates] Add option --xpath0 to xmllint from libxml2 In-Reply-To: <87eeeaiz5h.fsf@gnu.org> References: <20aec8da67d18b52e5a166f45cab40b2@selfhosted.xyz> <87eeeaiz5h.fsf@gnu.org> Message-ID: <48c1517d3239d55826324aa8f2bc9d4d@selfhosted.xyz> X-Sender: david.larsson@selfhosted.xyz X-Spam-Score: 0.2 (/) X-Debbugs-Envelope-To: 47898 Cc: 47898@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.2 (/) On 2021-05-13 14:41, Marius Bakke wrote: > david larsson skriver: > >> Hi! >> This patch adds the option to separate xpath results from xmllint by a >> null delimiter when using the --xpath0 option-flag. It is something >> that's been asked for for a long time by users on stackoverflow and >> merge-attempts have been made to upstream without success. >> >> Examples: >> - https://gitlab.gnome.org/GNOME/libxml2/-/issues/227 >> - https://gitlab.gnome.org/GNOME/libxml2/-/merge_requests/8 > > I'm reluctant to take a patch that has been rejected upstream, > especially for a core package such as libxml2. Porting can be > time-consuming which delays security updates, and we'll have situations > where something "works on Guix" but not elsewhere (or vice versa). I understand. > > Will adding it as a separate package be sufficient? We could call it > "xmllint-xpath0" or similar and make it clear that it's just libxml2 > with a patched xmllint in the description. > > Thoughts? Yes, that would be nice. How about calling it libxml2-xpath0 instead? That would maintain libxml2 in the name, letting users know it's just a version of the original package and should show up when searching for libxml2. If calling it xmllint-xpath0, I feel that the package should remove other outputs than just the xmllint binary file, which is perhaps a good idea though? Either option is fine for me. Best regards, David From debbugs-submit-bounces@debbugs.gnu.org Thu May 13 09:30:10 2021 Received: (at 47898) by debbugs.gnu.org; 13 May 2021 13:30:10 +0000 Received: from localhost ([127.0.0.1]:41722 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lhBPm-0000gm-8V for submit@debbugs.gnu.org; Thu, 13 May 2021 09:30:10 -0400 Received: from eggs.gnu.org ([209.51.188.92]:35918) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lhBPk-0000aO-Cd for 47898@debbugs.gnu.org; Thu, 13 May 2021 09:30:08 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:43462) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lhBPe-00005j-DN; Thu, 13 May 2021 09:30:02 -0400 Received: from host-37-191-231-185.lynet.no ([37.191.231.185]:37442 helo=localhost) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lhBPd-00028P-6G; Thu, 13 May 2021 09:30:01 -0400 From: Marius Bakke To: david larsson Subject: Re: [bug#47898] [PATCH] [core-updates] Add option --xpath0 to xmllint from libxml2 In-Reply-To: <48c1517d3239d55826324aa8f2bc9d4d@selfhosted.xyz> References: <20aec8da67d18b52e5a166f45cab40b2@selfhosted.xyz> <87eeeaiz5h.fsf@gnu.org> <48c1517d3239d55826324aa8f2bc9d4d@selfhosted.xyz> Date: Thu, 13 May 2021 15:29:58 +0200 Message-ID: <87bl9eiwx5.fsf@gnu.org> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.3 (/) X-Debbugs-Envelope-To: 47898 Cc: 47898@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.3 (-) --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable david larsson skriver: > On 2021-05-13 14:41, Marius Bakke wrote: >> david larsson skriver: >>=20 >> Will adding it as a separate package be sufficient? We could call it >> "xmllint-xpath0" or similar and make it clear that it's just libxml2 >> with a patched xmllint in the description. >>=20 >> Thoughts? > > Yes, that would be nice. How about calling it libxml2-xpath0 instead?=20 > That would maintain libxml2 in the name, letting users know it's just a=20 > version of the original package and should show up when searching for=20 > libxml2. If calling it xmllint-xpath0, I feel that the package should=20 > remove other outputs than just the xmllint binary file, which is perhaps= =20 > a good idea though? libxml2-xpath0 is probably better indeed, I don't have a strong opinion. Can you send an updated patch? :-) Thanks, Marius --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iIUEARYKAC0WIQRNTknu3zbaMQ2ddzTocYulkRQQdwUCYJ0p1g8cbWFyaXVzQGdu dS5vcmcACgkQ6HGLpZEUEHccigD/cEYdjZGWr2L/DXNkuIXuUld779u+qN2GyBaf tZUX1GsA/jJcoa4P6iFdo8rfa2cATHavlOtUzVA5sDUc+a7/6LoO =xEHg -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Sat May 15 08:53:53 2021 Received: (at 47898) by debbugs.gnu.org; 15 May 2021 12:53:53 +0000 Received: from localhost ([127.0.0.1]:47841 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lhtnl-00085o-0u for submit@debbugs.gnu.org; Sat, 15 May 2021 08:53:53 -0400 Received: from server0.selfhosted.xyz ([217.64.149.7]:45362) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lhtni-00085P-Mh for 47898@debbugs.gnu.org; Sat, 15 May 2021 08:53:52 -0400 Received: from server0.selfhosted.xyz (localhost [127.0.0.1]) by server0.selfhosted.xyz (Postfix) with ESMTP id 39A6E1DDB530 for <47898@debbugs.gnu.org>; Sat, 15 May 2021 14:53:36 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=selfhosted.xyz; s=dkim; t=1621083222; bh=EWB93ekZmlrCx9ySoW1IYLF5M7Lb9NjDtgzTzVOKTZ0=; h=Date:From:To:Subject:In-Reply-To:References; b=iaY/hxeamArhbaCg2pfEhZ52vbaWzd/7WdrTTuKTLrJ7lv71K/pyh2Z9R6id94D5b e1wAwKXt+dACz2gHFNn6qjvvgTWEopfVoFqqFzCaTs6V3LMcsxJL3P9yjyaVTpRZeT HFSVM0YQoqwV+W2wTGpwWxikENs4G5wk5jO8ezxuIeIN7GBBRhuL7g/zgHsM95yHWh VoDYs7VgsJ+c1TQzgLQcF0sm0l6HcATWAJH/mUP4cWqX1liR4s+XjaX25IFwpw7yND SEUx+iTJNJMucrdB0QnpDnrAm6fSMF5L3CTdOXLCOP44XW6Ra3KaUqLSXL33gbYjMS 8Z3DL1Q5pjGHw== X-Fuglu-Suspect: 76aa56e7800746918889000e13c0592a 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 for <47898@debbugs.gnu.org>; Sat, 15 May 2021 14:53:36 +0200 (CEST) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=_4c121c2ee89ae13f0fab22cc64aa6acd" Date: Sat, 15 May 2021 14:53:36 +0200 From: david larsson To: 47898@debbugs.gnu.org Subject: Re: [bug#47898] [PATCH] [core-updates] Add option --xpath0 to xmllint from libxml2 In-Reply-To: <80bc8f6c73d5aa423cf906d59bbcd43e@selfhosted.xyz> References: <20aec8da67d18b52e5a166f45cab40b2@selfhosted.xyz> <87eeeaiz5h.fsf@gnu.org> <48c1517d3239d55826324aa8f2bc9d4d@selfhosted.xyz> <87bl9eiwx5.fsf@gnu.org> <80bc8f6c73d5aa423cf906d59bbcd43e@selfhosted.xyz> Message-ID: X-Sender: david.larsson@selfhosted.xyz X-Spam-Score: 0.2 (/) X-Debbugs-Envelope-To: 47898 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.2 (/) --=_4c121c2ee89ae13f0fab22cc64aa6acd Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=US-ASCII; format=flowed > libxml2-xpath0 is probably better indeed, I don't have a strong > opinion. > Can you send an updated patch? :-) > > Thanks, > Marius Updated patch attached! Best regards, David --=_4c121c2ee89ae13f0fab22cc64aa6acd Content-Transfer-Encoding: base64 Content-Type: text/x-diff; charset=us-ascii; 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=8998 RnJvbSBmM2YzZmY1ZTE1NTMzNjNhM2M0NjMzNWQ0MThlZWQzMTQ2NDZkMzhlIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBEYXZpZCBMYXJzc29uIDxkYXZpZC5sYXJzc29uQHNlbGZob3N0 ZWQueHl6PgpEYXRlOiBTYXQsIDE1IE1heSAyMDIxIDExOjM1OjExICswMjAwClN1YmplY3Q6IFtQ QVRDSF0gZ251OiBsaWJ4bWwyLXhwYXRoMDogTmV3IHBhY2thZ2Ugd2l0aCBwYXRjaCBmb3IgeHBh dGgwIG9wdGlvbgogdG8geG1sbGludC4KCmdudS9wYWNrYWdlcy9wYXRjaGVzL2xpYnhtbDItQWRk LW9wdGlvbi14cGF0aDAucGF0Y2g6IE5ldyBmaWxlLi4uCmdudS9wYWNrYWdlcy94bWwuc2NtIChs aWJ4bWwyLXhwYXRoMCkgW3NvdXJjZV06IC4uLmFwcGx5IGl0LgotLS0KIC4uLi9wYXRjaGVzL2xp YnhtbDItQWRkLW9wdGlvbi14cGF0aDAucGF0Y2ggICB8IDEzOSArKysrKysrKysrKysrKysrKysK IGdudS9wYWNrYWdlcy94bWwuc2NtICAgICAgICAgICAgICAgICAgICAgICAgICB8ICA1MiArKysr KysrCiAyIGZpbGVzIGNoYW5nZWQsIDE5MSBpbnNlcnRpb25zKCspCiBjcmVhdGUgbW9kZSAxMDA2 NDQgZ251L3BhY2thZ2VzL3BhdGNoZXMvbGlieG1sMi1BZGQtb3B0aW9uLXhwYXRoMC5wYXRjaAoK ZGlmZiAtLWdpdCBhL2dudS9wYWNrYWdlcy9wYXRjaGVzL2xpYnhtbDItQWRkLW9wdGlvbi14cGF0 aDAucGF0Y2ggYi9nbnUvcGFja2FnZXMvcGF0Y2hlcy9saWJ4bWwyLUFkZC1vcHRpb24teHBhdGgw LnBhdGNoCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAuLjMzMzczNzRhOGMK LS0tIC9kZXYvbnVsbAorKysgYi9nbnUvcGFja2FnZXMvcGF0Y2hlcy9saWJ4bWwyLUFkZC1vcHRp b24teHBhdGgwLnBhdGNoCkBAIC0wLDAgKzEsMTM5IEBACitGcm9tIGUxZGY3NDMzMjliZGZkOTRm YmZkZWExODMwM2M1YzZjNmZlMTM0MDMgTW9uIFNlcCAxNyAwMDowMDowMCAyMDAxCitGcm9tOiBt ZXRodXNlbGFoLTAgPGRhdmlkLmxhcnNzb25Ac2VsZmhvc3RlZC54eXo+CitEYXRlOiBUaHUsIDEg QXByIDIwMjEgMDg6MzM6NTYgKzAyMDAKK1N1YmplY3Q6IFtQQVRDSF0gQWRkIG9wdGlvbiAtLXhw YXRoMAorCistLS0KKyBkb2MveG1sbGludC54bWwgfCAxNiArKysrKysrKysrKysrKysrCisgeG1s bGludC5jICAgICAgIHwgMzIgKysrKysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0KKyAyIGZp bGVzIGNoYW5nZWQsIDM5IGluc2VydGlvbnMoKyksIDkgZGVsZXRpb25zKC0pCisKK2RpZmYgLS1n aXQgYS9kb2MveG1sbGludC54bWwgYi9kb2MveG1sbGludC54bWwKK2luZGV4IDEwMDgxNzliLi5m Y2RjMjM3ZSAxMDA2NDQKKy0tLSBhL2RvYy94bWxsaW50LnhtbAorKysrIGIvZG9jL3htbGxpbnQu eG1sCitAQCAtNzAsNiArNzAsNyBAQAorIAkJCTxhcmcgY2hvaWNlPSJwbGFpbiI+PG9wdGlvbj4t LWRlYnVnPC9vcHRpb24+PC9hcmc+CisgCQkJPGFyZyBjaG9pY2U9InBsYWluIj48b3B0aW9uPi0t c2hlbGw8L29wdGlvbj48L2FyZz4KKyAJCQk8YXJnIGNob2ljZT0icGxhaW4iPjxvcHRpb24+LS14 cGF0aCAiPHJlcGxhY2VhYmxlIGNsYXNzPSJvcHRpb24iPlhQYXRoX2V4cHJlc3Npb248L3JlcGxh Y2VhYmxlPiI8L29wdGlvbj48L2FyZz4KKysJCQk8YXJnIGNob2ljZT0icGxhaW4iPjxvcHRpb24+ LS14cGF0aDAgIjxyZXBsYWNlYWJsZSBjbGFzcz0ib3B0aW9uIj5YUGF0aF9leHByZXNzaW9uPC9y ZXBsYWNlYWJsZT4iPC9vcHRpb24+PC9hcmc+CisgCQkJPGFyZyBjaG9pY2U9InBsYWluIj48b3B0 aW9uPi0tZGVidWdlbnQ8L29wdGlvbj48L2FyZz4KKyAJCQk8YXJnIGNob2ljZT0icGxhaW4iPjxv cHRpb24+LS1jb3B5PC9vcHRpb24+PC9hcmc+CisgCQkJPGFyZyBjaG9pY2U9InBsYWluIj48b3B0 aW9uPi0tcmVjb3Zlcjwvb3B0aW9uPjwvYXJnPgorQEAgLTUzNyw2ICs1MzgsMjEgQEAKKyAJCQlu b2RlIHNldCBpcyBzZXJpYWxpemVkIGluIGZ1bGwgaW4gdGhlIG91dHB1dC4gSW4gY2FzZQorIAkJ CW9mIGFuIGVtcHR5IG5vZGUgc2V0IHRoZSAiWFBhdGggc2V0IGlzIGVtcHR5IiByZXN1bHQKKyAJ CQl3aWxsIGJlIHNob3duIGFuZCBhbiBlcnJvciBleGl0IGNvZGUgd2lsbCBiZSByZXR1cm5lZC4K KysJCQlSZXN1bHRzIGFyZSBzZXBhcmF0ZWQgYnkgdGhlIG5ld2xpbmUgY2hhcmFjdGVyLgorKwkJ PC9wYXJhPgorKwk8L2xpc3RpdGVtPgorKwkJPC92YXJsaXN0ZW50cnk+CisrCisrCQk8dmFybGlz dGVudHJ5PgorKwk8dGVybT48b3B0aW9uPi0teHBhdGgwICI8cmVwbGFjZWFibGUgY2xhc3M9Im9w dGlvbiI+WFBhdGhfZXhwcmVzc2lvbjwvcmVwbGFjZWFibGU+Ijwvb3B0aW9uPjwvdGVybT4KKysJ PGxpc3RpdGVtPgorKwkJPHBhcmE+CisrCQkJUnVuIGFuIFhQYXRoIGV4cHJlc3Npb24gZ2l2ZW4g YXMgYXJndW1lbnQgYW5kIHByaW50IHRoZQorKwkJCXJlc3VsdC4gSW4gY2FzZSBvZiBhIG5vZGVz ZXQgcmVzdWx0LCBlYWNoIG5vZGUgaW4gdGhlCisrCQkJbm9kZSBzZXQgaXMgc2VyaWFsaXplZCBp biBmdWxsIGluIHRoZSBvdXRwdXQuIEluIGNhc2UKKysJCQlvZiBhbiBlbXB0eSBub2RlIHNldCB0 aGUgIlhQYXRoIHNldCBpcyBlbXB0eSIgcmVzdWx0CisrCQkJd2lsbCBiZSBzaG93biBhbmQgYW4g ZXJyb3IgZXhpdCBjb2RlIHdpbGwgYmUgcmV0dXJuZWQuCisrCQkJUmVzdWx0cyBhcmUgc2VwYXJh dGVkIGJ5IHRoZSBudWxsIGNoYXJhY3Rlci4KKyAJCTwvcGFyYT4KKyAJPC9saXN0aXRlbT4KKyAJ CTwvdmFybGlzdGVudHJ5PgorZGlmZiAtLWdpdCBhL3htbGxpbnQuYyBiL3htbGxpbnQuYworaW5k ZXggNmNhMWJmNTQuLmE2MGUxZjRmIDEwMDY0NAorLS0tIGEveG1sbGludC5jCisrKysgYi94bWxs aW50LmMKK0BAIC0xOTQsNiArMTk0LDcgQEAgc3RhdGljIGludCBzYXgxID0gMDsKKyAjZW5kaWYg LyogTElCWE1MX1NBWDFfRU5BQkxFRCAqLworICNpZmRlZiBMSUJYTUxfWFBBVEhfRU5BQkxFRAor IHN0YXRpYyBjb25zdCBjaGFyICp4cGF0aHF1ZXJ5ID0gTlVMTDsKKytzdGF0aWMgY29uc3QgY2hh ciAqeHBhdGhzZXAgPSAiXG4iOworICNlbmRpZgorIHN0YXRpYyBpbnQgb3B0aW9ucyA9IFhNTF9Q QVJTRV9DT01QQUNUIHwgWE1MX1BBUlNFX0JJR19MSU5FUzsKKyBzdGF0aWMgaW50IHNheCA9IDA7 CitAQCAtMjA5NSw3ICsyMDk2LDcgQEAgc3RhdGljIHZvaWQgZG9YUGF0aER1bXAoeG1sWFBhdGhP YmplY3RQdHIgY3VyKSB7CisgICAgICAgICAgICAgZm9yIChpID0gMDtpIDwgY3VyLT5ub2Rlc2V0 dmFsLT5ub2RlTnI7aSsrKSB7CisgICAgICAgICAgICAgICAgIG5vZGUgPSBjdXItPm5vZGVzZXR2 YWwtPm5vZGVUYWJbaV07CisgICAgICAgICAgICAgICAgIHhtbE5vZGVEdW1wT3V0cHV0KGJ1Ziwg TlVMTCwgbm9kZSwgMCwgMCwgTlVMTCk7CistICAgICAgICAgICAgICAgIHhtbE91dHB1dEJ1ZmZl cldyaXRlKGJ1ZiwgMSwgIlxuIik7CisrCQl4bWxPdXRwdXRCdWZmZXJXcml0ZShidWYsIDEsIHhw YXRoc2VwKTsKKyAgICAgICAgICAgICB9CisgICAgICAgICAgICAgeG1sT3V0cHV0QnVmZmVyQ2xv c2UoYnVmKTsKKyAjZWxzZQorQEAgLTIxMDQsMjcgKzIxMDUsMjcgQEAgc3RhdGljIHZvaWQgZG9Y UGF0aER1bXAoeG1sWFBhdGhPYmplY3RQdHIgY3VyKSB7CisgCSAgICBicmVhazsKKyAgICAgICAg IH0KKyAgICAgICAgIGNhc2UgWFBBVEhfQk9PTEVBTjoKKy0JICAgIGlmIChjdXItPmJvb2x2YWwp IHByaW50ZigidHJ1ZVxuIik7CistCSAgICBlbHNlIHByaW50ZigiZmFsc2VcbiIpOworKwkgICAg aWYgKGN1ci0+Ym9vbHZhbCkgcHJpbnRmKCJ0cnVlJXMiLCB4cGF0aHNlcCk7CisrCSAgICBlbHNl IHByaW50ZigiZmFsc2UlcyIsIHhwYXRoc2VwKTsKKyAJICAgIGJyZWFrOworICAgICAgICAgY2Fz ZSBYUEFUSF9OVU1CRVI6CisgCSAgICBzd2l0Y2ggKHhtbFhQYXRoSXNJbmYoY3VyLT5mbG9hdHZh bCkpIHsKKyAJICAgIGNhc2UgMToKKy0JCXByaW50ZigiSW5maW5pdHlcbiIpOworKwkgICAgICAg IHByaW50ZigiSW5maW5pdHklcyIsIHhwYXRoc2VwKTsKKyAJCWJyZWFrOworIAkgICAgY2FzZSAt MToKKy0JCXByaW50ZigiLUluZmluaXR5XG4iKTsKKysJICAgICAgICBwcmludGYoIi1JbmZpbml0 eSVzIiwgeHBhdGhzZXApOworIAkJYnJlYWs7CisgCSAgICBkZWZhdWx0OgorIAkJaWYgKHhtbFhQ YXRoSXNOYU4oY3VyLT5mbG9hdHZhbCkpIHsKKy0JCSAgICBwcmludGYoIk5hTlxuIik7CisrCQkg ICAgcHJpbnRmKCJOYU4lcyIsIHhwYXRoc2VwKTsKKyAJCX0gZWxzZSB7CistCQkgICAgcHJpbnRm KCIlMGdcbiIsIGN1ci0+ZmxvYXR2YWwpOworKwkJICAgIHByaW50ZigiJTBnJXMiLCBjdXItPmZs b2F0dmFsLCB4cGF0aHNlcCk7CisgCQl9CisgCSAgICB9CisgCSAgICBicmVhazsKKyAgICAgICAg IGNhc2UgWFBBVEhfU1RSSU5HOgorLQkgICAgcHJpbnRmKCIlc1xuIiwgKGNvbnN0IGNoYXIgKikg Y3VyLT5zdHJpbmd2YWwpOworKwkgICAgcHJpbnRmKCIlcyVzIiwgKGNvbnN0IGNoYXIgKikgY3Vy LT5zdHJpbmd2YWwsIHhwYXRoc2VwKTsKKyAJICAgIGJyZWFrOworICAgICAgICAgY2FzZSBYUEFU SF9VTkRFRklORUQ6CisgCSAgICBmcHJpbnRmKHN0ZGVyciwgIlhQYXRoIE9iamVjdCBpcyB1bmlu aXRpYWxpemVkXG4iKTsKK0BAIC0zMDk4LDcgKzMwOTksOCBAQCBzdGF0aWMgdm9pZCB1c2FnZShG SUxFICpmLCBjb25zdCBjaGFyICpuYW1lKSB7CisgICAgIGZwcmludGYoZiwgIlx0LS1zYXg6IGRv IG5vdCBidWlsZCBhIHRyZWUgYnV0IHdvcmsganVzdCBhdCB0aGUgU0FYIGxldmVsXG4iKTsKKyAg ICAgZnByaW50ZihmLCAiXHQtLW9sZHhtbDEwOiB1c2UgWE1MLTEuMCBwYXJzaW5nIHJ1bGVzIGJl Zm9yZSB0aGUgNXRoIGVkaXRpb25cbiIpOworICNpZmRlZiBMSUJYTUxfWFBBVEhfRU5BQkxFRAor LSAgICBmcHJpbnRmKGYsICJcdC0teHBhdGggZXhwcjogZXZhbHVhdGUgdGhlIFhQYXRoIGV4cHJl c3Npb24sIGltcGx5IC0tbm9vdXRcbiIpOworKyAgICBmcHJpbnRmKGYsICJcdC0teHBhdGggZXhw cjogZXZhbHVhdGUgdGhlIFhQYXRoIGV4cHJlc3Npb24sIHJlc3VsdHMgYXJlIHNlcGFyYXRlZCBi eSBcXG4sIGltcGx5IC0tbm9vdXRcbiIpOworKyAgICBmcHJpbnRmKGYsICJcdC0teHBhdGgwIGV4 cHI6IGV2YWx1YXRlIHRoZSBYUGF0aCBleHByZXNzaW9uLCByZXN1bHRzIGFyZSBzZXBhcmF0ZWQg YnkgXFwwLCBpbXBseSAtLW5vb3V0XG4iKTsKKyAjZW5kaWYKKyAKKyAgICAgZnByaW50ZihmLCAi XG5MaWJ4bWwgcHJvamVjdCBob21lIHBhZ2U6IGh0dHA6Ly94bWxzb2Z0Lm9yZy9cbiIpOworQEAg LTM0ODAsNiArMzQ4MiwxMyBAQCBtYWluKGludCBhcmdjLCBjaGFyICoqYXJndikgeworIAkgICAg aSsrOworIAkgICAgbm9vdXQrKzsKKyAJICAgIHhwYXRocXVlcnkgPSBhcmd2W2ldOworKwkgICAg eHBhdGhzZXAgPSAiXG4iOworKyAgICAgICAgfSBlbHNlIGlmICgoIXN0cmNtcChhcmd2W2ldLCAi LXhwYXRoMCIpKSB8fAorKyAgICAgICAgICAgICAgICAgICAoIXN0cmNtcChhcmd2W2ldLCAiLS14 cGF0aDAiKSkpIHsKKysJICAgIGkrKzsKKysJICAgIG5vb3V0Kys7CisrCSAgICB4cGF0aHF1ZXJ5 ID0gYXJndltpXTsKKysJICAgIHhwYXRoc2VwID0gIlwwIjsKKyAjZW5kaWYKKyAJfSBlbHNlIGlm ICgoIXN0cmNtcChhcmd2W2ldLCAiLW9sZHhtbDEwIikpIHx8CisgCSAgICAgICAgICAgKCFzdHJj bXAoYXJndltpXSwgIi0tb2xkeG1sMTAiKSkpIHsKK0BAIC0zNzEyLDYgKzM3MjEsMTEgQEAgbWFp bihpbnQgYXJnYywgY2hhciAqKmFyZ3YpIHsKKyAJICAgIGkrKzsKKyAJICAgIGNvbnRpbnVlOwor IAl9CisrICAgICAgICBpZiAoKCFzdHJjbXAoYXJndltpXSwgIi14cGF0aDAiKSkgfHwKKysJICAg ICghc3RyY21wKGFyZ3ZbaV0sICItLXhwYXRoMCIpKSkgeworKwkgICAgaSsrOworKwkgICAgY29u dGludWU7CisrCX0KKyAjZW5kaWYKKyAJaWYgKCh0aW1pbmcpICYmIChyZXBlYXQpKQorIAkgICAg c3RhcnRUaW1lcigpOworLS0gCisyLjMwLjIKKwpkaWZmIC0tZ2l0IGEvZ251L3BhY2thZ2VzL3ht bC5zY20gYi9nbnUvcGFja2FnZXMveG1sLnNjbQppbmRleCA5MzE2OThhNTc1Li4xMmNhZDY1MTU0 IDEwMDY0NAotLS0gYS9nbnUvcGFja2FnZXMveG1sLnNjbQorKysgYi9nbnUvcGFja2FnZXMveG1s LnNjbQpAQCAtMTY3LDYgKzE2Nyw1OCBAQCBiaW5hcnkgZXh0ZW5zaW9uIG9mIFhNTCBmb3IgdGhl IHB1cnBvc2Ugb2Ygc3RvcmluZyBhbmQgbWFuaXB1bGF0aW5nIGRhdGEgaW4gYQogaGllcmFyY2hp Y2FsIGZvcm0gd2l0aCB2YXJpYWJsZSBmaWVsZCBsZW5ndGhzLiIpCiAgICAgKGxpY2Vuc2UgbGlj ZW5zZTpsZ3BsMi4xKSkpCiAKKyhkZWZpbmUtcHVibGljIGxpYnhtbDIteHBhdGgwCisgIChwYWNr YWdlCisgICAgKG5hbWUgImxpYnhtbDIteHBhdGgwIikKKyAgICAodmVyc2lvbiAiMi45LjEwIikK KyAgICAoc291cmNlIChvcmlnaW4KKyAgICAgICAgICAgICAobWV0aG9kIHVybC1mZXRjaCkKKyAg ICAgICAgICAgICAodXJpIChzdHJpbmctYXBwZW5kICJmdHA6Ly94bWxzb2Z0Lm9yZy9saWJ4bWwy L2xpYnhtbDItIgorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdmVyc2lvbiAiLnRh ci5neiIpKQorICAgICAgICAgICAgIChzaGEyNTYKKyAgICAgICAgICAgICAgKGJhc2UzMgorICAg ICAgICAgICAgICAgIjA3eHluaDhoY3hiMnliMWZzMDUxeHJnc3pqdmozN3dueHZ4Z3NqMTByem1x enk5eTN6bWEiKSkKKyAgICAgICAgICAgICAocGF0Y2hlcyAobGlzdCAoc2VhcmNoLXBhdGNoICJs aWJ4bWwyLUFkZC1vcHRpb24teHBhdGgwLnBhdGNoIikpKSkpCisgICAgKGJ1aWxkLXN5c3RlbSBn bnUtYnVpbGQtc3lzdGVtKQorICAgIChvdXRwdXRzICcoIm91dCIgInN0YXRpYyIpKQorICAgIChh cmd1bWVudHMKKyAgICAgYCgjOnBoYXNlcyAobW9kaWZ5LXBoYXNlcyAlc3RhbmRhcmQtcGhhc2Vz CisgICAgICAgICAgICAgICAgICAoYWRkLWFmdGVyICdpbnN0YWxsICdtb3ZlLXN0YXRpYy1saWJz CisgICAgICAgICAgICAgICAgICAgIChsYW1iZGEqICgjOmtleSBvdXRwdXRzICM6YWxsb3ctb3Ro ZXIta2V5cykKKyAgICAgICAgICAgICAgICAgICAgICAobGV0ICgoc3JjIChzdHJpbmctYXBwZW5k IChhc3NvYy1yZWYgb3V0cHV0cyAib3V0IikgIi9saWIiKSkKKyAgICAgICAgICAgICAgICAgICAg ICAgICAgICAoZHN0IChzdHJpbmctYXBwZW5kIChhc3NvYy1yZWYgb3V0cHV0cyAic3RhdGljIikK KyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICIvbGliIikp KQorICAgICAgICAgICAgICAgICAgICAgICAgKG1rZGlyLXAgZHN0KQorICAgICAgICAgICAgICAg ICAgICAgICAgKGZvci1lYWNoIChsYW1iZGEgKGFyKQorICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgKHJlbmFtZS1maWxlIGFyIChzdHJpbmctYXBwZW5kIGRzdCAiLyIKKyAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAoYmFzZW5hbWUgYXIpKSkpCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg KGZpbmQtZmlsZXMgc3JjICJcXC5hJCIpKQorCisgICAgICAgICAgICAgICAgICAgICAgICA7OyBS ZW1vdmUgcmVmZXJlbmNlIHRvIHRoZSBzdGF0aWMgbGlicmFyeSBmcm9tIHRoZSAubGEKKyAgICAg ICAgICAgICAgICAgICAgICAgIDs7IGZpbGUgc3VjaCB0aGF0IExpYnRvb2wgZG9lcyB0aGUgcmln aHQgdGhpbmcgd2hlbiBib3RoCisgICAgICAgICAgICAgICAgICAgICAgICA7OyB0aGUgc2hhcmVk IGFuZCBzdGF0aWMgdmFyaWFudHMgYXJlIGF2YWlsYWJsZS4KKyAgICAgICAgICAgICAgICAgICAg ICAgIChzdWJzdGl0dXRlKiAoc3RyaW5nLWFwcGVuZCBzcmMgIi9saWJ4bWwyLmxhIikKKyAgICAg ICAgICAgICAgICAgICAgICAgICAgKCgiXm9sZF9saWJyYXJ5PSdsaWJ4bWwyLmEnIikgIm9sZF9s aWJyYXJ5PScnIikpCisgICAgICAgICAgICAgICAgICAgICAgICAjdCkpKSkpKQorICAgIChob21l LXBhZ2UgImh0dHA6Ly93d3cueG1sc29mdC5vcmcvIikKKyAgICAoc3lub3BzaXMgIkMgcGFyc2Vy IGZvciBYTUwiKQorICAgIChpbnB1dHMgYCgoInh6IiAseHopKSkKKyAgICAocHJvcGFnYXRlZC1p bnB1dHMgYCgoInpsaWIiICx6bGliKSkpIDsgbGlieG1sMi5sYSBzYXlzICctbHonLgorICAgIChu YXRpdmUtaW5wdXRzIGAoKCJwZXJsIiAscGVybCkpKQorICAgIDs7ICRYTUxfQ0FUQUxPR19GSUxF UyBsaXN0cyAnY2F0YWxvZy54bWwnIGZpbGVzIGZvdW5kIGluIHVuZGVyIHRoZSAneG1sJworICAg IDs7IHN1Yi1kaXJlY3Rvcnkgb2YgYW55IGdpdmVuIHBhY2thZ2UuCisgICAgKG5hdGl2ZS1zZWFy Y2gtcGF0aHMgKGxpc3QgKHNlYXJjaC1wYXRoLXNwZWNpZmljYXRpb24KKyAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgKHZhcmlhYmxlICJYTUxfQ0FUQUxPR19GSUxFUyIpCisgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIChzZXBhcmF0b3IgIiAiKQorICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAoZmlsZXMgJygieG1sIikpCisgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIChmaWxlLXBhdHRlcm4gIl5jYXRhbG9nXFwueG1sJCIpCisgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIChmaWxlLXR5cGUgJ3JlZ3VsYXIpKSkpCisgICAgKHNlYXJjaC1w YXRocyBuYXRpdmUtc2VhcmNoLXBhdGhzKQorICAgIChkZXNjcmlwdGlvbgorICAgICAiTGlieG1s MiBpcyB0aGUgWE1MIEMgcGFyc2VyIGFuZCB0b29sa2l0IGRldmVsb3BlZCBmb3IgdGhlIEdub21l Citwcm9qZWN0IChidXQgaXQgaXMgdXNhYmxlIG91dHNpZGUgb2YgdGhlIEdub21lIHBsYXRmb3Jt KS4iKQorICAgIChsaWNlbnNlIGxpY2Vuc2U6eDExKSkpCisKIChkZWZpbmUtcHVibGljIGxpYnht bDIKICAgKHBhY2thZ2UKICAgICAobmFtZSAibGlieG1sMiIpCi0tIAoyLjMxLjAKCg== --=_4c121c2ee89ae13f0fab22cc64aa6acd-- From debbugs-submit-bounces@debbugs.gnu.org Sat May 15 12:12:32 2021 Received: (at 47898) by debbugs.gnu.org; 15 May 2021 16:12:32 +0000 Received: from localhost ([127.0.0.1]:49115 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lhwu0-0004de-1F for submit@debbugs.gnu.org; Sat, 15 May 2021 12:12:32 -0400 Received: from eggs.gnu.org ([209.51.188.92]:42072) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lhwty-0004dR-F8 for 47898@debbugs.gnu.org; Sat, 15 May 2021 12:12:30 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:47924) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lhwtq-0000kd-19; Sat, 15 May 2021 12:12:22 -0400 Received: from host-37-191-231-185.lynet.no ([37.191.231.185]:37594 helo=localhost) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lhwtp-0006Wg-Ni; Sat, 15 May 2021 12:12:21 -0400 From: Marius Bakke To: david larsson , 47898@debbugs.gnu.org Subject: Re: [bug#47898] [PATCH] [core-updates] Add option --xpath0 to xmllint from libxml2 In-Reply-To: References: <20aec8da67d18b52e5a166f45cab40b2@selfhosted.xyz> <87eeeaiz5h.fsf@gnu.org> <48c1517d3239d55826324aa8f2bc9d4d@selfhosted.xyz> <87bl9eiwx5.fsf@gnu.org> <80bc8f6c73d5aa423cf906d59bbcd43e@selfhosted.xyz> Date: Sat, 15 May 2021 18:12:19 +0200 Message-ID: <875yzkht7g.fsf@gnu.org> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.3 (/) X-Debbugs-Envelope-To: 47898 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.3 (-) --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable david larsson skriver: >> libxml2-xpath0 is probably better indeed, I don't have a strong=20 >> opinion. >> Can you send an updated patch? :-) >>=20 >> Thanks, >> Marius > > Updated patch attached! Thanks! [...] > gnu/packages/patches/libxml2-Add-option-xpath0.patch: New file... > gnu/packages/xml.scm (libxml2-xpath0) [source]: ...apply it. > --- > .../patches/libxml2-Add-option-xpath0.patch | 139 ++++++++++++++++++ > gnu/packages/xml.scm | 52 +++++++ > 2 files changed, 191 insertions(+) > create mode 100644 gnu/packages/patches/libxml2-Add-option-xpath0.patch Please also register this patch in gnu/local.mk. Can you also add your copyright at the top of xml.scm? [...] > +(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.pat= ch"))))) 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 --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iIUEARYKAC0WIQRNTknu3zbaMQ2ddzTocYulkRQQdwUCYJ/y4w8cbWFyaXVzQGdu dS5vcmcACgkQ6HGLpZEUEHeAcAEA9arySw4EJ9t8tNYXWlwJFLwk/8YVzaVECJ00 PPTQwysA/iSv/GRtJeicerQ9AUh+uiSP1uWs8FH52NkrgwPZHe8H =ycNQ -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Sat May 15 13:13:00 2021 Received: (at 47898) by debbugs.gnu.org; 15 May 2021 17:13:00 +0000 Received: from localhost ([127.0.0.1]:49149 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lhxqW-00064l-7e for submit@debbugs.gnu.org; Sat, 15 May 2021 13:13:00 -0400 Received: from server0.selfhosted.xyz ([217.64.149.7]:42822) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lhxqU-00064O-5p for 47898@debbugs.gnu.org; Sat, 15 May 2021 13:12:58 -0400 Received: from server0.selfhosted.xyz (localhost [127.0.0.1]) by server0.selfhosted.xyz (Postfix) with ESMTP id C6D5B1DDBCC9; Sat, 15 May 2021 19:12:44 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=selfhosted.xyz; s=dkim; t=1621098771; bh=nkIE/BnDXb+4lKClooNkZkiV20qqmqgq/mVkhZmAftE=; h=Date:From:To:Cc:Subject:In-Reply-To:References; b=DFBxjxgu7777KPPpmn6CgOwiMfjVh/GRguKTCgHF0QsKQw+16T+7xuhyZmmkFI/j1 104gSOA5MDDErg9R61Lv3wCJ5QM9284fa3S7xFKLxAYXN9972zZeOs3XANlMS1zTfZ KRBvLdqMf2XeEVAd9cyUVyatMosoD+SRP3a+vrSaBCZTnurmSYclD2g4aXeQJHYMD8 rm22kqCxHb56uWsP4roPKRBXaZA1hVLUE89c3KNmhEDWv0gqaUjRRr4LkDJw9t0Pxl yrlau+3JbYDNltaCVaAJZMkP21UD5wdqEua8V4LSjkSvuh/0q+Rm+i2HskRFIdz3Sl kQx61Klzk9pzw== X-Fuglu-Suspect: 9bb175673f2f4f1fa2bd0d107db53f77 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 19:12:44 +0200 (CEST) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII; format=flowed Content-Transfer-Encoding: 7bit Date: Sat, 15 May 2021 19:12:44 +0200 From: david larsson To: Marius Bakke Subject: Re: [bug#47898] [PATCH] [core-updates] Add option --xpath0 to xmllint from libxml2 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: <350a1a3c73fb0040aadbba0fd34c6518@selfhosted.xyz> X-Sender: david.larsson@selfhosted.xyz X-Spam-Score: 0.2 (/) X-Debbugs-Envelope-To: 47898 Cc: 47898@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.2 (/) On 2021-05-15 18:12, Marius Bakke wrote: > david larsson skriver: > >>> libxml2-xpath0 is probably better indeed, I don't have a strong >>> opinion. >>> Can you send an updated patch? :-) >>> >>> Thanks, >>> Marius >> >> Updated patch attached! > > Thanks! > > [...] > >> gnu/packages/patches/libxml2-Add-option-xpath0.patch: New file... >> gnu/packages/xml.scm (libxml2-xpath0) [source]: ...apply it. >> --- >> .../patches/libxml2-Add-option-xpath0.patch | 139 >> ++++++++++++++++++ >> gnu/packages/xml.scm | 52 +++++++ >> 2 files changed, 191 insertions(+) >> create mode 100644 >> gnu/packages/patches/libxml2-Add-option-xpath0.patch > > Please also register this patch in gnu/local.mk. Can you also add your > copyright at the top of xml.scm? > > [...] > >> +(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 I can fix all of it and send an updated patch again. Best regards, David From debbugs-submit-bounces@debbugs.gnu.org Sat May 15 15:22:07 2021 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 To: Marius Bakke Subject: Re: [bug#47898] [PATCH] [core-updates] Add option --xpath0 to xmllint from libxml2 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-Spam-Score: 0.2 (/) X-Debbugs-Envelope-To: 47898 Cc: 47898@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.2 (/) --=_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-- From debbugs-submit-bounces@debbugs.gnu.org Tue May 18 16:25:59 2021 Received: (at 47898-done) by debbugs.gnu.org; 18 May 2021 20:25:59 +0000 Received: from localhost ([127.0.0.1]:57394 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lj6Hu-0000J9-Sw for submit@debbugs.gnu.org; Tue, 18 May 2021 16:25:59 -0400 Received: from eggs.gnu.org ([209.51.188.92]:52574) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lj6Ht-0000Iw-D4 for 47898-done@debbugs.gnu.org; Tue, 18 May 2021 16:25:57 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:50882) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lj6Hl-0006Gb-AF; Tue, 18 May 2021 16:25:49 -0400 Received: from host-37-191-231-185.lynet.no ([37.191.231.185]:34736 helo=localhost) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lj6Hk-0005kN-NY; Tue, 18 May 2021 16:25:49 -0400 From: Marius Bakke To: david larsson Subject: Re: [bug#47898] [PATCH] [core-updates] Add option --xpath0 to xmllint from libxml2 In-Reply-To: <2f7a02b8290c9728644a9d2c2caad0b9@selfhosted.xyz> References: <20aec8da67d18b52e5a166f45cab40b2@selfhosted.xyz> <87eeeaiz5h.fsf@gnu.org> <48c1517d3239d55826324aa8f2bc9d4d@selfhosted.xyz> <87bl9eiwx5.fsf@gnu.org> <80bc8f6c73d5aa423cf906d59bbcd43e@selfhosted.xyz> <875yzkht7g.fsf@gnu.org> <2f7a02b8290c9728644a9d2c2caad0b9@selfhosted.xyz> Date: Tue, 18 May 2021 22:25:46 +0200 Message-ID: <87im3fbxh1.fsf@gnu.org> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.3 (/) X-Debbugs-Envelope-To: 47898-done Cc: 47898-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.3 (-) --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable david larsson skriver: > Hi, new patch attached. There's a lint warning though:=20 > "libxml2-xpath0@2.9.10: no updater for libxml2-xpath0". I don't know=20 > what it means, maybe it should be fixed before committing? That warning is harmless and affects a lot of packages. I've applied the patch with a couple minor tweaks: > +From e1df743329bdfd94fbfdea18303c5c6c6fe13403 Mon Sep 17 00:00:00 2001 > +From: methuselah-0 > +Date: Thu, 1 Apr 2021 08:33:56 +0200 > +Subject: [PATCH] Add option --xpath0 > + > +--- > + doc/xmllint.xml | 16 ++++++++++++++++ > + xmllint.c | 32 +++++++++++++++++++++++--------- > + 2 files changed, 39 insertions(+), 9 deletions(-) I replaced this git-style patch header with a short description and an URL to the upstream issue, like we usually do. > +(define-public libxml2-xpath0 > + (package/inherit libxml2 > + (name "libxml2-xpath0") > + (source (origin > + (inherit (package-source libxml2)) > + (patches (append (search-patches > + "libxml2-xpath0-Add-option-xpath0.patch") > + (origin-patches (package-source libxml2))= )))) > + (description > + "Libxml2-xpath0 is like libxml2 but with a patch applied that > +provides an --xpath0 option to xmllint that enables it to output xpath > +results with a null delimiter"))) ...and sprinkled some markup and punctuation into the description. Pushed as b58efbc6611550ad9234163e198ff71ace5306ea, thank you! --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iIUEARYKAC0WIQRNTknu3zbaMQ2ddzTocYulkRQQdwUCYKQiyg8cbWFyaXVzQGdu dS5vcmcACgkQ6HGLpZEUEHcVzQD/c0IWBYUxvY42oYIeknVrHC1QIvpkbVSyvxyU PVYhLEkBAK54ZKGSAYL7yjrmYvjXGrHw/P5diRMkxLbTiF9D8RUI =YxIh -----END PGP SIGNATURE----- --=-=-=-- From unknown Tue Jun 24 06:51:38 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Wed, 16 Jun 2021 11:24:08 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator