From e9f0630bd3f6bf62b9c4fb9f69f9ac9b18026b6e Mon Sep 17 00:00:00 2001 From: Seemant Kulleen Date: Tue, 26 Apr 2005 21:25:27 +0000 Subject: version bump to 3.0.14a, but this time, with an appropriate patch tarball, which gives a much cleaner ebuild. I'll be updating the remaining samba ebuilds to use this method as well over the next week or so Package-Manager: portage-2.0.51.20-r4 --- net-fs/samba/ChangeLog | 10 +- net-fs/samba/Manifest | 8 +- net-fs/samba/files/digest-samba-3.0.14a | 3 + net-fs/samba/files/samba-2.2.8-statfs.patch | 4 +- net-fs/samba/samba-3.0.14a.ebuild | 304 ++++++++++++++++++++++++++++ 5 files changed, 323 insertions(+), 6 deletions(-) create mode 100644 net-fs/samba/files/digest-samba-3.0.14a create mode 100644 net-fs/samba/samba-3.0.14a.ebuild diff --git a/net-fs/samba/ChangeLog b/net-fs/samba/ChangeLog index 01daf197399c..fa0d6a2a456f 100644 --- a/net-fs/samba/ChangeLog +++ b/net-fs/samba/ChangeLog @@ -1,6 +1,14 @@ # 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.161 2005/04/13 11:59:59 seemant Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.162 2005/04/26 21:25:27 seemant Exp $ + +*samba-3.0.14a (26 Apr 2005) + + 26 Apr 2005; Seemant Kulleen + files/samba-2.2.8-statfs.patch, +samba-3.0.14a.ebuild: + version bump to 3.0.14a, but this time, with an appropriate patch tarball, + which gives a much cleaner ebuild. I'll be updating the remaining samba + ebuilds to use this method as well over the next week or so 13 Apr 2005; Seemant Kulleen -files/samba-3.0.6-samba.schema, -files/config-svc-smbd+nmbd, diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest index 1fdd282a7914..0786e28a7009 100644 --- a/net-fs/samba/Manifest +++ b/net-fs/samba/Manifest @@ -1,15 +1,18 @@ -MD5 375ea05c745db4603c5b28f0764451a7 ChangeLog 28894 +MD5 2e23c11a62459e5d7d83403dabcd43da ChangeLog 29247 MD5 41299f246433a1a55c8fccc77ccd709e metadata.xml 491 MD5 04e7264e5dfee95a35bc59578942b380 samba-3.0.11.ebuild 16532 MD5 b274c48ba2f4664b815cba907b13eb08 samba-3.0.12.ebuild 15718 MD5 4ec9fc723b0d9801152c2ddfd4442de9 samba-3.0.10.ebuild 16380 MD5 dde473d4519c83ca5e81ce51466117f2 samba-3.0.13.ebuild 15542 +MD5 e24468566ea2727e6a1695b59ea55edb samba-3.0.14a.ebuild 8832 MD5 fa1dcd2c95a81c22c2ad68de6698a85e files/digest-samba-3.0.10 206 MD5 5cb8bfa14396777d6e3b69975cf7e181 files/digest-samba-3.0.11 204 +MD5 def157a63ec14450df82373617c7dc4b files/samba-3.0.11-gcc4.patch 485 MD5 519576a9448b86f1a7baab18204533a5 files/lmhosts 126 MD5 5d3129a0f6bcbec6ec91d217881a34e1 files/nsswitch.conf-winbind 298 MD5 7ee5edc70bf80888c776f5808f865996 files/nsswitch.conf-wins 392 -MD5 60e527174c1b2c53126dbbedb3cae0f7 files/samba-2.2.8-statfs.patch 209 +MD5 0c0364e7f0bc4cc48d8f9b103e606a93 files/samba-2.2.8-statfs.patch 239 +MD5 8e27b3b4cae228d0f047b5ec2df9d52c files/digest-samba-3.0.14a 214 MD5 b836e258befae9d6c66cb3f158769b25 files/samba-3.0.x-libdirsymlink.patch 592 MD5 e75c2316eced1d80cb2161848581c6a3 files/samba-3.0.x-python-setup.patch 1094 MD5 8ea7b443dd580aaaaf7e9e896eba54f2 files/samba-3.0.x-smbumount-uid32.patch 425 @@ -22,6 +25,5 @@ MD5 3685eadb817d185b06476eca6c0c15c4 files/smbusers 204 MD5 e89b19f1e62e257cbaa23a44a0362a58 files/swat.xinetd 527 MD5 09195dd8ab25ce77ac51c0c05b4ab93c files/system-auth-winbind 869 MD5 e17a1638ad9f30f2e39db4c8981a2fcd files/vscan-0.3.5-libclamav.patch 523 -MD5 def157a63ec14450df82373617c7dc4b files/samba-3.0.11-gcc4.patch 485 MD5 30021657434000c4ef3bf62872367ea7 files/digest-samba-3.0.12 136 MD5 b2d8f41a9dad89b3e073259680a517cf files/digest-samba-3.0.13 136 diff --git a/net-fs/samba/files/digest-samba-3.0.14a b/net-fs/samba/files/digest-samba-3.0.14a new file mode 100644 index 000000000000..17bb8fa10d44 --- /dev/null +++ b/net-fs/samba/files/digest-samba-3.0.14a @@ -0,0 +1,3 @@ +MD5 ebee37e66a8b5f6fd328967dc09088e8 samba-3.0.14a.tar.gz 15605851 +MD5 68c9d099d942d85e68d96804b26ac788 samba-vscan-0.3.6.tar.bz2 166733 +MD5 d0e94c22baf93401ea6ddf12937f6ca3 samba-3-gentoo-patches-0.3.tar.bz2 3878 diff --git a/net-fs/samba/files/samba-2.2.8-statfs.patch b/net-fs/samba/files/samba-2.2.8-statfs.patch index ca658ae7e3df..9592a017e3b3 100644 --- a/net-fs/samba/files/samba-2.2.8-statfs.patch +++ b/net-fs/samba/files/samba-2.2.8-statfs.patch @@ -1,5 +1,5 @@ ---- includes.h Fri Feb 28 07:56:18 2003 -+++ includes.h.diff Tue Apr 1 15:39:16 2003 +--- source/include/includes.h Fri Feb 28 07:56:18 2003 ++++ source/include/includes.h.diff Tue Apr 1 15:39:16 2003 @@ -276,6 +276,7 @@ #ifdef HAVE_SYS_VFS_H diff --git a/net-fs/samba/samba-3.0.14a.ebuild b/net-fs/samba/samba-3.0.14a.ebuild new file mode 100644 index 000000000000..7397053aa99d --- /dev/null +++ b/net-fs/samba/samba-3.0.14a.ebuild @@ -0,0 +1,304 @@ +# 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.14a.ebuild,v 1.1 2005/04/26 21:25:27 seemant Exp $ + +inherit eutils versionator + +IUSE_LINGUAS="ja pl" +IUSE="acl cups doc kerberos ldap mysql pam postgres python quotas readline +winbind xml xml2 libclamav oav selinux" + +VSCAN_VER=0.3.6 +PATCH_VER=0.3 +MY_P=${PN}-${PV/_/} +MY_PP=${PN}-$(get_major_version)-gentoo-patches-${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? ( sys-libs/pam ) + postgres? ( dev-db/postgresql sys-libs/zlib ) + python? ( dev-lang/python ) + readline? ( sys-libs/readline ) + 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 + +src_unpack() { + unpack ${A}; cd ${S2} + + rm -rf ${S2}/examples.ORIG + + export EPATCH_SUFFIX="patch" + epatch ${WORKDIR}/gentoo/patches/general + if use oav ; then + cp -a ${WORKDIR}/${PFVSCAN} ${S2}/examples/VFS + epatch ${WORKDIR}/gentoo/patches/vscan + 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} \ + --enable-static --enable-shared \ + --with-smbmount --with-automount \ + --with-libsmbclient \ + --without-spinlocks \ + --with-syslog \ + --with-idmap \ + --without-ldapsam \ + $(use_with acl) \ + $(use_enable cups) \ + $(use_with kerberos krb5) \ + $(use_with ldap) \ + $(use_with python) \ + $(use_with readline) \ + $(use_with winbind) \ + $(use_with pam) $(use_with pam pam_smbpass) \ + $(use_with quotas) $(use_with quotas sys-quotas) \ + ${myconf} || die + + # Show install dirs + einfo "Dir conf:" + emake showlayout + # serialized headers make + make proto || die + + # Compile main SAMBA pieces + einfo "make everything" + emake \ + LAZYLDFLAGS="-Wl,-z,now" \ + 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 selected 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 + make DESTDIR=${D} INSTALLPERMS=4555 installsubin || 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 + + # 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 + + # mount backend + dodir /sbin + dosym ../usr/bin/smbmount /sbin/mount.smbfs + dosym ../usr/bin/mount.cifs /sbin/mount.cifs + + # 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 + touch ${D}/etc/samba/smb.conf + doins ${FILESDIR}/smbusers + newins ${FILESDIR}/smb.conf.example-samba3.gz smb.conf.example.gz + doins ${FILESDIR}/lmhosts + + newpamd ${FILESDIR}/samba.pam samba + use winbind && doins ${FILESDIR}/system-auth-winbind + insinto /etc/xinetd.d + newins ${FILESDIR}/swat.xinetd swat + newinitd ${FILESDIR}/samba-init samba + newconfd ${FILESDIR}/samba-conf samba + if use ldap; then + insinto /etc/openldap/schema + doins ${S}/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} + + # docs + dodoc ${S2}/{COPYING,Manifest,README,Roadmap,WHATSNEW.txt} + docinto examples + dodoc ${FILESDIR}/nsswitch.conf-wins + use winbind && dodoc ${FILESDIR}/nsswitch.conf-winbind + + cp -a ${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 +} + +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 -af ${ROOT}/${PRIVATE_SRC}/* ${IMAGE}/${PRIVATE_DST}/ + eend $? + fi +} + +pkg_postinst() { + ewarn "" + ewarn "If you are upgrading from a Samba version prior to 3.0.2, and you" + ewarn "use Samba's password database, you must run the following command:" + ewarn "" + ewarn " pdbedit --force-initialized-passwords" + ewarn "" + ewarn "2004-09: LIBs flags changes for suid bins: LDFLAGS+='-Wl,-z,now'" + ewarn "3.0.12: libsmbclient shared library retrocompatibility is not " + ewarn " assured: please rebuild all samba-linked third part packages" + + if use winbind; then + ewarn " 3.0.7: param: 'winbind enable local accounts' is now" + ewarn " disabled by default" + fi + + ewarn "2004-11: /etc/samba/private moved to ${PRIVATE_DST}" + ewarn " for better File System Hierarchy adeherence" + ewarn "" + einfo "If you experience client locks in file transfers _only_, try the parameter" + einfo " use sendfile = no (man smb.conf(5), man sendfile(2))" + einfo "There also seem some problems with the smbfs implementation of the recent 2.6.x kernels" + einfo "If you experience problems (lockups) with smbfs, try cifs as an alternative" + einfo "" + + if use ldap; then + ewarn "If you are upgrading from prior to 3.0.2, and you are using LDAP" + ewarn " for Samba authentication, you must check the sambaPwdLastSet" + ewarn " attribute on all accounts, and ensure it is not 0." + einfo "" + ewarn "2005-03 [3.0.12]: smbldap-tools is now a separate package" + ewarn " for ease of upgrade" + fi + + einfo "There is a good HOWTO about setting up samba3 with cups and clamav at" + einfo "http://www.gentoo.org/doc/en/quick-samba-howto.xml" +} + -- cgit v1.2.3-65-gdbad