rpms/389-ds-base
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Bump version to 2.0.8-6

Browse Source 
Resolves: Bug 2011397 - Not able to preserve users using "ipa user-del --preserve"
This commit is contained in:
Mark Reynolds 2021-10-06 10:33:41 -04:00
parent 6e34cb6e7a
commit 8cdec9a6ec
2 changed files with 46 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
0003-Issue-4169-backport-lib389-cert-list-fix.patch Normal file
View File

@ -0,0 +1,40 @@
From 91b90f583bf4046325438954523c78ea4f33d607 Mon Sep 17 00:00:00 2001
From: Mark Reynolds <mreynolds@redhat.com>
Date: Fri, 10 Sep 2021 09:39:57 -0400
Subject: [PATCH] Issue 4169 - backport lib389 cert list fix
Description: We didn't call ensure_str() on the output from certutil
commands
relates: https://github.com/389ds/389-ds-base/issues/4169
Reviewed by: mreynolds(one line commit rule)
---
src/lib389/lib389/nss_ssl.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/lib389/lib389/nss_ssl.py b/src/lib389/lib389/nss_ssl.py
index 1cd2768f1..6dc0c26d3 100644
--- a/src/lib389/lib389/nss_ssl.py
+++ b/src/lib389/lib389/nss_ssl.py
@@ -325,7 +325,7 @@ only.
]
self.log.debug("nss cmd: %s", format_cmd_list(cmd))
try:
- certdetails = check_output(cmd, stderr=subprocess.STDOUT, encoding='utf-8')
+ certdetails = ensure_str(check_output(cmd, stderr=subprocess.STDOUT, encoding='utf-8'))
except subprocess.CalledProcessError as e:
raise ValueError(e.output.decode('utf-8').rstrip())
end_date_str = certdetails.split("Not After : ")[1].split("\n")[0]
@@ -905,7 +905,7 @@ only.
except subprocess.CalledProcessError as e:
raise ValueError(e.output.decode('utf-8').rstrip())
- return result
+ return ensure_str(result)
def get_cert_details(self, nickname):
--
2.31.1

7
389-ds-base.spec
View File

@ -47,7 +47,7 @@ ExcludeArch: i686
Summary: 389 Directory Server (base)
Name: 389-ds-base
Version: 2.0.8
Release: 5%{?dist}
Release: 6%{?dist}
License: GPLv3+ and ASL 2.0 and MPLv2.0 and Boost
URL: https://www.port389.org
Conflicts: selinux-policy-base < 3.9.8
@ -258,6 +258,7 @@ Source3: https://github.com/jemalloc/%{jemalloc_name}/releases/download
%endif
Patch01: 0001-Issue-4884-server-crashes-when-dnaInterval-attribute.patch
Patch02: 0002-Issue-4894-IPA-failure-in-ipa-user-del-preserve-4907.patch
Patch03: 0003-Issue-4169-backport-lib389-cert-list-fix.patch
%description
389 Directory Server is an LDAPv3 compliant server. The base package includes
@ -707,6 +708,10 @@ exit 0
%endif
%changelog
* Fri Sep 17 2021 Mark Reynolds <mreynolds@redhat.com> - 2.0.8-6
- Bump version to 2.0.8-6
- Resolves: Bug 2000420 - Not able to preserve users using "ipa user-del --preserve"
* Fri Sep 17 2021 Mark Reynolds <mreynolds@redhat.com> - 2.0.8-5
- Bump version to 2.0.8-5
- Resolves: Bug 2000420 - Not able to preserve users using "ipa user-del --preserve"