The FixSELinuxContexts upgrade script has been removed temporarily due to a problem importing selinux library during RPM upgrade.
The FixDeploymentDescriptor script number has been changed accordingly. The code in the RPM spec that moves the upgrade scripts has been updated to reflect the FixSELinuxContexts deletion. The libselinux-python is used by deployment and upgrade scripts to set the SELinux contexts, so a direct runtime dependency has been added to the RPM spec file. The duplicate python-ldap and python-lxml dependencies have been removed. https://fedorahosted.org/pki/ticket/2452 -- Endi S. Dewata
>From e9d990248c59cb9216484101a98c9c42e0dfc44d Mon Sep 17 00:00:00 2001 From: "Endi S. Dewata" <[email protected]> Date: Wed, 7 Sep 2016 00:35:40 +0200 Subject: [PATCH] Removed FixSELinuxContexts upgrade script. The FixSELinuxContexts upgrade script has been removed temporarily due to a problem importing selinux library during RPM upgrade. The FixDeploymentDescriptor script number has been changed accordingly. https://fedorahosted.org/pki/ticket/2452 --- ...oymentDescriptor => 02-FixDeploymentDescriptor} | 0 base/server/upgrade/10.3.5/02-FixSELinuxContexts | 36 ---------------------- 2 files changed, 36 deletions(-) rename base/server/upgrade/10.3.5/{03-FixDeploymentDescriptor => 02-FixDeploymentDescriptor} (100%) delete mode 100644 base/server/upgrade/10.3.5/02-FixSELinuxContexts diff --git a/base/server/upgrade/10.3.5/03-FixDeploymentDescriptor b/base/server/upgrade/10.3.5/02-FixDeploymentDescriptor similarity index 100% rename from base/server/upgrade/10.3.5/03-FixDeploymentDescriptor rename to base/server/upgrade/10.3.5/02-FixDeploymentDescriptor diff --git a/base/server/upgrade/10.3.5/02-FixSELinuxContexts b/base/server/upgrade/10.3.5/02-FixSELinuxContexts deleted file mode 100644 index f3d981efac5d69515387b424ac6e04733f5e3a7d..0000000000000000000000000000000000000000 --- a/base/server/upgrade/10.3.5/02-FixSELinuxContexts +++ /dev/null @@ -1,36 +0,0 @@ -#!/usr/bin/python -# Authors: -# Endi S. Dewata <[email protected]> -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License along -# with this program; if not, write to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Copyright (C) 2016 Red Hat, Inc. -# All rights reserved. - -from __future__ import absolute_import -import selinux -import pki.server.upgrade - - -class FixSELinuxContexts(pki.server.upgrade.PKIServerUpgradeScriptlet): - - def __init__(self): - super(FixSELinuxContexts, self).__init__() - self.message = 'Fix SELinux contexts' - - def upgrade_instance(self, instance): - - selinux.restorecon(instance.base_dir, True) - selinux.restorecon(instance.conf_dir, True) - selinux.restorecon(instance.log_dir, True) -- 2.5.5
>From f6c7e64501aec6934156d773b9229a3661df05e3 Mon Sep 17 00:00:00 2001 From: "Endi S. Dewata" <[email protected]> Date: Tue, 6 Sep 2016 22:56:49 +0200 Subject: [PATCH] Updated RPM spec. The code in the RPM spec that moves the upgrade scripts has been updated to reflect the FixSELinuxContexts deletion. The libselinux-python is used by deployment and upgrade scripts to set the SELinux contexts, so a direct runtime dependency has been added to the RPM spec file. The duplicate python-ldap and python-lxml dependencies have been removed. https://fedorahosted.org/pki/ticket/2452 --- specs/pki-core.spec | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/specs/pki-core.spec b/specs/pki-core.spec index 76ef0440fe275b6e7a95eba2a47e5048ef1d1144..efdde69e6cbac86b67dfea03331fbbd9fe7be976 100644 --- a/specs/pki-core.spec +++ b/specs/pki-core.spec @@ -505,9 +505,6 @@ Requires: java-1.8.0-openjdk-headless Requires: hostname Requires: net-tools -Requires: python-ldap -Requires: python-lxml - %if 0%{?rhel} Requires: nuxwdog-client-java >= 1.0.1-11 %else @@ -521,6 +518,7 @@ Requires: pki-base-java = %{version}-%{release} Requires: pki-tools = %{version}-%{release} Requires: python-ldap Requires: python-lxml +Requires: libselinux-python Requires: policycoreutils-python %if 0%{?fedora} >= 23 Requires: policycoreutils-python-utils @@ -924,8 +922,7 @@ fi # Customize server upgrade scripts in /usr/share/pki/server/upgrade %if 0%{?rhel} mv %{buildroot}%{_datadir}/pki/server/upgrade/10.3.5/01-FixServerLibrary %{buildroot}%{_datadir}/pki/server/upgrade/10.3.3/02-FixServerLibrary -mv %{buildroot}%{_datadir}/pki/server/upgrade/10.3.5/02-FixSELinuxContexts %{buildroot}%{_datadir}/pki/server/upgrade/10.3.3/03-FixSELinuxContexts -mv %{buildroot}%{_datadir}/pki/server/upgrade/10.3.5/03-FixDeploymentDescriptor %{buildroot}%{_datadir}/pki/server/upgrade/10.3.3/04-FixDeploymentDescriptor +mv %{buildroot}%{_datadir}/pki/server/upgrade/10.3.5/02-FixDeploymentDescriptor %{buildroot}%{_datadir}/pki/server/upgrade/10.3.3/03-FixDeploymentDescriptor /bin/rm -rf %{buildroot}%{_datadir}/pki/server/upgrade/10.3.4 /bin/rm -rf %{buildroot}%{_datadir}/pki/server/upgrade/10.3.5 %endif -- 2.5.5
_______________________________________________ Pki-devel mailing list [email protected] https://www.redhat.com/mailman/listinfo/pki-devel
