bug #71223: win9x/Me lanman printing. bug #70628: 3.0.8 docs upstream permission error

4 files changed, 412 insertions, 1 deletions

diff --git a/net-fs/samba/ChangeLog b/net-fs/samba/ChangeLog
index 12e37649a5d6..c5824e15a192 100644
--- a/net-fs/samba/ChangeLog
+++ b/net-fs/samba/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-fs/samba
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.129 2004/11/13 10:38:47 satya Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.130 2004/11/15 10:12:30 satya Exp $
+
+*samba-3.0.8-r1 (15 Nov 2004)
+
+  15 Nov 2004; Christian Andreetta <satya@gentoo.org> +samba-3.0.8-r1.ebuild:
+  bug #71223: win9x/Me lanman printing. bug #70628: 3.0.8 docs upstream
+  permission error
 
   13 Nov 2004; Christian Andreetta <satya@gentoo.org>
   files/samba-3.0.x-python-setup.patch:
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index 7dad78c96498..d415f73d0cd7 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -5,6 +5,7 @@ MD5 fc36819e4e02fa146e936aa31947ad27 samba-3.0.6-r3.ebuild 14226
 MD5 a43f837ad8303a534ca76ea81bf66d53 samba-3.0.8.ebuild 16488
 MD5 ba2bd032935691ca39d03d607b5b4417 ChangeLog 23733
 MD5 41299f246433a1a55c8fccc77ccd709e metadata.xml 491
+MD5 9bae7ecfd2e3b0bd163b806ffe88dc58 samba-3.0.8-r1.ebuild 16510
 MD5 fcebd975211fecf647f6cecf26ba5c96 files/samba-3.0.4.patch 8086
 MD5 e89b19f1e62e257cbaa23a44a0362a58 files/swat.xinetd 527
 MD5 a7cc90ba23d86b1d90f65645826dde19 files/smbldap_conf.pm 7095
@@ -33,6 +34,7 @@ MD5 bf268fdddc8ef677b6fa78661a094eac files/samba-3.0.6-samba.schema 16044
 MD5 8c114eb3ebe56e7adb7db9381bea62db files/digest-samba-3.0.6-r3 203
 MD5 8c114eb3ebe56e7adb7db9381bea62db files/digest-samba-3.0.6-r4 203
 MD5 a6cb7ea67d2a4fa00cb2d5dba0710cc3 files/digest-samba-3.0.7-r1 203
+MD5 66e68bb6d3ceb275479b3c68e7becf9d files/digest-samba-3.0.8-r1 203
 MD5 9560b7e29d3a65db029fc1800e84abcc files/samba-pdb_ldap-exop.patch 3921
 MD5 3685eadb817d185b06476eca6c0c15c4 files/smbusers 204
 MD5 09195dd8ab25ce77ac51c0c05b4ab93c files/system-auth-winbind 869
diff --git a/net-fs/samba/files/digest-samba-3.0.8-r1 b/net-fs/samba/files/digest-samba-3.0.8-r1
new file mode 100644
index 000000000000..14c7f5bfbbfd
--- /dev/null
+++ b/net-fs/samba/files/digest-samba-3.0.8-r1
@@ -0,0 +1,3 @@
+MD5 7088483c858ac362d302acc0c2a1d431 samba-3.0.8.tar.gz 15101353
+MD5 5f173d549014985d681478897135915b samba-vscan-0.3.5.tar.bz2 161982
+MD5 998ece1ac96680d75cebe6f0352f56b9 smbldap-tools-0.8.5.tgz 271436
diff --git a/net-fs/samba/samba-3.0.8-r1.ebuild b/net-fs/samba/samba-3.0.8-r1.ebuild
new file mode 100644
index 000000000000..d13d90b0ac37
--- /dev/null
+++ b/net-fs/samba/samba-3.0.8-r1.ebuild
@@ -0,0 +1,400 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.0.8-r1.ebuild,v 1.1 2004/11/15 10:12:30 satya Exp $
+
+inherit eutils flag-o-matic
+#---------------------------------------------------------------------------
+IUSE="acl cups doc kerberos ldap mysql pam postgres python quotas readline winbind xml xml2"
+IUSE="${IUSE} libclamav oav"
+IUSE="${IUSE} selinux"
+#---------------------------------------------------------------------------
+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
+	http://samba.idealx.org"
+#---------------------------------------------------------------------------
+SMBLDAP_TOOLS_VER=0.8.5
+VSCAN_VER=0.3.5
+# all vscan modules are being installed
+#VSCAN_MODS="oav sophos fprotd fsav trend icap mksd kavp clamav nai" 
+#---------------------------------------------------------------------------
+_CVS="-${PV/_/}"
+S=${WORKDIR}/${PN}${_CVS}
+#---------------------------------------------------------------------------
+SRC_URI="mirror://samba/${PN}${_CVS}.tar.gz
+	oav? mirror://sourceforge/openantivirus/${PN}-vscan-${VSCAN_VER}.tar.bz2
+	ldap? http://samba.idealx.org/dist/smbldap-tools-${SMBLDAP_TOOLS_VER}.tgz"
+#---------------------------------------------------------------------------
+_COMMON_DEPS="dev-libs/popt
+	readline? sys-libs/readline
+	ldap? ( kerberos? ( virtual/krb5 ) )
+	mysql? ( dev-db/mysql sys-libs/zlib )
+	postgres? ( dev-db/postgresql sys-libs/zlib )
+	xml? ( dev-libs/libxml2 sys-libs/zlib )
+	xml2? ( dev-libs/libxml2 sys-libs/zlib )
+	acl? sys-apps/acl
+	cups? net-print/cups
+	ldap? ( net-nds/openldap dev-perl/Crypt-SmbHash )
+	pam? sys-libs/pam
+	python? dev-lang/python"
+DEPEND="sys-devel/autoconf
+	>=sys-apps/sed-4
+	${_COMMON_DEPS}"
+#IDEALX scripts are now using Net::LDAP
+#selinux: bug #62907
+RDEPEND="ldap? dev-perl/perl-ldap ${_COMMON_DEPS}
+	selinux? ( sec-policy/selinux-samba )"
+#---------------------------------------------------------------------------
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+#===========================================================================
+pkg_setup() {
+	ewarn "2004-11: new ebuild flags:"
+	ewarn "    quotas:    now disabled by default"
+	ewarn "    winbind:   now disabled by default"
+	ewarn "    libclamav: (oav) don't use clamav daemon, just load libraries when needed"
+	ebeep
+	epause
+}
+#===========================================================================
+src_unpack() {
+	local i
+	unpack ${A} || die
+	cd ${S} || die
+	# Clean up CVS ---------------------------------------------------------
+	find . -name .cvsignore | xargs rm -f
+	find . -name CVS | xargs rm -rf
+	# Add patch(es) --------------------------------------------------------
+	epatch ${FILESDIR}/samba-3.0.8-lanman.patch || die # win9x/Me NULL printing
+	epatch ${FILESDIR}/samba-3.0.x-python-setup.patch || die
+	#bug #44743 ------------------------------------------------------------
+	if [ ${ARCH} = "amd64" -o ${ARCH} = "ppc" -o ${ARCH} = "ppc64" ]; then
+		cd ${S} && epatch ${FILESDIR}/samba-3.0.x-smbumount-uid32.patch
+	fi
+	#Fix for bug #27858 ----------------------------------------------------
+	if [ ${ARCH} = "sparc" -o ${ARCH} = "ppc" -o ${ARCH} = "ppc64" ]; then
+		cd ${S}/source/include && epatch ${FILESDIR}/samba-2.2.8-statfs.patch
+	fi
+	#Bug #36200; sys-kernel/linux-headers dependent ------------------------
+	sed -i -e 's:#define LINUX_QUOTAS_2:#define LINUX_QUOTAS_1:' \
+		-e 's:<linux/quota.h>:<sys/quota.h>:' \
+		${S}/source/smbd/quotas.c
+	#amd64 lib location is not lib32 nor lib -------------------------------
+	cd ${S} || die
+	use amd64 && epatch ${FILESDIR}/samba-3.0.x-libdirsymlink.patch
+	# examples: to be copied as docs ---------------------------------------
+	rm -rf ${S}/examples.ORIG
+	cp -a ${S}/examples ${S}/examples.ORIG
+	# Prep samba-vscan source.
+	if use oav ; then
+		cd ${WORKDIR}/${PN}-vscan-${VSCAN_VER}
+		epatch ${FILESDIR}/vscan-${VSCAN_VER}-libclamav.patch
+		cp -a ${WORKDIR}/${PN}-vscan-${VSCAN_VER} ${S}/examples/VFS
+	fi
+	#-----------------------------------------------------------------------
+	cd ${S}/source
+	echo "Running autoconf ..."
+	autoconf || die
+}
+#===========================================================================
+my_configure() {
+	local myconf="$1"
+	#-----------------------------------------------------------------------
+	for info_var in myconf CFLAGS LDFLAGS; do
+		einfo "${info_var} is: ${!info_var}"
+	done
+	#-----------------------------------------------------------------------
+	#default_{static,shared}_modules|source/configure
+	cd ${S}/source
+	econf \
+		--prefix=/usr \
+		--libdir=/usr/lib/samba \
+		--with-libdir=/usr/lib/samba \
+		--with-swatdir=/usr/share/doc/${PF}/swat \
+		--localstatedir=/var \
+		--with-piddir=/var/run/samba \
+		--with-lockdir=/var/cache/samba \
+		--with-logfilebase=/var/log/samba \
+		--sysconfdir=/etc/samba \
+		--with-configdir=/etc/samba \
+		--with-privatedir=/var/lib/samba/private \
+		\
+		--enable-static \
+		--enable-shared \
+		--with-manpages-langs=en \
+		--without-spinlocks \
+		--with-libsmbclient \
+		--with-automount \
+		--with-smbmount \
+		--with-syslog \
+		--with-idmap \
+		--host=${CHOST} \
+		${myconf} || die
+	# Show install dirs ----------------------------------------------------
+	einfo "Dir conf:"
+	emake showlayout
+	# serialized headers make ----------------------------------------------
+	make proto
+}
+#===========================================================================
+src_compile() {
+	local myconf
+	local mymods
+	#mymods="nisplussam" #this is deprecated...
+	#-----------------------------------------------------------------------
+	use xml || use xml2 && mymods="xml,${mymods}"
+	use mysql && mymods="mysql,${mymods}"
+	use postgres && mymods="pgsql,${mymods}"
+	[ -n "${mymods}" ] && myconf="--with-expsam=${mymods}"
+	use acl \
+		&& myconf="${myconf} --with-acl-support" \
+		|| myconf="${myconf} --without-acl-support"
+	use pam \
+		&& myconf="${myconf} --with-pam --with-pam_smbpass" \
+		|| myconf="${myconf} --without-pam --without-pam_smbpass"
+	use cups \
+		&& myconf="${myconf} --enable-cups" \
+		|| myconf="${myconf} --disable-cups"
+	use ldap \
+		&& myconf="${myconf} --with-ldap" \
+		|| myconf="${myconf} --without-ldap"
+	#this is for old samba 2.x compat
+	#myconf="${myconf} --with-ldapsam"
+	myconf="${myconf} --without-ldapsam"
+	use quotas \
+		&& myconf="${myconf} --with-quotas --with-sys-quotas" \
+		|| myconf="${myconf} --without-quotas --without-sys-quotas"
+	use winbind \
+		&& myconf="${myconf} --with-winbind" \
+		|| myconf="${myconf} --without-winbind"
+	use python \
+		&& myconf="${myconf} --with-python=yes" \
+		|| myconf="${myconf} --with-python=no"
+	use readline \
+		&& myconf="${myconf} --with-readline" \
+		|| myconf="${myconf} --without-readline"
+	#-----------------------------------------------------------------------
+	# Removing: bug #64815 states that ads in amd64 is now ok
+	###if [ "${ARCH}" != "amd64" ]; then
+	###	use kerberos && use ldap \
+	###		&& myconf="${myconf} --with-ads" \
+	###		|| myconf="${myconf} --without-ads"
+	###else
+	###	myconf="${myconf} --without-ads"
+	###fi
+	use kerberos && use ldap \
+		&& myconf="${myconf} --with-ads" \
+		|| myconf="${myconf} --without-ads"
+	#-----------------------------------------------------------------------
+	append-ldflags -L/usr/$(get_libdir) # lib64 location
+	append-ldflags -Wl,-z,now # lib preload
+	# SUID configure -------------------------------------------------------
+	my_configure "${myconf}"
+	# SUID compile ---------------------------------------------------------
+	for file in smbmnt smbumount; do
+		einfo "LD: BIND_NOW: bin/${file}"
+		rm -f bin/${file}
+		emake bin/${file} || die "LD: BIND_NOW: bin/${file} compile error"
+	done
+	for file in mount.cifs; do
+		einfo "LD: BIND_NOW: bin/${file}"
+		gcc ${CFLAGS} ${LDFLAGS} client/${file}.c -o bin/${file} || die "LD: BIND_NOW: bin/${file} compile error"
+	done
+	# CONFIGURE ------------------------------------------------------------
+	LDFLAGS=${LDFLAGS/-Wl,-z,now/} #lib preload change must affect suid only!
+	my_configure "${myconf}"
+	# Compile main SAMBA pieces --------------------------------------------
+	einfo "make everything" && emake everything || die "SAMBA make everything error"
+	einfo "make rpctorture" && emake rpctorture || ewarn "rpctorture didn't build"
+	# build smbget ---------------------------------------------------------
+	einfo "smbget"
+	emake bin/smbget; assert "smbget compile error"
+	# Build selected samba-vscan plugins -----------------------------------
+	if use oav; then
+		cd ${S}/examples/VFS/${PN}-vscan-${VSCAN_VER}
+		my_conf="--prefix=/usr --libdir=/usr/lib/samba"
+		use libclamav && my_conf="${my_conf} --with-libclamav"
+		./configure ${my_conf}
+		assert "bad ${PN}-vscan-${VSCAN_VER} ./configure"
+		emake # ${VSCAN_MODS}
+	fi
+}
+#===========================================================================
+src_install() {
+	local i #for cicles
+	local extra_bins="debug2html smbfilter talloctort mount.cifs smbget"
+	#smbsh editreg
+	extra_bins="${extra_bins} smbtorture msgtest masktest locktest \
+		locktest2 nsstest vfstest rpctorture"
+	# ----------------------------------------------------------------------
+	cd ${S}/source
+	make DESTDIR=${D} install-everything
+	# Extra binary files, testing/torture progs ----------------------------
+	exeinto /usr/bin
+	for i in ${extra_bins}; do
+		[ -x ${S}/source/bin/${i} ] && doexe ${S}/source/bin/${i} && \
+		einfo "Extra binaries: ${i}"
+	done
+	# Installing these setuid-root allows users to (un)mount smbfs/cifs ----
+	for i in /usr/bin/smbumount /usr/bin/smbmnt /usr/bin/mount.cifs; do
+		fperms 4111 ${i} || die "No perms: ${i}"
+		einfo "suid: ${i}"
+	done
+	# Nsswitch extensions. Make link for wins and winbind resolvers --------
+	exeinto /lib
+	doexe ${S}/source/nsswitch/libnss_wins.so
+	( cd ${D}/lib; ln -s libnss_wins.so libnss_wins.so.2 )
+	if use winbind; then
+		doexe ${S}/source/nsswitch/libnss_winbind.so
+		( cd ${D}/lib; ln -s libnss_winbind.so libnss_winbind.so.2 )
+		exeinto /lib/security && doexe ${S}/source/nsswitch/pam_winbind.so
+	fi
+	exeinto /lib/security
+	use pam && doexe ${S}/source/bin/pam_smbpass.so
+	# mount backend --------------------------------------------------------
+	dodir /sbin
+	dosym ../usr/bin/smbmount /sbin/mount.smbfs
+	dosym ../usr/bin/mount.cifs /sbin/mount.cifs
+	# bug #46389: samba doesn't create symlink anymore
+	# beaviour seems to be changed in 3.0.6, see bug #61046 
+	dosym /usr/lib/samba/libsmbclient.so /usr/lib/libsmbclient.so.0
+	dosym /usr/lib/samba/libsmbclient.so /usr/lib/libsmbclient.so
+	# make the smb backend symlink for cups printing support..
+	if use cups; then
+		dodir /usr/lib/cups/backend
+		dosym /usr/bin/smbspool /usr/lib/cups/backend/smb
+	fi
+	# Install IDEALX scripts for LDAP backend administration ---------------
+	if use ldap; then
+		# corrections as per bug #41796
+		cd ${WORKDIR}/smbldap-tools-${SMBLDAP_TOOLS_VER}
+		exeinto /usr/share/samba/scripts; doexe smbldap-*
+		exeinto /etc/samba ; doexe smbldap_tools.pm
+		insinto /etc/smbldap-tools ; doins *.conf
+		fperms 644 /etc/smbldap-tools/smbldap.conf
+		fperms 600 /etc/smbldap-tools/smbldap_bind.conf
+		eval `perl '-V:installarchlib'`
+		dodir ${installarchlib}
+		#dosym /etc/samba/smbldap_conf.pm ${installarchlib}
+		#dosym /etc/samba/smbldap_conf.pm /usr/share/samba/scripts
+		dosym /etc/samba/smbldap_tools.pm ${installarchlib}
+		dosym /etc/samba/smbldap_tools.pm /usr/share/samba/scripts
+		if [ -f mkntpwd/mkntpwd ]; then
+			exeinto /usr/sbin ; doexe mkntpwd/mkntpwd
+		fi
+	fi
+	# VFS plugin modules ---------------------------------------------------
+	if use oav; then
+		#exeinto /usr/lib/samba/vfs
+		#doexe ${S}/examples/VFS/${PN}-vscan-${VSCAN_VER}/vscan-*.so
+		cd ${S}/examples/VFS/${PN}-vscan-${VSCAN_VER}
+		make install DESTDIR=${D} || die "VFS: vscan error"
+		insinto /etc/samba
+		doins ${S}/examples/VFS/${PN}-vscan-${VSCAN_VER}/openantivirus/*conf
+	fi
+	# Python extensions ----------------------------------------------------
+	if use python; then
+		cd ${S}/source
+		python python/setup.py install --root=${D} || die
+	fi
+	# General config files -------------------------------------------------
+	insinto /etc/samba
+	touch ${D}/etc/samba/smb.conf
+	doins ${FILESDIR}/smbusers
+	newins ${FILESDIR}/smb.conf.example-samba3.gz smb.conf.example.gz
+	doins ${FILESDIR}/lmhosts
+	#doins ${FILESDIR}/recycle.conf #obsolete: see bug #68315
+	insinto /etc/pam.d
+	newins ${FILESDIR}/samba.pam samba
+	use winbind && doins ${FILESDIR}/system-auth-winbind
+	insinto /etc/xinetd.d
+	newins ${FILESDIR}/swat.xinetd swat
+	exeinto /etc/init.d; newexe ${FILESDIR}/samba-init samba
+	insinto /etc/conf.d; newins ${FILESDIR}/samba-conf samba
+	if use ldap; then
+		insinto /etc/openldap/schema
+		doins ${S}/examples/LDAP/samba.schema
+	fi
+	# dirs -----------------------------------------------------------------
+	diropts -m0700
+	dodir /var/lib/samba/private
+	touch ${D}/var/lib/samba/private/.keep
+	diropts -m1777
+	dodir /var/spool/samba
+	touch ${D}/var/spool/samba/.keep
+	diropts -m0755
+	dodir /var/{log,run,cache}/samba
+	dodir /var/lib/samba/{netlogon,profiles}
+	dodir /var/lib/samba/printers/{W32X86,WIN40,W32ALPHA,W32MIPS,W32PPC}
+	touch ${D}/var/{log,run,cache}/samba/.keep
+	touch ${D}/var/lib/samba/{netlogon,profiles}/.keep
+	touch ${D}/var/lib/samba/printers/{W32X86,WIN40,W32ALPHA,W32MIPS,W32PPC}/.keep
+	# docs -----------------------------------------------------------------
+	docinto ""
+	dodoc ${S}/COPYING ${S}/Manifest ${S}/README ${S}/Roadmap ${S}/WHATSNEW.txt
+	docinto examples
+	dodoc ${FILESDIR}/nsswitch.conf-wins
+	use winbind && dodoc ${FILESDIR}/nsswitch.conf-winbind
+	cp -a ${S}/examples.ORIG/* ${D}/usr/share/doc/${PF}/examples
+	if use oav; then
+		docinto ${PN}-vscan-${VSCAN_VER}
+		cd ${WORKDIR}/${PN}-vscan-${VSCAN_VER}
+		dodoc AUTHORS COPYING ChangeLog FAQ INSTALL NEWS README TODO
+		dodoc */*.conf
+	fi
+	if use ldap; then
+		docinto smbldap-tools-${SMBLDAP_TOOLS_VER}
+		cd ${WORKDIR}/smbldap-tools-${SMBLDAP_TOOLS_VER}
+		dodoc CONTRIBUTORS COPYING ChangeLog FILES INFRA INSTALL README TODO
+	fi
+	if ! use doc; then
+		rm -rf ${D}/usr/share/doc/${PF}/swat/help/{guide,howto,devel}
+		rm -rf ${D}/usr/share/doc/${PF}/swat/using_samba
+	fi
+	# in case of upstream packaging errors... (bug #70628)
+	chown -R root:root ${D}/usr/share/doc/${PF}
+	chmod go+r  `find ${D}/usr/share/doc/${PF} -type f`
+	chmod go+rx `find ${D}/usr/share/doc/${PF} -type d`
+	# moving manpages ------------------------------------------------------
+	mv ${D}/usr/man ${D}/usr/share/man
+}
+#===========================================================================
+pkg_postinst() {
+	# touch /etc/samba/smb.conf so that people installing samba just
+	# to mount smb shares don't get annoying warnings all the time..
+	#[ ! -e ${ROOT}/etc/samba/smb.conf ] && touch ${ROOT}/etc/samba/smb.conf
+
+	ewarn ""
+	ewarn "If you are upgrading from a Samba version prior to 3.0.2, and you"
+	ewarn "use Samba's password database, you must run the following command:"
+	ewarn ""
+	ewarn "  pdbedit --force-initialized-passwords"
+	ewarn ""
+	ewarn "2004-05: LIBs location change: /usr/lib/samba/*"
+	ewarn "            (due to ldap/vfs external tools assumptions)"
+	ewarn "2004-09: LIBs flags changes for suid bins: LDFLAGS+='-Wl,-z,now'"
+	if use winbind; then
+		ewarn "         3.0.7: param: 'winbind enable local accounts' is now"
+		ewarn "                       disabled by default"
+	fi
+	ewarn "2004-11: /etc/samba/private moved to /var/lib/samba/private "
+	ewarn "            for better File System Hierarchy adeherence"
+	ewarn ""
+	einfo "If you experience client locks in file transfers _only_, try the parameter"
+	einfo "         use sendfile = no (man smb.conf(5), man sendfile(2))"
+	einfo "There also seem some problems with the smbfs implementation of the recent 2.6.x kernels"
+	einfo "If you experience problems (lockups) with smbfs, try cifs as an alternative"
+	einfo ""
+	if use ldap; then
+		ewarn "If you are upgrading from prior to 3.0.2, and you are using LDAP"
+		ewarn "    for Samba authentication, you must check the sambaPwdLastSet"
+		ewarn "    attribute on all accounts, and ensure it is not 0."
+		einfo "2004-07: WARNING: smbldap-tools changes"
+		einfo "    smbldap-tools conf changed to /etc/smbldap-tools"
+		einfo "    /usr/share/samba/scripts: some script names changed"
+		einfo "    dev-perl/Crypt-SmbHash: new pwd hash validation/conversion system"
+		einfo ""
+	fi
+}
+