diff --git a/crypto-policies-git5f3458e.tar.gz b/crypto-policies-git5f3458e.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..e45fe61ba71794b5e11e6017611f5f34032c9c2e Binary files /dev/null and b/crypto-policies-git5f3458e.tar.gz differ diff --git a/crypto-policies-gita4c31a3.tar.gz b/crypto-policies-gita4c31a3.tar.gz deleted file mode 100644 index a1d90fe8dd69a4e7fa0ccf84dc5b0ebb9f7ed026..0000000000000000000000000000000000000000 Binary files a/crypto-policies-gita4c31a3.tar.gz and /dev/null differ diff --git a/crypto-policies.spec b/crypto-policies.spec index 431203ca56baffae7cdd1ad1b7e03b082a27eeaf..f541ae5cbe04269e9ba9ddd76949b92a10e0f86a 100644 --- a/crypto-policies.spec +++ b/crypto-policies.spec @@ -1,6 +1,6 @@ -%define anolis_release 5 -%global git_date 20221215 -%global git_commit a4c31a34711325447363d87ba9fec5bb5535903a +%define anolis_release 1 +%global git_date 20230614 +%global git_commit 5f3458e619628288883f22695f3311f1ccd6a39f %{?git_commit:%global git_commit_hash %(c=%{git_commit}; echo ${c:0:7})} %bcond_with check %global _python_bytecompile_extra 0 @@ -14,8 +14,6 @@ License: LGPLv2.1+ URL: https://gitlab.com/redhat-crypto/fedora-crypto-policies Source0: https://gitlab.com/redhat-crypto/fedora-crypto-policies/-/archive/%{git_commit_hash}/%{name}-git%{git_commit_hash}.tar.gz -Patch1: update-for-asciidoc-10.patch - BuildArch: noarch BuildRequires: asciidoc BuildRequires: libxslt @@ -192,6 +190,7 @@ end %ghost %config(missingok,noreplace) %verify(not mode) %{_sysconfdir}/crypto-policies/back-ends/libreswan.config %ghost %config(missingok,noreplace) %verify(not mode) %{_sysconfdir}/crypto-policies/back-ends/libssh.config %ghost %config(missingok,noreplace) %verify(not mode) %{_sysconfdir}/crypto-policies/back-ends/sequoia.config +%ghost %config(missingok,noreplace) %verify(not mode) %{_sysconfdir}/crypto-policies/back-ends/rpm-sequoia.config # %verify(not mode) comes from the fact # these turn into symlinks and back to regular files at will, see bz1898986 @@ -225,6 +224,9 @@ end %doc NEWS README.md CONTRIBUTING.md %changelog +* Wed Feb 28 2024 mgb01105731 - 20230614-1 +- update to 20230614 + * Thu Oct 12 2023 Jingyun Hua - 20221215-5 - fix BuildRequires package for loongarch64 diff --git a/update-for-asciidoc-10.patch b/update-for-asciidoc-10.patch deleted file mode 100644 index 6f0df57868c0f6ef909a6bf00563fd6b9bfcaa3a..0000000000000000000000000000000000000000 --- a/update-for-asciidoc-10.patch +++ /dev/null @@ -1,39 +0,0 @@ -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,7 +10,12 @@ SCRIPTS=update-crypto-policies fips-finish-install fips-mode-setup - NUM_PROCS = $$(getconf _NPROCESSORS_ONLN) - PYVERSION = -3 - DIFFTOOL?=meld --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 --- -GitLab -