From 77066cdb40c49598354c760d0747770b6545d084 Mon Sep 17 00:00:00 2001 From: Thierry Bordaz Date: Thu, 25 Nov 2021 13:24:22 +0100 Subject: [PATCH] Bump version to 2.0.11-2 Revert commit "Set db home directory by default" Resolves: rhbz#2024693 --- 389-ds-base-revert-db-home-fix.patch | 49 ++++++++++++++++++++++++++++ 389-ds-base.spec | 9 ++++- 2 files changed, 57 insertions(+), 1 deletion(-) create mode 100644 389-ds-base-revert-db-home-fix.patch diff --git a/389-ds-base-revert-db-home-fix.patch b/389-ds-base-revert-db-home-fix.patch new file mode 100644 index 0000000..c4f41d9 --- /dev/null +++ b/389-ds-base-revert-db-home-fix.patch @@ -0,0 +1,49 @@ +From ec74c73eaa56271ce74e985ab6a69b36e98488e4 Mon Sep 17 00:00:00 2001 +From: Simon Pichugin +Date: Wed, 24 Nov 2021 08:35:17 -0800 +Subject: [PATCH] Revert "Issue 2790 - Set db home directory by default" + +This reverts commit 269f1f8e879a6fc098bb8cff780df6915e8ecb38. +--- + ldap/admin/src/defaults.inf.in | 2 +- + src/lib389/lib389/instance/setup.py | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/ldap/admin/src/defaults.inf.in b/ldap/admin/src/defaults.inf.in +index 28f908bcd..96a3b3eb1 100644 +--- a/ldap/admin/src/defaults.inf.in ++++ b/ldap/admin/src/defaults.inf.in +@@ -59,7 +59,7 @@ access_log = @localstatedir@/log/dirsrv/slapd-{instance_name}/access + audit_log = @localstatedir@/log/dirsrv/slapd-{instance_name}/audit + error_log = @localstatedir@/log/dirsrv/slapd-{instance_name}/errors + db_dir = @localstatedir@/lib/dirsrv/slapd-{instance_name}/db +-db_home_dir = /dev/shm/slapd-{instance_name} ++db_home_dir = @localstatedir@/lib/dirsrv/slapd-{instance_name}/db + backup_dir = @localstatedir@/lib/dirsrv/slapd-{instance_name}/bak + ldif_dir = @localstatedir@/lib/dirsrv/slapd-{instance_name}/ldif + +diff --git a/src/lib389/lib389/instance/setup.py b/src/lib389/lib389/instance/setup.py +index 0669e5856..4cbdda4fc 100644 +--- a/src/lib389/lib389/instance/setup.py ++++ b/src/lib389/lib389/instance/setup.py +@@ -775,7 +775,7 @@ class SetupDs(object): + self.log.info("Create file system structures ...") + # Create all the needed paths + # we should only need to make bak_dir, cert_dir, config_dir, db_dir, ldif_dir, lock_dir, log_dir, run_dir? +- for path in ('backup_dir', 'cert_dir', 'db_dir', 'db_home_dir', 'ldif_dir', 'lock_dir', 'log_dir', 'run_dir'): ++ for path in ('backup_dir', 'cert_dir', 'db_dir', 'ldif_dir', 'lock_dir', 'log_dir', 'run_dir'): + self.log.debug("ACTION: creating %s", slapd[path]) + try: + os.umask(0o007) # For parent dirs that get created -> sets 770 for perms +@@ -912,7 +912,7 @@ class SetupDs(object): + if general['selinux']: + self.log.info("Perform SELinux labeling ...") + selinux_paths = ('backup_dir', 'cert_dir', 'config_dir', 'db_dir', +- 'ldif_dir', 'lock_dir', 'log_dir', 'db_home_dir', ++ 'ldif_dir', 'lock_dir', 'log_dir', + 'run_dir', 'schema_dir', 'tmp_dir') + for path in selinux_paths: + selinux_restorecon(slapd[path]) +-- +2.31.1 + diff --git a/389-ds-base.spec b/389-ds-base.spec index 2d24f84..05eb03f 100644 --- a/389-ds-base.spec +++ b/389-ds-base.spec @@ -47,7 +47,7 @@ ExcludeArch: i686 Summary: 389 Directory Server (base) Name: 389-ds-base Version: 2.0.11 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv3+ and ASL 2.0 and MPLv2.0 and Boost URL: https://www.port389.org Conflicts: selinux-policy-base < 3.9.8 @@ -262,6 +262,9 @@ Source2: %{name}-devel.README Source3: https://github.com/jemalloc/%{jemalloc_name}/releases/download/%{jemalloc_ver}/%{jemalloc_name}-%{jemalloc_ver}.tar.bz2 %endif +# The patch should be removed after selinux-policy bz2015928 is fixed +Patch0: 389-ds-base-revert-db-home-fix.patch + %description 389 Directory Server is an LDAPv3 compliant server. The base package includes the LDAP server and command line utilities for server administration. @@ -709,6 +712,10 @@ exit 0 %endif %changelog +* Thu Nov 25 2021 Thierry Bordaz - 2.0.11-2 +- Bump version to 2.0.11-2 +- Revert commit "Set db home directory by default" + * Thu Nov 18 2021 Mark Reynolds - 2.0.11-1 - Bump version to 2.0.11-1 - Resolves: Bug 2024693 - Rebase RHEL 9.0 with 389-ds-base