Version bump to 3.5.9 bug #373445 , Adding notes to smb.conf.default #352869

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

4 files changed, 545 insertions, 5 deletions

diff --git a/net-fs/samba/ChangeLog b/net-fs/samba/ChangeLog
index ce2438dcf123..c4d5dd0ae51e 100644
--- a/net-fs/samba/ChangeLog
+++ b/net-fs/samba/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-fs/samba
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.471 2011/05/05 17:24:10 vostorga Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.472 2011/06/29 17:53:04 vostorga Exp $
+
+*samba-3.5.9 (29 Jun 2011)
+
+  29 Jun 2011; Víctor Ostorga <vostorga@gentoo.org>
+  +files/3.5/smb.conf.default.patch, +samba-3.5.9.ebuild:
+  Version bump to 3.5.9 bug #373445 , Adding notes to smb.conf.default #352869
 
   05 May 2011; Víctor Ostorga <vostorga@gentoo.org> samba-3.4.12.ebuild,
   samba-3.4.13.ebuild, samba-3.5.8.ebuild, samba-3.5.8-r1.ebuild:
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index 76019390eedc..43bf8c61dae4 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -21,6 +21,7 @@ AUX 3.5/samba.confd 1219 RMD160 88949f00ea94f14af751e53cf870b6481dc3770d SHA1 a9
 AUX 3.5/samba.initd 1228 RMD160 a4c5502dc1234d18eb7810899e171987ad33262b SHA1 b1d6d1ff47e3d2c0f96dfb2743915404ae6d59c1 SHA256 691b7389b87a5b413487443e3569e95b99208bd8d9f7dfaf9d54b42a5fc2d41a
 AUX 3.5/samba.pam 397 RMD160 8f64b09e17e0c458a8156db3cc92a0413513e4fc SHA1 f39d48e07be8069885b51253c5b891a856b7b41e SHA256 86634f2d541370518d0958a73c04776ed5df2a3716ef128ff384459acce9cd38
 AUX 3.5/smb.conf.default 9660 RMD160 049024e0b489027a44e3ae7b03216ebba8a2d716 SHA1 00954aa58287ef49e9eb0f9f6a04dd509f8835f3 SHA256 8f4fc4d137a32f92b9bc1b64f76ea25a690881cf6f385b9ce9eb0c98f2b0b297
+AUX 3.5/smb.conf.default.patch 2873 RMD160 f0e7ae6a41959dacdf9f71a14e3c9477f07bbf1b SHA1 e1066dc4db5566d2b5accac4febf46e449866557 SHA256 b617b011fa8be51d1f6da18dcede5bf0fc96d50551028aa2b3a5521322b4c8c7
 AUX 3.5/smbusers 218 RMD160 a94e0928466c0ed7cfd3edd3ac88dd1c8725a987 SHA1 84518d8768048e497724c72f89c00e6223c6cdb6 SHA256 ed24f121813aff4b8e79c99317f4f9dfde9246d150d7718f0fa60babb8b9dca1
 AUX 3.5/swat.xinetd 527 RMD160 8b2364e6fda8cecc75feef8129347ebc545ecc43 SHA1 98f94bc638ffb68d6fb35745aebbf0c63d4135ce SHA256 7919926945c9a7a28446280ea477aed2d7d3506372a03cbea96b446a8fa39aa4
 AUX 3.5/system-auth-winbind.pam 705 RMD160 666533e99283449d60a97fd4fcd704d72212b871 SHA1 a1fe11d7a4f7501c938c03121e4ad950c515f75e SHA256 eca81593dc1b3e2be19bba7a128d71474243216a7783ed788320ca51cf6ea6c7
@@ -29,19 +30,21 @@ AUX samba4.initd 634 RMD160 0d1028c3520102a7a2c4a7dd73723b66295db740 SHA1 cf2e0b
 DIST samba-3.4.12.tar.gz 34842685 RMD160 b78ae82371fce179cddb8dfd508d8075788082d0 SHA1 89c18711cf585de415c4e7e50e83596dc583cc3e SHA256 89c0862a683d1c5f0b8710df1ae6f628aa4530bbe5cbb11cf7415b1b0446f028
 DIST samba-3.4.13.tar.gz 34805783 RMD160 da4cdb57bec225fa35b1a6e889f1c49beaaf5089 SHA1 1318670371c55fe7383d583c5d184cbef7c6e5ea SHA256 f2725e66f6d4e0120c44ba22bc4461654a4222ae9881d04157dcc1faccbbffe4
 DIST samba-3.5.8.tar.gz 30721269 RMD160 02703bbaf7d7e7b9786a2228fe6085143c99251a SHA1 ffb71de38442eee14aafb44f819671354dc5cce9 SHA256 331e3f2806edcad853b48f4b1e653367ad9a6ce1ab5ed486c03a6bf614882796
+DIST samba-3.5.9.tar.gz 30750297 RMD160 c48b3d0ecf0b4cde2764cebdde5f8513320cd966 SHA1 77da3dff05032950fa1943057182d16894591a05 SHA256 8af8dccbb87a70a71f795180d873102b5cccba7012d66f2620cea8b87174380a
 DIST samba-4.0.0alpha11.tar.gz 13917363 RMD160 3ec5597de6a2c80eaa426712101777fa92786b5c SHA1 8ed2befbbd45f6501d9e6036bcdfb332431a7b4f SHA256 ec9f4a9153b9e2c233420642ee98a8b944322e8b39a9b6912430fb24e88b81b9
 DIST smb_traffic_analyzer_v2.diff.bz2 12226 RMD160 82f6d443d289253a184e5f5dda17d865cb79b2b5 SHA1 1dd5100447cb827aacb8bb18bf88b7b10955a38c SHA256 1bae7eafbe8ac2382313d5ab9d43d73ba64b63a714f0f588516952d476fb868d
 EBUILD samba-3.4.12.ebuild 11868 RMD160 f4a947beec3cceb95e1241991a827e673913aee3 SHA1 76ef9617d3604eb6941a13bae2f92e2816bdc223 SHA256 b72494103bf6f78691ec952bd878687b56671a1914e305a56a4728d22a410bb1
 EBUILD samba-3.4.13.ebuild 11879 RMD160 d8fe5d3ad76b26f653f4c2f8a62d57e748fb113f SHA1 217edcd9a75b23de4328d8f6cdbe441565bbc25a SHA256 9bb1cbe6642d07e12eb8f0e80228405fc5e09cb4f16bbf9f2c291d5750ef6c5f
 EBUILD samba-3.5.8-r1.ebuild 11968 RMD160 0b559c0d46a4e6493971616a765053e2ce216be3 SHA1 13b3686487563435be413ece26de403ebe59f8f1 SHA256 964102b971bf1c3db52b0673363f89250561f335601a9a33f3df1f2483c74917
 EBUILD samba-3.5.8.ebuild 12734 RMD160 3d4145c2be91bb05498adbbd507ced25df9aff91 SHA1 f30d7d7e16e365d421ef79a90efc20d1729b7e0f SHA256 cf6f724a69d82644ad4a4be64aed243775c44d55fbf7d69acf443d175c91b110
+EBUILD samba-3.5.9.ebuild 12008 RMD160 d4053610ac661eb0e3ea485f587dd4b4032ffc05 SHA1 6b3114748e010c7b5f3a2e42c689e6f4432c615a SHA256 bd4aa352db979cace6634c8df1221c6e0393da8678de64e92c1cacf716adc4b7
 EBUILD samba-4.0.0_alpha11.ebuild 4231 RMD160 efebbeed51868bf0cf51f6151b531f3e65834db2 SHA1 49169a33b69d1a69ecc102d8010c7b11f9256117 SHA256 02427fccf34de0f6aea8960d664b85a51fb80cce7bd107bc53111df386fb0660
-MISC ChangeLog 78764 RMD160 550079178613c7c3321583ffcc5696aabb8d420a SHA1 01acc82bfd7c759a7f0d31e761a7c10d5f23f890 SHA256 e1fd2687f31f3a3a7e0e5f8a684497e5bb610673e839b14a1ee35ca2db1fda1b
+MISC ChangeLog 78983 RMD160 0cbf6300e947556ee12f2a9a7ea14fa214d39d72 SHA1 6c49fcdaaf6b021beb3edcc7c900080f524a0cf3 SHA256 b2d131ec3970f8bf7b37d67864512f062bd1b26ad97029eb68c75021f667bcd9
 MISC metadata.xml 1435 RMD160 cbeae62707473b88127daa6170e8ca58861ef38b SHA1 32ff9e4f94646cc85bca64f208ea19faae1e2075 SHA256 bdff2271efdf94275d1a6096c48407c0372e088b10f85f19b989b18d50c2a5f0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk3C3VYACgkQKQaZ7OJe4zYlswCgk3UtNPMjQsJ9kpGc5nnUHyhN
-i24An1+HJbgSAXiWuS3lmjcbNXzbg7nw
-=dD/g
+iEYEARECAAYFAk4LZoYACgkQKQaZ7OJe4zbikgCgjT0KCp4lMd5izqSVL7gSyjk9
+btAAmwVSgnz1j03UjBCrpPBl0hx1+af+
+=R1IL
 -----END PGP SIGNATURE-----
diff --git a/net-fs/samba/files/3.5/smb.conf.default.patch b/net-fs/samba/files/3.5/smb.conf.default.patch
new file mode 100644
index 000000000000..e9d62db164f4
--- /dev/null
+++ b/net-fs/samba/files/3.5/smb.conf.default.patch
@@ -0,0 +1,86 @@
+--- samba-3.5.9/examples/smb.conf.default	2011-06-14 05:17:28.000000000 -0600
++++ /etc/samba/smb.conf.default	2011-06-29 10:12:13.000000000 -0600
+@@ -61,11 +61,11 @@
+ # otherwise the user "nobody" is used
+ ;  guest account = pcguest
+ 
+ # this tells Samba to use a separate log file for each machine
+ # that connects
+-   log file = /usr/local/samba/var/log.%m
++   log file = /var/log/samba/log.%m
+ 
+ # Put a capping on the size of the log files (in Kb).
+    max log size = 50
+ 
+ # Use password server option only with security = server
+@@ -79,19 +79,22 @@
+ # Specifies the Active Directory realm the host is part of
+ ;   realm = MY_REALM
+ 
+ # Backend to store user information in. New installations should 
+ # use either tdbsam or ldapsam. smbpasswd is available for backwards 
+-# compatibility. tdbsam requires no further configuration.
++# compatibility. tdbsam requires no further configuration. If you're 
++# migrating from < samba 3.4, you'll have to convert your old user 
++# passwords to the new backend with the command:
++# pdbedit -i smbpasswd:/var/lib/samba/private/smbpasswd -e
+ ;   passdb backend = tdbsam
+ 
+ # Using the following line enables you to customise your configuration
+ # on a per machine basis. The %m gets replaced with the netbios name
+ # of the machine that is connecting.
+ # Note: Consider carefully the location in the configuration file of
+ #       this line.  The included file is read at that point.
+-;   include = /usr/local/samba/lib/smb.conf.%m
++;   include = /etc/samba/smb.conf.%m
+ 
+ # Configure Samba to use multiple interfaces
+ # If you have multiple network interfaces then you must list them
+ # here. See the man page for details.
+ ;   interfaces = 192.168.12.2/24 192.168.13.2/24 
+@@ -164,29 +167,29 @@
+    writable = yes
+ 
+ # Un-comment the following and create the netlogon directory for Domain Logons
+ ; [netlogon]
+ ;   comment = Network Logon Service
+-;   path = /usr/local/samba/lib/netlogon
++;   path = /var/lib/samba/netlogon
+ ;   guest ok = yes
+ ;   writable = no
+ ;   share modes = no
+ 
+ 
+ # Un-comment the following to provide a specific roving profile share
+ # the default is to use the user's home directory
+ ;[Profiles]
+-;    path = /usr/local/samba/profiles
++;    path = /var/lib/samba/profiles
+ ;    browseable = no
+ ;    guest ok = yes
+ 
+ 
+ # NOTE: If you have a BSD-style print system there is no need to 
+ # specifically define each individual printer
+ [printers]
+    comment = All Printers
+-   path = /usr/spool/samba
++   path = /var/spool/samba
+    browseable = no
+ # Set public = yes to allow user 'guest account' to print
+    guest ok = no
+    writable = no
+    printable = yes
+@@ -202,11 +205,11 @@
+ # the "staff" group
+ ;[public]
+ ;   comment = Public Stuff
+ ;   path = /home/samba
+ ;   public = yes
+-;   writable = no
++;   writable = yes
+ ;   printable = no
+ ;   write list = @staff
+ 
+ # Other examples. 
+ #
diff --git a/net-fs/samba/samba-3.5.9.ebuild b/net-fs/samba/samba-3.5.9.ebuild
new file mode 100644
index 000000000000..eb56bee7f846
--- /dev/null
+++ b/net-fs/samba/samba-3.5.9.ebuild
@@ -0,0 +1,445 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.5.9.ebuild,v 1.1 2011/06/29 17:53:04 vostorga Exp $
+
+EAPI=4
+
+inherit pam versionator multilib eutils
+
+MY_PV=${PV/_/}
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="Library bits of the samba network filesystem"
+HOMEPAGE="http://www.samba.org/"
+SRC_URI="mirror://samba/${P}.tar.gz
+	http://dev.gentoo.org/~dagger/files/smb_traffic_analyzer_v2.diff.bz2"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="acl addns ads +aio avahi caps +client cluster cups debug doc examples fam
+	ldap ldb +netapi pam quota +readline +server +smbclient smbsharemodes smbtav2
+	swat syslog winbind"
+
+DEPEND="dev-libs/popt
+	!net-fs/samba-client
+	!net-fs/samba-libs
+	!net-fs/samba-server
+	!net-fs/cifs-utils
+	sys-libs/talloc
+	sys-libs/tdb
+	virtual/libiconv
+	ads? ( virtual/krb5 sys-fs/e2fsprogs
+		client? ( sys-apps/keyutils ) )
+	avahi? ( net-dns/avahi[dbus] )
+	caps? ( sys-libs/libcap )
+	client? ( !net-fs/mount-cifs
+		dev-libs/iniparser )
+	cluster? ( >=dev-db/ctdb-1.0.114_p1 )
+	cups? ( net-print/cups )
+	debug? ( dev-libs/dmalloc )
+	fam? ( virtual/fam )
+	ldap? ( net-nds/openldap )
+	pam? ( virtual/pam
+		winbind? ( dev-libs/iniparser )
+	)
+	readline? ( >=sys-libs/readline-5.2 )
+	syslog? ( virtual/logger )"
+
+RDEPEND="${DEPEND}"
+
+# Disable tests since we don't want to build that much here
+RESTRICT="test"
+
+SBINPROGS=""
+BINPROGS=""
+KRBPLUGIN=""
+PLUGINEXT=".so"
+SHAREDMODS=""
+
+S="${WORKDIR}/${MY_P}/source3"
+
+# TODO:
+# - enable iPrint on Prefix/OSX and Darwin?
+# - selftest-prefix? selftest?
+# - AFS?
+
+CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
+
+REQUIRED_USE="
+	ads? ( ldap )
+	swat? ( server )
+"
+
+pkg_setup() {
+	if use server ; then
+		SBINPROGS="${SBINPROGS} bin/smbd bin/nmbd"
+		BINPROGS="${BINPROGS} bin/testparm bin/smbstatus bin/smbcontrol bin/pdbedit
+			bin/profiles bin/sharesec bin/eventlogadm"
+
+		use smbtav2 && BINPROGS="${BINPROGS} bin/smbta-util"
+		use swat && SBINPROGS="${SBINPROGS} bin/swat"
+		use winbind && SBINPROGS="${SBINPROGS} bin/winbindd"
+		use ads && use winbind && KRBPLUGIN="${KRBPLUGIN} bin/winbind_krb5_locator"
+	fi
+
+	if use client ; then
+		BINPROGS="${BINPROGS} bin/smbclient bin/net bin/smbget bin/smbtree
+			bin/nmblookup bin/smbpasswd bin/rpcclient bin/smbcacls bin/smbcquotas
+			bin/ntlm_auth"
+
+		use ads && SBINPROGS="${SBINPROGS} bin/cifs.upcall"
+	fi
+
+	use cups && BINPROGS="${BINPROGS} bin/smbspool"
+	use ldb && BINPROGS="${BINPROGS} bin/ldbedit bin/ldbsearch bin/ldbadd bin/ldbdel bin/ldbmodify bin/ldbrename";
+
+	if use winbind ; then
+		BINPROGS="${BINPROGS} bin/wbinfo"
+		SHAREDMODS="${SHAREDMODS}idmap_rid,idmap_hash"
+		use ads && SHAREDMODS="${SHAREDMODS},idmap_ad"
+		use ldap && SHAREDMODS="${SHAREDMODS},idmap_ldap,idmap_adex"
+	fi
+
+	if use winbind &&
+		[[ $(tc-getCC)$ == *gcc* ]] &&
+		[[ $(gcc-major-version)$(gcc-minor-version) -lt 43 ]]
+	then
+		eerror "It is a known issue that ${P} will not build with "
+		eerror "winbind use flag enabled when using gcc < 4.3 ."
+		eerror "Please use at least the latest stable gcc version."
+		die "Using sys-devel/gcc < 4.3 with winbind use flag."
+	fi
+}
+
+src_prepare() {
+	cp "${FILESDIR}/samba-3.4.2-lib.tevent.python.mk" "../lib/tevent/python.mk"
+
+	# ensure that winbind has correct ldflags (QA notice)
+	sed -i \
+		-e 's|LDSHFLAGS="|LDSHFLAGS="\\${LDFLAGS} |g' \
+		configure || die "sed failed"
+
+	epatch "${CONFDIR}"/${PN}-3.5.6-kerberos-dummy.patch
+	use smbtav2 && cd "${WORKDIR}/${P}" && epatch "${WORKDIR}"/smb_traffic_analyzer_v2.diff
+	cd "${WORKDIR}/${MY_P}" && epatch "${CONFDIR}"/${PN}-3.5.8-uclib-build.patch
+	epatch "${CONFDIR}"/smb.conf.default.patch
+}
+
+src_configure() {
+	local myconf
+
+	# Filter out -fPIE
+	[[ ${CHOST} == *-*bsd* ]] && myconf+=" --disable-pie"
+
+	# Upstream refuses to make this configurable
+	use caps && export ac_cv_header_sys_capability_h=yes || export ac_cv_header_sys_capability_h=no
+
+	# use_with doesn't accept 2 USE-flags
+	if use client && use ads ; then
+		myconf+=" --with-cifsupcall"
+	else
+		myconf+=" --without-cifsupcall"
+	fi
+
+	# Notes:
+	# - automount is only needed in conjunction with NIS and we don't have that
+	# anymore => LDAP?
+	# - --without-dce-dfs and --without-nisplus-home can't be passed to configure but are disabled by default
+	econf ${myconf} \
+		--with-piddir=/var/run/samba \
+		--sysconfdir=/etc/samba \
+		--localstatedir=/var \
+		$(use_enable debug developer) \
+		--enable-largefile \
+		--enable-socket-wrapper \
+		--enable-nss-wrapper \
+		$(use_enable swat) \
+		$(use_enable debug dmalloc) \
+		$(use_enable cups) \
+		--disable-iprint \
+		$(use_enable fam) \
+		--enable-shared-libs \
+		--disable-dnssd \
+		$(use_enable avahi) \
+		--with-fhs \
+		--with-privatedir=/var/lib/samba/private \
+		--with-rootsbindir=/var/cache/samba \
+		--with-lockdir=/var/cache/samba \
+		--with-swatdir=/usr/share/doc/${PF}/swat \
+		--with-configdir=/etc/samba \
+		--with-logfilebase=/var/log/samba \
+		--with-pammodulesdir=$(getpam_mod_dir) \
+		--without-afs \
+		--without-fake-kaserver \
+		--without-vfs-afsacl \
+		$(use_with ldap) \
+		$(use_with ads) \
+		$(use_with ads krb5 /usr) \
+		$(use_with ads dnsupdate) \
+		--without-automount \
+		$(use_with client cifsmount) \
+		$(use_with client cifsumount) \
+		$(use_with pam) \
+		$(use_with pam pam_smbpass) \
+		$(use_with syslog) \
+		$(use_with quota quotas) \
+		$(use_with quota sys-quotas) \
+		--without-utmp \
+		--without-lib{talloc,tdb} \
+		$(use_with netapi libnetapi) \
+		$(use_with smbclient libsmbclient) \
+		$(use_with smbsharemodes libsmbsharemodes) \
+		$(use_with addns libaddns) \
+		$(use_with cluster ctdb /usr) \
+		$(use_with cluster cluster-support) \
+		$(use_with acl acl-support) \
+		$(use_with aio aio-support) \
+		--with-sendfile-support \
+		$(use_with winbind) \
+		--with-shared-modules=${SHAREDMODS} \
+		--without-included-popt \
+		--without-included-iniparser
+}
+
+src_compile() {
+	# compile libs
+	if use addns ; then
+		einfo "make addns library"
+		emake libaddns
+	fi
+	if use netapi ; then
+		einfo "make netapi library"
+		emake libnetapi
+	fi
+	if use smbclient ; then
+		einfo "make smbclient library"
+		emake libsmbclient
+	fi
+	if use smbsharemodes ; then
+		einfo "make smbsharemodes library"
+		emake libsmbsharemodes
+	fi
+
+	# compile modules
+	emake modules
+
+	# compile pam moudles
+	if use pam ; then
+		einfo "make pam modules"
+		emake pam_modules
+	fi
+
+	# compile winbind nss modules
+	if use winbind ; then
+		einfo "make nss modules"
+		emake nss_modules
+	fi
+
+	# compile utilities
+	if [ -n "${BINPROGS}" ] ; then
+		einfo "make binprogs"
+		emake ${BINPROGS}
+	fi
+	if [ -n "${SBINPROGS}" ] ; then
+		einfo "make sbinprogs"
+		emake ${SBINPROGS}
+	fi
+
+	if [ -n "${KRBPLUGIN}" ] ; then
+		einfo "make krbplugin"
+		emake ${KRBPLUGIN}${PLUGINEXT}
+	fi
+
+	if use client ; then
+		einfo "make {,u}mount.cifs"
+		emake bin/{,u}mount.cifs
+	fi
+}
+
+src_install() {
+	# install libs
+	if use addns ; then
+		einfo "install addns library"
+		emake installlibaddns DESTDIR="${D}"
+	fi
+	if use netapi ; then
+		einfo "install netapi library"
+		emake installlibnetapi DESTDIR="${D}"
+	fi
+	if use smbclient ; then
+		einfo "install smbclient library"
+		emake installlibsmbclient DESTDIR="${D}"
+	fi
+	if use smbsharemodes ; then
+		einfo "install smbsharemodes library"
+		emake installlibsmbsharemodes DESTDIR="${D}"
+	fi
+
+	# install modules
+	emake installmodules DESTDIR="${D}"
+
+	if use pam ; then
+		einfo "install pam modules"
+		emake installpammodules DESTDIR="${D}"
+
+		if use winbind ; then
+			newpamd "${CONFDIR}/system-auth-winbind.pam" system-auth-winbind
+			doman ../docs/manpages/pam_winbind.8
+		fi
+
+		newpamd "${CONFDIR}/samba.pam" samba
+		dodoc pam_smbpass/README
+	fi
+
+	# Nsswitch extensions. Make link for wins and winbind resolvers
+	if use winbind ; then
+		einfo "install libwbclient"
+		emake installlibwbclient DESTDIR="${D}"
+		dolib.so ../nsswitch/libnss_wins.so
+		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
+	insinto /usr
+	for prog in ${SBINPROGS} ; do
+		dosbin ${prog}
+		doman ../docs/manpages/${prog/bin\/}*
+	done
+
+	for prog in ${BINPROGS} ; do
+		dobin ${prog}
+		doman ../docs/manpages/${prog/bin\/}*
+	done
+
+	# install krbplugin
+	if [ -n "${KRBPLUGIN}" ] ; then
+		if has_version app-crypt/mit-krb5 ; then
+			insinto /usr/$(get_libdir)/krb5/plugins/libkrb5
+			doins ${KRBPLUGIN}${PLUGINEXT}
+		elif has_version app-crypt/heimdal ; then
+			insinto /usr/$(get_libdir)/plugin/krb5
+			doins ${KRBPLUGIN}${PLUGINEXT}
+		fi
+		insinto /usr
+		for prog in ${KRBPLUGIN} ; do
+			doman ../docs/manpages/${prog/bin\/}*
+		done
+	fi
+
+	# install server components
+	if use server ; then
+		doman ../docs/manpages/vfs* ../docs/manpages/samba.7
+
+		diropts -m0700
+		keepdir /var/lib/samba/private
+
+		diropts -m1777
+		keepdir /var/spool/samba
+
+		diropts -m0755
+		keepdir /var/{cache,log}/samba
+		keepdir /var/lib/samba/{netlogon,profiles}
+		keepdir /var/lib/samba/printers/{W32X86,WIN40,W32ALPHA,W32MIPS,W32PPC,X64,IA64,COLOR}
+		keepdir /usr/$(get_libdir)/samba/{auth,pdb,rpc,idmap,nss_info,gpext}
+
+		newconfd "${CONFDIR}/samba.confd" samba
+		newinitd "${CONFDIR}/samba.initd" samba
+
+		insinto /etc/samba
+		doins "${CONFDIR}"/{smbusers,lmhosts}
+
+		if use ldap ; then
+			insinto /etc/openldap/schema
+			doins ../examples/LDAP/samba.schema
+		fi
+
+		if use swat ; then
+			insinto /etc/xinetd.d
+			newins "${CONFDIR}/swat.xinetd" swat
+			script/installswat.sh "${D}" "${ROOT}/usr/share/doc/${PF}/swat" "${S}"
+		fi
+
+		dodoc ../MAINTAINERS ../README* ../Roadmap ../WHATSNEW.txt ../docs/THANKS
+	fi
+
+	# install client files ({u,}mount.cifs into /)
+	if use client ; then
+		into /
+		dosbin bin/{u,}mount.cifs
+		doman ../docs/manpages/{u,}mount.cifs.8
+	fi
+
+	# install the spooler to cups
+	if use cups ; then
+		dosym /usr/bin/smbspool $(cups-config --serverbin)/backend/smb
+	fi
+
+	# install misc files
+	insinto /etc/samba
+	doins ../examples/smb.conf.default
+	doman  ../docs/manpages/smb.conf.5
+
+	insinto /usr/"$(get_libdir)"/samba
+	doins ../codepages/{valid.dat,upcase.dat,lowcase.dat}
+
+	# install docs
+	if use doc ; then
+		dohtml -r ../docs/htmldocs/*
+		dodoc ../docs/*.pdf
+	fi
+
+	# install examples
+	if use examples ; then
+		insinto /usr/share/doc/${PF}/examples
+
+		if use smbclient ; then
+			doins -r ../examples/libsmbclient
+		fi
+
+		if use winbind ; then
+			doins -r ../examples/pam_winbind ../examples/nss
+		fi
+
+		if use server ; then
+			cd ../examples
+			doins -r auth autofs dce-dfs LDAP logon misc pdb \
+			perfcounter printer-accounting printing scripts tridge \
+			validchars VFS
+		fi
+	fi
+
+	# Remove empty installation directories
+	rmdir --ignore-fail-on-non-empty \
+		"${D}/usr/$(get_libdir)/samba" \
+		"${D}/usr"/{sbin,bin} \
+		"${D}/usr/share"/{man,locale,} \
+		"${D}/var"/{run,lib/samba/private,lib/samba,lib,cache/samba,cache,} \
+	#	|| die "tried to remove non-empty dirs, this seems like a bug in the ebuild"
+}
+
+pkg_postinst() {
+	elog "The default value of 'wide links' has been changed to 'no' in samba 3.5"
+	elog "to avoid an insecure default configuration"
+	elog "('wide links = yes' and 'unix extensions = yes'). For more details,"
+	elog "please see http://www.samba.org/samba/news/symlink_attack.html ."
+	elog ""
+	elog "An EXPERIMENTAL implementation of the SMB2 protocol has been added."
+	elog "SMB2 can be enabled by setting 'max protocol = smb2'. SMB2 is a new "
+	elog "implementation of the SMB protocol used by Windows Vista and higher"
+	elog ""
+	elog "For further information make sure to read the release notes at"
+	elog "http://samba.org/samba/history/${P}.html and "
+	elog "http://samba.org/samba/history/${PN}-3.5.0.html"
+}