From patchwork Wed Aug 23 22:35:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruno Victal X-Patchwork-Id: 53132 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 3A55327BBE9; Wed, 23 Aug 2023 23:38:24 +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=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 18C6727BBE2 for ; Wed, 23 Aug 2023 23:38:22 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qYwTV-00085i-Uf; Wed, 23 Aug 2023 18:37:17 -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 ) id 1qYwTS-00082J-ME for guix-patches@gnu.org; Wed, 23 Aug 2023 18:37:14 -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 ) id 1qYwTS-0004zq-DF for guix-patches@gnu.org; Wed, 23 Aug 2023 18:37:14 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qYwTW-0004El-0j for guix-patches@gnu.org; Wed, 23 Aug 2023 18:37:18 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65479] [PATCH core-updates 25/61] gnu: secilc: Drop xmlto workaround. Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 23 Aug 2023 22:37:17 +0000 Resent-Message-ID: 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 Received: via spool by 65479-submit@debbugs.gnu.org id=B65479.169283022816095 (code B ref 65479); Wed, 23 Aug 2023 22:37:17 +0000 Received: (at 65479) by debbugs.gnu.org; 23 Aug 2023 22:37:08 +0000 Received: from localhost ([127.0.0.1]:35435 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qYwTL-0004BF-1a for submit@debbugs.gnu.org; Wed, 23 Aug 2023 18:37:07 -0400 Received: from smtpm2.myservices.hosting ([185.26.105.233]:37444) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qYwT5-00045t-Ft for 65479@debbugs.gnu.org; Wed, 23 Aug 2023 18:36:52 -0400 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpm2.myservices.hosting (Postfix) with ESMTP id 80BA620E8C for <65479@debbugs.gnu.org>; Thu, 24 Aug 2023 00:36:14 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id E62658009A; Thu, 24 Aug 2023 00:36:13 +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 JffbC2h_osuL; Thu, 24 Aug 2023 00:36:13 +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 F2BFD8005B; Thu, 24 Aug 2023 00:36:12 +0200 (CEST) From: Bruno Victal Date: Wed, 23 Aug 2023 23:35:17 +0100 Message-Id: <53f15f25ae12f0c21a03cb3e6fc3848bc8520b8e.1692830149.git.mirai@makinata.eu> X-Mailer: git-send-email 2.40.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 The xmlto error[1] was due to libsepol using an unversioned PUBLIC identifier for DocBook 4.2. [1]: * gnu/packages/patches/libsepol-versioned-docbook.patch: New file. * gnu/local.mk: Register it. * gnu/packages/selinux.scm (libsepol)[source]: Apply it. (secilc)[arguments]: Drop xmlto workaround. [native-inputs]: Add docbook-xml-4.2. --- gnu/local.mk | 1 + .../patches/libsepol-versioned-docbook.patch | 56 +++++++++++++++++++ gnu/packages/selinux.scm | 13 +---- 3 files changed, 60 insertions(+), 10 deletions(-) create mode 100644 gnu/packages/patches/libsepol-versioned-docbook.patch diff --git a/gnu/local.mk b/gnu/local.mk index d4d5f6d3a8..300881d567 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1527,6 +1527,7 @@ dist_patch_DATA = \ %D%/packages/patches/libqalculate-3.8.0-libcurl-ssl-fix.patch \ %D%/packages/patches/libquicktime-ffmpeg.patch \ %D%/packages/patches/librecad-support-for-boost-1.76.patch \ + %D%/packages/patches/libsepol-versioned-docbook.patch \ %D%/packages/patches/libtar-CVE-2013-4420.patch \ %D%/packages/patches/libtgvoip-disable-sse2.patch \ %D%/packages/patches/libtgvoip-disable-webrtc.patch \ diff --git a/gnu/packages/patches/libsepol-versioned-docbook.patch b/gnu/packages/patches/libsepol-versioned-docbook.patch new file mode 100644 index 0000000000..6b39de0a5b --- /dev/null +++ b/gnu/packages/patches/libsepol-versioned-docbook.patch @@ -0,0 +1,56 @@ +# Sent upstream: + +From 260cd39c55ff2d13f5ac916b508f023bedecfce9 Mon Sep 17 00:00:00 2001 +Message-Id: <260cd39c55ff2d13f5ac916b508f023bedecfce9.1692827278.git.mirai@makinata.eu> +From: Bruno Victal +Date: Mon, 14 Aug 2023 15:51:05 +0100 +Subject: [PATCH] secilc: Use versioned DocBook public identifier. + +Fix xml validation issues that often crop up since the XML catalogs +for DocBook often only contain versioned public identifiers. + +Signed-off-by: Bruno Victal +--- + secilc/secil2conf.8.xml | 2 +- + secilc/secil2tree.8.xml | 2 +- + secilc/secilc.8.xml | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/secilc/secil2conf.8.xml b/secilc/secil2conf.8.xml +index 33646f97..330b6a07 100644 +--- a/secilc/secil2conf.8.xml ++++ b/secilc/secil2conf.8.xml +@@ -1,5 +1,5 @@ + +- + + +diff --git a/secilc/secil2tree.8.xml b/secilc/secil2tree.8.xml +index e95a8947..d7bb177e 100644 +--- a/secilc/secil2tree.8.xml ++++ b/secilc/secil2tree.8.xml +@@ -1,5 +1,5 @@ + +- + + +diff --git a/secilc/secilc.8.xml b/secilc/secilc.8.xml +index e9a121e2..5c0680a8 100644 +--- a/secilc/secilc.8.xml ++++ b/secilc/secilc.8.xml +@@ -1,5 +1,5 @@ + +- + + + +base-commit: f6dc6acfa00707ce25c6357169111937f12512dd +-- +2.40.1 + diff --git a/gnu/packages/selinux.scm b/gnu/packages/selinux.scm index c45570744a..3fc88154fa 100644 --- a/gnu/packages/selinux.scm +++ b/gnu/packages/selinux.scm @@ -60,7 +60,8 @@ (define-public libsepol (file-name (git-file-name "selinux" version)) (sha256 (base32 - "1lcmgmfr0q7g5cwg6b7jm6ncw8cw6c1jblkm93v1g37bfhcgrqc0")))) + "1lcmgmfr0q7g5cwg6b7jm6ncw8cw6c1jblkm93v1g37bfhcgrqc0")) + (patches (search-patches "libsepol-versioned-docbook.patch")))) (build-system gnu-build-system) (arguments (list @@ -231,14 +232,6 @@ (define-public secilc (name "secilc") (arguments (substitute-keyword-arguments (package-arguments libsepol) - ((#:make-flags flags) - #~(let ((xsl (search-input-directory %build-inputs "xml/xsl"))) - (cons (string-append "XMLTO=xmlto --skip-validation -x " - xsl "/docbook-xsl-" - #$(package-version - (this-package-native-input "docbook-xsl")) - "/manpages/docbook.xsl") - #$flags))) ((#:phases phases) #~(modify-phases #$phases (delete 'portability) @@ -247,7 +240,7 @@ (define-public secilc (inputs (list libsepol)) (native-inputs - (list xmlto docbook-xsl)) + (list docbook-xml-4.2 docbook-xsl xmlto)) (synopsis "SELinux common intermediate language (CIL) compiler") (description "The SELinux CIL compiler is a compiler that converts the @dfn{common intermediate language} (CIL) into a kernel binary policy file.")