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>

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

4 files changed, 43 insertions, 10 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/Manifest b/net-fs/samba/Manifest
index 80aea3852109..f63bfb68df07 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -23,8 +23,8 @@ AUX samba4.initd 634 RMD160 0d1028c3520102a7a2c4a7dd73723b66295db740 SHA1 cf2e0b
 DIST samba-3.4.9.tar.gz 34850281 RMD160 1c724ac3bee4f1a5b547a89cd5f899226aac6717 SHA1 2e16ee2398d232a0bd6e457df8b5b3d45217ad22 SHA256 593952940f6c460a8486906aff55c56c8168c0f74d2d016bb55d080259048b8e
 DIST samba-3.5.6.tar.gz 30803319 RMD160 0993c0ac080fd873860e176f3efe0ba07d1e99e1 SHA1 5eb31e8d542d5b65867cfa5290f97783ea4628d3 SHA256 466410868375d19a286ac3fc5d9f3c267ce359189f8e0d76e72ec10bd54247da
 DIST samba-4.0.0alpha11.tar.gz 13917363 RMD160 3ec5597de6a2c80eaa426712101777fa92786b5c SHA1 8ed2befbbd45f6501d9e6036bcdfb332431a7b4f SHA256 ec9f4a9153b9e2c233420642ee98a8b944322e8b39a9b6912430fb24e88b81b9
-EBUILD samba-3.4.9.ebuild 11253 RMD160 8f5533661f954415eb4ff42ab01db3edf683ad28 SHA1 8395f1649e410eae5604be5feba944b01c750fd9 SHA256 4cf8299e93e3c20a60f810e69ed8ae67a330af093a0d5d6b499bc25733efecd2
-EBUILD samba-3.5.6.ebuild 12354 RMD160 edd543630461c4c57e5677deb96da9a2fbb8044f SHA1 245debb9583f791ca7aff95c3cca234072fec25d SHA256 b992abbc2ffcc9b4f450d209dfdd8aa3ae845eee1eac5bdfcd0543350e245fef
+EBUILD samba-3.4.9.ebuild 11750 RMD160 2b22d354e0e70763cfe96125a586f5807582e356 SHA1 a0674fbcfd87668479e04c63dbdc09c7c8bace4f SHA256 46f36b0c7e3812dcf785439f73f066619aa190b6c6b28222be09fbabac605a67
+EBUILD samba-3.5.6.ebuild 12663 RMD160 2539b46dd0cd636d2c2e816479ea785ce369b6d5 SHA1 bb5016983f5c2d1cfab8e68c5691a69f8b8954e0 SHA256 9abb693c83b3b0217f9e06bf904766e04617e379e47b0f8c797ce5ac6f3799bc
 EBUILD samba-4.0.0_alpha11.ebuild 4231 RMD160 efebbeed51868bf0cf51f6151b531f3e65834db2 SHA1 49169a33b69d1a69ecc102d8010c7b11f9256117 SHA256 02427fccf34de0f6aea8960d664b85a51fb80cce7bd107bc53111df386fb0660
-MISC ChangeLog 75875 RMD160 04fb66a9da473fe1cdf3384a9d80edcf24bc9f59 SHA1 0128096afb3e731711a8f46bb5bbd243091b2281 SHA256 ef0a0ae1122b5d4f9d171ee4d2805824b463d85d69866a6892944865494aedd8
+MISC ChangeLog 76178 RMD160 8db27e6437dbc09f62b44b7c84c7c0bb1ab466cb SHA1 96ff05aa03b2e37036e378ba19dfa03c2a85dcfd SHA256 89cfa7012f49503b2f4fc0d88874f4e5b348eaba19d6ea8168b59d3ce9792d9a
 MISC metadata.xml 1365 RMD160 2f64795a1d7d7c42fef60ebf208dd7b857786e47 SHA1 5c76d183a1f4f77832415fce1eb02e7ee4ecea2f SHA256 adffcfd42c6c2895909ba3eb6dda9a398d9d499fbced64c6c65d51ac71a0374b
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