The Identity, Policy and Audit system
CentOS Sources
2015-08-05 76902d919ea4aad5579714af913357a0f8670812
debrand ipa-4.1.0-18.el7_1.4
1 files added
1 files modified
62 ■■■■ changed files
SOURCES/ipa-centos-branding.patch 38 ●●●●● patch | view | raw | blame | history
SPECS/ipa.spec 24 ●●●●● 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
@@ -40,10 +40,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)
@@ -191,6 +191,7 @@
Patch1012:      1012-Expand-the-token-auth-sync-windows.patch
Patch1013:      1013-extdom-fix-wrong-realloc-size.patch
Patch1014:      1014-fix-Makefile.am-for-daemons.patch
Patch1015:      ipa-centos-branding.patch
# RHEL spec file only: END
%if ! %{ONLY_CLIENT}
@@ -294,7 +295,7 @@
Requires: slapi-nis >= 0.54-2
Requires: pki-ca >= 10.1.2-5
%if 0%{?rhel}
Requires: subscription-manager
# Requires: subscription-manager
%endif
Requires(preun): python systemd-units
Requires(postun): python systemd-units
@@ -308,7 +309,7 @@
Requires: open-sans-fonts
# RHEL spec file only: DELETED: Disable DNSSEC support
# RHEL spec file only: START
Requires: redhat-access-plugin-ipa
# Requires: redhat-access-plugin-ipa
# RHEL spec file only: END
Conflicts: %{alt_name}-server
@@ -482,10 +483,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
@@ -1035,6 +1036,9 @@
# RHEL spec file only: DELETED: Do not build tests
%changelog
* Wed Aug 05 2015 CentOS Sources <bugs@centos.org> - 4.1.0-18.el7.centos.4
- Roll in CentOS Branding
* Tue Jul 21 2015 Jan Cholasta <jcholast@redhat.com> - 4.1.0-18.4
- krb5kdc : segfault at 0 ip 00007fa9f64d82bb sp 00007fffd68b2340 error 6 in
  libc-2.17.so (#1245097)