[SSSD] [PATCH] Spec file changes for cifs-utils plugin

Lukas Slebodnik lslebodn at redhat.com
Mon Oct 14 15:05:12 UTC 2013


On (14/10/13 16:48), Sumit Bose wrote:
>On Mon, Oct 14, 2013 at 01:37:01PM +0200, Sumit Bose wrote:
>> On Mon, Oct 14, 2013 at 01:15:02PM +0200, Benjamin Franzke wrote:
>> > Hi Sumit,
>> > 
>> > Should the spec file also include an /etc/alternatives integration, like
>> > cifs-utils has?
>> > http://pkgs.fedoraproject.org/cgit/cifs-utils.git/tree/cifs-utils.spec#n90
>> 
>> yes, my plan was to include this into the spec file for the Fedora
>> package. I thought for the upstream spec file this is not needed since
>> cifs-utils upstream does not use it either.
>> 
>> On the other hand I guess the upstream spec file will be used mostly by
>> Fedora/RHEL users to replace the distributed SSSD packages. So it makes
>> sense to include it upstream as well. I'll send a new patch.
>
>Please find attached a new version with alternatives.
>
>bye,
>Sumit
>
>> 
>> bye,
>> Sumit
>> 
>> > 
>> > 
>> > 2013/10/14 Sumit Bose <sbose at redhat.com>
>> > 
>> > > and now with the patch included :-)
>> > >
>> > > On Mon, Oct 14, 2013 at 01:08:39PM +0200, Sumit Bose wrote:
>> > > > Hi,
>> > > >
>> > > > as promised I created the spec file changes to include the cifs-utils
>> > > > plugin into the sssd-client package on Fedora and RHEL platforms where
>> > > > recent cifs-utils are available.
>> > > >
>> > > > bye,
>> > > > Sumit
>> > >

just one nitpick.

>From b64e0b5c45152436f6c5d24b25bf66ed88d9fc32 Mon Sep 17 00:00:00 2001
>From: Sumit Bose <sbose at redhat.com>
>Date: Mon, 14 Oct 2013 12:47:59 +0200
>Subject: [PATCH] Spec file changes for cifs-utils plugin
>
>---
> contrib/sssd.spec.in | 25 +++++++++++++++++++++++++
> 1 file changed, 25 insertions(+)
>
>diff --git a/contrib/sssd.spec.in b/contrib/sssd.spec.in
>index fe002b6..5390391 100644
>--- a/contrib/sssd.spec.in
>+++ b/contrib/sssd.spec.in
>@@ -41,6 +41,12 @@
> %define _hardened_build 1
> %endif
> 
>+%if (0%{?fedora} >= 17 || 0%{?rhel} >= 7)
>+    %global with_cifs_utils_plugin 1
>+%else
>+    %global with_cifs_utils_plugin_option --disable-cifs-idmap-plugin
>+%endif
>+
> Name: @PACKAGE_NAME@
> Version: @PACKAGE_VERSION@
> Release: 0 at PRERELEASE_VERSION@%{?dist}
>@@ -128,6 +134,9 @@ BuildRequires: libnl-devel
> %if (0%{?use_systemd} == 1)
> BuildRequires: systemd-devel
> %endif
>+%if (0%{?with_cifs_utils_plugin} == 1)
>+BuildRequires: cifs-utils-devel
>+%endif
> 
> # RHEL 5 is too old to support samba4 and the PAC responder
> %if !0%{?is_rhel5}
>@@ -412,6 +421,7 @@ autoreconf -ivf
>     --disable-rpath \
>     %{?with_ccache} \
>     %{with_initscript} \
>+    %{?with_cifs_utils_plugin_option} \
>     %{?experimental}
> 
> make %{?_smp_mflags} all
>@@ -644,6 +654,10 @@ rm -rf $RPM_BUILD_ROOT
> %if !0%{?is_rhel5}
> %{_libdir}/krb5/plugins/authdata/sssd_pac_plugin.so
> %endif
>+%if (0%{?with_cifs_utils_plugin} == 1)
>+%{_libdir}/cifs-utils/cifs_idmap_sss.so
>+%ghost %{_sysconfdir}/cifs-utils/idmap-plugin
>+%endif
> %{_mandir}/man8/pam_sss.8*
> %{_mandir}/man8/sssd_krb5_locator_plugin.8*
> 
>@@ -773,7 +787,18 @@ if [ $1 = 0 ]; then
> fi
> %endif
> 
>+%if (0%{?with_cifs_utils_plugin} == 1)
>+%post client
>+/sbin/ldconfig
>+/usr/sbin/alternatives --install /etc/cifs-utils/idmap-plugin cifs-idmap-plugin %{_libdir}/cifs-utils/cifs_idmap_sss.so 20
>+
>+%preun client
>+if [ $1 = 0 ]; then
         ^^^
        "-eq" should be used for integer comparison (man test)
>+        /usr/sbin/alternatives --remove cifs-idmap-plugin %{_libdir}/cifs-utils/cifs_idmap_sss.so
>+fi
>+%else
> %post client -p /sbin/ldconfig
>+%endif
> 
> %postun client -p /sbin/ldconfig
> 
>-- 
>1.8.3.1
>

LS



More information about the sssd-devel mailing list