From patchwork Sat Mar 11 17:54:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruno Victal X-Patchwork-Id: 47903 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 B74D016B92; Sat, 11 Mar 2023 17:55:32 +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=-1.9 required=5.0 tests=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 A3DE71685F for ; Sat, 11 Mar 2023 17:55:31 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pb3Qv-00065V-On; Sat, 11 Mar 2023 12:55: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 1pb3Qt-000651-Jg for guix-patches@gnu.org; Sat, 11 Mar 2023 12:55: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 1pb3Qt-00078T-BL for guix-patches@gnu.org; Sat, 11 Mar 2023 12:55:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pb3Qt-0003ny-7N for guix-patches@gnu.org; Sat, 11 Mar 2023 12:55:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61015] [PATCH v2 1/4] gnu: docbook-xml: Use copy-build-system. References: In-Reply-To: Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 11 Mar 2023 17:55:03 +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.167855727314562 (code B ref 61015); Sat, 11 Mar 2023 17:55:03 +0000 Received: (at 61015) by debbugs.gnu.org; 11 Mar 2023 17:54:33 +0000 Received: from localhost ([127.0.0.1]:58607 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pb3QO-0003mh-Hp for submit@debbugs.gnu.org; Sat, 11 Mar 2023 12:54:33 -0500 Received: from smtpmciv1.myservices.hosting ([185.26.107.237]:42794) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pb3QK-0003mG-Ll for 61015@debbugs.gnu.org; Sat, 11 Mar 2023 12:54:29 -0500 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpmciv1.myservices.hosting (Postfix) with ESMTP id C49B220D38 for <61015@debbugs.gnu.org>; Sat, 11 Mar 2023 18:54:27 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id 69358800A0; Sat, 11 Mar 2023 18:54:24 +0100 (CET) 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 Jj7pqv6OKJjD; Sat, 11 Mar 2023 18:54:22 +0100 (CET) Received: from guix-nuc.home.arpa (bl9-119-177.dsl.telepac.pt [85.242.119.177]) (Authenticated sender: lumen@makinata.eu) by mail1.netim.hosting (Postfix) with ESMTPSA id 7A4B28009C; Sat, 11 Mar 2023 18:54:22 +0100 (CET) From: Bruno Victal Date: Sat, 11 Mar 2023 17:54:10 +0000 Message-Id: <821b168ca199012a29d7a95961c6380b40e46855.1678557210.git.mirai@makinata.eu> X-Mailer: git-send-email 2.39.1 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. (docbook-xml)[arguments]: Remove. [source]: Switch to url-fetch/zipbomb. (docbook-xml-4.4)[source]: Switch to url-fetch/zipbomb. (docbook-xml-4.3)[source]: Switch to url-fetch/zipbomb. (docbook-xml-4.2)[source]: Switch to url-fetch/zipbomb. (docbook-xml-4.1.2)[arguments]: Remove. [source]: Switch to url-fetch/zipbomb. --- gnu/packages/docbook.scm | 73 +++++++++------------------------------- 1 file changed, 15 insertions(+), 58 deletions(-) diff --git a/gnu/packages/docbook.scm b/gnu/packages/docbook.scm index 8d4892b93b..7cfe550593 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") @@ -95,37 +83,18 @@ (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) (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 @@ -136,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 @@ -147,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 @@ -158,24 +127,12 @@ (define-public docbook-xml-4.1.2 (package (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")) - (dtd (string-append (assoc-ref %outputs "out") - "/xml/dtd/docbook"))) - (mkdir-p dtd) - (invoke unzip source "-d" dtd))))))) + "0wkp5rvnqj0ghxia0558mnn4c7s3n501j99q2isp3sp0ci069w1h")))))) (define-public docbook-xsl (package