The Identity, Policy and Audit system
CentOS Sources
2017-10-19 8ae601da28bc2ba78f462b2907ba834be99dd07b
debrand ipa-4.5.0-21.el7_4.2.2
1 files added
1 files modified
58 ■■■■ changed files
SOURCES/ipa-centos-branding.patch 38 ●●●●● patch | view | raw | blame | history
SPECS/ipa.spec 20 ●●●●● 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
@@ -76,10 +76,10 @@
URL:            http://www.freeipa.org/
Source0:        https://releases.pagure.org/freeipa/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)
@@ -321,6 +321,7 @@
Patch1002:      1002-Package-copy-schema-to-ca.py.patch
Patch1003:      1003-Revert-Increased-mod_wsgi-socket-timeout.patch
Patch1004:      1004-Remove-csrgen.patch
Patch1005:      ipa-centos-branding.patch
# RHEL spec file only: END
BuildRequires:  openldap-devel
@@ -1117,10 +1118,10 @@
%endif # with_python3
# RHEL spec file only: START: Change branding to IPA and Identity Management
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: Change branding to IPA and Identity Management
@@ -1868,6 +1869,9 @@
%changelog
* Thu Oct 19 2017 CentOS Sources <bugs@centos.org> - 4.5.0-21.el7.centos.2.2
- Roll in CentOS Branding
* Wed Sep 20 2017 Felipe Barreto <fbarreto@redhat.com> - 4.5.0-21.el7.2.2
- Resolves: #1493410 ipa-server-upgrade timeouts on wait_for_open ports
  expecting IPA services listening on IPv6 ports