Attachment 624780 Details for Bug 864889 – patch to introduce alternatives for winbind_krb5_locator.so

[patch] patch to introduce alternatives for winbind_krb5_locator.so

samba-4.0.0-alternatives-krb5-locator.patch (text/plain), 2.94 KB, created by Alexander Bokovoy on 2012-10-10 10:54:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alexander Bokovoy

Created: 2012-10-10 10:54:22 UTC

Size: 2.94 KB

patch

obsolete

>diff --git a/samba4.spec b/samba4.spec
>index ed3f248..4602af4 100644
>--- a/samba4.spec
>+++ b/samba4.spec
>@@ -1,4 +1,4 @@
>-%define main_release 30
>+%define main_release 31
> 
> %define samba_version 4.0.0
> %define talloc_version 2.0.7
>@@ -269,6 +269,14 @@ Requires: %{name}-libs = %{samba_depver}
> 
> Conflicts: samba-winbind-krb5-locator < %{samba_conflict_ver}
> Provides: samba-winbind-krb5-locator = %{samba_depver}
>+# Handle winbind_krb5_locator.so as alternatives to allow
>+# IPA AD trusts case where it should not be used by libkrb5
>+# The plugin will be diverted to /dev/null by the FreeIPA
>+# freeipa-server-trust-ad subpackage due to higher priority
>+# and restored to the proper one on uninstall
>+Requires(post): %{_sbindir}/update-alternatives
>+Requires(postun): %{_sbindir}/update-alternatives
>+Requires(preun): %{_sbindir}/update-alternatives
> 
> %description winbind-krb5-locator
> The winbind krb5 locator is a plugin for the system kerberos library to allow
>@@ -540,8 +548,7 @@ install -m 0755 %{SOURCE102} %{buildroot}%{_initrddir}/winbind
> 
> # winbind krb5 locator
> install -d -m 0755 %{buildroot}%{_libdir}/krb5/plugins/libkrb5
>-install -m 755 %{buildroot}/%{_libdir}/winbind_krb5_locator.so %{buildroot}/%{_libdir}/krb5/plugins/libkrb5/winbind_krb5_locator.so
>-rm -f %{buildroot}/%{_libdir}/winbind_krb5_locator.so
>+touch %{buildroot}%{_libdir}/krb5/plugins/libkrb5/winbind_krb5_locator.so
> 
> # cleanup stuff that does not belong here
> rm -f %{buildroot}/%{_mandir}/man3/ldb.3*
>@@ -636,6 +643,22 @@ exit 0
> %postun -n libwbclient -p /sbin/ldconfig
> %endif # with_libwbclient
> 
>+%postun winbind-krb5-locator 
>+if [ "$1" -ge "1" ]; then
>+        if [ "`readlink %{_sysconfdir}/alternatives/winbind_krb5_locator.so`" == "%{_libdir}/winbind_krb5_locator.so" ]; then
>+                %{_sbindir}/alternatives --set winbind_krb5_locator %{_libdir}/winbind_krb5_locator.so
>+        fi
>+fi
>+
>+%post winbind-krb5-locator
>+%{_sbindir}/update-alternatives --install %{_libdir}/krb5/plugins/libkrb5/winbind_krb5_locator.so \
>+                                winbind_krb5_locator.so %{_libdir}/winbind_krb5_locator.so 10
>+
>+%preun winbind-krb5-locator
>+if [ $1 -eq 0 ]; then
>+        %{_sbindir}/update-alternatives --remove winbind_krb5_locator.so %{_libdir}/winbind_krb5_locator.so
>+fi
>+
> %clean
> rm -rf %{buildroot}
> 
>@@ -916,7 +939,8 @@ rm -rf %{buildroot}
> 
> %files winbind-krb5-locator
> %defattr(-,root,root)
>-%{_libdir}/krb5/plugins/libkrb5/winbind_krb5_locator.so
>+%ghost %{_libdir}/krb5/plugins/libkrb5/winbind_krb5_locator.so
>+%{_libdir}/winbind_krb5_locator.so
> %{_mandir}/man7/winbind_krb5_locator.7*
> 
> %files winbind-clients
>@@ -1271,6 +1295,10 @@ rm -rf %{buildroot}
> %endif # with_libwbclient
> 
> %changelog
>+* Wed Oct 10 2012 - Alexander Bokovoy <abokovoy@redhat.com> - 4.0.0-30.rc1
>+- Use alternatives to configure winbind_krb5_locator.so
>+- resolves: #864889
>+
> * Thu Oct 04 2012 - Andreas Schneider <asn@redhat.com> - 4.0.0-30.rc1
> - Fix multilib package installation.
> - resolves: #862047

Actions: View | Diff

Attachments on bug 864889: 624780