From 2ca91d9a63acdc80558db9c00016bb17f7256670 Mon Sep 17 00:00:00 2001 From: yixiangzhike Date: Mon, 27 Feb 2023 16:40:53 +0800 Subject: [PATCH] update Makefile for asciidoc-10 Signed-off-by: yixiangzhike --- ...-overriding-asciidoc-executable-name.patch | 36 ++++++++++++++++++ ...port-Makefile-update-for-asciidoc-10.patch | 38 +++++++++++++++++++ crypto-policies.spec | 8 +++- 3 files changed, 81 insertions(+), 1 deletion(-) create mode 100644 backport-Makefile-support-overriding-asciidoc-executable-name.patch create mode 100644 backport-Makefile-update-for-asciidoc-10.patch diff --git a/backport-Makefile-support-overriding-asciidoc-executable-name.patch b/backport-Makefile-support-overriding-asciidoc-executable-name.patch new file mode 100644 index 0000000..9a5af46 --- /dev/null +++ b/backport-Makefile-support-overriding-asciidoc-executable-name.patch @@ -0,0 +1,36 @@ +From 66c30b1e2de5fd37d610463a8fb6e70f6164fecc Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= +Date: Mon, 7 Nov 2022 16:56:43 +0100 +Subject: [PATCH] Makefile: support overriding asciidoc executable name + +Support `ASCIIDOC` override to specify another name for the asciidoc +executable. On Gentoo, only `asciidoc` is installed and there is no +`asciidoc.py`. Furthermore, this makes it possible to easily use +asciidoctor in place of asciidoc. +--- + Makefile | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 0d93587..f99dc6d 100644 +--- a/Makefile ++++ b/Makefile +@@ -10,5 +10,6 @@ SCRIPTS=update-crypto-policies fips-finish-install fips-mode-setup + NUM_PROCS = $$(getconf _NPROCESSORS_ONLN) + PYVERSION = -3 ++ASCIIDOC?=asciidoc.py + + all: build + +@@ -109,7 +110,7 @@ clean: + rm -rf output + + %: %.txt +- asciidoc.py -v -d manpage -b docbook $< ++ $(ASCIIDOC) -v -d manpage -b docbook $< + xsltproc --nonet -o $@ /usr/share/asciidoc/docbook-xsl/manpage.xsl $@.xml + + dist: +-- +2.27.0 + diff --git a/backport-Makefile-update-for-asciidoc-10.patch b/backport-Makefile-update-for-asciidoc-10.patch new file mode 100644 index 0000000..a7694aa --- /dev/null +++ b/backport-Makefile-update-for-asciidoc-10.patch @@ -0,0 +1,38 @@ +From 8c7de0471c1de088ff3c332590ea91a71d4273c0 Mon Sep 17 00:00:00 2001 +From: Alexander Sosedkin +Date: Mon, 20 Feb 2023 11:39:28 +0100 +Subject: [PATCH] Makefile: update for asciidoc 10 + +--- + Makefile | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +diff --git a/Makefile b/Makefile +index f99dc6d..e99ca19 100644 +--- a/Makefile ++++ b/Makefile +@@ -10,6 +10,11 @@ SCRIPTS=update-crypto-policies fips-finish-install fips-mode-setup + NUM_PROCS = $$(getconf _NPROCESSORS_ONLN) + PYVERSION = -3 +-ASCIIDOC?=asciidoc.py ++ASCIIDOC?=asciidoc ++ifneq ("$(wildcard /usr/lib/python*/*/asciidoc/resources/docbook-xsl/manpage.xsl)","") ++MANPAGEXSL?=$(wildcard /usr/lib/python*/*/asciidoc/resources/docbook-xsl/manpage.xsl) ++else ++MANPAGEXSL?=/usr/share/asciidoc/docbook-xsl/manpage.xsl ++endif + + all: build + +@@ -111,7 +116,7 @@ clean: + + %: %.txt + $(ASCIIDOC) -v -d manpage -b docbook $< +- xsltproc --nonet -o $@ /usr/share/asciidoc/docbook-xsl/manpage.xsl $@.xml ++ xsltproc --nonet -o $@ ${MANPAGEXSL} $@.xml + + dist: + rm -rf crypto-policies && git clone . crypto-policies && rm -rf crypto-policies/.git/ && tar -czf crypto-policies-git$(VERSION).tar.gz crypto-policies && rm -rf crypto-policies +-- +2.27.0 + diff --git a/crypto-policies.spec b/crypto-policies.spec index fb8b091..17528fc 100644 --- a/crypto-policies.spec +++ b/crypto-policies.spec @@ -4,7 +4,7 @@ Name: crypto-policies Version: %{git_date} -Release: 3.git%{git_commit_hash} +Release: 4.git%{git_commit_hash} Summary: Crypto policies package for Fedora License: LGPLv2+ @@ -18,6 +18,8 @@ Patch0: backport-rewrite-test-nss-pl-in-python.patch Patch1: backport-policygenerators-nss-output-sigalgs-nss-3-59.patch Patch2: crypto-policies-tests-outputs-NEXT-nss-output-sigalgs-nss-3-59.patch Patch3: backport-Describe-some-of-the-quirks-of-the-back-end-config-g.patch +Patch4: backport-Makefile-support-overriding-asciidoc-executable-name.patch +Patch5: backport-Makefile-update-for-asciidoc-10.patch BuildArch: noarch BuildRequires: asciidoc @@ -149,6 +151,10 @@ make check %{?_smp_mflags} %license COPYING.LESSER %changelog +* Mon Feb 27 2023 yixiangzhike - 20200619-4.git781bbd4 +- Makefile support overriding asciidoc executable name +- update Makefile for asciidoc 10 + * Thu Oct 20 2022 yixiangzhike - 20200619-3.git781bbd4 - backport upstream patch to add more notes for crypto-policies exceptions -- Gitee