diff options
author | Christian Andreetta <satya@gentoo.org> | 2005-10-14 13:34:00 +0000 |
---|---|---|
committer | Christian Andreetta <satya@gentoo.org> | 2005-10-14 13:34:00 +0000 |
commit | ebd75f8aa9407910d8c8964645032abe38b09fec (patch) | |
tree | 3d513c1aa7e99dc4679201a32ca1ec9afaa9a14d /net-fs | |
parent | Updated to latest upstream version. Dropped divx4linux dependency entirely. (diff) | |
download | gentoo-2-ebd75f8aa9407910d8c8964645032abe38b09fec.tar.gz gentoo-2-ebd75f8aa9407910d8c8964645032abe38b09fec.tar.bz2 gentoo-2-ebd75f8aa9407910d8c8964645032abe38b09fec.zip |
3.0.20b version bump (bug #109174), swat: xinetd dependency (bug #81387), smbmount not suid (bug #105680), sql backend and mysql schema (bug #106457), ldapsam support (bug #108400)
(Portage version: 2.0.51.22-r3)
Diffstat (limited to 'net-fs')
-rw-r--r-- | net-fs/samba/ChangeLog | 9 | ||||
-rw-r--r-- | net-fs/samba/Manifest | 2 | ||||
-rw-r--r-- | net-fs/samba/files/digest-samba-3.0.20b | 3 | ||||
-rw-r--r-- | net-fs/samba/samba-3.0.20b.ebuild | 307 |
4 files changed, 320 insertions, 1 deletions
diff --git a/net-fs/samba/ChangeLog b/net-fs/samba/ChangeLog index a7b44f8a6991..6373d305bbbe 100644 --- a/net-fs/samba/ChangeLog +++ b/net-fs/samba/ChangeLog @@ -1,6 +1,13 @@ # 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.207 2005/10/06 14:55:45 satya Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.208 2005/10/14 13:33:59 satya Exp $ + +*samba-3.0.20b (14 Oct 2005) + + 14 Oct 2005; Christian Andreetta <satya@gentoo.org> +samba-3.0.20b.ebuild: + 3.0.20b version bump (bug #109174), which fixes also swat: xinetd dependency + (bug #81387), smbmount not suid (bug #105680), sql backend and mysql schema + (bug #106457), ldapsam support (bug #108400) *samba-3.0.20a (06 Oct 2005) diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest index 70f937092e81..9e2f7a702adf 100644 --- a/net-fs/samba/Manifest +++ b/net-fs/samba/Manifest @@ -1,5 +1,6 @@ MD5 befd6e972303040584c4ae13553c32b0 samba-3.0.14a-r2.ebuild 9230 MD5 c837e49c112f33ecbf1115e70d64366a samba-3.0.20-r1.ebuild 7920 +MD5 1e3d1997f88f3aadeada5c7771f66460 samba-3.0.20b.ebuild 8405 MD5 d5af7566e4d4414dc84bae05cfd0bdc2 ChangeLog 36676 MD5 41299f246433a1a55c8fccc77ccd709e metadata.xml 491 MD5 72241950493402811f88e16d77dcc69a samba-3.0.14a-r3.ebuild 9241 @@ -8,4 +9,5 @@ MD5 a81151c8ce798cbb8498e4e3723dd5bb files/README.gentoo 2458 MD5 8655ff25f25d7e80f85a5e527d43e94b files/digest-samba-3.0.14a-r2 209 MD5 15a9e77f4ef8bd8a597b0efe99599337 files/digest-samba-3.0.14a-r3 209 MD5 101abdf5b841b3e0dc27ab5ae299ff79 files/digest-samba-3.0.20a 209 +MD5 7bc0aaaba16409d481afc302a7cbae7e files/digest-samba-3.0.20b 209 MD5 b0edbbe79d56d73a741ab67940725cd5 files/digest-samba-3.0.20-r1 208 diff --git a/net-fs/samba/files/digest-samba-3.0.20b b/net-fs/samba/files/digest-samba-3.0.20b new file mode 100644 index 000000000000..719c5af67fd7 --- /dev/null +++ b/net-fs/samba/files/digest-samba-3.0.20b @@ -0,0 +1,3 @@ +MD5 39c0cae08fe0224cb003aa0af97d3050 samba-3.0.20b.tar.gz 17165513 +MD5 68c9d099d942d85e68d96804b26ac788 samba-vscan-0.3.6.tar.bz2 166733 +MD5 c8e73e9cf44f443ae1694ab9c88cb8c7 samba-3-gentoo-0.3.9.tar.bz2 16803 diff --git a/net-fs/samba/samba-3.0.20b.ebuild b/net-fs/samba/samba-3.0.20b.ebuild new file mode 100644 index 000000000000..a507f6472805 --- /dev/null +++ b/net-fs/samba/samba-3.0.20b.ebuild @@ -0,0 +1,307 @@ +# 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.20b.ebuild,v 1.1 2005/10/14 13:34:00 satya Exp $ + +inherit eutils versionator + +IUSE_LINGUAS="ja pl" +IUSE="acl async automount cups doc kerberos ldap ldapsam libclamav mysql oav + pam postgres python quotas readline selinux swat syslog winbind xml xml2" +RESTRICT="test" + +VSCAN_VER=0.3.6 +PATCH_VER=0.3.9 +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 + mirror://samba/old-versions/${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 ) + selinux? ( sec-policy/selinux-samba ) + swat? ( sys-apps/xinetd ) + syslog? ( virtual/logger ) + xml? ( dev-libs/libxml2 sys-libs/zlib ) + xml2? ( dev-libs/libxml2 sys-libs/zlib ) + " + +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)" + ewarn "3.0.20b: New USE flags: ldapsam, swat (default: disabled)" + ewarn "SQL and XML backends are *experimental*" + 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}" + + if use ldap; then + myconf="${myconf} $(use_with ldap) $(use_with kerberos ads)" + myconf="${myconf} $(use_with ldapsam)" + else + myconf="${myconf} --without-ldapsam" + fi + use winbind && myconf="${myconf} $(use_with winbind) --with-shared-modules=idmap_rid" + + 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 \ + $(use_with acl acl-support) \ + $(use_with async aio-support) \ + $(use_with automount) \ + $(use_enable cups) \ + $(use_with kerberos krb5) \ + $(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) \ + ${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 + if use winbind; then + exeinto /$(get_libdir)/security + doexe ${S}/nsswitch/pam_winbind.so + 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.. + 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 + + if use oav; then + docinto ${PFVSCAN} + cd ${WORKDIR}/${PFVSCAN} + dodoc AUTHORS COPYING ChangeLog FAQ INSTALL NEWS README TODO + dodoc */*.conf + fi + + 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 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 ${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() { + if use swat; then + einfo "swat must be enabled by xinetd:" + einfo " change the /etc/xinetd/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} +} + |