Version bump for security bug #200773 (CVE-2007-6015).

Minor fixes for bugs #200132 and #199934)
Package-Manager: portage-2.1.4_rc9
RepoMan-Options: --force

4 files changed, 337 insertions, 5 deletions

diff --git a/net-fs/samba/ChangeLog b/net-fs/samba/ChangeLog
index c42adfa4b0f9..66e93d3f55b4 100644
--- a/net-fs/samba/ChangeLog
+++ b/net-fs/samba/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-fs/samba
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.325 2007/12/02 18:28:55 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.326 2007/12/10 16:39:55 dev-zero Exp $
+
+*samba-3.0.28 (10 Dec 2007)
+
+  10 Dec 2007; Tiziano Müller <dev-zero@gentoo.org> +samba-3.0.28.ebuild:
+  Version bump for security bug #200773 (CVE-2007-6015). 
+  Minor fixes for bugs #200132 and #199934.
 
   02 Dec 2007; Tiziano Müller <dev-zero@gentoo.org> samba-3.0.27a.ebuild:
   Added note to restart clients
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index 8005b0da14a6..7b7c316a0980 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -92,6 +92,7 @@ DIST samba-3.0.25c.tar.gz 18178029 RMD160 7c8de2c27144b2b23e7c3f4a8fceb35bddfd57
 DIST samba-3.0.26a.tar.gz 18180031 RMD160 9a62ba3ea2747b500ddea56729499524ae4329d2 SHA1 1625ac3f1c2a57600a9141a2b4bbe59fe8c4d6d2 SHA256 41e11f69288b2291f12f8db093e2c55dc1360555d4542c83c0758c4c7a3d4d37
 DIST samba-3.0.27.tar.gz 18135175 RMD160 e81cbcfc7d5b1768f78d1e7a6908695207543dac SHA1 d1157992adbab1f5d5aff54f370d1797fcf8927e SHA256 a8fe4c4b8dde879c61d6989015dafde240c461051a0769f739d8227597825859
 DIST samba-3.0.27a.tar.gz 18159377 RMD160 601c095fdfd5a66e3ce9d57a2d3874d37641ba3f SHA1 4bed2619d2f92ce41f7f84f00537a487c1bef7c9 SHA256 33e4998366e30ff7d6bdd70446fe9222badb0d4386d929e3d7cd28933685b6ae
+DIST samba-3.0.28.tar.gz 18159912 RMD160 816b57bff30a968c56be0c6864e6ea9f18981737 SHA1 4fcad8134f89a123a254138de0ace4a13993b007 SHA256 dcaf9213b9f7c749b346214ae21808cd336947c71693b4eca1af6f037725d98e
 DIST samba-vscan-0.3.6b.tar.bz2 164471 RMD160 5cd81345b06f44b2febf3f24e62325322b1c6a3b SHA1 b11e8303380ee8d271a916a17a16cbab9d0d36f8 SHA256 14f78b624b047b90ddf4965998e7115d3b3ac97b3229154a302637d8e49adcd4
 EBUILD samba-3.0.24-r3.ebuild 8558 RMD160 8639eaba80f753d5da2bbfa7c2b451c954b563f3 SHA1 c4724b60f864312b33497f14dc44c05dcea8ca5a SHA256 b7179360d8560f2d28d1404bf64cb45d01af910668f4b017f2c0e127202ead4f
 MD5 0c0cbf31c82035fa8a41f96dabe0ca4f samba-3.0.24-r3.ebuild 8558
@@ -117,10 +118,14 @@ EBUILD samba-3.0.27a.ebuild 8987 RMD160 697c77d1dbad904010d443ada0cd4e434a0d1e32
 MD5 6b0efcf356e9a629186a64d164a05c8a samba-3.0.27a.ebuild 8987
 RMD160 697c77d1dbad904010d443ada0cd4e434a0d1e32 samba-3.0.27a.ebuild 8987
 SHA256 d35de591c3b3a826ce269a552ece7a81addaa39bbfdb54f0b3223aee2e1d5ff2 samba-3.0.27a.ebuild 8987
-MISC ChangeLog 54779 RMD160 759321adc66bb188ca8f6d150cd9c4300f0cc3d4 SHA1 6000bd953844242688c8d0053dbecc643347c48e SHA256 e6a58d76926b9968954fa11a581de23228a1d1176b9e136a9990226b39e6066e
-MD5 9f0c6f42c959601d0374130ef04d0391 ChangeLog 54779
-RMD160 759321adc66bb188ca8f6d150cd9c4300f0cc3d4 ChangeLog 54779
-SHA256 e6a58d76926b9968954fa11a581de23228a1d1176b9e136a9990226b39e6066e ChangeLog 54779
+EBUILD samba-3.0.28.ebuild 9081 RMD160 a383b975369972770820b92ee42fcaebf09e31d3 SHA1 8dc7e7d4cf1694a5fd3cd1f07cfb1fb8b049f5c5 SHA256 f7e9f12d0021e4779b54459a48f75b2d47880618e6f37a1ddf6bb798ac750659
+MD5 6c2eccc687dc1bf391e91bb04ec225f5 samba-3.0.28.ebuild 9081
+RMD160 a383b975369972770820b92ee42fcaebf09e31d3 samba-3.0.28.ebuild 9081
+SHA256 f7e9f12d0021e4779b54459a48f75b2d47880618e6f37a1ddf6bb798ac750659 samba-3.0.28.ebuild 9081
+MISC ChangeLog 54986 RMD160 2f11425079c88fad95be90492ff19886d62a2a56 SHA1 60b7c7563f9fd9870780f0ad0f3a42d0224416ab SHA256 c477301fd315b3ccbc52e88deed991f98e7d6c3b83b30423d57d5f7b763f0af3
+MD5 e3a98fc2a364b10db1c8bf610e7b50a7 ChangeLog 54986
+RMD160 2f11425079c88fad95be90492ff19886d62a2a56 ChangeLog 54986
+SHA256 c477301fd315b3ccbc52e88deed991f98e7d6c3b83b30423d57d5f7b763f0af3 ChangeLog 54986
 MISC metadata.xml 489 RMD160 36eed0edca609c521314ae415efd57ca9acfecb4 SHA1 317e61704a10a3bd888d32c6834721f5d40d00ff SHA256 6f35f13dd39bb51d304fd59b5352c92bc35a957c9c9412c5c1f3f58e98519792
 MD5 324855d88a5c326d1b45b5c7719d5536 metadata.xml 489
 RMD160 36eed0edca609c521314ae415efd57ca9acfecb4 metadata.xml 489
@@ -143,3 +148,6 @@ SHA256 015d41df43f169e09e028d36079a67f55af039ff56315a246bd8d8a6fd0f4cbd files/di
 MD5 756391f4edf7a6f5447bc8ca8e7439a0 files/digest-samba-3.0.27a 247
 RMD160 2ff89f9fa599cc4ef90c8dcdd2ed3128c8ff52eb files/digest-samba-3.0.27a 247
 SHA256 d30d7b1fd94c32817ee61c8a77599a410776102bdb3130a75a5ea7bd9209416b files/digest-samba-3.0.27a 247
+MD5 fb47fd3e67c975a4213a7499b75c8e18 files/digest-samba-3.0.28 244
+RMD160 168b301f7460331687ef11fd9fcc8c28ee0abede files/digest-samba-3.0.28 244
+SHA256 8c0f733830035e15114997699a885fa95311e7385183364b0db0dc658ed3f00b files/digest-samba-3.0.28 244
diff --git a/net-fs/samba/files/digest-samba-3.0.28 b/net-fs/samba/files/digest-samba-3.0.28
new file mode 100644
index 000000000000..37d3a886d68f
--- /dev/null
+++ b/net-fs/samba/files/digest-samba-3.0.28
@@ -0,0 +1,3 @@
+MD5 8761cd7c02833d959fbebd4f69895075 samba-3.0.28.tar.gz 18159912
+RMD160 816b57bff30a968c56be0c6864e6ea9f18981737 samba-3.0.28.tar.gz 18159912
+SHA256 dcaf9213b9f7c749b346214ae21808cd336947c71693b4eca1af6f037725d98e samba-3.0.28.tar.gz 18159912
diff --git a/net-fs/samba/samba-3.0.28.ebuild b/net-fs/samba/samba-3.0.28.ebuild
new file mode 100644
index 000000000000..37350130e962
--- /dev/null
+++ b/net-fs/samba/samba-3.0.28.ebuild
@@ -0,0 +1,315 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.0.28.ebuild,v 1.1 2007/12/10 16:39:55 dev-zero Exp $
+
+inherit eutils pam python multilib versionator confutils
+
+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"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc ~sparc-fbsd x86 ~x86-fbsd"
+IUSE_LINGUAS="linguas_ja linguas_pl"
+IUSE="${IUSE_LINGUAS} acl ads async automount caps cups doc examples ipv6 kernel_linux ldap fam
+	pam python quotas readline selinux swat syslog winbind"
+
+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}"
+
+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"
+
+	# This patch adds "-Wl,-z,now" to smb{mnt,umount}
+	# Please read ... for further informations
+	epatch "${FILESDIR}/3.0.26a-lazyldflags.patch"
+
+	# Bug #196015 (upstream: #5021)
+	epatch "${FILESDIR}/3.0.26a-invalid-free-fix.patch"
+
+	# 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}"
+
+	mylangs="--with-manpages-langs=en"
+	use linguas_ja && mylangs="${mylangs},ja"
+	use linguas_pl && mylangs="${mylangs},pl"
+
+	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-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 \
+		--without-spinlocks \
+		--enable-socket-wrapper \
+		--with-cifsmount=no \
+		$(use_with acl acl-support) \
+		$(use_with async aio-support) \
+		$(use_with automount) \
+		$(use_enable cups) \
+		$(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} || die "econf failed"
+
+	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
+}
+
+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 pam ; then
+		dopammod bin/pam_smbpass.so
+		use winbind && dopammod bin/pam_winbind.so
+	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 && doins ${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}
+	keepdir /usr/$(get_libdir)/samba/{rpc,idmap,auth}
+
+	# docs
+	dodoc "${FILESDIR}/README.gentoo"
+	dodoc "${S}"/{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
+	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."
+
+	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
+}