Message ID | 52bffd0b261be7dd2452c72d0cb498446b677ae0.1695478390.git.mirai@makinata.eu |
---|---|
State | New |
Headers |
Return-Path: <guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org> X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 117ED27BBEA; Sat, 23 Sep 2023 15:22:19 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 4AB6E27BBE2 for <patchwork@mira.cbaines.net>; Sat, 23 Sep 2023 15:22:15 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from <guix-patches-bounces@gnu.org>) id 1qk3W9-0006v3-0G; Sat, 23 Sep 2023 10:21:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1qk3W4-0006tl-Lu for guix-patches@gnu.org; Sat, 23 Sep 2023 10:21:52 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1qk3W3-00038C-QV for guix-patches@gnu.org; Sat, 23 Sep 2023 10:21:52 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1qk3WE-00081a-ON for guix-patches@gnu.org; Sat, 23 Sep 2023 10:22:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65479] [PATCH core-updates v2 03/62] gnu: docbook-xml-5.1: Fix URIs in catalog.xml. Resent-From: Bruno Victal <mirai@makinata.eu> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org> Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 23 Sep 2023 14:22:02 +0000 Resent-Message-ID: <handler.65479.B65479.169547889030577@debbugs.gnu.org> Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65479 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65479@debbugs.gnu.org Cc: Bruno Victal <mirai@makinata.eu> Received: via spool by 65479-submit@debbugs.gnu.org id=B65479.169547889030577 (code B ref 65479); Sat, 23 Sep 2023 14:22:02 +0000 Received: (at 65479) by debbugs.gnu.org; 23 Sep 2023 14:21:30 +0000 Received: from localhost ([127.0.0.1]:40164 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces@debbugs.gnu.org>) id 1qk3Vh-0007x7-Rc for submit@debbugs.gnu.org; Sat, 23 Sep 2023 10:21:30 -0400 Received: from smtpmciv4.myservices.hosting ([185.26.107.240]:34942) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <mirai@makinata.eu>) id 1qk3Vf-0007wx-Ii for 65479@debbugs.gnu.org; Sat, 23 Sep 2023 10:21:28 -0400 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpmciv4.myservices.hosting (Postfix) with ESMTP id C57DE209E8 for <65479@debbugs.gnu.org>; Sat, 23 Sep 2023 16:21:15 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id 2594780095; Sat, 23 Sep 2023 16:21:15 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at mail1.netim.hosting Received: from mail1.netim.hosting ([127.0.0.1]) by localhost (mail1-2.netim.hosting [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id e_ggEr3MOtlU; Sat, 23 Sep 2023 16:21:14 +0200 (CEST) Received: from guix-nuc.home.arpa (unknown [10.192.1.83]) (Authenticated sender: lumen@makinata.eu) by mail1.netim.hosting (Postfix) with ESMTPSA id 95EEE80097; Sat, 23 Sep 2023 16:21:14 +0200 (CEST) From: Bruno Victal <mirai@makinata.eu> Date: Sat, 23 Sep 2023 15:19:38 +0100 Message-ID: <52bffd0b261be7dd2452c72d0cb498446b677ae0.1695478390.git.mirai@makinata.eu> X-Mailer: git-send-email 2.41.0 In-Reply-To: <cover.1695478390.git.mirai@makinata.eu> References: <cover.1692828533.git.mirai@makinata.eu> <cover.1695478390.git.mirai@makinata.eu> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: <guix-patches.gnu.org> List-Unsubscribe: <https://lists.gnu.org/mailman/options/guix-patches>, <mailto:guix-patches-request@gnu.org?subject=unsubscribe> List-Archive: <https://lists.gnu.org/archive/html/guix-patches> List-Post: <mailto:guix-patches@gnu.org> List-Help: <mailto:guix-patches-request@gnu.org?subject=help> List-Subscribe: <https://lists.gnu.org/mailman/listinfo/guix-patches>, <mailto:guix-patches-request@gnu.org?subject=subscribe> Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches |
Series |
Docbook & XML/SGML improvements.
|
|
Commit Message
Bruno Victal
Sept. 23, 2023, 2:19 p.m. UTC
* gnu/packages/docbook.scm (docbook-xml-5.1)[source]: Patch version in URI. --- gnu/packages/docbook.scm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
Comments
Hi, Bruno Victal <mirai@makinata.eu> writes: > * gnu/packages/docbook.scm (docbook-xml-5.1)[source]: Patch version in URI. > --- > gnu/packages/docbook.scm | 8 +++++++- > 1 file changed, 7 insertions(+), 1 deletion(-) > > diff --git a/gnu/packages/docbook.scm b/gnu/packages/docbook.scm > index ec1b9acb36..4a0104c253 100644 > --- a/gnu/packages/docbook.scm > +++ b/gnu/packages/docbook.scm > @@ -109,7 +109,13 @@ (define-public docbook-xml-5.1 > "/docbook-v" version "-os.zip")) > (sha256 > (base32 > - "0zqy9prj9wam9dn7v3mgr7ld1axqxdhgrmv06dviwg00ahv43wxk")))) > + "0zqy9prj9wam9dn7v3mgr7ld1axqxdhgrmv06dviwg00ahv43wxk")) > + (modules '((guix build utils))) > + (snippet > + ;; The .zip release mistakenly uses '5.1CR4' instead of > + ;; '5.1' as intended by <https://docbook.org/xml/5.1/catalog.xml>. > + #~(substitute* "schemas/catalog.xml" > + (("5\\.1CR4") #$version))))) Fun! Is this known upstream?
On 2023-10-05 20:23, Maxim Cournoyer wrote: >> + ;; The .zip release mistakenly uses '5.1CR4' instead of >> + ;; '5.1' as intended by <https://docbook.org/xml/5.1/catalog.xml>. >> + #~(substitute* "schemas/catalog.xml" >> + (("5\\.1CR4") #$version))))) > > Fun! Is this known upstream? No idea. (it doesn't look obvious where issues should be reported to) The upstream is rather strange IMO: the .zip releases don't seem to get updated (otherwise we'd see docbook-xml-4.1.2 retrofitted with a catalog.xml instead of leaving it up to distros to figure this one out in painful ways) and the files in the .zip don't match against the files in their HTTP mirror [1]. You can see that [2] doesn't have the bogus entries that are in the zip release [3]. My guess is that the HTTP mirror gets “hotfixes” but the .zip release is the original release that is left frozen in time. Other fun extras: There seems to be a OASIS “upstream” as well [5][6], and the URIs in the catalog [7] for the same standard are different!! Not only that, the OASIS “upstream” lists a 5.1.1 release [8] which is absent from the official [4] home page. [1]: <https://docbook.org/xml/5.1/> [2]: <https://docbook.org/xml/5.1/catalog.xml> [3]: <https://docbook.org/xml/5.1/docbook-v5.1-os.zip> [4]: <https://docbook.org/schemas/5x> [5]: <https://docs.oasis-open.org/docbook/docbook/> [6]: <https://www.oasis-open.org/committees/tc_home.php?wg_abbrev=docbook> [7]: <https://docs.oasis-open.org/docbook/docbook/v5.1/cs01/schemas/catalog.xml> [8]: <https://docs.oasis-open.org/docbook/docbook/v5.1.1/>
Hello! Bruno Victal <mirai@makinata.eu> writes: > On 2023-10-05 20:23, Maxim Cournoyer wrote: >>> + ;; The .zip release mistakenly uses '5.1CR4' instead of >>> + ;; '5.1' as intended by <https://docbook.org/xml/5.1/catalog.xml>. >>> + #~(substitute* "schemas/catalog.xml" >>> + (("5\\.1CR4") #$version))))) >> >> Fun! Is this known upstream? > > No idea. (it doesn't look obvious where issues should be reported to) They appear to accept issues on their Github: https://github.com/docbook/docbook/issues > The upstream is rather strange IMO: the .zip releases don't seem > to get updated (otherwise we'd see docbook-xml-4.1.2 retrofitted with > a catalog.xml instead of leaving it up to distros to figure this one > out in painful ways) and the files in the .zip don't match against > the files in their HTTP mirror [1]. > > You can see that [2] doesn't have the bogus entries that are in the > zip release [3]. > > My guess is that the HTTP mirror gets “hotfixes” but the .zip release > is the original release that is left frozen in time. > > Other fun extras: > There seems to be a OASIS “upstream” as well [5][6], and the URIs in > the catalog [7] for the same standard are different!! > > Not only that, the OASIS “upstream” lists a 5.1.1 release [8] which > is absent from the official [4] home page. Interesting. If you could forward all these oddities to an issue upstream perhaps that'd help them or someone else.
On 2023-10-07 18:04, Maxim Cournoyer wrote: > They appear to accept issues on their Github: > https://github.com/docbook/docbook/issues Indeed, I see that this 5.1CR4 issue has already been reported upstream [1] and fixed in [2] but it seems the zip archive remained unchanged. Searching for catalog related issues has yielded [3] which we might need to account for as well. I'll try to address these in the upcoming revision. [1]: <https://github.com/docbook/docbook/issues/100> [2]: <https://docbook.org/xml/5.1/catalog.xml> [3]: <https://github.com/docbook/docbook/issues/201>
diff --git a/gnu/packages/docbook.scm b/gnu/packages/docbook.scm index ec1b9acb36..4a0104c253 100644 --- a/gnu/packages/docbook.scm +++ b/gnu/packages/docbook.scm @@ -109,7 +109,13 @@ (define-public docbook-xml-5.1 "/docbook-v" version "-os.zip")) (sha256 (base32 - "0zqy9prj9wam9dn7v3mgr7ld1axqxdhgrmv06dviwg00ahv43wxk")))) + "0zqy9prj9wam9dn7v3mgr7ld1axqxdhgrmv06dviwg00ahv43wxk")) + (modules '((guix build utils))) + (snippet + ;; The .zip release mistakenly uses '5.1CR4' instead of + ;; '5.1' as intended by <https://docbook.org/xml/5.1/catalog.xml>. + #~(substitute* "schemas/catalog.xml" + (("5\\.1CR4") #$version))))) (template (docbook-xml-package source version))) (package (inherit template)