diff --git a/SOURCES/ipa-centos-branding.patch b/SOURCES/ipa-centos-branding.patch new file mode 100644 index 0000000..673cd2f --- /dev/null +++ b/SOURCES/ipa-centos-branding.patch @@ -0,0 +1,38 @@ +From 99efecaf87dc1fc9517efaff441a6a7ce46444eb Mon Sep 17 00:00:00 2001 +From: Jim Perrin +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 + diff --git a/SPECS/ipa.spec b/SPECS/ipa.spec index b2253d6..a1f06b7 100644 --- a/SPECS/ipa.spec +++ b/SPECS/ipa.spec @@ -110,9 +110,9 @@ License: GPLv3+ 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 -Source4: product-name.png +#Source1: header-logo.png +#Source2: login-screen-background.jpg +#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) @@ -175,6 +175,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: 1005-Removing-filesystem-encoding-check.patch +Patch1006: ipa-centos-branding.patch # RHEL spec file only: END BuildRequires: libtool, automake, autoconf @@ -973,9 +974,9 @@ cp -r %{_builddir}/freeipa-%{version} %{_builddir}/freeipa-%{version}-python3 %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 %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 %SOURCE4 install/ui/images/product-name.png # RHEL spec file only: END: Change branding to IPA and Identity Management @@ -1744,6 +1745,9 @@ fi %changelog +* Tue Aug 06 2019 CentOS Sources - 4.6.5-11.el7.centos +- Roll in CentOS Branding + * Fri Jun 28 2019 Florence Blanc-Renaud - 4.6.5-11.el7 - Resolves: 1723473 - ipa upgrade fails with trust entry already exists - adtrust upgrade: fix wrong primary principal name, part 2