diff options
-rw-r--r-- | net-fs/samba/ChangeLog | 8 | ||||
-rw-r--r-- | net-fs/samba/Manifest | 6 | ||||
-rw-r--r-- | net-fs/samba/files/digest-samba-3.0.21b | 9 | ||||
-rw-r--r-- | net-fs/samba/samba-3.0.21b.ebuild | 308 |
4 files changed, 330 insertions, 1 deletions
diff --git a/net-fs/samba/ChangeLog b/net-fs/samba/ChangeLog index 1d3099e6b048..5d459bfe7d19 100644 --- a/net-fs/samba/ChangeLog +++ b/net-fs/samba/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-fs/samba # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.213 2006/02/02 10:47:03 satya Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.214 2006/02/02 10:55:13 satya Exp $ + +*samba-3.0.21b (02 Feb 2006) + + 02 Feb 2006; Christian Andreetta <satya@gentoo.org> +samba-3.0.21b.ebuild: + 3.0.21b version bump: includes samba-vscan-0.3.6b support. *Many* thanks to + Chris Smith (bug #116284) for the patchset and the test *samba-3.0.21a (02 Feb 2006) diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest index 5e1687a66510..fd319d04dc89 100644 --- a/net-fs/samba/Manifest +++ b/net-fs/samba/Manifest @@ -22,6 +22,9 @@ SHA256 07c74c34402600edb4ade79ca726daa3e38c1fc33096dbd441aa00aca4daffcc files/di MD5 ad50e9df5afa7a68ae92fafc5d3daf16 files/digest-samba-3.0.21a 771 RMD160 a32a0d0ac8be9be925086fb62047d31557758121 files/digest-samba-3.0.21a 771 SHA256 faf73ffb71cafa8a1e1e6ec414653152cbf27f66534cd17d415314c612bcb8f4 files/digest-samba-3.0.21a 771 +MD5 adb7ab134c8c36d103e72cf1b41c3255 files/digest-samba-3.0.21b 771 +RMD160 56ae2c22ea011aec0ab585c3aa452ff7644b01c4 files/digest-samba-3.0.21b 771 +SHA256 2e1f17c1d03f9f6f7fd99942fe59a064ec353f5c464e97f29fc7c534f11fd8af files/digest-samba-3.0.21b 771 MD5 41299f246433a1a55c8fccc77ccd709e metadata.xml 491 RMD160 a168f5ebf64e25d8c80c1c33220b2695ae8f3645 metadata.xml 491 SHA256 f6534dfe5249b4f1482818d56c36126ae4681eb5b7d24dbf985f6be6f2c58493 metadata.xml 491 @@ -43,3 +46,6 @@ SHA256 7c816bdf1e9d104d9402add068b96930ce06d869bcce69df8cdcd6725db908f2 samba-3. MD5 c5a70bc09be5f115ebfbc5fb000be560 samba-3.0.21a.ebuild 8614 RMD160 8ab10e38ca352508befe26e9ceba22fa28580942 samba-3.0.21a.ebuild 8614 SHA256 8c18e7127bcb06a0d4867a001dbcf71478154d747862cc7a32ef3f9c8ffc2818 samba-3.0.21a.ebuild 8614 +MD5 86ffe8b2bea614f4f68869d32ddc1204 samba-3.0.21b.ebuild 8614 +RMD160 a1e7cc057a3cf606ab14a60d4b5f75f79610d7d4 samba-3.0.21b.ebuild 8614 +SHA256 db63082fe37eec5109c825d628681502a2e2ea9933489488f949a8d16ee2cf71 samba-3.0.21b.ebuild 8614 diff --git a/net-fs/samba/files/digest-samba-3.0.21b b/net-fs/samba/files/digest-samba-3.0.21b new file mode 100644 index 000000000000..8ba15fb23471 --- /dev/null +++ b/net-fs/samba/files/digest-samba-3.0.21b @@ -0,0 +1,9 @@ +MD5 e68da25c1ff30482c9401e279ae62797 samba-3-gentoo-0.3.11.tar.bz2 15929 +RMD160 2ad449ab8ceddb2d2f940eaebdab7965925038c5 samba-3-gentoo-0.3.11.tar.bz2 15929 +SHA256 8c6de0f26458995b8d095ddc433caac8b183fbc6e5f9cbc240cb762ae3c1f3da samba-3-gentoo-0.3.11.tar.bz2 15929 +MD5 bb73dffb33f4a39386ef9f3e07ae28ff samba-3.0.21b.tar.gz 17539079 +RMD160 883f855523e2a079cd7295df6647b3cb9b56c23a samba-3.0.21b.tar.gz 17539079 +SHA256 a5e6982024105276d347b3b521897d6937c727e273814e743ada8eddf972e7d0 samba-3.0.21b.tar.gz 17539079 +MD5 900502ba36b80620229b94e5129bc856 samba-vscan-0.3.6b.tar.bz2 164471 +RMD160 5cd81345b06f44b2febf3f24e62325322b1c6a3b samba-vscan-0.3.6b.tar.bz2 164471 +SHA256 2fa680c85ef036a9ac27d1039807881c7a0f35f64f731b1d3a13b860a9135e7a samba-vscan-0.3.6b.tar.bz2 164471 diff --git a/net-fs/samba/samba-3.0.21b.ebuild b/net-fs/samba/samba-3.0.21b.ebuild new file mode 100644 index 000000000000..0cac36c95ddf --- /dev/null +++ b/net-fs/samba/samba-3.0.21b.ebuild @@ -0,0 +1,308 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.0.21b.ebuild,v 1.1 2006/02/02 10:55:13 satya Exp $ + +inherit eutils versionator + +IUSE_LINGUAS="ja pl" +IUSE="acl async automount cups doc examples kerberos ldap ldapsam libclamav mysql + oav pam postgres python quotas readline selinux swat syslog winbind xml xml2" +RESTRICT="test" + +VSCAN_VER="0.3.6b" +PATCH_VER="0.3.11" +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}/patches +CONFDIR=${WORKDIR}/configs + +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 + + #uClib: bug #120383, https://bugzilla.samba.org/show_bug.cgi?id=3451 + sed -i -e '/include.*fstab.h/d' "${S}"/client/umount.cifs.c +} + +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" + + [[ ${CHOST} == *-*bsd* ]] && myconf="${myconf} --disable-pie" + + 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} + 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 + + if use examples; then + docinto examples + 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` + fi + + 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.d/swat configuration" + fi + einfo "As of 3.0.20: New USE flags: syslog, automount, async (default: disabled)" + einfo "As of 3.0.20b: New USE flags: ldapsam, swat (default: disabled)" + einfo "SQL and XML backends are *experimental*" + 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} +} + |