Fixing build with USE=ads

Package-Manager: portage-2.1.8.3/cvs/Linux i686

diff --git a/net-fs/samba/ChangeLog b/net-fs/samba/ChangeLog
index 82a8e1f55165adc4b297d3eecab3d08107f9f763..0d7e36981437e582f699c9939f87598c8657372d 100644 (file)
--- a/net-fs/samba/ChangeLog
+++ b/net-fs/samba/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-fs/samba
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.417 2010/05/20 00:04:21 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.418 2010/05/21 17:31:08 vostorga Exp $
+
+  21 May 2010; Víctor Ostorga <vostorga@gentoo.org> samba-3.5.3.ebuild:
+  Fixing build with USE=ads winbind, patch thanks to Rainer Ruecker
+  <rainer@emdete.de> bugs #314709 #315975
 
   20 May 2010; Jeroen Roovers <jer@gentoo.org> samba-3.4.6.ebuild:
   Stable for HPPA (bug #300158).

diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index 56ae3c8752353c3f1fa45c8cccef7fc354bfad1b..2cdd0789752d98f0a5e9cf63405cff192bf53368 100644 (file)
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -67,7 +67,7 @@ EBUILD samba-3.4.6.ebuild 10276 RMD160 d93c3ceb9379ea30725e97c31385e407057511c5
 EBUILD samba-3.4.8.ebuild 10279 RMD160 8b074f156261ac02ccea0498128baaa111cb49c5 SHA1 54aa753544d2364222595ff6e2e696fb71a53c55 SHA256 406ac133473a56f6a35987f483dd11e7891d0c41b16ff1e7c479304444d4430d
 EBUILD samba-3.5.0.ebuild 10367 RMD160 3747350a7c8fb15ba076a61335fb9c2232787d8e SHA1 8ad51a352093142f65971f84761b12092205f2e1 SHA256 acf23ab0b379185db2d2577da1bf078687b6bb3047ac497153264c464b99cc99
 EBUILD samba-3.5.2-r1.ebuild 10383 RMD160 e696906d98534964483c9ea731dd0e5377d0440e SHA1 f4f53d3fd39152ca575234c1f61fc88306b54da0 SHA256 e39214300e0fbdb2f8e401772a53b425eba4678c09c5a6f769f67610dbed60e0
-EBUILD samba-3.5.3.ebuild 10319 RMD160 d7540889fffb81f1cf7b47ecea3083972acc6cdd SHA1 7feaddadd5150dd19c96af52cc21cffc74990816 SHA256 13ce980b8ddd93041706279f906b48374807f932e2febcf038d572d1d79e32b4
+EBUILD samba-3.5.3.ebuild 10971 RMD160 46098d1f9624e1d3d9b5d4acbe54f7a6c0b67e7b SHA1 3e5442d18a790fc63a815c6c0c9713914f7722ca SHA256 a1e9280099c1ca4d4040c07a83c5e0139ac19d23a101e2eae19b8eabe7f11e76
 EBUILD samba-4.0.0_alpha11.ebuild 4156 RMD160 d63bbf124c3fde8d264da490122a0826dda1aa13 SHA1 4bd67529b6094b91349e138614ba36075e5912c5 SHA256 619c7c38aa499083e3ee7ba06f681851b76a4456c1b8e8f3d4f3c998eaccda58
-MISC ChangeLog 69381 RMD160 52ce10d4a9ced896a23e0ad5701ced9cf4cda89d SHA1 c6450c89a2fbc8aa5d6f2dbbe2c9298cdb124937 SHA256 37afb2c277f0de73d7b7512d67547d19e743417f125ce34a18e601576d4989b9
+MISC ChangeLog 69570 RMD160 cedd6e664684ec5fe82c23c86aa3bb4185ba7c45 SHA1 8601b9a9c704a0baa27410da5839b2d604369aa5 SHA256 1524aa4ac8c7778d32b06ec795d14c92f120c4b6239475ecf8ca4918777fc498
 MISC metadata.xml 1678 RMD160 fc5f6a9674053523edb993fda99f75789e995231 SHA1 7a3f710083ab340eb139281a0d9d94af1aaa4927 SHA256 afeddf0c54227bcdd40ccc67c65b5ee8809cbba447d0500773270d89de7d044e

diff --git a/net-fs/samba/samba-3.5.3.ebuild b/net-fs/samba/samba-3.5.3.ebuild
index c236f944802e279607eab5f6e35acd2ea6de96cd..5dcb775e3b4a410072bfc4fd2f8a4a60fb3c3506 100644 (file)
--- a/net-fs/samba/samba-3.5.3.ebuild
+++ b/net-fs/samba/samba-3.5.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.5.3.ebuild,v 1.2 2010/05/19 17:16:15 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.5.3.ebuild,v 1.3 2010/05/21 17:31:08 vostorga Exp $
 
 EAPI="2"
 
@@ -49,6 +49,8 @@ RESTRICT="test"
 
 SBINPROGS=""
 BINPROGS=""
+KRBPLUGIN=""
+PLUGINEXT=".so"
 
 if use server ; then
        SBINPROGS="${SBINPROGS} bin/smbd bin/nmbd"
@@ -57,7 +59,7 @@ if use server ; then
 
        use swat && SBINPROGS="${SBINPROGS} bin/swat"
        use winbind && SBINPROGS="${SBINPROGS} bin/winbindd"
-       use ads && use winbind && SBINPROGS="${SBINPROGS} bin/winbind_krb5_locator"
+       use ads && use winbind && KRBPLUGIN="${KRBPLUGIN} bin/winbind_krb5_locator"
 fi
 
 if use client ; then
@@ -214,6 +216,11 @@ src_compile() {
                emake ${SBINPROGS} || die "emake sbinprogs failed";
        fi
 
+       if [ -n "${KRBPLUGIN}" ] ; then
+               einfo "make krbplugin"
+               emake ${KRBPLUGIN}${PLUGINEXT} || die "emake krbplugin failed";
+       fi
+
        if use client ; then
                einfo "make {,u}mount.cifs"
                emake bin/{,u}mount.cifs || die "emake {,u}mount.cifs failed"
@@ -277,6 +284,21 @@ src_install() {
                doman ../docs/manpages/${prog/bin\/}* || die "doman failed"
        done
 
+       # install krbplugin
+       if has_version app-crypt/mit-krb5 ; then
+               insinto /usr/$(get_libdir)/krb5/plugins/libkrb5
+               doins ${KRBPLUGIN}${PLUGINEXT} || die "installing
+               ${KRBPLUGIN}${PLUGINEXT} failed"
+       elif has_version app-crypt/heimdal ; then
+               insinto /usr/$(get_libdir)/plugin/krb5
+               doins ${KRBPLUGIN}${PLUGINEXT} || die "installing
+               ${KRBPLUGIN}${PLUGINEXT} failed"
+       fi
+       insinto /usr
+       for prog in ${KRBPLUGIN} ; do
+               doman ../docs/manpages/${prog/bin\/}* || die "doman failed"
+       done
+
        # install server components
        if use server ; then
                doman ../docs/manpages/vfs* ../docs/manpages/samba.7