From 1a3b37eaefe7dd536aab964aaccae1198a3a3603 Mon Sep 17 00:00:00 2001 From: Jacco Ligthart Date: Wed, 13 Apr 2016 23:21:09 +0200 Subject: [PATCH] redsleeve --- SOURCES/ipa-redsleeve-branding.patch | 28 ++++++++++++++++++++++++++++ SPECS/ipa.spec | 7 +++++-- 2 files changed, 33 insertions(+), 2 deletions(-) create mode 100644 SOURCES/ipa-redsleeve-branding.patch diff --git a/SOURCES/ipa-redsleeve-branding.patch b/SOURCES/ipa-redsleeve-branding.patch new file mode 100644 index 0000000..dbc81ab --- /dev/null +++ b/SOURCES/ipa-redsleeve-branding.patch @@ -0,0 +1,28 @@ +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_REDSLEEVE_RELEASE = "/etc/redsleeve-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_REDSLEEVE_RELEASE): ++ os = "redsleeve" + 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 4744e1e..fe0bc01 100644 --- a/SPECS/ipa.spec +++ b/SPECS/ipa.spec @@ -35,7 +35,7 @@ Name: ipa Version: 4.2.0 -Release: 15.0.1%{?dist}.6.1 +Release: 15.0.1%{?dist}.6.1.redsleeve Summary: The Identity, Policy and Audit system Group: System Environment/Base @@ -242,7 +242,7 @@ Patch1007: 1007-Do-not-build-tests.patch 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 +Patch1011: ipa-redsleeve-branding.patch # RHEL spec file only: END %if ! %{ONLY_CLIENT} @@ -1186,6 +1186,9 @@ fi # RHEL spec file only: DELETED: Do not build tests %changelog +* Wed Apr 13 2016 Jacco Ligthart - 4.2.0-15.el7.6.1.redsleeve +- Roll in RedSleeve Branding + * Tue Apr 12 2016 CentOS Sources - 4.2.0-15.el7.centos.6.1 - Roll in CentOS Branding - add .0.1 to release for dist tag change to .el7.centos -- 1.8.3.1