The Identity, Policy and Audit system
CentOS Sources
2016-08-02 198fa5c96263dd198525085552df13866301dd64
debrand ipa-4.2.0-15.el7_2.18
1 files added
1 files modified
60 ■■■■ changed files
SOURCES/ipa-centos-branding.patch 38 ●●●●● patch | view | raw | blame | history
SPECS/ipa.spec 22 ●●●●● patch | view | raw | blame | history
SOURCES/ipa-centos-branding.patch
New file
@@ -0,0 +1,38 @@
From 99efecaf87dc1fc9517efaff441a6a7ce46444eb Mon Sep 17 00:00:00 2001
From: Jim Perrin <jperrin@centos.org>
Date: Wed, 11 Mar 2015 10:37:03 -0500
Subject: [PATCH] update for new ntp server method
---
 ipaplatform/base/paths.py        | 1 +
 ipaserver/install/ntpinstance.py | 2 ++
 2 files changed, 3 insertions(+)
diff --git a/ipaplatform/base/paths.py b/ipaplatform/base/paths.py
index af50262..5090062 100644
--- a/ipaplatform/base/paths.py
+++ b/ipaplatform/base/paths.py
@@ -99,6 +99,7 @@ class BasePathNamespace(object):
     PKI_TOMCAT_ALIAS_DIR = "/etc/pki/pki-tomcat/alias/"
     PKI_TOMCAT_PASSWORD_CONF = "/etc/pki/pki-tomcat/password.conf"
     ETC_REDHAT_RELEASE = "/etc/redhat-release"
+    ETC_CENTOS_RELEASE = "/etc/centos-release"
     RESOLV_CONF = "/etc/resolv.conf"
     SAMBA_KEYTAB = "/etc/samba/samba.keytab"
     SMB_CONF = "/etc/samba/smb.conf"
diff --git a/ipaserver/install/ntpinstance.py b/ipaserver/install/ntpinstance.py
index c653525..4b0578b 100644
--- a/ipaserver/install/ntpinstance.py
+++ b/ipaserver/install/ntpinstance.py
@@ -44,6 +44,8 @@ class NTPInstance(service.Service):
         os = ""
         if ipautil.file_exists(paths.ETC_FEDORA_RELEASE):
             os = "fedora"
+        elif ipautil.file_exists(paths.ETC_CENTOS_RELEASE):
+            os = "centos"
         elif ipautil.file_exists(paths.ETC_REDHAT_RELEASE):
             os = "rhel"
--
1.8.3.1
SPECS/ipa.spec
@@ -43,10 +43,10 @@
URL:            http://www.freeipa.org/
Source0:        http://www.freeipa.org/downloads/src/freeipa-%{VERSION}.tar.gz
# RHEL spec file only: START: Change branding to IPA and Identity-Management
Source1:        header-logo.png
Source2:        login-screen-background.jpg
Source3:        login-screen-logo.png
Source4:        product-name.png
#Source1:        header-logo.png
#Source2:        login-screen-background.jpg
#Source3:        login-screen-logo.png
#Source4:        product-name.png
# RHEL spec file only: END: Change branding to IPA and Identity-Management
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -267,6 +267,7 @@
Patch1008:      1008-RCUE.patch
Patch1009:      1009-Do-not-allow-installation-in-FIPS-mode.patch
Patch1010:      1010-WebUI-add-API-browser-is-experimental-warning.patch
Patch1011:      ipa-centos-branding.patch
# RHEL spec file only: END
%if ! %{ONLY_CLIENT}
@@ -401,7 +402,7 @@
Requires: %{etc_systemd_dir}
Requires: gzip
# RHEL spec file only: START
Requires: redhat-access-plugin-ipa
# Requires: redhat-access-plugin-ipa
# RHEL spec file only: END
Conflicts: %{alt_name}-server
@@ -610,10 +611,10 @@
done
# Red Hat's Identity Management branding
cp %SOURCE1 install/ui/images/header-logo.png
cp %SOURCE2 install/ui/images/login-screen-background.jpg
cp %SOURCE3 install/ui/images/login-screen-logo.png
cp %SOURCE4 install/ui/images/product-name.png
#cp %SOURCE1 install/ui/images/header-logo.png
#cp %SOURCE2 install/ui/images/login-screen-background.jpg
#cp %SOURCE3 install/ui/images/login-screen-logo.png
#cp %SOURCE4 install/ui/images/product-name.png
# RHEL spec file only: END
%build
@@ -1210,6 +1211,9 @@
# RHEL spec file only: DELETED: Do not build tests
%changelog
* Tue Aug 02 2016 CentOS Sources <bugs@centos.org> - 4.2.0-15.el7.centos.18
- Roll in CentOS Branding
* Mon Jun 27 2016 Jan Cholasta <jcholast@redhat.com> - 4.2.0-15.18
- Resolves: #1350305 Multiple clients cannot join domain simultaneously:
  /var/run/httpd/ipa/clientcaches race condition?