From patchwork Mon Jan 23 03:32:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruno Victal X-Patchwork-Id: 46350 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 8D48027BBED; Mon, 23 Jan 2023 03:34:13 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,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 C457C27BBEB for ; Mon, 23 Jan 2023 03:34:09 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pJnau-0006AZ-Ma; Sun, 22 Jan 2023 22:34:04 -0500 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 ) id 1pJnas-0006AR-Og for guix-patches@gnu.org; Sun, 22 Jan 2023 22:34:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pJnas-00082V-F7 for guix-patches@gnu.org; Sun, 22 Jan 2023 22:34:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pJnas-00054l-Ac for guix-patches@gnu.org; Sun, 22 Jan 2023 22:34:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61015] [PATCH core-updates 1/9] gnu: docbook-xml: Use copy-build-system. Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 23 Jan 2023 03:34:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61015 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61015@debbugs.gnu.org Cc: Bruno Victal Received: via spool by 61015-submit@debbugs.gnu.org id=B61015.167444479019446 (code B ref 61015); Mon, 23 Jan 2023 03:34:02 +0000 Received: (at 61015) by debbugs.gnu.org; 23 Jan 2023 03:33:10 +0000 Received: from localhost ([127.0.0.1]:52942 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pJna1-00053a-Nd for submit@debbugs.gnu.org; Sun, 22 Jan 2023 22:33:09 -0500 Received: from smtpmciv6.myservices.hosting ([185.26.106.201]:38798) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pJnZx-00053P-23 for 61015@debbugs.gnu.org; Sun, 22 Jan 2023 22:33:07 -0500 Received: from mail1.netim.hosting (unknown [185.26.106.172]) by smtpmciv6.myservices.hosting (Postfix) with ESMTP id 100F92077E for <61015@debbugs.gnu.org>; Mon, 23 Jan 2023 04:33:03 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id A589380096; Mon, 23 Jan 2023 04:33:03 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at mail1.netim.hosting Received: from mail1.netim.hosting ([127.0.0.1]) by localhost (mail1-1.netim.hosting [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id 9t20yrOS3-2B; Mon, 23 Jan 2023 04:33:03 +0100 (CET) Received: from guix-nuc.home.arpa (bl9-118-236.dsl.telepac.pt [85.242.118.236]) (Authenticated sender: lumen@makinata.eu) by mail1.netim.hosting (Postfix) with ESMTPSA id 09C6180093; Mon, 23 Jan 2023 04:33:02 +0100 (CET) From: Bruno Victal Date: Mon, 23 Jan 2023 03:32:47 +0000 Message-Id: X-Mailer: git-send-email 2.38.1 In-Reply-To: References: MIME-Version: 1.0 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/docbook.scm (docbook-xml-5) [build-system]: Switch to copy-build-system. [source][arguments]: Adapt to copy-build-system. --- gnu/packages/docbook.scm | 28 ++++++++-------------------- 1 file changed, 8 insertions(+), 20 deletions(-) diff --git a/gnu/packages/docbook.scm b/gnu/packages/docbook.scm index f66ce4b959..a670eaa7f4 100644 --- a/gnu/packages/docbook.scm +++ b/gnu/packages/docbook.scm @@ -59,27 +59,15 @@ (define-public docbook-xml-5 (sha256 (base32 "1iz3hq1lqgnshvlz4j9gvh4jy1ml74qf90vqf2ikbq0h4i2xzybs")))) - (build-system trivial-build-system) + (build-system copy-build-system) (arguments - `(#:modules ((guix build utils)) - #:builder - (begin - (use-modules (guix build utils)) - (let* ((unzip - (string-append (assoc-ref %build-inputs "unzip") - "/bin/unzip")) - (source (assoc-ref %build-inputs "source")) - (out (assoc-ref %outputs "out")) - (dtd (string-append out "/xml/dtd/docbook"))) - (invoke unzip source) - (mkdir-p dtd) - (copy-recursively (string-append "docbook-" ,version) dtd) - (with-directory-excursion dtd - (substitute* (string-append out "/xml/dtd/docbook/catalog.xml") - (("uri=\"") - (string-append - "uri=\"file://" dtd "/"))) - #t))))) + (list + #:phases + #~(modify-phases %standard-phases + (replace 'install + (lambda _ + (let ((dtd-path (string-append #$output "/xml/dtd/docbook"))) + (copy-recursively "." dtd-path))))))) (native-inputs (list unzip)) (home-page "https://docbook.org") (synopsis "DocBook XML DTDs for document authoring") From patchwork Mon Jan 23 03:32:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruno Victal X-Patchwork-Id: 46351 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 21FED27BBED; Mon, 23 Jan 2023 03:35:15 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,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 8F45527BBE9 for ; Mon, 23 Jan 2023 03:35:13 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pJnbt-0006UJ-8a; Sun, 22 Jan 2023 22:35:05 -0500 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 ) id 1pJnbq-0006So-Uw for guix-patches@gnu.org; Sun, 22 Jan 2023 22:35:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pJnbq-0008Ux-M2 for guix-patches@gnu.org; Sun, 22 Jan 2023 22:35:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pJnbq-00056W-IW for guix-patches@gnu.org; Sun, 22 Jan 2023 22:35:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61015] [PATCH core-updates 2/9] gnu: docbook-xml-4.1.2: Adapt to copy-build-system. Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 23 Jan 2023 03:35:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61015 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61015@debbugs.gnu.org Cc: Bruno Victal Received: via spool by 61015-submit@debbugs.gnu.org id=B61015.167444487419579 (code B ref 61015); Mon, 23 Jan 2023 03:35:02 +0000 Received: (at 61015) by debbugs.gnu.org; 23 Jan 2023 03:34:34 +0000 Received: from localhost ([127.0.0.1]:52946 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pJnbO-00055j-3b for submit@debbugs.gnu.org; Sun, 22 Jan 2023 22:34:34 -0500 Received: from smtpmciv4.myservices.hosting ([185.26.107.240]:42044) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pJnbL-00055Z-BU for 61015@debbugs.gnu.org; Sun, 22 Jan 2023 22:34:32 -0500 Received: from mail1.netim.hosting (unknown [185.26.106.172]) by smtpmciv4.myservices.hosting (Postfix) with ESMTP id 855B020770 for <61015@debbugs.gnu.org>; Mon, 23 Jan 2023 04:34:30 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id 4147D80096; Mon, 23 Jan 2023 04:34:30 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at mail1.netim.hosting Received: from mail1.netim.hosting ([127.0.0.1]) by localhost (mail1-1.netim.hosting [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id gO-vz0anAyNm; Mon, 23 Jan 2023 04:34:30 +0100 (CET) Received: from guix-nuc.home.arpa (bl9-118-236.dsl.telepac.pt [85.242.118.236]) (Authenticated sender: lumen@makinata.eu) by mail1.netim.hosting (Postfix) with ESMTPSA id CC67080093; Mon, 23 Jan 2023 04:34:29 +0100 (CET) From: Bruno Victal Date: Mon, 23 Jan 2023 03:32:48 +0000 Message-Id: <1a3d04377283b56ff657f64317aad2fd91922b96.1674443296.git.mirai@makinata.eu> X-Mailer: git-send-email 2.38.1 In-Reply-To: References: MIME-Version: 1.0 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/docbook.scm (docbook-xml-4.1.2) [arguments]: Adapt to copy-build-system. [source]: Switch to url-fetch/zipbomb. --- gnu/packages/docbook.scm | 25 ++----------------------- 1 file changed, 2 insertions(+), 23 deletions(-) diff --git a/gnu/packages/docbook.scm b/gnu/packages/docbook.scm index a670eaa7f4..113039616e 100644 --- a/gnu/packages/docbook.scm +++ b/gnu/packages/docbook.scm @@ -147,33 +147,12 @@ (define-public docbook-xml-4.1.2 (inherit docbook-xml) (version "4.1.2") (source (origin - (method url-fetch) + (method url-fetch/zipbomb) (uri (string-append "https://docbook.org/xml/" version "/docbkx412.zip")) (sha256 (base32 - "0wkp5rvnqj0ghxia0558mnn4c7s3n501j99q2isp3sp0ci069w1h")))) - (arguments - '(#:modules ((guix build utils)) - #:builder - (begin - (use-modules (guix build utils)) - (let* ((source (assoc-ref %build-inputs "source")) - (unzip (string-append (assoc-ref %build-inputs "unzip") - "/bin/unzip")) - (xmlcatalog (string-append (assoc-ref %build-inputs "libxml2") - "/bin/xmlcatalog")) - (dtd (string-append (assoc-ref %outputs "out") - "/xml/dtd/docbook")) - (catalog.xml (string-append dtd "/catalog.xml"))) - (mkdir-p dtd) - (invoke unzip source "-d" dtd) - ;; Create a minimal XML catalog, to use with libxml2 tools. - (invoke xmlcatalog "--noout" "--create" catalog.xml) - (invoke xmlcatalog "--noout" "--add" "public" - "-//OASIS//DTD DocBook XML V4.1.2//EN" - (string-append dtd "/docbookx.dtd") catalog.xml))))) - (native-inputs (list libxml2 unzip)))) + "0wkp5rvnqj0ghxia0558mnn4c7s3n501j99q2isp3sp0ci069w1h")))))) ;;; There's an issue in docbook-xsl 1.79.2 that causes manpages to be ;;; generated incorrectly and embed raw nroff syntax such as '.PP' when there From patchwork Mon Jan 23 03:32:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruno Victal X-Patchwork-Id: 46352 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 643C927BBEB; Mon, 23 Jan 2023 03:36:20 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable 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 4716D27BBE9 for ; Mon, 23 Jan 2023 03:36:19 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pJncp-00072M-Qm; Sun, 22 Jan 2023 22:36:03 -0500 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 ) id 1pJnco-000726-LV for guix-patches@gnu.org; Sun, 22 Jan 2023 22:36:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pJnco-0000K5-1G for guix-patches@gnu.org; Sun, 22 Jan 2023 22:36:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pJncn-00058J-Tg for guix-patches@gnu.org; Sun, 22 Jan 2023 22:36:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61015] [PATCH core-updates 3/9] gnu: docbook-xml: Adapt to copy-build-system. Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 23 Jan 2023 03:36:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61015 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61015@debbugs.gnu.org Cc: Bruno Victal Received: via spool by 61015-submit@debbugs.gnu.org id=B61015.167444493819699 (code B ref 61015); Mon, 23 Jan 2023 03:36:01 +0000 Received: (at 61015) by debbugs.gnu.org; 23 Jan 2023 03:35:38 +0000 Received: from localhost ([127.0.0.1]:52951 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pJncQ-00057e-Fx for submit@debbugs.gnu.org; Sun, 22 Jan 2023 22:35:38 -0500 Received: from smtpmciv7.myservices.hosting ([185.26.106.202]:37832) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pJncP-00057W-F1 for 61015@debbugs.gnu.org; Sun, 22 Jan 2023 22:35:37 -0500 Received: from mail1.netim.hosting (unknown [185.26.106.172]) by smtpmciv7.myservices.hosting (Postfix) with ESMTP id D83A220B99 for <61015@debbugs.gnu.org>; Mon, 23 Jan 2023 04:35:36 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id 8778680096; Mon, 23 Jan 2023 04:35:36 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at mail1.netim.hosting Received: from mail1.netim.hosting ([127.0.0.1]) by localhost (mail1-1.netim.hosting [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id PDXvkgD3siBK; Mon, 23 Jan 2023 04:35:36 +0100 (CET) Received: from guix-nuc.home.arpa (bl9-118-236.dsl.telepac.pt [85.242.118.236]) (Authenticated sender: lumen@makinata.eu) by mail1.netim.hosting (Postfix) with ESMTPSA id 21C1880093; Mon, 23 Jan 2023 04:35:36 +0100 (CET) From: Bruno Victal Date: Mon, 23 Jan 2023 03:32:49 +0000 Message-Id: X-Mailer: git-send-email 2.38.1 In-Reply-To: References: MIME-Version: 1.0 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/docbook.scm (docbook-xml) [arguments]: Adapt to copy-build-system. [source]: Switch to url-fetch/zipbomb. --- gnu/packages/docbook.scm | 23 ++--------------------- 1 file changed, 2 insertions(+), 21 deletions(-) diff --git a/gnu/packages/docbook.scm b/gnu/packages/docbook.scm index 113039616e..11e65b1091 100644 --- a/gnu/packages/docbook.scm +++ b/gnu/packages/docbook.scm @@ -83,31 +83,12 @@ (define-public docbook-xml (name "docbook-xml") (version "4.5") (source (origin - (method url-fetch) + (method url-fetch/zipbomb) (uri (string-append "https://docbook.org/xml/" version "/docbook-xml-" version ".zip")) (sha256 (base32 - "1d671lcjckjri28xfbf6dq7y3xnkppa910w1jin8rjc35dx06kjf")))) - (arguments - '(#:builder (begin - (use-modules (guix build utils)) - - (let* ((unzip - (string-append (assoc-ref %build-inputs "unzip") - "/bin/unzip")) - (source (assoc-ref %build-inputs "source")) - (out (assoc-ref %outputs "out")) - (dtd (string-append out "/xml/dtd/docbook"))) - (mkdir-p dtd) - (with-directory-excursion dtd - (invoke unzip source)) - (substitute* (string-append out "/xml/dtd/docbook/catalog.xml") - (("uri=\"") - (string-append - "uri=\"file://" dtd "/"))) - #t)) - #:modules ((guix build utils)))))) + "1d671lcjckjri28xfbf6dq7y3xnkppa910w1jin8rjc35dx06kjf")))))) (define-public docbook-xml-4.4 (package (inherit docbook-xml) From patchwork Mon Jan 23 03:32:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruno Victal X-Patchwork-Id: 46353 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 86E6327BBED; Mon, 23 Jan 2023 03:37:14 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.8 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED,URIBL_SBL_A 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 227D127BBE9 for ; Mon, 23 Jan 2023 03:37:13 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pJndo-0007EE-VH; Sun, 22 Jan 2023 22:37:04 -0500 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 ) id 1pJndm-0007Dn-Ug for guix-patches@gnu.org; Sun, 22 Jan 2023 22:37:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pJndm-0000U3-Gx for guix-patches@gnu.org; Sun, 22 Jan 2023 22:37:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pJndm-0005A5-AI for guix-patches@gnu.org; Sun, 22 Jan 2023 22:37:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61015] [PATCH core-updates 4/9] gnu: docbook-xml-4.4: Adapt to copy-build-system. Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 23 Jan 2023 03:37:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61015 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61015@debbugs.gnu.org Cc: Bruno Victal Received: via spool by 61015-submit@debbugs.gnu.org id=B61015.167444497319776 (code B ref 61015); Mon, 23 Jan 2023 03:37:02 +0000 Received: (at 61015) by debbugs.gnu.org; 23 Jan 2023 03:36:13 +0000 Received: from localhost ([127.0.0.1]:52955 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pJncy-00058u-RT for submit@debbugs.gnu.org; Sun, 22 Jan 2023 22:36:13 -0500 Received: from smtpmciv3.myservices.hosting ([185.26.107.239]:49954) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pJncx-00058i-0F for 61015@debbugs.gnu.org; Sun, 22 Jan 2023 22:36:11 -0500 Received: from mail1.netim.hosting (unknown [185.26.106.172]) by smtpmciv3.myservices.hosting (Postfix) with ESMTP id 3A9E5203E6 for <61015@debbugs.gnu.org>; Mon, 23 Jan 2023 04:36:10 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id EABA680096; Mon, 23 Jan 2023 04:36:09 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at mail1.netim.hosting Received: from mail1.netim.hosting ([127.0.0.1]) by localhost (mail1-1.netim.hosting [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id 9xpb0UXbxFzz; Mon, 23 Jan 2023 04:36:09 +0100 (CET) Received: from guix-nuc.home.arpa (bl9-118-236.dsl.telepac.pt [85.242.118.236]) (Authenticated sender: lumen@makinata.eu) by mail1.netim.hosting (Postfix) with ESMTPSA id 7431A80093; Mon, 23 Jan 2023 04:36:09 +0100 (CET) From: Bruno Victal Date: Mon, 23 Jan 2023 03:32:50 +0000 Message-Id: <0bbaed834af8621439ef732d5173b7b554480524.1674443296.git.mirai@makinata.eu> X-Mailer: git-send-email 2.38.1 In-Reply-To: References: MIME-Version: 1.0 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/docbook.scm (docbook-xml-4.4) [source]: Switch to url-fetch/zipbomb. --- gnu/packages/docbook.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/docbook.scm b/gnu/packages/docbook.scm index 11e65b1091..7df07533aa 100644 --- a/gnu/packages/docbook.scm +++ b/gnu/packages/docbook.scm @@ -94,7 +94,7 @@ (define-public docbook-xml-4.4 (package (inherit docbook-xml) (version "4.4") (source (origin - (method url-fetch) + (method url-fetch/zipbomb) (uri (string-append "https://docbook.org/xml/" version "/docbook-xml-" version ".zip")) (sha256 From patchwork Mon Jan 23 03:32:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruno Victal X-Patchwork-Id: 46354 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 5BDA227BBEB; Mon, 23 Jan 2023 03:38:15 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.8 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED,URIBL_SBL_A autolearn=unavailable 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 8205827BBE9 for ; Mon, 23 Jan 2023 03:38:13 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pJnem-0007NG-Mv; Sun, 22 Jan 2023 22:38:04 -0500 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 ) id 1pJnel-0007N6-N1 for guix-patches@gnu.org; Sun, 22 Jan 2023 22:38:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pJnel-0000ZY-2W for guix-patches@gnu.org; Sun, 22 Jan 2023 22:38:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pJnek-0005Bm-Jy for guix-patches@gnu.org; Sun, 22 Jan 2023 22:38:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61015] [PATCH core-updates 5/9] gnu: docbook-xml-4.3: Adapt to copy-build-system. Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 23 Jan 2023 03:38:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61015 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61015@debbugs.gnu.org Cc: Bruno Victal Received: via spool by 61015-submit@debbugs.gnu.org id=B61015.167444506019918 (code B ref 61015); Mon, 23 Jan 2023 03:38:02 +0000 Received: (at 61015) by debbugs.gnu.org; 23 Jan 2023 03:37:40 +0000 Received: from localhost ([127.0.0.1]:52959 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pJneO-0005BC-8d for submit@debbugs.gnu.org; Sun, 22 Jan 2023 22:37:40 -0500 Received: from smtpm8.myservices.hosting ([185.26.105.209]:45326) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pJneM-0005B2-1w for 61015@debbugs.gnu.org; Sun, 22 Jan 2023 22:37:39 -0500 Received: from mail1.netim.hosting (unknown [185.26.106.172]) by smtpm8.myservices.hosting (Postfix) with ESMTP id 130EE20C76 for <61015@debbugs.gnu.org>; Mon, 23 Jan 2023 04:37:36 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id BBAD080097; Mon, 23 Jan 2023 04:37:36 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at mail1.netim.hosting Received: from mail1.netim.hosting ([127.0.0.1]) by localhost (mail1-1.netim.hosting [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id 6zoH6DSXSrIw; Mon, 23 Jan 2023 04:37:36 +0100 (CET) Received: from guix-nuc.home.arpa (bl9-118-236.dsl.telepac.pt [85.242.118.236]) (Authenticated sender: lumen@makinata.eu) by mail1.netim.hosting (Postfix) with ESMTPSA id 4D70280093; Mon, 23 Jan 2023 04:37:36 +0100 (CET) From: Bruno Victal Date: Mon, 23 Jan 2023 03:32:51 +0000 Message-Id: <3b071541e8b9d71e1bd5f2c6f122900adffcbdb7.1674443296.git.mirai@makinata.eu> X-Mailer: git-send-email 2.38.1 In-Reply-To: References: MIME-Version: 1.0 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/docbook.scm (docbook-xml-4.3) [source]: Switch to url-fetch/zipbomb. --- gnu/packages/docbook.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/docbook.scm b/gnu/packages/docbook.scm index 7df07533aa..f0c734e74f 100644 --- a/gnu/packages/docbook.scm +++ b/gnu/packages/docbook.scm @@ -105,7 +105,7 @@ (define-public docbook-xml-4.3 (package (inherit docbook-xml) (version "4.3") (source (origin - (method url-fetch) + (method url-fetch/zipbomb) (uri (string-append "https://docbook.org/xml/" version "/docbook-xml-" version ".zip")) (sha256 From patchwork Mon Jan 23 03:32:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruno Victal X-Patchwork-Id: 46355 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 2F51D27BBED; Mon, 23 Jan 2023 03:39:25 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,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 1AFA927BBEB for ; Mon, 23 Jan 2023 03:39:24 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pJnfk-0007UV-9d; Sun, 22 Jan 2023 22:39:04 -0500 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 ) id 1pJnfi-0007U7-Ed for guix-patches@gnu.org; Sun, 22 Jan 2023 22:39:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pJnfi-0000k1-23 for guix-patches@gnu.org; Sun, 22 Jan 2023 22:39:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pJnfh-0005DU-S8 for guix-patches@gnu.org; Sun, 22 Jan 2023 22:39:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61015] [PATCH core-updates 6/9] gnu: docbook-xml-4.2: Adapt to copy-build-system. Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 23 Jan 2023 03:39:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61015 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61015@debbugs.gnu.org Cc: Bruno Victal Received: via spool by 61015-submit@debbugs.gnu.org id=B61015.167444511720016 (code B ref 61015); Mon, 23 Jan 2023 03:39:01 +0000 Received: (at 61015) by debbugs.gnu.org; 23 Jan 2023 03:38:37 +0000 Received: from localhost ([127.0.0.1]:52963 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pJnfJ-0005Cm-J8 for submit@debbugs.gnu.org; Sun, 22 Jan 2023 22:38:37 -0500 Received: from smtpm6.myservices.hosting ([185.26.105.207]:47364) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pJnfI-0005Cc-0J for 61015@debbugs.gnu.org; Sun, 22 Jan 2023 22:38:36 -0500 Received: from mail1.netim.hosting (unknown [185.26.106.172]) by smtpm6.myservices.hosting (Postfix) with ESMTP id 4AB5A20BEF for <61015@debbugs.gnu.org>; Mon, 23 Jan 2023 04:38:34 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id D8EAB80096; Mon, 23 Jan 2023 04:38:34 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at mail1.netim.hosting Received: from mail1.netim.hosting ([127.0.0.1]) by localhost (mail1-1.netim.hosting [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id ZtWopHCcBhTS; Mon, 23 Jan 2023 04:38:34 +0100 (CET) Received: from guix-nuc.home.arpa (bl9-118-236.dsl.telepac.pt [85.242.118.236]) (Authenticated sender: lumen@makinata.eu) by mail1.netim.hosting (Postfix) with ESMTPSA id 6E43780093; Mon, 23 Jan 2023 04:38:34 +0100 (CET) From: Bruno Victal Date: Mon, 23 Jan 2023 03:32:52 +0000 Message-Id: <49b473b13d01393b36c5494a8bb5372b4ee4bea9.1674443296.git.mirai@makinata.eu> X-Mailer: git-send-email 2.38.1 In-Reply-To: References: MIME-Version: 1.0 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/docbook.scm (docbook-xml-4.2) [source]: Switch to url-fetch/zipbomb. --- gnu/packages/docbook.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/docbook.scm b/gnu/packages/docbook.scm index f0c734e74f..e09d8395a5 100644 --- a/gnu/packages/docbook.scm +++ b/gnu/packages/docbook.scm @@ -116,7 +116,7 @@ (define-public docbook-xml-4.2 (package (inherit docbook-xml) (version "4.2") (source (origin - (method url-fetch) + (method url-fetch/zipbomb) (uri (string-append "https://docbook.org/xml/" version "/docbook-xml-" version ".zip")) (sha256 From patchwork Mon Jan 23 03:32:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruno Victal X-Patchwork-Id: 46356 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 50A5C27BBED; Mon, 23 Jan 2023 03:40:19 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS 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 A4F8927BBE9 for ; Mon, 23 Jan 2023 03:40:18 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pJngi-0007cd-KK; Sun, 22 Jan 2023 22:40:04 -0500 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 ) id 1pJngg-0007cD-Ks for guix-patches@gnu.org; Sun, 22 Jan 2023 22:40:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pJngg-0000q2-CB for guix-patches@gnu.org; Sun, 22 Jan 2023 22:40:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pJngg-0005FD-7o for guix-patches@gnu.org; Sun, 22 Jan 2023 22:40:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61015] [PATCH core-updates 7/9] gnu: docbook-xml: Fix permissions. Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 23 Jan 2023 03:40:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61015 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61015@debbugs.gnu.org Cc: Bruno Victal Received: via spool by 61015-submit@debbugs.gnu.org id=B61015.167444516720109 (code B ref 61015); Mon, 23 Jan 2023 03:40:02 +0000 Received: (at 61015) by debbugs.gnu.org; 23 Jan 2023 03:39:27 +0000 Received: from localhost ([127.0.0.1]:52967 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pJng6-0005EG-U3 for submit@debbugs.gnu.org; Sun, 22 Jan 2023 22:39:27 -0500 Received: from smtpmciv5.myservices.hosting ([185.26.107.241]:54640) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pJng3-0005E6-1J for 61015@debbugs.gnu.org; Sun, 22 Jan 2023 22:39:24 -0500 Received: from mail1.netim.hosting (unknown [185.26.106.172]) by smtpmciv5.myservices.hosting (Postfix) with ESMTP id 51D9920C8A for <61015@debbugs.gnu.org>; Mon, 23 Jan 2023 04:39:22 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id 0D73E80096; Mon, 23 Jan 2023 04:39:22 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at mail1.netim.hosting Received: from mail1.netim.hosting ([127.0.0.1]) by localhost (mail1-1.netim.hosting [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id HpH2dwMCEyGX; Mon, 23 Jan 2023 04:39:21 +0100 (CET) Received: from guix-nuc.home.arpa (bl9-118-236.dsl.telepac.pt [85.242.118.236]) (Authenticated sender: lumen@makinata.eu) by mail1.netim.hosting (Postfix) with ESMTPSA id A179680093; Mon, 23 Jan 2023 04:39:21 +0100 (CET) From: Bruno Victal Date: Mon, 23 Jan 2023 03:32:53 +0000 Message-Id: <87d74d07fd74d7ce0ffbe330aa72d327f7dc7708.1674443296.git.mirai@makinata.eu> X-Mailer: git-send-email 2.38.1 In-Reply-To: References: MIME-Version: 1.0 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/docbook.scm (docbook-xml-5) [arguments]: Remove unnecessary executable permissions. --- gnu/packages/docbook.scm | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/gnu/packages/docbook.scm b/gnu/packages/docbook.scm index e09d8395a5..b1743baf5e 100644 --- a/gnu/packages/docbook.scm +++ b/gnu/packages/docbook.scm @@ -62,8 +62,15 @@ (define-public docbook-xml-5 (build-system copy-build-system) (arguments (list + #:modules '((guix build copy-build-system) + (guix build utils) + (srfi srfi-26)) #:phases #~(modify-phases %standard-phases + (add-after 'unpack 'fix-permissions + (lambda _ + ;; XXX: These files do not need 0755 permission. + (for-each (cut chmod <> #o644) (find-files ".")))) (replace 'install (lambda _ (let ((dtd-path (string-append #$output "/xml/dtd/docbook"))) From patchwork Mon Jan 23 03:32:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Bruno Victal X-Patchwork-Id: 46357 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 CD4B627BBEB; Mon, 23 Jan 2023 03:41:26 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.8 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED,URIBL_SBL_A autolearn=unavailable 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 8984D27BBE9 for ; Mon, 23 Jan 2023 03:41:23 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pJnhn-0007mU-Op; Sun, 22 Jan 2023 22:41:11 -0500 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 ) id 1pJnhk-0007l6-PG for guix-patches@gnu.org; Sun, 22 Jan 2023 22:41:10 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pJnhf-0001HK-EJ for guix-patches@gnu.org; Sun, 22 Jan 2023 22:41:08 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pJnhe-0005H2-Ad for guix-patches@gnu.org; Sun, 22 Jan 2023 22:41:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61015] [PATCH core-updates 8/9] gnu: docbook-xml: Use XSLT to patch catalog.xml. Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 23 Jan 2023 03:41:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61015 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61015@debbugs.gnu.org Cc: Bruno Victal Received: via spool by 61015-submit@debbugs.gnu.org id=B61015.167444522220217 (code B ref 61015); Mon, 23 Jan 2023 03:41:02 +0000 Received: (at 61015) by debbugs.gnu.org; 23 Jan 2023 03:40:22 +0000 Received: from localhost ([127.0.0.1]:52971 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pJnh0-0005Fy-7T for submit@debbugs.gnu.org; Sun, 22 Jan 2023 22:40:22 -0500 Received: from smtpmciv8.myservices.hosting ([185.26.106.203]:52420) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pJngx-0005Fp-TJ for 61015@debbugs.gnu.org; Sun, 22 Jan 2023 22:40:21 -0500 Received: from mail1.netim.hosting (unknown [185.26.106.172]) by smtpmciv8.myservices.hosting (Postfix) with ESMTP id 1C31620C76 for <61015@debbugs.gnu.org>; Mon, 23 Jan 2023 04:40:18 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id C96EB80096; Mon, 23 Jan 2023 04:40:18 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at mail1.netim.hosting Received: from mail1.netim.hosting ([127.0.0.1]) by localhost (mail1-1.netim.hosting [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id ENDR8Twd3R_e; Mon, 23 Jan 2023 04:40:18 +0100 (CET) Received: from guix-nuc.home.arpa (bl9-118-236.dsl.telepac.pt [85.242.118.236]) (Authenticated sender: lumen@makinata.eu) by mail1.netim.hosting (Postfix) with ESMTPSA id 9D53D80093; Mon, 23 Jan 2023 04:40:17 +0100 (CET) From: Bruno Victal Date: Mon, 23 Jan 2023 03:32:54 +0000 Message-Id: <6c949db09590acc43d9af65726a9471240fc0bce.1674443296.git.mirai@makinata.eu> X-Mailer: git-send-email 2.38.1 In-Reply-To: References: MIME-Version: 1.0 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches (sxml transforms) are unsuited here due to guile-bug #20339. * gnu/packages/aux-files/xml/patch-uri.xsl: New file. * gnu/packages/docbook.scm (docbook-xml-5) [native-inputs]: Add libxslt. [arguments]: Patch catalog.xml using XSLT. --- gnu/packages/aux-files/xml/patch-uri.xsl | 24 ++++++++++++++++++++++++ gnu/packages/docbook.scm | 13 ++++++++++++- 2 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/aux-files/xml/patch-uri.xsl diff --git a/gnu/packages/aux-files/xml/patch-uri.xsl b/gnu/packages/aux-files/xml/patch-uri.xsl new file mode 100644 index 0000000000..947517476d --- /dev/null +++ b/gnu/packages/aux-files/xml/patch-uri.xsl @@ -0,0 +1,24 @@ + + + + + / + + + + + + + + + + + + + + diff --git a/gnu/packages/docbook.scm b/gnu/packages/docbook.scm index b1743baf5e..ce0b823e3a 100644 --- a/gnu/packages/docbook.scm +++ b/gnu/packages/docbook.scm @@ -8,6 +8,7 @@ ;;; Copyright © 2021 Mark H Weaver ;;; Copyright © 2021 Efraim Flashner ;;; Copyright © 2021 Andrew Whatson +;;; Copyright © 2023 Bruno Victal ;;; ;;; This file is part of GNU Guix. ;;; @@ -71,11 +72,21 @@ (define-public docbook-xml-5 (lambda _ ;; XXX: These files do not need 0755 permission. (for-each (cut chmod <> #o644) (find-files ".")))) + (add-before 'install 'patch-uri + (lambda* (#:key inputs #:allow-other-keys) + (let ((xsltproc (search-input-file inputs "/bin/xsltproc")) + (dtd-path (string-append #$output "/xml/dtd/docbook"))) + (invoke xsltproc "--nonet" "--noout" + "--stringparam" "prefix" dtd-path + "--output" "catalog.xml.new" + #$(local-file (search-auxiliary-file "xml/patch-uri.xsl")) + "catalog.xml") + (rename-file "catalog.xml.new" "catalog.xml")))) (replace 'install (lambda _ (let ((dtd-path (string-append #$output "/xml/dtd/docbook"))) (copy-recursively "." dtd-path))))))) - (native-inputs (list unzip)) + (native-inputs (list libxslt unzip)) (home-page "https://docbook.org") (synopsis "DocBook XML DTDs for document authoring") (description From patchwork Mon Jan 23 03:32:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruno Victal X-Patchwork-Id: 46358 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 3EE8827BBEB; Mon, 23 Jan 2023 03:42:24 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable 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 66D0227BBE9 for ; Mon, 23 Jan 2023 03:42:22 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pJnii-00083E-49; Sun, 22 Jan 2023 22:42:08 -0500 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 ) id 1pJnic-00082e-A2 for guix-patches@gnu.org; Sun, 22 Jan 2023 22:42:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pJnib-0001Nc-Qk for guix-patches@gnu.org; Sun, 22 Jan 2023 22:42:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pJnib-0005Ic-Kj for guix-patches@gnu.org; Sun, 22 Jan 2023 22:42:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61015] [PATCH core-updates 9/9] gnu: docbook-xml-4.1.2: Add missing catalog.xml. Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 23 Jan 2023 03:42:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61015 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61015@debbugs.gnu.org Cc: Bruno Victal Received: via spool by 61015-submit@debbugs.gnu.org id=B61015.167444528720330 (code B ref 61015); Mon, 23 Jan 2023 03:42:01 +0000 Received: (at 61015) by debbugs.gnu.org; 23 Jan 2023 03:41:27 +0000 Received: from localhost ([127.0.0.1]:52975 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pJni2-0005Hp-Rq for submit@debbugs.gnu.org; Sun, 22 Jan 2023 22:41:27 -0500 Received: from smtpm2.myservices.hosting ([185.26.105.233]:38210) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pJni0-0005Hg-0u for 61015@debbugs.gnu.org; Sun, 22 Jan 2023 22:41:25 -0500 Received: from mail1.netim.hosting (unknown [185.26.106.172]) by smtpm2.myservices.hosting (Postfix) with ESMTP id 5E78020DF7 for <61015@debbugs.gnu.org>; Mon, 23 Jan 2023 04:41:23 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id 114EE80096; Mon, 23 Jan 2023 04:41:23 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at mail1.netim.hosting Received: from mail1.netim.hosting ([127.0.0.1]) by localhost (mail1-1.netim.hosting [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id Sy-v6he91cxO; Mon, 23 Jan 2023 04:41:22 +0100 (CET) Received: from guix-nuc.home.arpa (bl9-118-236.dsl.telepac.pt [85.242.118.236]) (Authenticated sender: lumen@makinata.eu) by mail1.netim.hosting (Postfix) with ESMTPSA id 4D55980093; Mon, 23 Jan 2023 04:41:22 +0100 (CET) From: Bruno Victal Date: Mon, 23 Jan 2023 03:32:55 +0000 Message-Id: <547d75c1c95c3334a6d985c397651c84b660e49c.1674443296.git.mirai@makinata.eu> X-Mailer: git-send-email 2.38.1 In-Reply-To: References: MIME-Version: 1.0 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/aux-files/xml/docbook-xml/catalog-4.1.2.xml: New file. * gnu/packages/docbook.scm (docbook-xml-4.1.2) [arguments]: Use prebuilt catalog.xml. [native-inputs]: Add libxml2. --- .../xml/docbook-xml/catalog-4.1.2.xml | 31 +++++++++++++++++++ gnu/packages/docbook.scm | 31 ++++++++++++++++++- 2 files changed, 61 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/aux-files/xml/docbook-xml/catalog-4.1.2.xml diff --git a/gnu/packages/aux-files/xml/docbook-xml/catalog-4.1.2.xml b/gnu/packages/aux-files/xml/docbook-xml/catalog-4.1.2.xml new file mode 100644 index 0000000000..cfb1849202 --- /dev/null +++ b/gnu/packages/aux-files/xml/docbook-xml/catalog-4.1.2.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/gnu/packages/docbook.scm b/gnu/packages/docbook.scm index ce0b823e3a..6dc57d5d03 100644 --- a/gnu/packages/docbook.scm +++ b/gnu/packages/docbook.scm @@ -39,6 +39,7 @@ (define-module (gnu packages docbook) #:use-module (gnu packages web-browsers) #:use-module (gnu packages xml) #:use-module (guix gexp) + #:use-module (guix utils) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix download) @@ -151,7 +152,35 @@ (define-public docbook-xml-4.1.2 "/docbkx412.zip")) (sha256 (base32 - "0wkp5rvnqj0ghxia0558mnn4c7s3n501j99q2isp3sp0ci069w1h")))))) + "0wkp5rvnqj0ghxia0558mnn4c7s3n501j99q2isp3sp0ci069w1h")))) + (arguments + (substitute-keyword-arguments (package-arguments docbook-xml) + ((#:phases phases) + #~(modify-phases #$phases + (add-after 'unpack 'copy-catalog-file + ;; docbook-xml-4.1.2 is unique in the fact that it doesn't come + ;; with a catalog.xml file, requiring it to be generated by hand from + ;; the docbook.cat SGML catalog. We could automatically generate it here + ;; at the cost of enlarging the package definition with a rudimentary + ;; (PEG) parser for the SGML catalog but this is overkill since this + ;; file is unlikely to change, therefore we use a pre-generated catalog.xml. + (lambda _ + (copy-file #$(local-file + (search-auxiliary-file "xml/docbook-xml/catalog-4.1.2.xml")) + "catalog.xml"))) + (add-after 'patch-uri 'add-rewrite-entries + (lambda* (#:key inputs #:allow-other-keys) + (let ((xmlcatalog (search-input-file inputs "/bin/xmlcatalog")) + (dtd-path (string-append #$output "/xml/dtd/docbook"))) + (for-each (lambda (type) + (invoke xmlcatalog "--noout" + "--add" type "http://www.oasis-open.org/docbook/xml/4.1.2/" + (string-append "file://" dtd-path "/") + "catalog.xml")) + (list "rewriteSystem" "rewriteURI"))))))))) + (native-inputs + (modify-inputs (package-native-inputs docbook-xml) + (prepend libxml2))))) ;;; There's an issue in docbook-xsl 1.79.2 that causes manpages to be ;;; generated incorrectly and embed raw nroff syntax such as '.PP' when there