From patchwork Sat May 15 19:21:50 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: david larsson X-Patchwork-Id: 29328 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 00BF827BC81; Sat, 15 May 2021 20:23:11 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 2851E27BC78 for ; Sat, 15 May 2021 20:23:11 +0100 (BST) Received: from localhost ([::1]:58288 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lhzsU-0004d1-92 for patchwork@mira.cbaines.net; Sat, 15 May 2021 15:23:10 -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 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+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches > 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 From 70c7a419f060256795737a7dc7122bfbcd456ae6 Mon Sep 17 00:00:00 2001 From: David Larsson Date: Sat, 15 May 2021 20:52:50 +0200 Subject: [PATCH] gnu: libxml2-xpath0: New package with patch for xpath0 option to xmllint. * gnu/packages/patches/libxml2-xpath0-Add-option-xpath0.patch: New file... * gnu/local.mk: register it. * gnu/packages/xml.scm (libxml2-xpath0) [source]: ...apply it. --- gnu/local.mk | 1 + .../libxml2-xpath0-Add-option-xpath0.patch | 139 ++++++++++++++++++ gnu/packages/xml.scm | 14 ++ 3 files changed, 154 insertions(+) create mode 100644 gnu/packages/patches/libxml2-xpath0-Add-option-xpath0.patch diff --git a/gnu/local.mk b/gnu/local.mk index c3b0274945..d3e8baf17e 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1366,6 +1366,7 @@ dist_patch_DATA = \ %D%/packages/patches/libutils-remove-damaging-includes.patch \ %D%/packages/patches/libvdpau-va-gl-unbundle.patch \ %D%/packages/patches/libvpx-CVE-2016-2818.patch \ + %D%/packages/patches/libxml2-xpath0-Add-option-xpath0.patch \ %D%/packages/patches/libxslt-generated-ids.patch \ %D%/packages/patches/libxt-guix-search-paths.patch \ %D%/packages/patches/lierolibre-check-unaligned-access.patch \ diff --git a/gnu/packages/patches/libxml2-xpath0-Add-option-xpath0.patch b/gnu/packages/patches/libxml2-xpath0-Add-option-xpath0.patch new file mode 100644 index 0000000000..3337374a8c --- /dev/null +++ b/gnu/packages/patches/libxml2-xpath0-Add-option-xpath0.patch @@ -0,0 +1,139 @@ +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(-) + +diff --git a/doc/xmllint.xml b/doc/xmllint.xml +index 1008179b..fcdc237e 100644 +--- a/doc/xmllint.xml ++++ b/doc/xmllint.xml +@@ -70,6 +70,7 @@ + + + ++ + + + +@@ -537,6 +538,21 @@ + node set is serialized in full in the output. In case + of an empty node set the "XPath set is empty" result + will be shown and an error exit code will be returned. ++ Results are separated by the newline character. ++ ++ ++ ++ ++ ++ ++ ++ ++ Run an XPath expression given as argument and print the ++ result. In case of a nodeset result, each node in the ++ node set is serialized in full in the output. In case ++ of an empty node set the "XPath set is empty" result ++ will be shown and an error exit code will be returned. ++ Results are separated by the null character. + + + +diff --git a/xmllint.c b/xmllint.c +index 6ca1bf54..a60e1f4f 100644 +--- a/xmllint.c ++++ b/xmllint.c +@@ -194,6 +194,7 @@ static int sax1 = 0; + #endif /* LIBXML_SAX1_ENABLED */ + #ifdef LIBXML_XPATH_ENABLED + static const char *xpathquery = NULL; ++static const char *xpathsep = "\n"; + #endif + static int options = XML_PARSE_COMPACT | XML_PARSE_BIG_LINES; + static int sax = 0; +@@ -2095,7 +2096,7 @@ static void doXPathDump(xmlXPathObjectPtr cur) { + for (i = 0;i < cur->nodesetval->nodeNr;i++) { + node = cur->nodesetval->nodeTab[i]; + xmlNodeDumpOutput(buf, NULL, node, 0, 0, NULL); +- xmlOutputBufferWrite(buf, 1, "\n"); ++ xmlOutputBufferWrite(buf, 1, xpathsep); + } + xmlOutputBufferClose(buf); + #else +@@ -2104,27 +2105,27 @@ static void doXPathDump(xmlXPathObjectPtr cur) { + break; + } + case XPATH_BOOLEAN: +- if (cur->boolval) printf("true\n"); +- else printf("false\n"); ++ if (cur->boolval) printf("true%s", xpathsep); ++ else printf("false%s", xpathsep); + break; + case XPATH_NUMBER: + switch (xmlXPathIsInf(cur->floatval)) { + case 1: +- printf("Infinity\n"); ++ printf("Infinity%s", xpathsep); + break; + case -1: +- printf("-Infinity\n"); ++ printf("-Infinity%s", xpathsep); + break; + default: + if (xmlXPathIsNaN(cur->floatval)) { +- printf("NaN\n"); ++ printf("NaN%s", xpathsep); + } else { +- printf("%0g\n", cur->floatval); ++ printf("%0g%s", cur->floatval, xpathsep); + } + } + break; + case XPATH_STRING: +- printf("%s\n", (const char *) cur->stringval); ++ printf("%s%s", (const char *) cur->stringval, xpathsep); + break; + case XPATH_UNDEFINED: + fprintf(stderr, "XPath Object is uninitialized\n"); +@@ -3098,7 +3099,8 @@ static void usage(FILE *f, const char *name) { + fprintf(f, "\t--sax: do not build a tree but work just at the SAX level\n"); + fprintf(f, "\t--oldxml10: use XML-1.0 parsing rules before the 5th edition\n"); + #ifdef LIBXML_XPATH_ENABLED +- fprintf(f, "\t--xpath expr: evaluate the XPath expression, imply --noout\n"); ++ fprintf(f, "\t--xpath expr: evaluate the XPath expression, results are separated by \\n, imply --noout\n"); ++ fprintf(f, "\t--xpath0 expr: evaluate the XPath expression, results are separated by \\0, imply --noout\n"); + #endif + + fprintf(f, "\nLibxml project home page: http://xmlsoft.org/\n"); +@@ -3480,6 +3482,13 @@ main(int argc, char **argv) { + i++; + noout++; + xpathquery = argv[i]; ++ xpathsep = "\n"; ++ } else if ((!strcmp(argv[i], "-xpath0")) || ++ (!strcmp(argv[i], "--xpath0"))) { ++ i++; ++ noout++; ++ xpathquery = argv[i]; ++ xpathsep = "\0"; + #endif + } else if ((!strcmp(argv[i], "-oldxml10")) || + (!strcmp(argv[i], "--oldxml10"))) { +@@ -3712,6 +3721,11 @@ main(int argc, char **argv) { + i++; + continue; + } ++ if ((!strcmp(argv[i], "-xpath0")) || ++ (!strcmp(argv[i], "--xpath0"))) { ++ i++; ++ continue; ++ } + #endif + if ((timing) && (repeat)) + startTimer(); +-- +2.30.2 + diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index 931698a575..28601f0d09 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -31,6 +31,7 @@ ;;; Copyright © 2021 Julien Lepiller ;;; Copyright © 2021 Felix Gruber ;;; Copyright © 2021 Guillaume Le Vaillant +;;; Copyright © 2021 David Larsson ;;; ;;; This file is part of GNU Guix. ;;; @@ -218,6 +219,19 @@ hierarchical form with variable field lengths.") project (but it is usable outside of the Gnome platform).") (license license:x11))) +(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"))) + (define-public libxlsxwriter (package (name "libxlsxwriter") -- 2.31.0