Adding idmap (rid,adex,ldap,hash,ad) modules support, bugs #329383 #285814 #290265 Adding manpages for idmap modules bug #281262. Based on patch thanks to Azamat H. Hackimov <azamat.hackimov@gmail.com>

(Portage version: 2.1.9.24/cvs/Linux i686)

3 files changed, 40 insertions, 7 deletions

diff --git a/net-fs/samba/ChangeLog b/net-fs/samba/ChangeLog
index 6af78801a52c..16b48ad13c5e 100644
--- a/net-fs/samba/ChangeLog
+++ b/net-fs/samba/ChangeLog
@@ -1,6 +1,12 @@
 # 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.454 2010/12/20 20:35:07 vostorga Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.455 2010/12/22 19:36:59 vostorga Exp $
+
+  22 Dec 2010; Víctor Ostorga <vostorga@gentoo.org> samba-3.4.9.ebuild,
+  samba-3.5.6.ebuild:
+  Adding idmap (rid,adex,ldap,hash,ad) modules support, bugs #329383 #285814
+  #290265 Adding manpages for idmap modules bug #281262
+  Based on patch thanks to Azamat H. Hackimov <azamat.hackimov@gmail.com>
 
   20 Dec 2010; Víctor Ostorga <vostorga@gentoo.org> files/3.4/samba.initd,
   files/3.5/samba.initd:
diff --git a/net-fs/samba/samba-3.4.9.ebuild b/net-fs/samba/samba-3.4.9.ebuild
index 16659095d7e9..ee842a21d5c1 100644
--- a/net-fs/samba/samba-3.4.9.ebuild
+++ b/net-fs/samba/samba-3.4.9.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.4.9.ebuild,v 1.7 2010/10/24 16:42:17 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.4.9.ebuild,v 1.8 2010/12/22 19:36:59 vostorga Exp $
 
 EAPI="2"
 
@@ -70,7 +70,13 @@ fi
 
 use cups && BINPROGS="${BINPROGS} bin/smbspool"
 use ldb && BINPROGS="${BINPROGS} bin/ldbedit bin/ldbsearch bin/ldbadd bin/ldbdel bin/ldbmodify bin/ldbrename";
-use winbind && BINPROGS="${BINPROGS} bin/wbinfo"
+
+if use winbind ; then
+	BINPROGS="${BINPROGS} bin/wbinfo"
+	mymod_shared="--with-shared-modules=idmap_rid,idmap_hash"
+	use ldap && mymod_shared="${mymod_shared},idmap_adex,idmap_ldap"
+	use ads && mymod_shared="${mymod_shared},idmap_ad"
+fi
 
 S="${WORKDIR}/${MY_P}/source3"
 
@@ -82,7 +88,7 @@ S="${WORKDIR}/${MY_P}/source3"
 CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
 
 pkg_setup() {
-	 if use winbind &&
+	if use winbind &&
 		[[ $(tc-getCC)$ == *gcc* ]] &&
 		[[ $(gcc-major-version)$(gcc-minor-version) -lt 43 ]]
 	then
@@ -176,6 +182,7 @@ src_configure() {
 		$(use_with aio aio-support) \
 		--with-sendfile-support \
 		$(use_with winbind) \
+		${mymod_shared} \
 		--without-included-popt \
 		--without-included-iniparser
 }
@@ -273,6 +280,16 @@ src_install() {
 		dosym libnss_wins.so /usr/$(get_libdir)/libnss_wins.so.2
 		dolib.so ../nsswitch/libnss_winbind.so
 		dosym libnss_winbind.so /usr/$(get_libdir)/libnss_winbind.so.2
+		einfo "install libwbclient related manpages"
+		doman ../docs/manpages/idmap_rid.8
+		doman ../docs/manpages/idmap_hash.8
+		if use ldap ; then
+			doman ../docs/manpages/idmap_adex.8
+			doman ../docs/manpages/idmap_ldap.8
+		fi
+		if use ads ; then
+			doman ../docs/manpages/idmap_ad.8
+		fi
 	fi
 
 	# install binaries
diff --git a/net-fs/samba/samba-3.5.6.ebuild b/net-fs/samba/samba-3.5.6.ebuild
index 6e0f084cfe85..cca42fdd8174 100644
--- a/net-fs/samba/samba-3.5.6.ebuild
+++ b/net-fs/samba/samba-3.5.6.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.6.ebuild,v 1.2 2010/11/05 15:24:44 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.5.6.ebuild,v 1.3 2010/12/22 19:36:59 vostorga Exp $
 
 EAPI="2"
 
@@ -86,9 +86,9 @@ pkg_setup() {
 
 	if use winbind ; then
 		BINPROGS="${BINPROGS} bin/wbinfo"
-		SHAREDMODS="${SHAREDMODS}idmap_rid"
+		SHAREDMODS="${SHAREDMODS}idmap_rid,idmap_hash"
 		use ads && SHAREDMODS="${SHAREDMODS},idmap_ad"
-		use ldap && SHAREDMODS="${SHAREDMODS},idmap_ldap"
+		use ldap && SHAREDMODS="${SHAREDMODS},idmap_ldap,idmap_adex"
 	fi
 
 	if use winbind &&
@@ -288,6 +288,16 @@ src_install() {
 		dosym libnss_wins.so /usr/$(get_libdir)/libnss_wins.so.2
 		dolib.so ../nsswitch/libnss_winbind.so
 		dosym libnss_winbind.so /usr/$(get_libdir)/libnss_winbind.so.2
+		einfo "install libwbclient related manpages"
+		doman ../docs/manpages/idmap_rid.8
+		doman ../docs/manpages/idmap_hash.8
+		if use ldap ; then
+			doman ../docs/manpages/idmap_adex.8
+			doman ../docs/manpages/idmap_ldap.8
+		fi
+		if use ads ; then
+			doman ../docs/manpages/idmap_ad.8
+		fi
 	fi
 
 	# install binaries