From 42c657cfc5a7277498c1dcb2bdd0741ecc274a67 Mon Sep 17 00:00:00 2001 From: Donny Davies Date: Tue, 29 Jan 2002 23:23:19 +0000 Subject: temporarily disable spinlocks, always use pam. --- net-fs/samba/files/digest-samba-2.2.2-r7 | 4 - net-fs/samba/files/digest-samba-2.2.2-r8 | 4 + net-fs/samba/samba-2.2.2-r7.ebuild | 158 ------------------------------ net-fs/samba/samba-2.2.2-r8.ebuild | 159 +++++++++++++++++++++++++++++++ 4 files changed, 163 insertions(+), 162 deletions(-) delete mode 100644 net-fs/samba/files/digest-samba-2.2.2-r7 create mode 100644 net-fs/samba/files/digest-samba-2.2.2-r8 delete mode 100644 net-fs/samba/samba-2.2.2-r7.ebuild create mode 100644 net-fs/samba/samba-2.2.2-r8.ebuild (limited to 'net-fs') diff --git a/net-fs/samba/files/digest-samba-2.2.2-r7 b/net-fs/samba/files/digest-samba-2.2.2-r7 deleted file mode 100644 index 895097676cd1..000000000000 --- a/net-fs/samba/files/digest-samba-2.2.2-r7 +++ /dev/null @@ -1,4 +0,0 @@ -MD5 df642726476af756df8a2e6c0537eb0d loadparm.c.patch 4096 -MD5 b8b577540c1de5202e70584a402c2d74 proto.h.patch 4096 -MD5 fcc861e805f74ec610ba44ab5cc9f1b7 reply.c.patch 4096 -MD5 d0aba688a1b6189f09f3ba0b44b1da8e samba-2.2.2.tar.gz 6623232 diff --git a/net-fs/samba/files/digest-samba-2.2.2-r8 b/net-fs/samba/files/digest-samba-2.2.2-r8 new file mode 100644 index 000000000000..895097676cd1 --- /dev/null +++ b/net-fs/samba/files/digest-samba-2.2.2-r8 @@ -0,0 +1,4 @@ +MD5 df642726476af756df8a2e6c0537eb0d loadparm.c.patch 4096 +MD5 b8b577540c1de5202e70584a402c2d74 proto.h.patch 4096 +MD5 fcc861e805f74ec610ba44ab5cc9f1b7 reply.c.patch 4096 +MD5 d0aba688a1b6189f09f3ba0b44b1da8e samba-2.2.2.tar.gz 6623232 diff --git a/net-fs/samba/samba-2.2.2-r7.ebuild b/net-fs/samba/samba-2.2.2-r7.ebuild deleted file mode 100644 index 4cd6863152fe..000000000000 --- a/net-fs/samba/samba-2.2.2-r7.ebuild +++ /dev/null @@ -1,158 +0,0 @@ -# Copyright 1999-2002 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License, v2 or later -# Maintainer: Donny Davies -# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-2.2.2-r7.ebuild,v 1.1 2002/01/28 23:00:55 woodchip Exp $ - -DESCRIPTION="SAMBA is a suite of SMB and CIFS client/server programs for UNIX" -HOMEPAGE="http://samba.org http://www.amherst.edu/~bbstone/howto/samba.html" - -S=${WORKDIR}/${P} -SRC_URI="http://us1.samba.org/samba/ftp/${P}.tar.gz - http://www.amherst.edu/~bbstone/recycle_bin/2.2.2/loadparm.c.patch - http://www.amherst.edu/~bbstone/recycle_bin/2.2.2/proto.h.patch - http://www.amherst.edu/~bbstone/recycle_bin/2.2.2/reply.c.patch" - -RDEPEND="virtual/glibc cups? ( net-print/cups ) pam? ( >=sys-libs/pam-0.72 ) ssl? ( >=dev-libs/openssl-0.9.6 )" -DEPEND="${RDEPEND} tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) sys-devel/autoconf" - -src_unpack() { - - unpack ${P}.tar.gz ; cd ${S} - use afs && ( patch -p0 < ${FILESDIR}/samba-2.2.1a-afs.diff || die ) - patch -p0 < ${FILESDIR}/samba-2.2.2-smbmount.diff || die - patch -p1 < ${FILESDIR}/samba-2.2.2-XFS-quota.diff || die - - #network recycle bin must be enabled in your smb.conf per share - cd ${S}/source - patch -p0 < ${DISTDIR}/loadparm.c.patch || die - patch -p0 < ${DISTDIR}/proto.h.patch || die - patch -p0 < ${DISTDIR}/reply.c.patch || die - - #makes cups not absolutely required - if [ ! "`use cups`" ] ; then - cd ${S}/source - cp configure.in configure.in.orig - sed -e "s:AC_CHECK_LIB(cups,httpConnect)::" configure.in.orig > configure.in - autoconf || die - fi - - #fix kerberos include file collision. from Paul de Vrieze. - 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 -} - -src_compile() { - - local myconf - use afs && myconf="--with-afs" - use pam && myconf="${myconf} --with-pam --with-pam_smbpass" - use acl && myconf="${myconf} --with-acl-support" - #ssl needs testing.. anybody feel like trying and reporting back? - myconf="${myconf} --without-ssl" - - export CFLAGS="${CFLAGS} -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE" - cd ${S}/source - ./configure \ - --prefix=/usr \ - --libdir=/etc/smb \ - --sbindir=/usr/sbin \ - --sysconfdir=/etc/smb \ - --localstatedir=/var/log \ - --with-lockdir=/var/run/smb \ - --with-mandir=/usr/share/man \ - --with-swatdir=/usr/share/swat \ - --with-privatedir=/etc/smb/private \ - --without-sambabook \ - --without-automount \ - --with-spinlocks \ - --with-netatalk \ - --with-smbmount \ - --with-profile \ - --with-quotas \ - --with-syslog \ - --with-msdfs \ - --with-utmp \ - --with-vfs \ - --host=${CHOST} ${myconf} || die "bad ./configure" - - emake || die "compile problem" -} - -src_install() { - - cd ${S}/source - dodir /sbin /etc/smb /usr/share/swat /var/log /var/run/smb /lib/security - - make install \ - prefix=${D}/usr \ - BASEDIR=${D}/usr \ - LIBDIR=${D}/etc/smb \ - VARDIR=${D}/var/log \ - LOCKDIR=${D}/var/lock \ - SBINDIR=${D}/usr/sbin \ - MANDIR=${D}/usr/share/man \ - SWATDIR=${D}/usr/share/swat \ - PRIVATEDIR=${D}/etc/smb/private || die - - #we specified PRIVATEDIR=/etc/smb/private - rm -rf ${D}/usr/private - diropts -m 0700 ; dodir /etc/smb/private - - #link /usr/bin/smbmount to /sbin/mount.smbfs which allows it - #to work transparently with standard 'mount' command - dosym /usr/bin/smbmount /sbin/mount.smbfs - - #handy scripts for user management - cd ${S}/source/script - exeinto /usr/sbin - doexe convert_smbpasswd mknissmbpasswd.sh mknissmbpwdtbl.sh mksmbpasswd.sh - - #place this correctly - mv ${D}/usr/bin/pam_smbpass.so ${D}/lib/security/pam_smbpass.so - - #too many docs to sort through. install 'em all :> - cd ${S} - dodoc COPYING Manifest README Roadmap WHATSNEW.txt - docinto full_docs ; cp -a docs/* ${D}/usr/share/doc/${PF}/full_docs - docinto examples ; cp -a examples/* ${D}/usr/share/doc/${PF}/examples - prepalldocs - - insinto /etc/pam.d ; newins ${FILESDIR}/samba.pam samba - insinto /etc/smb ; newins examples/smb.conf.default smb.conf.example - exeinto /etc/init.d ; newexe ${FILESDIR}/samba.rc6 samba -} - -pkg_preinst() { - if [ "$ROOT" = "/" ] && [ -e /dev/shm/.init.d/started/samba ] ; then - /etc/init.d/samba stop - fi -} - -pkg_prerm() { - if [ "$ROOT" = "/" ] && [ -e /dev/shm/.init.d/started/samba ] ; then - /etc/init.d/samba stop - fi -} - -pkg_postinst() { - - #we touch ${D}/etc/smb/smb.conf so that people installing samba - #just to mount smb shares don't get annoying warnings all the time. - if [ ! -e ${ROOT}etc/smb/smb.conf ] ; then - touch ${ROOT}etc/smb/smb.conf - fi - - echo "##" - echo " If you had samba running earlier, you'll need to start it again. Also, please note" - echo " that you must configure /etc/smb/smb.conf before samba (the server) will work properly." - echo " Mounting smb shares and the smbclient program should work immediately. To accomplish" - echo " this there is an empty /etc/smb/smb.conf file installed." - echo - echo " To mount smb shares, type something like this. You will need kernel SMB support first:" - echo " % mount -t smbfs -o username=drobbins,password=foo,ip=192.168.1.1 //mybox/drobbins /mnt/foo" - echo " If you wish to allow normal users to mount smb shares, type the following as root:" - echo " % chmod u+s /usr/bin/smbmnt" - echo "##" -} diff --git a/net-fs/samba/samba-2.2.2-r8.ebuild b/net-fs/samba/samba-2.2.2-r8.ebuild new file mode 100644 index 000000000000..fc9225619df7 --- /dev/null +++ b/net-fs/samba/samba-2.2.2-r8.ebuild @@ -0,0 +1,159 @@ +# Copyright 1999-2002 Gentoo Technologies, Inc. +# Distributed under the terms of the GNU General Public License, v2 or later +# Maintainer: Donny Davies +# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-2.2.2-r8.ebuild,v 1.1 2002/01/29 23:23:19 woodchip Exp $ + +DESCRIPTION="SAMBA is a suite of SMB and CIFS client/server programs for UNIX" +HOMEPAGE="http://samba.org http://www.amherst.edu/~bbstone/howto/samba.html" + +S=${WORKDIR}/${P} +SRC_URI="http://us1.samba.org/samba/ftp/${P}.tar.gz + http://www.amherst.edu/~bbstone/recycle_bin/2.2.2/loadparm.c.patch + http://www.amherst.edu/~bbstone/recycle_bin/2.2.2/proto.h.patch + http://www.amherst.edu/~bbstone/recycle_bin/2.2.2/reply.c.patch" + +RDEPEND="virtual/glibc >=sys-libs/pam-0.72 cups? ( net-print/cups )" +# needs testing -- ssl? ( >=dev-libs/openssl-0.9.6 )" +DEPEND="${RDEPEND} tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) sys-devel/autoconf" + +src_unpack() { + + unpack ${P}.tar.gz ; cd ${S} + use afs && ( patch -p0 < ${FILESDIR}/samba-2.2.1a-afs.diff || die ) + patch -p0 < ${FILESDIR}/samba-2.2.2-smbmount.diff || die + patch -p1 < ${FILESDIR}/samba-2.2.2-XFS-quota.diff || die + + #network recycle bin must be enabled in your smb.conf per share + cd ${S}/source + patch -p0 < ${DISTDIR}/loadparm.c.patch || die + patch -p0 < ${DISTDIR}/proto.h.patch || die + patch -p0 < ${DISTDIR}/reply.c.patch || die + + #makes cups not absolutely required + if [ ! "`use cups`" ] ; then + cd ${S}/source + cp configure.in configure.in.orig + sed -e "s:AC_CHECK_LIB(cups,httpConnect)::" configure.in.orig > configure.in + autoconf || die + fi + + #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 +} + +src_compile() { + + local myconf + use afs && myconf="--with-afs" + use acl && myconf="${myconf} --with-acl-support" + #ssl needs testing... + myconf="${myconf} --without-ssl" + + export CFLAGS="${CFLAGS} -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE" + cd ${S}/source + ./configure \ + --prefix=/usr \ + --libdir=/etc/smb \ + --sbindir=/usr/sbin \ + --sysconfdir=/etc/smb \ + --localstatedir=/var/log \ + --with-lockdir=/var/run/smb \ + --with-mandir=/usr/share/man \ + --with-swatdir=/usr/share/swat \ + --with-privatedir=/etc/smb/private \ + --with-pam --with-pam_smbpass \ + --without-sambabook \ + --without-automount \ + --without-spinlocks \ + --with-netatalk \ + --with-smbmount \ + --with-profile \ + --with-quotas \ + --with-syslog \ + --with-msdfs \ + --with-utmp \ + --with-vfs \ + --host=${CHOST} ${myconf} || die "bad ./configure" + + emake || die "compile problem" +} + +src_install() { + + cd ${S}/source + dodir /sbin /etc/smb /usr/share/swat /var/log /var/run/smb /lib/security + + make install \ + prefix=${D}/usr \ + BASEDIR=${D}/usr \ + LIBDIR=${D}/etc/smb \ + VARDIR=${D}/var/log \ + LOCKDIR=${D}/var/lock \ + SBINDIR=${D}/usr/sbin \ + MANDIR=${D}/usr/share/man \ + SWATDIR=${D}/usr/share/swat \ + PRIVATEDIR=${D}/etc/smb/private || die + + #we specified PRIVATEDIR=/etc/smb/private + rm -rf ${D}/usr/private + diropts -m 0700 ; dodir /etc/smb/private + + #link /usr/bin/smbmount to /sbin/mount.smbfs which allows it + #to work transparently with standard 'mount' command + dosym /usr/bin/smbmount /sbin/mount.smbfs + + #handy scripts for user management + cd ${S}/source/script + exeinto /usr/sbin + doexe convert_smbpasswd mknissmbpasswd.sh mknissmbpwdtbl.sh mksmbpasswd.sh + + #place this correctly + mv ${D}/usr/bin/pam_smbpass.so ${D}/lib/security/pam_smbpass.so + + #too many docs to sort through. install 'em all :> + cd ${S} + dodoc COPYING Manifest README Roadmap WHATSNEW.txt + docinto full_docs ; cp -a docs/* ${D}/usr/share/doc/${PF}/full_docs + docinto examples ; cp -a examples/* ${D}/usr/share/doc/${PF}/examples + prepalldocs + + insinto /etc/pam.d ; newins ${FILESDIR}/samba.pam samba + insinto /etc/smb ; newins examples/smb.conf.default smb.conf.example + exeinto /etc/init.d ; newexe ${FILESDIR}/samba.rc6 samba +} + +pkg_preinst() { + if [ "$ROOT" = "/" ] && [ -e /dev/shm/.init.d/started/samba ] ; then + /etc/init.d/samba stop + fi +} + +pkg_prerm() { + if [ "$ROOT" = "/" ] && [ -e /dev/shm/.init.d/started/samba ] ; then + /etc/init.d/samba stop + fi +} + +pkg_postinst() { + + #we touch ${D}/etc/smb/smb.conf so that people installing samba + #just to mount smb shares don't get annoying warnings all the time. + if [ ! -e ${ROOT}etc/smb/smb.conf ] ; then + touch ${ROOT}etc/smb/smb.conf + fi + + echo "##" + echo " If you had samba running earlier, you'll need to start it again. Also, please note" + echo " that you must configure /etc/smb/smb.conf before samba (the server) will work properly." + echo " Mounting smb shares and the smbclient program should work immediately. To accomplish" + echo " this there is an empty /etc/smb/smb.conf file installed." + echo + echo " To mount smb shares, type something like this. You will need kernel SMB support first:" + echo " % mount -t smbfs -o username=drobbins,password=foo,ip=192.168.1.1 //mybox/drobbins /mnt/foo" + echo " If you wish to allow normal users to mount smb shares, type the following as root:" + echo " % chmod u+s /usr/bin/smbmnt" + echo "##" +} -- cgit v1.2.3-65-gdbad