From f4fe3d001c165c1faf9f33b1309e25a6e038bf10 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Mar 05 2015 13:11:05 +0000 Subject: debrand ipa-4.1.0-18.el7 --- diff --git a/SOURCES/ipa-centos-branding.patch b/SOURCES/ipa-centos-branding.patch new file mode 100644 index 0000000..33b4609 --- /dev/null +++ b/SOURCES/ipa-centos-branding.patch @@ -0,0 +1,12 @@ +diff -uNrp freeipa-3.3.3.orig/ipaserver/install/ntpinstance.py freeipa-3.3.3/ipaserver/install/ntpinstance.py +--- freeipa-3.3.3.orig/ipaserver/install/ntpinstance.py 2013-11-01 10:34:30.000000000 -0500 ++++ freeipa-3.3.3/ipaserver/install/ntpinstance.py 2014-06-26 07:27:19.644718099 -0500 +@@ -43,6 +43,8 @@ class NTPInstance(service.Service): + os = "" + if ipautil.file_exists("/etc/fedora-release"): + os = "fedora" ++ elif ipautil.file_exists("/etc/centos-release"): ++ os = "centos" + elif ipautil.file_exists("/etc/redhat-release"): + os = "rhel" + diff --git a/SPECS/ipa.spec b/SPECS/ipa.spec index dbe9471..8a331b1 100644 --- a/SPECS/ipa.spec +++ b/SPECS/ipa.spec @@ -174,6 +174,7 @@ Patch1010: 1010-Disable-DNSSEC-support.patch Patch1011: 1011-Disable-TLS-1.2-in-nss.conf-until-mod_nss-supports-i.patch Patch1012: 1012-Expand-the-token-auth-sync-windows.patch Patch1013: 1013-ipa-kdb-reject-principals-from-disabled-domains-as-a.patch +Patch1014: ipa-centos-branding.patch # RHEL spec file only: END %if ! %{ONLY_CLIENT} @@ -1015,6 +1016,9 @@ fi # RHEL spec file only: DELETED: Do not build tests %changelog +* Thu Mar 05 2015 CentOS Sources - 4.1.0-18.el7.centos +- Roll in CentOS Branding + * Thu Jan 29 2015 Martin Kosek 4.1.0-18 - Fix ipa-pwd-extop global configuration caching (#1187342) - group-detach does not add correct objectclasses (#1187540)