Version bump (fixes bug #165549 aka CVE-2007-0452, CVE-2007-0453, CVE-2007-0454). Small cleanups.

Package-Manager: portage-2.1.2-r7

4 files changed, 326 insertions, 15 deletions

diff --git a/net-fs/samba/ChangeLog b/net-fs/samba/ChangeLog
index f168281223ce..35ca81a73997 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.262 2007/01/08 15:33:14 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.263 2007/02/06 10:35:59 dev-zero Exp $
+
+*samba-3.0.24 (06 Feb 2007)
+
+  06 Feb 2007; Tiziano Müller <dev-zero@gentoo.org> +samba-3.0.24.ebuild:
+  Version bump (fixes bug #165549 aka CVE-2007-0452, CVE-2007-0453,
+  CVE-2007-0454). Small cleanups.
 
   08 Jan 2007; Diego Pettenò <flameeyes@gentoo.org>
   samba-3.0.14a-r2.ebuild, samba-3.0.20b.ebuild, samba-3.0.21a.ebuild,
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index 2817df398ef1..38a3e369036b 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX README.gentoo 3208 RMD160 858aee78e07bdc0ebee7bc6c2212d4c528325633 SHA1 819ae809566e967cdc03024adae4443c5833dfc5 SHA256 9e87efa3fcea73becdfad4adb0fe677e1969c2951f03c47d1b0f4aeb00999578
 MD5 2c134a0ccc3f2cc76669edd86d7476df files/README.gentoo 3208
 RMD160 858aee78e07bdc0ebee7bc6c2212d4c528325633 files/README.gentoo 3208
@@ -20,6 +17,7 @@ DIST samba-3.0.22.tar.gz 17542657 RMD160 b41cffc999c524c1650d2dd3fbd063dc7974109
 DIST samba-3.0.23.tar.gz 17677551 RMD160 d8814845c5e177e5ac0a376c40e7e2d1b3733dd7 SHA1 94b40c42b976ef19714a105823416e64fd855d5c SHA256 a198213c44c9837169916c82a885c9916e1627c5dc2285663998f8c307d8590e
 DIST samba-3.0.23a.tar.gz 17683518 RMD160 d7ab7ec895923d74c8b11507c3cc678d0b0b895c SHA1 11d6b75811c38ed89da2460386e36fd23af24d3c SHA256 e0504eabb825875213cc06607d93946227d884cb3d09e551c4a1de547b1956f2
 DIST samba-3.0.23d.tar.gz 17704221 RMD160 2c80a504f01dc78e2fa52e1f7d765812ac20672e SHA1 080d617ecda196db4e6d58ac55573ee016e37b60 SHA256 0af21d6cfeb8186987cc5b59e41034f663124859ce30b5b98f3abed501f2cd46
+DIST samba-3.0.24.tar.gz 17708128 RMD160 f208dca645d07a195169e005a50fb4c4879254eb SHA1 216020b58abca191b8146f76f98a8bda3508fcd3 SHA256 c4e8de3426fbbcee7f338f5cf09052cbdf9a36ae638aeeeca10498ef8d5343e2
 DIST samba-vscan-0.3.6.tar.bz2 166733 RMD160 462a9de0789122c0627b0ed4f6e7b6ed3cd883af SHA256 5e552668d8e31d78281a4e93c4ac9b3490e145bc27d4ad0029d175f6c90a755a
 DIST samba-vscan-0.3.6b.tar.bz2 164471 RMD160 5cd81345b06f44b2febf3f24e62325322b1c6a3b SHA1 b11e8303380ee8d271a916a17a16cbab9d0d36f8 SHA256 14f78b624b047b90ddf4965998e7115d3b3ac97b3229154a302637d8e49adcd4
 EBUILD samba-3.0.14a-r2.ebuild 9200 RMD160 a628a00dec53bd7fad7d336aee09acb11a90797c SHA1 ba642f54680f42eb624d6ecd460d1368a25a9975 SHA256 a8c266477910a2f13acbe7ff99910a8079baf26e78396a8326a09136fa6c932b
@@ -62,10 +60,14 @@ EBUILD samba-3.0.23d.ebuild 8386 RMD160 3bdc7855e60a653d549441a0b6236be78fb695ce
 MD5 2e4cb1456e4debea82be39fe086cdcf2 samba-3.0.23d.ebuild 8386
 RMD160 3bdc7855e60a653d549441a0b6236be78fb695ce samba-3.0.23d.ebuild 8386
 SHA256 8d7434d059b12ae3045dee27c0b2958a964228700c4ea866028d56ae3e89ca16 samba-3.0.23d.ebuild 8386
-MISC ChangeLog 45418 RMD160 3b2c530a0699ac8465b51c6f74e9c394fac6e9be SHA1 0751f6af084863d285853ff7fdd02736ce9a2fd1 SHA256 66b258dad5551bcea85ebffc4e1865f1c52cb0b46147353f50a0c8a64e1e4505
-MD5 9b86acd745d65d10c201cb720695bb64 ChangeLog 45418
-RMD160 3b2c530a0699ac8465b51c6f74e9c394fac6e9be ChangeLog 45418
-SHA256 66b258dad5551bcea85ebffc4e1865f1c52cb0b46147353f50a0c8a64e1e4505 ChangeLog 45418
+EBUILD samba-3.0.24.ebuild 8346 RMD160 c59ed742429956586e1a50ab1b0197112539d1e3 SHA1 9303c682e1381eb2566cd7fb6f3e5625a274ca61 SHA256 ad565979f05735a6564f2e8ac262a55b8ce84d52a44fcf042e08c1caef6b1c9f
+MD5 cf2a01aa34befb7e97ca7735fb2ed7ce samba-3.0.24.ebuild 8346
+RMD160 c59ed742429956586e1a50ab1b0197112539d1e3 samba-3.0.24.ebuild 8346
+SHA256 ad565979f05735a6564f2e8ac262a55b8ce84d52a44fcf042e08c1caef6b1c9f samba-3.0.24.ebuild 8346
+MISC ChangeLog 45624 RMD160 aaac8efa6cec1fd772c947b0e8359591949e1619 SHA1 2e6df0a4f9a425b9fae265f754156ee3d36f5e1f SHA256 06acc49163217ac25d418a7d6ba3bde5b8f04408b1432c8d4a555330f2dc91e6
+MD5 9503679bbd5466974a1cd6a1f87c3554 ChangeLog 45624
+RMD160 aaac8efa6cec1fd772c947b0e8359591949e1619 ChangeLog 45624
+SHA256 06acc49163217ac25d418a7d6ba3bde5b8f04408b1432c8d4a555330f2dc91e6 ChangeLog 45624
 MISC metadata.xml 491 RMD160 a168f5ebf64e25d8c80c1c33220b2695ae8f3645 SHA1 0e2b7b349b3494ce9c4a96dbedd970ca07e8394c SHA256 f6534dfe5249b4f1482818d56c36126ae4681eb5b7d24dbf985f6be6f2c58493
 MD5 41299f246433a1a55c8fccc77ccd709e metadata.xml 491
 RMD160 a168f5ebf64e25d8c80c1c33220b2695ae8f3645 metadata.xml 491
@@ -100,10 +102,6 @@ SHA256 16d8cbdd4db0901523de3d7d7cf693deb7394bf71bcf47c7826bd182f10183bf files/di
 MD5 13675ea30af4dd21c7aba8b559de468b files/digest-samba-3.0.23d 771
 RMD160 1fab9b6e1e88a1885bfc474d19ca1df43c85db59 files/digest-samba-3.0.23d 771
 SHA256 30f6f8be83fa2e02aabfbed9e619367d82f4e70c67e9baeab97fdd451b8f4d2e files/digest-samba-3.0.23d 771
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.1 (GNU/Linux)
-
-iD8DBQFFomREAiZjviIA2XgRAn38AJ93McOWhbJeahJchy/EZ/M6zWGnDQCfZZkS
-GDDggjzKzJ2E+bGESqmmrL0=
-=rnqb
------END PGP SIGNATURE-----
+MD5 8108cc4de0f97e9bb076873e71dfbf88 files/digest-samba-3.0.24 768
+RMD160 3fc1a13d13b9638d6c08b69dce6dd6893e03e4e7 files/digest-samba-3.0.24 768
+SHA256 175e4abf1de4b025ee3f704cc7e02c1457286b186afded0c9753c02559494c61 files/digest-samba-3.0.24 768
diff --git a/net-fs/samba/files/digest-samba-3.0.24 b/net-fs/samba/files/digest-samba-3.0.24
new file mode 100644
index 000000000000..399e5e7d6d92
--- /dev/null
+++ b/net-fs/samba/files/digest-samba-3.0.24
@@ -0,0 +1,9 @@
+MD5 78346283a12e7e9a6eeec9a5b0019a26 samba-3-gentoo-0.3.15.tar.bz2 15774
+RMD160 facce158355559a300923272b655f6c0c50c8b3b samba-3-gentoo-0.3.15.tar.bz2 15774
+SHA256 820758c4a8710da27fc1dc3f25729bce79fd0d2a92db5414353f5fe730f5c439 samba-3-gentoo-0.3.15.tar.bz2 15774
+MD5 89273f67a6d8067cbbecefaa13747153 samba-3.0.24.tar.gz 17708128
+RMD160 f208dca645d07a195169e005a50fb4c4879254eb samba-3.0.24.tar.gz 17708128
+SHA256 c4e8de3426fbbcee7f338f5cf09052cbdf9a36ae638aeeeca10498ef8d5343e2 samba-3.0.24.tar.gz 17708128
+MD5 900502ba36b80620229b94e5129bc856 samba-vscan-0.3.6b.tar.bz2 164471
+RMD160 5cd81345b06f44b2febf3f24e62325322b1c6a3b samba-vscan-0.3.6b.tar.bz2 164471
+SHA256 14f78b624b047b90ddf4965998e7115d3b3ac97b3229154a302637d8e49adcd4 samba-vscan-0.3.6b.tar.bz2 164471
diff --git a/net-fs/samba/samba-3.0.24.ebuild b/net-fs/samba/samba-3.0.24.ebuild
new file mode 100644
index 000000000000..07def96b7167
--- /dev/null
+++ b/net-fs/samba/samba-3.0.24.ebuild
@@ -0,0 +1,298 @@
+# 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.24.ebuild,v 1.1 2007/02/06 10:35:59 dev-zero Exp $
+
+WANT_AUTOCONF="latest"
+
+inherit eutils autotools versionator pam
+
+IUSE_LINGUAS="ja pl"
+IUSE="acl async automount cups doc examples kerberos kernel_linux ldap fam
+	linguas_ja linguas_pl
+	oav pam python quotas readline selinux swat syslog winbind"
+#RESTRICT="test" # tests are enabled with --enable-socket-wrapper
+
+VSCAN_VER="0.3.6b"
+PATCH_VER="0.3.15"
+MY_P=${PN}-${PV/_/}
+MY_PP=${PN}-$(get_major_version)-gentoo-${PATCH_VER}
+S2=${WORKDIR}/${MY_P}
+S=${S2}/source
+PFVSCAN=${PN}-vscan-${VSCAN_VER}
+
+DESCRIPTION="SAMBA is a suite of SMB and CIFS client/server programs for UNIX"
+HOMEPAGE="http://www.samba.org/ http://www.openantivirus.org/projects.php"
+SRC_URI="mirror://gentoo/${MY_PP}.tar.bz2
+	mirror://samba/${MY_P}.tar.gz
+	mirror://samba/old-versions/${MY_P}.tar.gz
+	oav? ( mirror://sourceforge/openantivirus/${PFVSCAN}.tar.bz2 )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+
+RDEPEND="dev-libs/popt
+	virtual/libiconv
+	acl?       ( kernel_linux? ( sys-apps/acl ) )
+	cups?      ( net-print/cups )
+	ldap?      ( kerberos? ( virtual/krb5 ) 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 )"
+DEPEND="${RDEPEND}"
+
+PRIVATE_DST=/var/lib/samba/private
+PATCHDIR=${WORKDIR}/patches
+CONFDIR=${WORKDIR}/configs
+
+src_unpack() {
+	unpack ${A}
+	cd "${S2}"
+
+	rm -rf ${S2}/examples.ORIG
+
+	export EPATCH_SUFFIX="patch"
+	epatch ${PATCHDIR}/general
+	if use oav ; then
+		cd ${WORKDIR}
+		if [[ -d ${PATCHDIR}/vscan ]] ; then
+			epatch ${PATCHDIR}/vscan
+		fi
+		cp -pPR ${WORKDIR}/${PFVSCAN} ${S2}/examples/VFS
+	fi
+
+	# patches screw with autotool files
+	cd "${S}"
+	eautoconf
+}
+
+src_compile() {
+	local myconf
+	local mylangs
+	local mymod_shared
+
+	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 kerberos ads)"
+		use winbind && mymod_shared="${mymod_shared},idmap_ad"
+	fi
+
+	[[ ${CHOST} == *-*bsd* ]] && myconf="${myconf} --disable-pie"
+	use hppa && myconf="${myconf} --disable-pie"
+
+	use fam && export ac_cv_header_fam_h=yes || export ac_cv_header_fam_h=no
+	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 \
+		$(use_with acl acl-support) \
+		$(use_with async aio-support) \
+		$(use_with automount) \
+		$(use_enable cups) \
+		$(use_with kerberos krb5) \
+		$(use_with ldap) \
+		$(use_with pam) $(use_with pam pam_smbpass) \
+		$(use_with python) \
+		$(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
+
+	emake proto || die "SAMBA make proto error"
+	emake everything || die "SAMBA make everything error"
+
+	emake rpctorture >& rpctorture.log || ewarn "rpctorture didn't build [that's ok!]"
+
+	if use python ; then
+		python python/setup.py build
+	fi
+
+	# Build samba-vscan plugins
+	if use oav ; then
+		cd ${S2}/examples/VFS/${PFVSCAN}
+		econf \
+			--with-fhs \
+			--libdir=/usr/$(get_libdir)/samba \
+			|| die "${PFVSCAN} ./configure failed"
+		emake || die "Failed to make ${PFVSCAN}"
+	fi
+
+}
+
+src_install() {
+	local extra_bins="rpctorture"
+
+	emake DESTDIR="${D}" install-everything || die
+
+	# Extra rpctorture progs
+	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
+
+	# Nsswitch extensions. Make link for wins and winbind resolvers
+	if use winbind ; then
+		dolib.so "${S}"/nsswitch/libnss_wins.so || die
+		dosym libnss_wins.so /usr/$(get_libdir)/libnss_wins.so.2
+		dolib.so "${S}"/nsswitch/libnss_winbind.so || die
+		dosym libnss_winbind.so /usr/$(get_libdir)/libnss_winbind.so.2
+	fi
+
+	if use pam ; then
+		exeinto /$(get_libdir)/security
+		doexe "${S}"/bin/pam_smbpass.so || die
+		if use winbind ; then
+			exeinto /$(get_libdir)/security
+			doexe "${S}"/bin/pam_winbind.so || die
+		fi
+	fi
+
+	if use kernel_linux ; then
+		# mount backend
+		dodir /sbin
+		dosym ../usr/bin/smbmount /sbin/mount.smbfs
+		dosym ../usr/bin/mount.cifs /sbin/mount.cifs
+	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
+
+	# VFS plugin modules
+	if use oav ; then
+		cd ${S2}/examples/VFS/${PFVSCAN}
+		make install DESTDIR=${D} || die "VFS: vscan error"
+		insinto /etc/samba
+		doins ${S2}/examples/VFS/${PFVSCAN}/openantivirus/*conf
+	fi
+
+	# Python extensions
+	if use python ; then
+		cd ${S}
+		python python/setup.py install --root=${D} || die
+	fi
+
+	# General config files
+	insinto /etc/samba
+	doins ${CONFDIR}/smbusers
+	newins ${CONFDIR}/smb.conf.example-samba3 smb.conf.example
+	doins ${CONFDIR}/lmhosts
+
+	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 ${CONFDIR}/samba-init samba
+	newconfd ${CONFDIR}/samba-conf samba
+	if use ldap ; then
+		insinto /etc/openldap/schema
+		doins ${S2}/examples/LDAP/samba.schema
+	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 ${S2}/{COPYING,Manifest,README,Roadmap,WHATSNEW.txt}
+	dodoc ${CONFDIR}/nsswitch.conf-wins
+	use winbind && dodoc ${CONFDIR}/nsswitch.conf-winbind
+
+	if use oav ; then
+		docinto ${PFVSCAN}
+		cd ${WORKDIR}/${PFVSCAN}
+		dodoc AUTHORS COPYING ChangeLog FAQ INSTALL NEWS README TODO
+		dodoc */*.conf
+	fi
+
+	if use examples ; then
+		docinto examples
+		cp -pPR ${S2}/examples/* "${D}"/usr/share/doc/${PF}/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
+	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
+
+	# Patch ChangeLog
+	docinto gentoo
+	dodoc ${PATCHDIR}/ChangeLog
+}
+
+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 swat ; then
+		einfo "swat must be enabled by xinetd:"
+		einfo "    change the /etc/xinetd.d/swat configuration"
+	fi
+	einfo "Latest info: README.gentoo in documentation directory"
+}
+
+pkg_postrm(){
+	# If stale docs, and one isn't re-emerging the latest version, removes
+	# (this is actually a portage bug, though)
+	[[ -n ${PF} && ! -f ${ROOT}/usr/lib/${PN}/en.msg ]] && \
+		rm -rf "${ROOT}"/usr/share/doc/${PF}
+}