fix #6936, #7133, thx for reports

4 files changed, 345 insertions, 58 deletions

diff --git a/net-fs/samba/ChangeLog b/net-fs/samba/ChangeLog
index 0de3cd7008f7..8ef8c984473c 100644
--- a/net-fs/samba/ChangeLog
+++ b/net-fs/samba/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-fs/samba
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.12 2002/08/25 06:20:18 jmorgan Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.13 2002/08/27 20:39:48 woodchip Exp $
+
+*samba-2.2.5-r1 (Aug 27 2002)
+
+  27 Aug 2002; Donny Davies <woodchip@gentoo.org> samba-2.2.5-r1.ebuid,
+  smb.conf.example :
+
+  Fix #6936; thanks shadow@ines.ro.  Fix #7133, thanks klebermass@limtec.de.
 
 *samba-2.2.5 (23 Jun 2002)
 
@@ -19,9 +26,9 @@
 
   13 May 2002; Donny Davies <woodchip@gentoo.org> :
 
-  o Install smbmnt and smbumount suid root, making user's lives easier; closes #2635.
-  o Pass --bindir to ./configure, un-breaking mount.smbfs; closes #2515.
-  o Add a few more codepages.
+  Install smbmnt and smbumount suid root, close #2635.
+  Pass --bindir to ./configure, close #2515.
+  Add a few more codepages.
 
 *samba-2.2.4 (6 May 2002)
   
@@ -29,40 +36,15 @@
   smb.conf.example, system-auth-winbind, samba-svc, winbind-init, lmhosts,
   samba-init, nsswitch.conf-winbind, nsswitch.conf-wins :
 
-  Update to latest; samba-2.2.4.
-
-  o Added a much better smb.conf.example
-  o Added smbwrapper (smbsh)
-  o Added libnss_winbind (see /etc/nsswitch.conf-winbind)
-  o Added libnss_wins (see /etc/nsswitch.conf-wins)
-  o Added libsmbclient
-  o Added USE ssl and ldap support (apparently they work but I haven't had
-    time to test them; feedback appreciated.  the support builds ok though.)
-  o Added better winbind support including an example nsswitch.conf, a pam.d/
-    service snippet and a winbind initscript.  Also see smb.conf.example.
-  o Mucho cleaned up the docs (no more 2 copies of the book!)
-  o Removed the recycle bin patches.  There is now some generic VFS layer
-    support for this.  If you're interested, please see examples/VFS in the
-    documentation.  Perhaps we might build it if enough people ask ;)
-  o Removed the afs patch.  Consider this unmaintained by me.  If you really
-    want it, you'll have to patch, test and submit it yourself.
-  o src_install is now all done by hand.  (easier this way, actually)
-  o Added a few convenience directories for netlogon, profiles, samba-hosted
-    printer drivers and the samba spool directory.  These are only really for
-    those who will blindly follow smb.conf.example.  If you already have
-    your own setup/layout, they're not really needed.
-
-  ** Changes important for people upgrading **
-  o None
-    If you're coming from samba-2.2.3, then this is a transparent upgrade.
-    Just down your daemon, merge 2.2.4, and bring it back up.
-
-    If you're coming from something older than 2.2.3 there's instructions
-    printed after install.  Follow them!
-
-  All-in-all this update basically adds more features, better documentation,
-  better out-of-the-box support for various things, and bug fixes.  There
-  are no sweeping changes to the package layout and such.
+  Added a much better smb.conf.example.  Added smbwrapper (smbsh).  Added
+  libnss_winbind (see /etc/nsswitch.conf-winbind).  Added libnss_wins
+  (see /etc/nsswitch.conf-wins).  Added libsmbclient.  Added USE ssl and
+  ldap support.  Added better winbind support including an example
+  nsswitch.conf, a pam.d/ service snippet and a winbind initscript.  Also
+  see smb.conf.example.  Mucho cleaned up the docs (no more 2 copies of
+  the book!).  Removed the recycle bin patches.  Removed the afs patch.
+  Added a few convenience directories for netlogon, profiles, samba-hosted
+  printer drivers and the samba spool directory.
 
 *samba-2.2.3a-r3 (3 May 2002)
   
@@ -75,23 +57,14 @@
   27 March 2002; Donny Davies <woodchip@gentoo.org> samba-2.2.3a-r2.ebuild,
   swat.xinetd, smbusers, samba.rc6, samba-2.2.3a-srv_spoolss_nt.patch :
 
-  The "tidy up a bunch of loose-ends before the 1.0 release, release :)"
-
-  *** Changes important for people upgrading ***:
-    o /etc/smb has moved to the better-suited /etc/samba directory.
-       Simply move your /etc/smb/* to /etc/samba.  Then delete the /etc/samba/codepages
-       directory.  These files are now in /var/lib/samba/codepages since I see no need
-       to have 3.3MB of files in /etc which people will never change :)
-    o /var/run/smb has moved to /var/run/samba.
-       Again, simply move your /var/run/smb/* to /var/run/samba and all will be well.
-    o If you have the string "/etc/smb" in your smb.conf file (likely), then please
-       change all occurances of that to "/etc/samba".  Thats it, you're done.
-
-  Other changes:
-    As mentioned above, /etc/smb/codepages has moved to /var/lib/samba/codepages.  The
-    initscript was tweaked to start cupsd before samba and also tweaked to start smbd
-    before nmbd.  Added a sample smbusers file.  Added an xinetd snippet for the swat
-    service.  Added a patch to fix changing printer properties from Windows NT.
+  /etc/smb has moved to the better-suited /etc/samba directory.  Simply move
+  your /etc/smb/* to /etc/samba.  Then delete the /etc/samba/codepages
+  directory.  These files are now in /var/lib/samba/codepages.  /var/run/smb
+  has moved to /var/run/samba.  Simply move your /var/run/smb/* to
+  /var/run/samba.  If you have the string "/etc/smb" in your smb.conf file,
+  then please change all occurances of that to "/etc/samba".  Added a
+  sample smbusers file.  Added an xinetd snippet for the swat service.
+  Added a patch to fix changing printer properties from Windows NT.
 
   10 March 2002; Donny Davies <woodchip@gentoo.org> files/samba.rc6 :
 
diff --git a/net-fs/samba/files/digest-samba-2.2.5-r1 b/net-fs/samba/files/digest-samba-2.2.5-r1
new file mode 100644
index 000000000000..8e17a3d11b74
--- /dev/null
+++ b/net-fs/samba/files/digest-samba-2.2.5-r1
@@ -0,0 +1 @@
+MD5 4899dfdca88d86e7809c16f23c24eecc samba-2.2.5.tar.gz 5293193
diff --git a/net-fs/samba/files/smb.conf.example b/net-fs/samba/files/smb.conf.example
index c41d7ed939ec..83d8bbd4313d 100644
--- a/net-fs/samba/files/smb.conf.example
+++ b/net-fs/samba/files/smb.conf.example
@@ -1,4 +1,4 @@
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/files/smb.conf.example,v 1.2 2002/06/23 20:56:53 woodchip Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/files/smb.conf.example,v 1.3 2002/08/27 20:39:48 woodchip Exp $
 # This is the main Samba configuration file. You should read the
 # smb.conf(5) manual page in order to understand the options listed
 # here. Samba has a huge number of configurable options (perhaps too
@@ -307,8 +307,8 @@
 # =====================================
 # print command: see above for details.
 # =====================================
-   print command = lpr-cups -P %p -o raw %s -r   # using client side printer drivers.
-;   print command = lpr-cups -P %p %s # using cups own drivers (use generic PostScript on clients).
+   print command = lpr -P %p -o raw %s -r   # using client side printer drivers.
+;   print command = lpr -P %p %s # using cups own drivers (use generic PostScript on clients).
 # The following two commands are the samba defaults for printing=cups
 # change them only if you need different options:
 ;   lpq command = lpq -P %p
diff --git a/net-fs/samba/samba-2.2.5-r1.ebuild b/net-fs/samba/samba-2.2.5-r1.ebuild
new file mode 100644
index 000000000000..c68d803c9314
--- /dev/null
+++ b/net-fs/samba/samba-2.2.5-r1.ebuild
@@ -0,0 +1,313 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-2.2.5-r1.ebuild,v 1.1 2002/08/27 20:39:48 woodchip Exp $
+
+DESCRIPTION="SAMBA is a suite of SMB and CIFS client/server programs for UNIX"
+HOMEPAGE="http://www.samba.org"
+
+S=${WORKDIR}/${P}
+SRC_URI="http://us2.samba.org/samba/ftp/${P}.tar.gz"
+
+RDEPEND="virtual/glibc
+	>=sys-libs/pam-0.72
+	acl? ( sys-apps/acl )
+	cups? ( net-print/cups )
+	ldap? ( =net-nds/openldap-2* )
+	ssl? ( >=dev-libs/openssl-0.9.6 )"
+
+DEPEND="${RDEPEND}
+	sys-devel/autoconf
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86 ppc sparc64"
+
+src_unpack() {
+	unpack ${A} ; cd ${S}
+	patch -p0 < ${FILESDIR}/samba-2.2.2-smbmount.diff || die
+
+	# fix kerberos include file collision..
+	cd ${S}/source/include
+	mv profile.h smbprofile.h
+	sed -e "s:profile\.h:smbprofile.h:" includes.h > includes.h.new
+	mv includes.h.new includes.h
+
+	#cd ${S}/source
+	#autoconf || die
+}
+
+src_compile() {
+	local myconf
+	use acl && myconf="${myconf} --with-acl-support"
+	use acl ||  myconf="${myconf} --without-acl-support"
+	use ssl && myconf="${myconf} --with-ssl"
+	use ssl || myconf="${myconf} --without-ssl"
+	use cups && myconf="${myconf} --enable-cups"
+	use cups || myconf="${myconf} --disable-cups"
+	use ldap && myconf="${myconf} --with-ldapsam"
+	use ldap || myconf="${myconf} --without-ldapsam"
+
+	cd ${S}/source
+	./configure \
+		--prefix=/usr \
+		--bindir=/usr/sbin \
+		--libdir=/etc/samba \
+		--sbindir=/usr/sbin \
+		--sysconfdir=/etc/samba \
+		--localstatedir=/var/log \
+		--with-configdir=/etc/samba \
+		--with-mandir=/usr/share/man \
+		--with-piddir=/var/run/samba \
+		--with-lockdir=/var/run/samba \
+		--with-swatdir=/usr/share/swat \
+		--with-privatedir=/etc/samba/private \
+		--with-codepagedir=/var/lib/samba/codepages \
+		--with-pam --with-pam_smbpass \
+		--without-sambabook \
+		--without-automount \
+		--without-spinlocks \
+		--with-libsmbclient \
+		--with-smbwrapper \
+		--with-netatalk \
+		--with-smbmount \
+		--with-profile \
+		--with-quotas \
+		--with-syslog \
+		--with-msdfs \
+		--with-utmp \
+		--with-vfs \
+		--host=${CHOST} ${myconf} || die "bad ./configure"
+
+	make all smbfilter smbwrapper smbcacls pam_smbpass \
+		nsswitch nsswitch/libnss_wins.so debug2html
+	assert "compile problem"
+}
+
+src_install() {
+	local i
+
+	# we may as well do this all manually since it was starting
+	# to get out of control and samba _does_ have some rather
+	# silly installation quirks ;)  much of this was adapted
+	# from mandrake's .spec file..
+	#
+	# // woodchip - 5 May 2002
+
+
+	# install standard binary files..
+	for i in nmblookup smbclient smbpasswd smbstatus testparm testprns \
+		make_smbcodepage make_unicodemap make_printerdef rpcclient \
+		smbspool smbcacls smbclient smbmount smbumount smbsh wbinfo
+	do
+		exeinto /usr/bin
+		doexe source/bin/${i}
+	done
+	# make users lives easier..
+	fperms 4755 /usr/bin/smbumount
+
+
+	# libraries..
+	exeinto /usr/lib
+	doexe source/bin/smbwrapper.so
+	doexe source/bin/libsmbclient.so
+	insinto /usr/lib
+	doins source/bin/libsmbclient.a
+	exeinto /lib/security
+	doexe source/bin/pam_smbpass.so
+	doexe source/nsswitch/pam_winbind.so
+
+
+	# some utility scripts..
+	for i in mksmbpasswd.sh smbtar convert_smbpasswd
+	do
+		exeinto /usr/bin
+		doexe source/script/${i}
+	done
+
+
+	# install secure binary files..
+	for i in smbd nmbd swat smbfilter debug2html smbmnt smbcontrol winbindd
+	do
+		exeinto /usr/sbin
+		doexe source/bin/${i}
+	done
+	# make users lives easier..
+	fperms 4755 /usr/sbin/smbmnt
+
+
+	# install man pages..
+	doman docs/manpages/*
+
+
+	# install codepage source files
+	for i in 437 737 775 850 852 857 861 862 866 932 936 949 950 1125 1251
+	do
+		insinto /var/lib/samba/codepages/src
+		doins source/codepages/codepage_def.${i}
+	done
+	for i in 437 737 775 850 852 857 861 862 866 932 936 949 950 1125 1251 \
+		ISO8859-1 ISO8859-2 ISO8859-5 ISO8859-7 \
+		ISO8859-9 ISO8859-13 ISO8859-15 KOI8-R KOI8-U
+	do
+		insinto /var/lib/samba/codepages/src
+		doins source/codepages/CP${i}.TXT
+	done
+
+
+	# build codepage load files..
+	for i in 437 737 775 850 852 857 861 862 866 932 936 949 950 1125 1251
+	do
+		${D}/usr/bin/make_smbcodepage c ${i} \
+			${D}/var/lib/samba/codepages/src/codepage_def.${i} \
+			${D}/var/lib/samba/codepages/codepage.${i}
+	done
+
+
+	# build unicode load files..
+	for i in 437 737 775 850 852 857 861 862 866 932 936 949 950 1125 1251 \
+		ISO8859-1 ISO8859-2 ISO8859-5 ISO8859-7 \
+		ISO8859-9 ISO8859-13 ISO8859-15 KOI8-R KOI8-U
+	do
+		${D}/usr/bin/make_unicodemap ${i} \
+			${D}/var/lib/samba/codepages/src/CP${i}.TXT \
+			${D}/var/lib/samba/codepages/unicode_map.${i}
+	done
+	rm -rf ${D}/var/lib/samba/codepages/src
+
+
+	# install the nsswitch library extension files..
+	for i in wins winbind
+	do
+		exeinto /lib
+		doexe source/nsswitch/libnss_${i}.so
+	done
+	# make link for wins and winbind resolvers..
+	( cd ${D}/lib ; ln -s libnss_wins.so libnss_wins.so.2 )
+	( cd ${D}/lib ; ln -s libnss_winbind.so libnss_winbind.so.2 )
+
+
+	# install SWAT helper files..
+	for i in swat/help/*.html docs/htmldocs/*.html
+	do
+		insinto /usr/share/swat/help
+		doins ${i}
+	done
+	for i in swat/images/*.gif
+	do
+		insinto /usr/share/swat/images
+		doins ${i}
+	done
+	for i in swat/include/*.html
+	do
+		insinto /usr/share/swat/include
+		doins ${i}
+	done
+
+
+	# install the O'Reilly "Using Samba" book..
+	for i in docs/htmldocs/using_samba/*.html
+	do
+		insinto /usr/share/swat/using_samba
+		doins ${i}
+	done
+	for i in docs/htmldocs/using_samba/gifs/*.gif
+	do
+		insinto /usr/share/swat/using_samba/gifs
+		doins ${i}
+	done
+	for i in docs/htmldocs/using_samba/figs/*.gif
+	do
+		insinto /usr/share/swat/using_samba/figs
+		doins ${i}
+	done
+
+
+	# too many docs to sort through; install them all! :)
+	dodoc COPYING Manifest README Roadmap WHATSNEW.txt
+	docinto full_docs
+	cp -a docs/* ${D}/usr/share/doc/${PF}/full_docs
+	# but we don't want two copies of the book!
+	rm -rf ${D}/usr/share/doc/${PF}/full_docs/htmldocs/using_samba
+	docinto examples
+	cp -a examples/* ${D}/usr/share/doc/${PF}/examples
+	prepalldocs
+	# keep this next line *after* prepalldocs!
+	dosym /usr/share/swat/using_samba /usr/share/doc/${PF}/using_samba
+	# and we should unzip the html docs..
+	gunzip ${D}/usr/share/doc/${PF}/full_docs/faq/*
+	gunzip ${D}/usr/share/doc/${PF}/full_docs/htmldocs/*
+
+
+	# link /usr/bin/smbmount to /sbin/mount.smbfs which allows it
+	# to work transparently with the standard 'mount' command..
+	dodir /sbin
+	dosym /usr/bin/smbmount /sbin/mount.smbfs
+
+
+	# make the smb backend symlink for cups printing support..
+	if [ -n "`use cups`" ] ; then
+		dodir /usr/lib/cups/backend
+		dosym /usr/bin/smbspool /usr/lib/cups/backend/smb
+	fi
+
+
+	# make a symlink on /usr/lib/smbwrapper.so in /usr/sbin
+	# to fix smbsh problem.  #6936
+	dosym /usr/lib/smbwrapper.so /usr/sbin/smbwrapper.so
+
+
+	# now the config files..
+	insinto /etc
+	doins ${FILESDIR}/nsswitch.conf-winbind
+	doins ${FILESDIR}/nsswitch.conf-wins
+
+	insinto /etc/samba
+	doins ${FILESDIR}/smbusers
+	doins ${FILESDIR}/smb.conf.example
+	doins ${FILESDIR}/lmhosts
+
+	insinto /etc/pam.d
+	newins ${FILESDIR}/samba.pam samba
+	doins ${FILESDIR}/system-auth-winbind
+
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/samba-init samba
+	newexe ${FILESDIR}/winbind-init winbind
+
+	insinto /etc/xinetd.d
+	newins ${FILESDIR}/swat.xinetd swat
+}
+
+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..
+	if [ ! -e ${ROOT}/etc/samba/smb.conf ] ; then
+		touch ${ROOT}/etc/samba/smb.conf
+	fi
+
+
+	# empty dirs..
+	install -m0700 -o root -g root -d ${ROOT}/etc/samba/private
+	install -m1777 -o root -g root -d ${ROOT}/var/spool/samba
+	install -m0755 -o root -g root -d ${ROOT}/var/log/samba
+	install -m0755 -o root -g root -d ${ROOT}/var/run/samba
+	install -m0755 -o root -g root -d ${ROOT}/var/lib/samba/{netlogon,profiles}
+	install -m0755 -o root -g root -d \
+		${ROOT}/var/lib/samba/printers/{W32X86,WIN40,W32ALPHA,W32MIPS,W32PPC}
+
+
+	# im guessing people dont need this anymore, it was quite a while ago...
+	# /etc/smb is changed to /etc/samba, /var/run/smb to /var/run/samba
+	#ewarn "******************************************************************"
+	#ewarn "* NOTE: If you upgraded from an earlier version of samba you     *"
+	#ewarn "*       must move your /etc/smb files to the more aptly suited   *"
+	#ewarn "*       /etc/samba directory.  Also, please move the files in    *"
+	#ewarn "*       /var/run/smb to /var/run/samba.  Lastly, if you have     *"
+	#ewarn "*       the string "/etc/smb" in your smb.conf file, please      *"
+	#ewarn "*       change that to "/etc/samba".  The old /etc/smb/codepages *"
+	#ewarn "*       directory doesn't need to be moved into /etc/samba       *"
+	#ewarn "*       because those files are now kept in the                  *"
+	#ewarn "*       /var/lib/samba/codepages directory.                      *"
+	#ewarn "******************************************************************"
+}