From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id SFqBO3EAzmMPEgAAbAwnHQ (envelope-from ) for ; Mon, 23 Jan 2023 04:35:14 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id 4PG2OnEAzmN8ywAAG6o9tA (envelope-from ) for ; Mon, 23 Jan 2023 04:35:13 +0100 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 9B56C42AFD for ; Mon, 23 Jan 2023 04:35:13 +0100 (CET) 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 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1674444913; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post; bh=zIH0h9cUE6QejlK3SMZ8Mk9l6ZQWs8zT4o++NFA0NvM=; b=WPrRs3k/qE6hJOK0Z3xtbVMAMI/I1tqhxbhn43HQIbLw0n1QoI42ir/QEM4/hv3SFvsHy3 Mi1MyPB91Zl4HrArKg5d7xzX9p+PmIpZqdq2oFA/E5lnt/6MfSfxcEtT79KqOHnSFGBGPA BmOVjBTxLUm6mRVb8CxHbgH4RkJ2ftZ8wpPMxVi0vQesVtgfRceUieoxv2/a98ELfVDRGi LyefWzyKCED9vGDI1DhWnZmY0CYzJwErVGgFL8jiI5ZKmo4jPkXrtdZZUsOTF3JIHBkaqz Cv/fPXeu/mGRvIxSed5ORAaeLdW848KyuG4+x5fqd7sEKdCeOFMSXFY3CTMmHg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1674444913; a=rsa-sha256; cv=none; b=pOej2oCer2mFdZY3r3jJex7XS243En7LUt7fkav7HPPAi4G9FydUiKQnWlQLaeUWzi2VCr HVFKH1Ft8ptbJvnanKvuVRe7L+jdQ4aBmGMnsOCtJjQia1kxw0XzYKMGAkjfJzOT9+LKVq 3cWc1n5uwgKMQKlEaeaQ8ZKUANkLAcZyJNi1eWkj3nDesYQSAaOj3EEQycc5CIIq/xZlSm 818XmSVhsKi1+V8y41jvixKkiRpuGE5w/k2YGNgaFvzxD8vctswRg2u6sK1NlVWb2ZnUBO YSHetGQj12b96TFbR3W5MnBb+tP76B4EWXOhv0j5lVnlZIf75RQ0sr3LKkGi7g== X-Migadu-Scanner: scn1.migadu.com X-Migadu-Spam-Score: -1.58 X-Spam-Score: -1.58 X-Migadu-Queue-Id: 9B56C42AFD Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-TUID: tkl2ykCPHuZX * 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 -- 2.38.1