Bump to 3.0.34. Fixes #256778

Package-Manager: portage-2.2_rc28/cvs/Linux x86_64

3 files changed, 360 insertions, 2 deletions

diff --git a/net-fs/samba/ChangeLog b/net-fs/samba/ChangeLog
index 6e039f15a0c5..2bc3c4e6bf35 100644
--- a/net-fs/samba/ChangeLog
+++ b/net-fs/samba/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-fs/samba
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.352 2009/01/04 17:51:15 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.353 2009/03/29 16:49:58 patrick Exp $
+
+*samba-3.0.34 (29 Mar 2009)
+
+  29 Mar 2009; Patrick Lauer <patrick@gentoo.org> +samba-3.0.34.ebuild:
+  Bump to 3.0.34. Fixes #256778
 
   04 Jan 2009; Raúl Porcel <armin76@gentoo.org> samba-3.0.33.ebuild:
   s390/sh stable wrt #247620
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index e9a317aa1238..6c55d73c4cdc 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -34,6 +34,7 @@ DIST samba-3.0.30.tar.gz 20510081 RMD160 49f2f77294cdab6d7ca9db878755db2384e897c
 DIST samba-3.0.31.tar.gz 20514191 RMD160 dc2051baa8f78f31026f17d9f9ac26ad4b9aa691 SHA1 0f13fcf69072b40340c00e9bcf4af13670efffd3 SHA256 b44f0b0fd79a25b2e6c3f3836a615c5c7d55ac65c460bd68be6380ec77abc28e
 DIST samba-3.0.32.tar.gz 21679285 RMD160 91bea73b9a799b8cb67d5fadd288d9403f175492 SHA1 bcbcff2c00a7cec07886de184d8761fd8b424810 SHA256 8a7f50e0e85eb0c5c5a9bee7d464367afe09366e66a162cdbb4f13860c0fecd6
 DIST samba-3.0.33.tar.gz 49393320 RMD160 c396f9dbd052d9377ca7ff75550173855c9792e2 SHA1 235c15e796a49fcf80b154d608813af8e7ebb329 SHA256 285004bdfb452235ac8ac20d33c083ecb326a10f6ee819dab4032ab5c6563a16
+DIST samba-3.0.34.tar.gz 24835363 RMD160 d79cd544b5ab2b4a7130b8c52c19edcfc89083ea SHA1 18104d1bf509cd3fd3107c09fa6205666e04ac16 SHA256 530793de9f4114f4b391d932e2833baf25a00498317471cd75a068f3378c299e
 DIST samba-3.2.0rc2.tar.gz 23798537 RMD160 28fe017a713c30fb054eef92a4c21b39ea8036c9 SHA1 23d8865da812cd6f1fd5a5b690bf9c0761dca902 SHA256 c2bff2c31d147377e58275e8aea76ad5e4dc668067f8f0ab9e0ecfa2afc6bc87
 DIST samba-vscan-0.3.6c-beta5.tar.gz 248183 RMD160 6929c30b57e342c4bdf6a6b432fbe41c2ac70a74 SHA1 9e1b37225246ff2f19e37aceb97a680afc82cdda SHA256 bfe910d54add8dcb87d5babdf50127a6dcf079e0e90ad9947b4cbfdbe3e3037d
 EBUILD samba-3.0.28.ebuild 9283 RMD160 7b7b2c477fb2abcafd32067575c33eb712a92140 SHA1 afb536f0dcafcdd411ed0ac51d7f852c6925ed1b SHA256 857d28fc7d3dfdf424b23ad5d03cd34030051a95932ca6797ed41b504bc358ec
@@ -42,6 +43,7 @@ EBUILD samba-3.0.30.ebuild 9348 RMD160 806c245a0103c831d54fadf8c10d9cab0b97af8b
 EBUILD samba-3.0.31.ebuild 10181 RMD160 98ce7c399f12ddbe428134198fea40ecbcf1491e SHA1 7a96fcb82144993fc3350d826d62af286211ecfb SHA256 ada088e475f5416dd71c810aa5cf7acf9471b66d26c500fc7651734dc4d54832
 EBUILD samba-3.0.32.ebuild 10168 RMD160 28c0579b851622a54c8a455681ead6369466a71b SHA1 9663e85817b2f8016e75356669da992fce48b39c SHA256 0eb10b229e54c1a3847e32e41c557342974e31402ff72dea9340a09c1ef5796c
 EBUILD samba-3.0.33.ebuild 10171 RMD160 20100c365e5a855ddc3f3709da2993c9bb650a65 SHA1 bbed50cfbd692d21afb4d9112302685246c009b2 SHA256 a257a4e16024acb0c0dce88e1bfec1e4cc212e264956468d0183aac87748b75e
+EBUILD samba-3.0.34.ebuild 10133 RMD160 5f857c8257b06c19799dbdc111c2f512d5efe596 SHA1 a2f877667f592c2a36c21fab2033e4b7767b5616 SHA256 e26e9c95b73de095949f3b425e28e710341b662705d1a4164d69238921838060
 EBUILD samba-3.2.0_rc2.ebuild 8524 RMD160 3059d780ce7ef1f206d90f959cd1e9c0ed8fa57c SHA1 7db27ea7b786e7f71f9b734109277c9c6d72d78f SHA256 b406f8a11e900190813cdac175f573bc0e7cf182e011d88531e52b81071a733b
-MISC ChangeLog 59580 RMD160 e840c64804a01b4174e284f6dafc3968df9db791 SHA1 7e8df92c51a3bb0a86b3ab7c2d070c329382251e SHA256 0fcd3a08f29ac297edaf876522363166aeacae558df0b0bace353b49d19feaa6
+MISC ChangeLog 59714 RMD160 16a5adb3cdf048c4066cc2691ab9a1bb8a6e4219 SHA1 1b47734c0c0f94129a916e20b514c207a735e80c SHA256 ef3f280dc913ed2a82eb280a1a8be2ce6e1fe4327b2afe07a76a86b8b483dc7d
 MISC metadata.xml 950 RMD160 4947143536f9776d7dd7f7d6552d624e1f2ac14d SHA1 ef8a8c0c5cd229c88b1f93042ebfbdafaf45deb2 SHA256 b040a13821dbd3f1214b96ed5a808188ef0996161b0ce0cc11de8d8397de960f
diff --git a/net-fs/samba/samba-3.0.34.ebuild b/net-fs/samba/samba-3.0.34.ebuild
new file mode 100644
index 000000000000..fda7acf9bf9f
--- /dev/null
+++ b/net-fs/samba/samba-3.0.34.ebuild
@@ -0,0 +1,351 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.0.34.ebuild,v 1.1 2009/03/29 16:49:58 patrick Exp $
+
+inherit autotools eutils pam python multilib versionator confutils
+
+VSCAN_P="samba-vscan-0.3.6c-beta5"
+MY_P=${PN}-${PV/_/}
+
+DESCRIPTION="A suite of SMB and CIFS client/server programs for UNIX"
+HOMEPAGE="http://www.samba.org/"
+SRC_URI="mirror://samba/${MY_P}.tar.gz
+	mirror://samba/old-versions/${MY_P}.tar.gz
+	oav? ( http://www.openantivirus.org/download/${VSCAN_P}.tar.gz )"
+LICENSE="GPL-3 oav? ( GPL-2 LGPL-2.1 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE="acl ads async automount caps cups debug doc examples ipv6 kernel_linux ldap fam
+	pam python quotas readline selinux swat syslog winbind oav"
+
+RDEPEND="dev-libs/popt
+	virtual/libiconv
+	acl?       ( kernel_linux? ( sys-apps/acl ) )
+	cups?      ( net-print/cups )
+	ipv6?      ( sys-apps/xinetd )
+	ads?       ( virtual/krb5 )
+	ldap?      ( net-nds/openldap )
+	pam?       ( virtual/pam )
+	python?    ( dev-lang/python )
+	readline?  ( sys-libs/readline )
+	selinux?   ( sec-policy/selinux-samba )
+	swat?      ( sys-apps/xinetd )
+	syslog?    ( virtual/logger )
+	fam?       ( virtual/fam )
+	caps?      ( sys-libs/libcap )"
+DEPEND="${RDEPEND}"
+
+# Tests are broken now :-(
+RESTRICT="test"
+
+S=${WORKDIR}/${MY_P}
+CONFDIR=${FILESDIR}/config
+PRIVATE_DST=/var/lib/samba/private
+
+pkg_setup() {
+	confutils_use_depend_all ads ldap
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}/source"
+
+	# lazyldflags.patch: adds "-Wl,-z,now" to smb{mnt,umount}
+	# invalid-free-fix.patch: Bug #196015 (upstream: #5021)
+
+	epatch \
+		"${FILESDIR}/3.0.26a-lazyldflags.patch" \
+		"${FILESDIR}/3.0.26a-invalid-free-fix.patch" \
+		"${FILESDIR}/3.0.28-fix_broken_readdir_detection.patch" \
+		"${FILESDIR}/3.0.28a-wrong_python_ldflags.patch"
+
+	eautoconf -I. -Ilib/replace
+
+	# Ok, agreed, this is ugly. But it avoids a patch we
+	# need for every samba version and we don't need autotools
+	sed -i \
+		-e 's|"lib32" ||' \
+		-e 's|if test -d "$i/$l" ;|if test -d "$i/$l" -o -L "$i/$l";|' \
+		configure || die "sed failed"
+
+	rm "${S}/docs/manpages"/{mount,umount}.cifs.8
+
+}
+
+src_compile() {
+	cd "${S}/source"
+
+	local myconf
+	local mylangs
+	local mymod_shared
+
+	python_version
+	myconf="--with-python=no"
+	use python && myconf="--with-python=${python}"
+
+	use winbind && mymod_shared="--with-shared-modules=idmap_rid"
+	if use ldap ; then
+		myconf="${myconf} $(use_with ads)"
+		use winbind && mymod_shared="${mymod_shared},idmap_ad"
+	fi
+
+	[[ ${CHOST} == *-*bsd* ]] && myconf="${myconf} --disable-pie"
+	use hppa && myconf="${myconf} --disable-pie"
+
+	use caps && export ac_cv_header_sys_capability_h=yes || export ac_cv_header_sys_capability_h=no
+
+	# Otherwise we get the whole swat stuff installed
+	if ! use swat ; then
+		sed -i \
+			-e 's/^\(install:.*\)installswat \(.*\)/\1\2/' \
+			Makefile.in || die "sed failed"
+	fi
+
+	econf \
+		--with-fhs \
+		--sysconfdir=/etc/samba \
+		--localstatedir=/var \
+		--with-configdir=/etc/samba \
+		--with-libdir=/usr/$(get_libdir)/samba \
+		--with-pammodulesdir=$(getpam_mod_dir) \
+		--with-swatdir=/usr/share/doc/${PF}/swat \
+		--with-piddir=/var/run/samba \
+		--with-lockdir=/var/cache/samba \
+		--with-logfilebase=/var/log/samba \
+		--with-privatedir=${PRIVATE_DST} \
+		--with-libsmbclient \
+		--enable-socket-wrapper \
+		--with-cifsmount=no \
+		$(use_with acl acl-support) \
+		$(use_with async aio-support) \
+		$(use_with automount) \
+		$(use_enable cups) \
+		$(use_enable debug) \
+		$(use_enable fam) \
+		$(use_with ads krb5) \
+		$(use_with ldap) \
+		$(use_with pam) $(use_with pam pam_smbpass) \
+		$(use_with quotas) $(use_with quotas sys-quotas) \
+		$(use_with readline) \
+		$(use_with kernel_linux smbmount) \
+		$(use_with syslog) \
+		$(use_with winbind) \
+		${myconf} ${mylangs} ${mymod_shared}
+
+	emake proto || die "emake proto failed"
+	emake everything || die "emake everything failed"
+
+	if use python ; then
+		emake python_ext || die "emake python_ext failed"
+	fi
+
+	if use oav ; then
+		# maintainer-info:
+		# - there are no known releases of mks or kavdc,
+		#   setting to builtin to disable auto-detection
+		cd "${WORKDIR}/${VSCAN_P}"
+		econf \
+			--with-fhs \
+			--with-samba-source="${S}/source" \
+			--with-libmksd-builtin \
+			--with-libkavdc-builtin \
+			--without-symantec \
+			--with-filetype \
+			--with-fileregexp \
+			$(use_enable debug)
+		emake || die "emake oav plugins failed"
+	fi
+}
+
+src_test() {
+	cd "${S}/source"
+	emake test || die "tests failed"
+}
+
+src_install() {
+	cd "${S}/source"
+
+	emake DESTDIR="${D}" install-everything || die "emake install-everything failed"
+
+	# Extra rpctorture progs
+	local extra_bins="rpctorture"
+	for i in ${extra_bins} ; do
+		[[ -x "${S}/bin/${i}" ]] && dobin "${S}/bin/${i}"
+	done
+
+	# remove .old stuff from /usr/bin:
+	rm -f "${D}"/usr/bin/*.old
+
+	# Removing executable bits from header-files
+	fperms 644 /usr/include/lib{msrpc,smbclient}.h
+
+	# Nsswitch extensions. Make link for wins and winbind resolvers
+	if use winbind ; then
+		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
+	fi
+
+	if use kernel_linux ; then
+		# Warning: this can byte you if /usr is
+		# on a separate volume and you have to mount
+		# a smb volume before the local mount
+		dosym ../usr/bin/smbmount /sbin/mount.smbfs
+		fperms 4755 /usr/bin/smbmnt
+		fperms 4755 /usr/bin/smbumount
+	fi
+
+	# bug #46389: samba doesn't create symlink anymore
+	# beaviour seems to be changed in 3.0.6, see bug #61046
+	dosym samba/libsmbclient.so /usr/$(get_libdir)/libsmbclient.so.0
+	dosym samba/libsmbclient.so /usr/$(get_libdir)/libsmbclient.so
+
+	# make the smb backend symlink for cups printing support (bug #133133)
+	if use cups ; then
+		dodir $(cups-config --serverbin)/backend
+		dosym /usr/bin/smbspool $(cups-config --serverbin)/backend/smb
+	fi
+
+	if use python ; then
+		emake DESTDIR="${D}" python_install || die "emake installpython failed"
+		# We're doing that manually
+		find "${D}/usr/$(get_libdir)/python${PYVER}/site-packages" -iname "*.pyc" -delete
+	fi
+
+	cd "${S}/source"
+
+	# General config files
+	insinto /etc/samba
+	doins "${CONFDIR}"/{smbusers,lmhosts}
+	newins "${CONFDIR}/smb.conf.example-samba3" smb.conf.example
+
+	newpamd "${CONFDIR}/samba.pam" samba
+	use winbind && dopamd "${CONFDIR}/system-auth-winbind"
+	if use swat ; then
+		insinto /etc/xinetd.d
+		newins "${CONFDIR}/swat.xinetd" swat
+	else
+		rm -f "${D}/usr/sbin/swat"
+		rm -f "${D}/usr/share/man/man8/swat.8"
+	fi
+
+	newinitd "${FILESDIR}/samba-init" samba
+	newconfd "${FILESDIR}/samba-conf" samba
+
+	if use ldap ; then
+		insinto /etc/openldap/schema
+		doins "${S}/examples/LDAP/samba.schema"
+	fi
+
+	if use ipv6 ; then
+		insinto /etc/xinetd.d
+		newins "${FILESDIR}/samba-xinetd" smb
+	fi
+
+	# dirs
+	diropts -m0700 ; keepdir "${PRIVATE_DST}"
+	diropts -m1777 ; keepdir /var/spool/samba
+
+	diropts -m0755
+	keepdir /var/{log,run,cache}/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/{rpc,idmap,auth}
+
+	# docs
+	dodoc "${FILESDIR}/README.gentoo"
+	dodoc "${S}"/{MAINTAINERS,README,Roadmap,WHATSNEW.txt}
+	dodoc "${CONFDIR}/nsswitch.conf-wins"
+	use winbind && dodoc "${CONFDIR}/nsswitch.conf-winbind"
+
+	if use examples ; then
+		insinto /usr/share/doc/${PF}
+		doins -r "${S}/examples/"
+		find "${D}/usr/share/doc/${PF}" -type d -print0 | xargs -0 chmod 755
+		find "${D}/usr/share/doc/${PF}/examples" ! -type d -print0 | xargs -0 chmod 644
+		if use python ; then
+			insinto /usr/share/doc/${PF}/python
+			doins -r "${S}/source/python/examples"
+		fi
+	fi
+
+	if ! use doc ; then
+		if ! use swat ; then
+			rm -rf "${D}/usr/share/doc/${PF}/swat"
+		else
+			rm -rf "${D}/usr/share/doc/${PF}/swat/help"/{guide,howto,devel}
+			rm -rf "${D}/usr/share/doc/${PF}/swat/using_samba"
+		fi
+	else
+		cd "${S}/docs"
+		insinto /usr/share/doc/${PF}
+		doins *.pdf
+		doins -r registry
+		dohtml -r htmldocs/*
+	fi
+
+	if use oav ; then
+		cd "${WORKDIR}/${VSCAN_P}"
+		emake DESTDIR="${D}" install || die "emake install oav plugins failed"
+		docinto samba-vscan
+		dodoc AUTHORS ChangeLog FAQ INSTALL NEWS README TODO
+		find . -iname "*.conf" -print0 | xargs -0 dodoc
+	fi
+}
+
+pkg_preinst() {
+	local PRIVATE_SRC=/etc/samba/private
+	if [[ ! -r "${ROOT}/${PRIVATE_DST}/secrets.tdb" \
+		&& -r "${ROOT}/${PRIVATE_SRC}/secrets.tdb" ]] ; then
+		ebegin "Copying "${ROOT}"/${PRIVATE_SRC}/* to ${ROOT}/${PRIVATE_DST}/"
+			mkdir -p "${D}/${PRIVATE_DST}"
+			cp -pPRf "${ROOT}/${PRIVATE_SRC}"/* "${D}/${PRIVATE_DST}/"
+		eend $?
+	fi
+
+	if [[ ! -f "${ROOT}/etc/samba/smb.conf" ]] ; then
+		touch "${D}/etc/samba/smb.conf"
+	fi
+}
+
+pkg_postinst() {
+	if use python ; then
+		python_version
+		python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages/samba
+	fi
+
+	if use swat ; then
+		einfo "swat must be enabled by xinetd:"
+		einfo "  change the /etc/xinetd.d/swat configuration"
+	fi
+
+	if use ipv6 ; then
+		einfo "ipv6 support must be enabled by xinetd:"
+		einfo "  change the /etc/xinetd.d/smb configuration"
+	fi
+
+	elog "It is possible to start/stop daemons separately:"
+	elog "  Create a symlink from /etc/init.d/samba.{smbd,nmbd,winbind} to"
+	elog "  /etc/init.d/samba. Calling /etc/init.d/samba directly will start"
+	elog "  the daemons configured in /etc/conf.d/samba"
+
+	elog "The mount/umount.cifs helper applications are not included anymore."
+	elog "Please install net-fs/mount-cifs instead."
+
+	if use oav ; then
+		elog "The configure snippets for various antivirus plugins are available here:"
+		elog "  /usr/share/doc/${PF}/samba-vscan"
+	fi
+
+	ewarn "If you're upgrading from 3.0.24 or earlier, please make sure to"
+	ewarn "restart your clients to clear any cached information about the server."
+	ewarn "Otherwise they might not be able to connect to the volumes."
+}
+
+pkg_postrm() {
+	if use python ; then
+		python_version
+		python_mod_cleanup /usr/$(get_libdir)/python${PYVER}/site-packages/samba
+	fi
+}