From ba521eaf9ebc94cec74d71e79851fcc0501c07da Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Mar 26 2015 09:19:12 +0000 Subject: debrand ipa-4.1.0-18.el7_1.3 --- 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 899d783..d210940 100644 --- a/SPECS/ipa.spec +++ b/SPECS/ipa.spec @@ -189,6 +189,7 @@ 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-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} @@ -1033,6 +1034,9 @@ fi # RHEL spec file only: DELETED: Do not build tests %changelog +* Thu Mar 26 2015 CentOS Sources - 4.1.0-18.el7.centos.3 +- Roll in CentOS Branding + * Thu Mar 19 2015 Jan Cholasta - 4.1.0-18.3 - [ipa-python] ipalib.errors.LDAPError: failed to decode certificate: (SEC_ERROR_INVALID_ARGS) security library: invalid arguments. (#1194312)