From b5e201aa50d854c8a38efafd6a12ef04ea4cc5b1 Mon Sep 17 00:00:00 2001 From: Tomas Mraz Date: Oct 29 2019 10:34:51 +0000 Subject: Drop patch that is already included in the tarball --- diff --git a/crypto-policies-fips-mode-check.patch b/crypto-policies-fips-mode-check.patch deleted file mode 100644 index 39678d9..0000000 --- a/crypto-policies-fips-mode-check.patch +++ /dev/null @@ -1,25 +0,0 @@ -commit 22ec79bdfe2970ab70e0a137a481421e3fdd5188 -Author: Tomas Mraz -Date: Tue Sep 10 15:49:44 2019 +0200 - - fips-mode-setup: Fix the --check option behavior on containers - - Also ignore lsinitrd failure due to permission denied. - -diff --git a/fips-mode-setup b/fips-mode-setup -index 27754a6..688bfc6 100755 ---- a/fips-mode-setup -+++ b/fips-mode-setup -@@ -63,8 +63,10 @@ if test $usage = 1 -o x$enable_fips = x ; then - exit 2 - fi - --if test -f /etc/system-fips && test x"$(lsinitrd -f etc/system-fips)" != x ; then -- fips_install_complete=1 -+if test -f /etc/system-fips ; then -+ if test ! -x /usr/bin/lsinitrd || test x"$(/usr/bin/lsinitrd -f etc/system-fips 2>/dev/null || test $? = 2 && echo y)" != x ; then -+ fips_install_complete=1 -+ fi - fi - - if test $check = 1 ; then diff --git a/crypto-policies.spec b/crypto-policies.spec index 1815dac..e7bb558 100644 --- a/crypto-policies.spec +++ b/crypto-policies.spec @@ -13,8 +13,6 @@ License: LGPLv2+ 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: crypto-policies-fips-mode-check.patch - BuildArch: noarch BuildRequires: asciidoc BuildRequires: libxslt @@ -64,7 +62,6 @@ The package provides a tool to enable or disable the system FIPS mode. %prep %setup -q -n fedora-crypto-policies-%{git_commit_hash}-%{git_commit} -%patch1 -p1 -b .check %build %make_build