added umount.cifs support (bug #104504)
authorChristian Andreetta <satya@gentoo.org>
Fri, 2 Sep 2005 08:12:41 +0000 (08:12 +0000)
committerChristian Andreetta <satya@gentoo.org>
Fri, 2 Sep 2005 08:12:41 +0000 (08:12 +0000)
Package-Manager: portage-2.0.51.22-r2

net-fs/samba/ChangeLog
net-fs/samba/Manifest
net-fs/samba/files/digest-samba-3.0.20-r1 [new file with mode: 0644]
net-fs/samba/samba-3.0.20-r1.ebuild [new file with mode: 0644]

index 4475f49bb0ca3b2d079453f331c3f11790f2cb05..c150fe4e6413aabc06a3d7c02a5958d3973cf13d 100644 (file)
@@ -1,6 +1,12 @@
 # ChangeLog for net-fs/samba
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.200 2005/09/01 08:12:36 satya Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.201 2005/09/02 08:12:41 satya Exp $
+
+*samba-3.0.20-r1 (02 Sep 2005)
+
+  02 Sep 2005; Christian Andreetta <satya@gentoo.org>
+  +samba-3.0.20-r1.ebuild:
+  added umount.cifs support (bug #104504)
 
 *samba-3.0.20 (01 Sep 2005)
 
index 62f00842f4b29ba2721163c81b80506861c98701..0b8cdccf6155bd9da504ffa2b39e1f96234773f8 100644 (file)
@@ -1,9 +1,11 @@
 MD5 ffd10fb9f7dd4b46afe0eb26be7e6735 samba-3.0.20.ebuild 7871
 MD5 d3c731b8858464c44e87d89d38b41f37 samba-3.0.14a-r2.ebuild 9184
-MD5 e24e509e73d64431074efa9bb48d26d1 ChangeLog 35875
+MD5 d48d02aced6bf2a6b662688af42be5c2 samba-3.0.20-r1.ebuild 7874
+MD5 0aeee40984ae355d11f04e9afbc0356e ChangeLog 36031
 MD5 41299f246433a1a55c8fccc77ccd709e metadata.xml 491
 MD5 e2d4d730a5b94ca850858aee5802134d samba-3.0.14a-r3.ebuild 9190
 MD5 a81151c8ce798cbb8498e4e3723dd5bb files/README.gentoo 2458
 MD5 2e9c176e386e3a8cde27015235173de3 files/digest-samba-3.0.20 208
 MD5 8655ff25f25d7e80f85a5e527d43e94b files/digest-samba-3.0.14a-r2 209
 MD5 15a9e77f4ef8bd8a597b0efe99599337 files/digest-samba-3.0.14a-r3 209
+MD5 16ef9d6a2586c74d9948b52608e5f3a2 files/digest-samba-3.0.20-r1 208
diff --git a/net-fs/samba/files/digest-samba-3.0.20-r1 b/net-fs/samba/files/digest-samba-3.0.20-r1
new file mode 100644 (file)
index 0000000..a057527
--- /dev/null
@@ -0,0 +1,3 @@
+MD5 68e72ab16334c329901816febc43217a samba-3.0.20.tar.gz 17182336
+MD5 68c9d099d942d85e68d96804b26ac788 samba-vscan-0.3.6.tar.bz2 166733
+MD5 86186c19455a8740b92d27a676d7a094 samba-3-gentoo-0.3.6.tar.bz2 16339
diff --git a/net-fs/samba/samba-3.0.20-r1.ebuild b/net-fs/samba/samba-3.0.20-r1.ebuild
new file mode 100644 (file)
index 0000000..a7748a0
--- /dev/null
@@ -0,0 +1,292 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.0.20-r1.ebuild,v 1.1 2005/09/02 08:12:41 satya Exp $
+
+inherit eutils versionator
+
+IUSE_LINGUAS="ja pl"
+IUSE="acl async automount cups doc kerberos ldap mysql pam postgres python quotas
+       readline syslog winbind xml xml2 libclamav oav selinux"
+RESTRICT="test"
+
+VSCAN_VER=0.3.6
+PATCH_VER=0.3.6
+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://samba/${MY_P}.tar.gz
+       oav? ( mirror://sourceforge/openantivirus/${PFVSCAN}.tar.bz2 )
+       mirror://gentoo/${MY_PP}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+RDEPEND="dev-libs/popt
+       acl?       ( sys-apps/acl )
+       cups?      ( net-print/cups )
+       ldap?      ( kerberos? ( virtual/krb5 ) net-nds/openldap )
+       mysql?     ( dev-db/mysql sys-libs/zlib )
+       pam?       ( virtual/pam )
+       postgres?  ( dev-db/postgresql sys-libs/zlib )
+       python?    ( dev-lang/python )
+       readline?  ( sys-libs/readline )
+       syslog?    ( virtual/logger )
+       xml?       ( dev-libs/libxml2 sys-libs/zlib )
+       xml2?      ( dev-libs/libxml2 sys-libs/zlib )
+       selinux? ( sec-policy/selinux-samba )"
+
+DEPEND="${RDEPEND}
+       sys-devel/autoconf
+       >=sys-apps/sed-4"
+
+PRIVATE_DST=/var/lib/samba/private
+PATCHDIR=${WORKDIR}/gentoo/patches
+CONFDIR=${WORKDIR}/gentoo/configs
+
+pkg_setup() {
+       ewarn "3.0.20: New USE flags: syslog, automount, async (default: disabled)"
+       ebeep
+       epause
+}
+
+src_unpack() {
+       unpack ${A}; cd ${S2}
+
+       rm -rf ${S2}/examples.ORIG
+
+       export EPATCH_SUFFIX="patch"
+       epatch ${PATCHDIR}/general
+       if use oav ; then
+               cd ${WORKDIR}
+               epatch ${PATCHDIR}/vscan
+               cp -pPR ${WORKDIR}/${PFVSCAN} ${S2}/examples/VFS
+       fi
+}
+
+src_compile() {
+       ebegin "Running autoconf"
+               autoconf
+       eend $?
+
+       local myconf
+       local mymods
+       local mylangs
+
+       if use xml || use xml2 ;
+       then
+               mymods="xml,${mymods}"
+       fi
+       use mysql && mymods="mysql,${mymods}"
+       use postgres && mymods="pgsql,${mymods}"
+       [[ -n "${mymods}" ]] && myconf="--with-expsam=${mymods}"
+
+       mylangs="en"
+       use linguas_ja && mylangs="${mylangs},ja"
+       use linguas_pl && mylangs="${mylangs},pl"
+       myconf="${myconf} --with-manpages-langs=${mylangs}"
+
+       use ldap && myconf="${myconf} $(use_with kerberos ads)"
+
+       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 \
+               --without-ldapsam \
+               $(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} || die
+
+       emake proto || die "SAMBA make proto error"
+       emake everything || die "SAMBA make everything error"
+
+       einfo "make rpctorture"
+       emake rpctorture || ewarn "rpctorture didn't build"
+
+       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 \
+                       $(use_with libclamav) || die "${PFVSCAN} ./configure failed"
+               emake || die "Failed to make ${PFVSCAN}"
+       fi
+
+}
+
+src_install() {
+       local extra_bins="rpctorture"
+
+       make DESTDIR=${D} install-everything || die
+
+       # Extra rpctorture progs
+       exeinto /usr/bin
+       for i in ${extra_bins}; do
+               [[ -x ${S}/bin/${i} ]] && doexe ${S}/bin/${i}
+               einfo "Extra binaries: ${i}"
+       done
+
+       # remove .old stuff from /usr/bin:
+       rm -f ${D}/usr/bin/*.old
+
+       # Nsswitch extensions. Make link for wins and winbind resolvers
+       dolib.so ${S}/nsswitch/libnss_wins.so
+       dosym libnss_wins.so /usr/$(get_libdir)/libnss_wins.so.2
+       if use winbind; then
+               dolib.so ${S}/nsswitch/libnss_winbind.so
+               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
+       fi
+
+       if use pam && use winbind; then
+               exeinto /$(get_libdir)/security
+               doexe ${S}/nsswitch/pam_winbind.so
+       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..
+       if use cups; then
+               dodir /usr/$(get_libdir)/cups/backend
+               dosym ../../../bin/smbspool /usr/$(get_libdir)/cups/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
+       insinto /etc/xinetd.d
+       newins ${CONFDIR}/swat.xinetd swat
+       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}
+       docinto examples
+       dodoc ${CONFDIR}/nsswitch.conf-wins
+       use winbind && dodoc ${CONFDIR}/nsswitch.conf-winbind
+
+       cp -pPR ${S2}/examples/* ${D}/usr/share/doc/${PF}/examples
+
+       chmod -R 755 `find ${D}/usr/share/doc/${PF}/examples -type d`
+       chmod -R 644 `find ${D}/usr/share/doc/${PF}/examples ! -type d`
+
+       if use oav; then
+               docinto ${PFVSCAN}
+               cd ${WORKDIR}/${PFVSCAN}
+               dodoc AUTHORS COPYING ChangeLog FAQ INSTALL NEWS README TODO
+               dodoc */*.conf
+       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
+
+       # 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 ${IMAGE}/${PRIVATE_DST}
+                       cp -pPRf ${ROOT}/${PRIVATE_SRC}/* ${IMAGE}/${PRIVATE_DST}/
+               eend $?
+       fi
+
+       if [[ ! -f "${ROOT}/etc/samba/smb.conf" ]]; then
+               touch ${IMAGE}/etc/samba/smb.conf
+       fi
+}
+
+pkg_postinst() {
+       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}
+}
+