Bump to 3.0.35. Fixes #275236.

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

3 files changed, 360 insertions, 12 deletions

diff --git a/net-fs/samba/ChangeLog b/net-fs/samba/ChangeLog
index 907901cbaba4..2b85b0ab9c0f 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.355 2009/05/29 19:55:00 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.356 2009/06/25 18:18:09 patrick Exp $
+
+*samba-3.0.35 (25 Jun 2009)
+
+  25 Jun 2009; Patrick Lauer <patrick@gentoo.org> +samba-3.0.35.ebuild:
+  Bump to 3.0.35. Fixes #275236.
 
   29 May 2009; Diego E. Pettenò <flameeyes@gentoo.org> samba-3.0.28.ebuild,
   samba-3.0.28a-r1.ebuild, samba-3.0.30.ebuild, samba-3.0.31.ebuild,
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index 98cbff80ce71..254ea33e972c 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 3.0.26a-invalid-free-fix.patch 541 RMD160 13e1b0420ae9c06a2e6d4f9a8a0a3af8c32318b9 SHA1 0457c901f55b86b9b3751dc67b86a26cb19ec4e7 SHA256 4a727b9a02cbc7e2efc00190d5068c82e12a0b9fdad2a50869a2f10bc39a06f2
 AUX 3.0.26a-lazyldflags.patch 1466 RMD160 12a3d97c8b84af5dea7c70173e4613bc663d4e8d SHA1 35742557c810ae4bfbbfecc3a6c3549c392fd313 SHA256 07eb35a567540bc88657f75881c8daf10de3697b64ec9bd7167f1df80cfb0d55
 AUX 3.0.28-autoconf-2.62-fix.patch 524 RMD160 843a8adb134376259485fba22deceeebf453abea SHA1 2adfe8d3a5ea32971c67305fc047f39e5c03ba76 SHA256 0b9b80b52899154f6526d4864218742c2ec836d44a8a4045e091b3bb40449171
@@ -38,6 +35,7 @@ DIST samba-3.0.31.tar.gz 20514191 RMD160 dc2051baa8f78f31026f17d9f9ac26ad4b9aa69
 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.0.35.tar.gz 24839204 RMD160 81c708aa6ab048f9fa24999650992a92a95f7da3 SHA1 c75e20890f893decfd4285480041b7e39d43ed3d SHA256 87b81c0cea653305e796013148d3c0c68d7f38cbd7ed3b5255ddace14fd37748
 DIST samba-3.2.0rc2.tar.gz 23798537 RMD160 28fe017a713c30fb054eef92a4c21b39ea8036c9 SHA1 23d8865da812cd6f1fd5a5b690bf9c0761dca902 SHA256 c2bff2c31d147377e58275e8aea76ad5e4dc668067f8f0ab9e0ecfa2afc6bc87
 DIST samba-3.2.11.tar.gz 24399021 RMD160 08910e5640dcdb4a72d062d87a31a9f7fc2ebc71 SHA1 2b5d41547aae0267930addd60a1e84f3f3ee7071 SHA256 5db81a9bd2842e7bf5f2fe8eeb0533eb59e6bb75a7d5f79f9e04c13baec32ef5
 DIST samba-vscan-0.3.6c-beta5.tar.gz 248183 RMD160 6929c30b57e342c4bdf6a6b432fbe41c2ac70a74 SHA1 9e1b37225246ff2f19e37aceb97a680afc82cdda SHA256 bfe910d54add8dcb87d5babdf50127a6dcf079e0e90ad9947b4cbfdbe3e3037d
@@ -48,14 +46,8 @@ EBUILD samba-3.0.31.ebuild 10163 RMD160 a66ae1f11b42d0e16ae340c8088c51bf46339491
 EBUILD samba-3.0.32.ebuild 10152 RMD160 be0739a7fede7a93884c938ff19de71e644afe1e SHA1 a1562e70ad30cc615123d5d94c689fcb11a6c444 SHA256 1f1bd3a9b27cfe89f49f6d6869c5d5fdec9bc7c95a7de43761b983804c072773
 EBUILD samba-3.0.33.ebuild 10154 RMD160 bef33d341d1681ac3b0427bb72fa7cc58b45933c SHA1 3fd7304c502c36f0a2774daa5d181fd81fef7be5 SHA256 339f4ac029d8c4357b59eb832457ee787b74830412c7a0557904f2863d3b987c
 EBUILD samba-3.0.34.ebuild 10116 RMD160 ee8f7ec7636a35df2d62f432e8b086e734d956b6 SHA1 74747c552b73c501dbf55b4afa3eb3a380aba3f8 SHA256 1c17b80cee7b28773bd78251d51fdb9771fbf6792b4b8ce03ad6e9d1438ee757
+EBUILD samba-3.0.35.ebuild 10114 RMD160 142f18ec729d107e7048ab4cdc6329c92f8fdffe SHA1 c896996379d51a2f0c55e1bea20e0512a32accde SHA256 6c95478f41e24073c6efd4fdc0b780e2276b2ea6d7c8c15c6432068d8492ebde
 EBUILD samba-3.2.0_rc2.ebuild 8506 RMD160 1979bf98256a7c8f7450956a56c18f39c7527425 SHA1 8204df28d2c8930be373f04d219cc937d289fe82 SHA256 8c774b83cb78e356fac26dfe12bee9e0609d110db99c0cb4dc51338aa69993f8
 EBUILD samba-3.2.11.ebuild 8291 RMD160 894aff8b443c73ab65c6a0bdbb9a602907c771af SHA1 292a791031267868a08b486cff05bca58ac70a8b SHA256 d85019e0b7dea53f78f0075aac0112d146a0b283e4f4b16ba6181e2db7a09ba2
-MISC ChangeLog 60313 RMD160 c50a1fe65419ca984c23a2011fc41be0a2881127 SHA1 4f473a9a299a6472a87ccf1960ee1c8f22e588e3 SHA256 5ea6a184c8fef5d195891bb3e81508943304e10f544279a6c3f2d87e0aeeeca4
+MISC ChangeLog 60446 RMD160 a18cff4ca5e198089efb542fe1aab9ddcd6b8a56 SHA1 6c6a55d704897e00b851e09d576e0caeb4b197a9 SHA256 dabbe7104643f3c6936b24f524a2ee0716dbb504d931b75fb5c980dd2660d46a
 MISC metadata.xml 950 RMD160 4947143536f9776d7dd7f7d6552d624e1f2ac14d SHA1 ef8a8c0c5cd229c88b1f93042ebfbdafaf45deb2 SHA256 b040a13821dbd3f1214b96ed5a808188ef0996161b0ce0cc11de8d8397de960f
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkogPaUACgkQAiZjviIA2XgpMwCgpbPYXscu156ezV1X6/7yDhZL
-xoEAniDbwTMM8/ScvZUQu4MUUG7lMOaG
-=8IRu
------END PGP SIGNATURE-----
diff --git a/net-fs/samba/samba-3.0.35.ebuild b/net-fs/samba/samba-3.0.35.ebuild
new file mode 100644
index 000000000000..5c99c3e27406
--- /dev/null
+++ b/net-fs/samba/samba-3.0.35.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.35.ebuild,v 1.1 2009/06/25 18:18:09 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?       ( virtual/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
+}