|
 |
a47729 |
From 0d44e959e5bbe822b51137a8e7cf48fa25533805 Mon Sep 17 00:00:00 2001
|
|
|
a47729 |
From: Rafael Guterres Jeffman <rjeffman@redhat.com>
|
|
|
a47729 |
Date: Fri, 10 Dec 2021 12:15:36 -0300
|
|
|
a47729 |
Subject: [PATCH] Revert "freeipa.spec: depend on bind-dnssec-utils"
|
|
|
a47729 |
|
|
|
a47729 |
This reverts commit f89d59b6e18b54967682f6a37ce92ae67ab3fcda.
|
|
|
a47729 |
---
|
|
|
a47729 |
freeipa.spec.in | 4 +---
|
|
|
a47729 |
ipaplatform/base/paths.py | 2 +-
|
|
|
a47729 |
ipaplatform/fedora/paths.py | 1 +
|
|
|
a47729 |
ipaserver/dnssec/bindmgr.py | 1 -
|
|
|
a47729 |
4 files changed, 3 insertions(+), 5 deletions(-)
|
|
|
a47729 |
|
|
|
a47729 |
diff --git a/freeipa.spec.in b/freeipa.spec.in
|
|
|
a47729 |
index 8f5c370e5..e20edb7bc 100755
|
|
|
a47729 |
--- a/freeipa.spec.in
|
|
|
a47729 |
+++ b/freeipa.spec.in
|
|
|
a47729 |
@@ -576,11 +576,9 @@ Requires: %{name}-server = %{version}-%{release}
|
|
|
a47729 |
Requires: bind-dyndb-ldap >= 11.2-2
|
|
|
a47729 |
Requires: bind >= %{bind_version}
|
|
|
a47729 |
Requires: bind-utils >= %{bind_version}
|
|
|
a47729 |
-# bind-dnssec-utils is required by the OpenDNSSec integration
|
|
|
a47729 |
-# https://pagure.io/freeipa/issue/9026
|
|
|
a47729 |
-Requires: bind-dnssec-utils >= %{bind_version}
|
|
|
a47729 |
%if %{with bind_pkcs11}
|
|
|
a47729 |
Requires: bind-pkcs11 >= %{bind_version}
|
|
|
a47729 |
+Requires: bind-pkcs11-utils >= %{bind_version}
|
|
|
a47729 |
%else
|
|
|
a47729 |
Requires: softhsm >= %{softhsm_version}
|
|
|
a47729 |
Requires: openssl-pkcs11 >= %{openssl_pkcs11_version}
|
|
|
a47729 |
diff --git a/ipaplatform/base/paths.py b/ipaplatform/base/paths.py
|
|
|
a47729 |
index 7d21367ec..42a47f1df 100644
|
|
|
a47729 |
--- a/ipaplatform/base/paths.py
|
|
|
a47729 |
+++ b/ipaplatform/base/paths.py
|
|
|
3413ae |
@@ -259,7 +259,6 @@ class BasePathNamespace:
|
|
|
a47729 |
IPA_PKI_RETRIEVE_KEY = "/usr/libexec/ipa/ipa-pki-retrieve-key"
|
|
|
a47729 |
IPA_HTTPD_PASSWD_READER = "/usr/libexec/ipa/ipa-httpd-pwdreader"
|
|
|
a47729 |
IPA_PKI_WAIT_RUNNING = "/usr/libexec/ipa/ipa-pki-wait-running"
|
|
|
a47729 |
- DNSSEC_KEYFROMLABEL = "/usr/sbin/dnssec-keyfromlabel"
|
|
|
a47729 |
+ DNSSEC_KEYFROMLABEL = "/usr/sbin/dnssec-keyfromlabel-pkcs11"
|
|
|
3413ae |
- DNSSEC_KEYFROMLABEL_9_17 = "/usr/bin/dnssec-keyfromlabel"
|
|
|
a47729 |
GETSEBOOL = "/usr/sbin/getsebool"
|
|
|
a47729 |
GROUPADD = "/usr/sbin/groupadd"
|
|
|
a47729 |
diff --git a/ipaplatform/fedora/paths.py b/ipaplatform/fedora/paths.py
|
|
|
a47729 |
index 4e993c063..92a948966 100644
|
|
|
a47729 |
--- a/ipaplatform/fedora/paths.py
|
|
|
a47729 |
+++ b/ipaplatform/fedora/paths.py
|
|
|
a47729 |
@@ -36,6 +36,7 @@ class FedoraPathNamespace(RedHatPathNamespace):
|
|
|
a47729 |
NAMED_CRYPTO_POLICY_FILE = "/etc/crypto-policies/back-ends/bind.config"
|
|
|
a47729 |
if HAS_NFS_CONF:
|
|
|
a47729 |
SYSCONFIG_NFS = '/etc/nfs.conf'
|
|
|
a47729 |
+ DNSSEC_KEYFROMLABEL = "/usr/sbin/dnssec-keyfromlabel"
|
|
|
3413ae |
|
|
|
3413ae |
|
|
|
a47729 |
paths = FedoraPathNamespace()
|
|
|
a47729 |
diff --git a/ipaserver/dnssec/bindmgr.py b/ipaserver/dnssec/bindmgr.py
|
|
|
a47729 |
index 0c79cc03d..a15c0e601 100644
|
|
|
a47729 |
--- a/ipaserver/dnssec/bindmgr.py
|
|
|
a47729 |
+++ b/ipaserver/dnssec/bindmgr.py
|
|
|
a47729 |
@@ -127,7 +127,6 @@ class BINDMgr:
|
|
|
a47729 |
)
|
|
|
a47729 |
cmd = [
|
|
|
a47729 |
paths.DNSSEC_KEYFROMLABEL,
|
|
|
a47729 |
- '-E', 'pkcs11',
|
|
|
a47729 |
'-K', workdir,
|
|
|
a47729 |
'-a', attrs['idnsSecAlgorithm'][0],
|
|
|
a47729 |
'-l', uri
|
|
|
3413ae |
--
|
|
|
a47729 |
2.31.1
|