On 07/24/2015 09:46 AM, Lukas Slebodnik wrote:
>ehlo,
>
>patch is attached.
>
>LS
>
>0001-SPEC-Update-spec-file-for-krb5_local_auth_plugin.patch
>
>
> From 9474dfc64cbd73ab25bf12660f6b55e5563fe14c Mon Sep 17 00:00:00 2001
>From: Lukas Slebodnik<lslebodn(a)redhat.com>
>Date: Fri, 24 Jul 2015 09:24:31 +0200
>Subject: [PATCH] SPEC: Update spec file for krb5_local_auth_plugin
>
>krb5_localauth_plugin could be build only with MIT kerberos >= 1.12.
>However, this feature was backported in downstream to older version
>of kerberos. So there were packaging failures
>
>error: Installed (but unpackaged) file(s) found:
> /usr/lib/sssd/modules/sssd_krb5_localauth_plugin.so
>RPM build errors:
> Installed (but unpackaged) file(s) found:
> /usr/lib/sssd/modules/sssd_krb5_localauth_plugin.so
>Child returncode was: 1
>EXCEPTION: Command failed. See logs for output.
>---
> contrib/sssd.spec.in | 7 ++-----
> 1 file changed, 2 insertions(+), 5 deletions(-)
>
>diff --git a/contrib/sssd.spec.in b/contrib/sssd.spec.in
>index
15f7c582cba1b9052e180596625be7dd5749599f..cb3aab78616c6c8f9442fbf3d0944d4d140ff549 100644
>--- a/contrib/sssd.spec.in
>+++ b/contrib/sssd.spec.in
>@@ -1,3 +1,4 @@
>+%global rhel6_minor %(%{__grep} -o "6.[0-9]*" /etc/redhat-release
|%{__sed} -s 's/6.//')
> %global rhel7_minor %(%{__grep} -o "7.[0-9]*" /etc/redhat-release
|%{__sed} -s 's/7.//')
> %if 0%{?rhel} && 0%{?rhel} <= 6
>@@ -41,7 +42,7 @@
> %global with_cifs_utils_plugin_option --disable-cifs-idmap-plugin
> %endif
>-%if (0%{?fedora} >= 21 || (0%{?rhel} == 7 && 0%{?rhel7_minor} >= 1))
>+%if (0%{?fedora} || (0%{?rhel} == 7 && 0%{?rhel7_minor} >= 1) ||
(0%{?rhel} == 6 && 0%{?rhel6_minor} >= 7))
> %global with_krb5_localauth_plugin 1
> %endif
>@@ -112,11 +113,7 @@ BuildRequires: pcre-devel
> BuildRequires: libxslt
> BuildRequires: libxml2
> BuildRequires: docbook-style-xsl
>-%if (0%{?with_krb5_localauth_plugin} == 1)
>-BuildRequires: krb5-devel >= 1.12
>-%else
> BuildRequires: krb5-devel
>-%endif
> BuildRequires: c-ares-devel
> BuildRequires: python-devel
> %if (0%{?with_python3} == 1)
>-- 2.4.3
>
Hi,
I looked at the patch and successfully built rpm on RHEL 6.6 and 6.7 (and on
Fedora 22). Then I used CI, result is there
http://sssd-ci.duckdns.org/logs/commit/7c/fbe0ff1743a1939c8066175f1634842...
It is look good for me. So -- if nobody has comments -- ACK.
Petr