From d083205eeb3fc783215ced94d7a9a0257d3bf2a4 Mon Sep 17 00:00:00 2001 From: Alexey Berezhok Date: Tue, 30 Jan 2024 12:15:05 +0300 Subject: [PATCH] Added debug patch for checking fail in build (added arch info). third fix --- ...OST-policy-also-added-experimental-PAM-genera.patch | 10 +++++----- SPECS/crypto-policies.spec | 1 - 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/SOURCES/0001-Added-GOST-policy-also-added-experimental-PAM-genera.patch b/SOURCES/0001-Added-GOST-policy-also-added-experimental-PAM-genera.patch index 2e4cc86..033c1a1 100644 --- a/SOURCES/0001-Added-GOST-policy-also-added-experimental-PAM-genera.patch +++ b/SOURCES/0001-Added-GOST-policy-also-added-experimental-PAM-genera.patch @@ -1,4 +1,4 @@ -From ba6573835fe5828325048ad46c75f2d72c650f3b Mon Sep 17 00:00:00 2001 +From dc95ab82c6a961755c8d06949ca02c1685dca275 Mon Sep 17 00:00:00 2001 From: Alexey Berezhok Date: Tue, 23 Jan 2024 23:01:57 +0300 Subject: [PATCH] Added GOST policy also added experimental PAM generator @@ -720,7 +720,7 @@ index 0000000..37e478b +action_do = GOST diff --git a/policies/modules/GOST.pmod b/policies/modules/GOST.pmod new file mode 100644 -index 0000000..019e063 +index 0000000..b9021ea --- /dev/null +++ b/policies/modules/GOST.pmod @@ -0,0 +1,18 @@ @@ -754,7 +754,7 @@ index 0000000..9082402 + +authopt@AUTH = custom/sssd_gost with-gost with-fingerprint with-silent-lastlog diff --git a/python/build-crypto-policies.py b/python/build-crypto-policies.py -index c04d518..2eab19b 100755 +index c04d518..90a0772 100755 --- a/python/build-crypto-policies.py +++ b/python/build-crypto-policies.py @@ -9,6 +9,7 @@ import argparse @@ -769,11 +769,11 @@ index c04d518..2eab19b 100755 try: with open(path, mode='r', encoding='utf-8') as f: old_config = f.read() -+ if '[gost_section]' in old_config: ++ if '[gost_section]' in config: + arch, links = platform.architecture() + if arch == '32bit': + #Make test expected file same for x86 and x86_64 systems -+ old_config = old_config.replace('dynamic_path = /usr/lib/engines-3/gost.so', 'dynamic_path = /usr/lib64/engines-3/gost.so') ++ config = config.replace('dynamic_path = /usr/lib/engines-3/gost.so', 'dynamic_path = /usr/lib64/engines-3/gost.so') if old_config != config: eprint(f'Config for {config_name} for policy {policy_name} ' 'differs from the existing one') diff --git a/SPECS/crypto-policies.spec b/SPECS/crypto-policies.spec index c7b0244..092f578 100644 --- a/SPECS/crypto-policies.spec +++ b/SPECS/crypto-policies.spec @@ -35,7 +35,6 @@ URL: https://gitlab.com/redhat-crypto/fedora-crypto-policies # For RHEL-9.3 we use the upstream branch rhel9.3 and are freezing version at 20230731-1.git94f0e2c. Source0: https://gitlab.com/redhat-crypto/fedora-crypto-policies/-/archive/%{git_commit_hash}/%{name}-git%{git_commit_hash}.tar.gz Patch1: 0001-Added-GOST-policy-also-added-experimental-PAM-genera.patch -Patch100: check_uexpected.patch BuildArch: noarch BuildRequires: asciidoc