From d566a3f5350ddcb8539f33600faf2e6e7db82258 Mon Sep 17 00:00:00 2001 From: Christian Andreetta Date: Fri, 17 Dec 2004 15:27:23 +0000 Subject: [PATCH] version bump --- net-fs/samba/ChangeLog | 7 +- net-fs/samba/Manifest | 4 +- net-fs/samba/files/digest-samba-3.0.10 | 3 + net-fs/samba/samba-3.0.10.ebuild | 397 +++++++++++++++++++++++++ 4 files changed, 409 insertions(+), 2 deletions(-) create mode 100644 net-fs/samba/files/digest-samba-3.0.10 create mode 100644 net-fs/samba/samba-3.0.10.ebuild diff --git a/net-fs/samba/ChangeLog b/net-fs/samba/ChangeLog index fa3c24030be5..580d30ff4477 100644 --- a/net-fs/samba/ChangeLog +++ b/net-fs/samba/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-fs/samba # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.136 2004/12/17 08:57:27 satya Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.137 2004/12/17 15:27:23 satya Exp $ + +*samba-3.0.10 (17 Dec 2004) + + 17 Dec 2004; Christian Andreetta +samba-3.0.10.ebuild: + version bump *samba-3.0.9-r1 (17 Dec 2004) diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest index da93bd893520..d750ca18bff3 100644 --- a/net-fs/samba/Manifest +++ b/net-fs/samba/Manifest @@ -4,11 +4,13 @@ MD5 cd9f3589a14d50054a0b1e4e129602af samba-3.0.6-r4.ebuild 14203 MD5 7ad9048a4062a3c8ce96af16abb18e4c samba-3.0.9.ebuild 16191 MD5 fc36819e4e02fa146e936aa31947ad27 samba-3.0.6-r3.ebuild 14226 MD5 9025af06e2c7a6149580a8309231b0e8 samba-3.0.9-r1.ebuild 16378 +MD5 deb2ab624a8e99a9cd4eb2ca2a10d2b4 samba-3.0.10.ebuild 16192 MD5 826ef7c1a083b2b7f564dc5198072698 samba-3.0.8.ebuild 16812 -MD5 d43fe1fd8a7597e75981dd1bc08abc8d ChangeLog 24937 +MD5 b10f59de49927de62b6e4338fd432e05 ChangeLog 25058 MD5 41299f246433a1a55c8fccc77ccd709e metadata.xml 491 MD5 7c1f458c46d453971ac7ca85c290f7a3 samba-3.0.8-r1.ebuild 17126 MD5 fcebd975211fecf647f6cecf26ba5c96 files/samba-3.0.4.patch 8086 +MD5 fa1dcd2c95a81c22c2ad68de6698a85e files/digest-samba-3.0.10 206 MD5 e89b19f1e62e257cbaa23a44a0362a58 files/swat.xinetd 527 MD5 a7cc90ba23d86b1d90f65645826dde19 files/smbldap_conf.pm 7095 MD5 cbaa5a39d9bd67b13f8131b426a4256b files/samba-2.2.5-gp-reloc-fix.patch 431 diff --git a/net-fs/samba/files/digest-samba-3.0.10 b/net-fs/samba/files/digest-samba-3.0.10 new file mode 100644 index 000000000000..e8c6da2d8546 --- /dev/null +++ b/net-fs/samba/files/digest-samba-3.0.10 @@ -0,0 +1,3 @@ +MD5 b19fd86d3c11a1b43f75a5988cd9ceeb samba-3.0.10.tar.gz 15176926 +MD5 5f173d549014985d681478897135915b samba-vscan-0.3.5.tar.bz2 161982 +MD5 63abfa7c522c8fb37e1d2e2fb9d422ab smbldap-tools-0.8.5-3.tgz 275520 diff --git a/net-fs/samba/samba-3.0.10.ebuild b/net-fs/samba/samba-3.0.10.ebuild new file mode 100644 index 000000000000..74c0e6af3bf9 --- /dev/null +++ b/net-fs/samba/samba-3.0.10.ebuild @@ -0,0 +1,397 @@ +# Copyright 1999-2004 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.0.10.ebuild,v 1.1 2004/12/17 15:27:23 satya Exp $ + +inherit eutils flag-o-matic +#--------------------------------------------------------------------------- +IUSE="acl cups doc kerberos ldap mysql pam postgres python quotas readline winbind xml xml2" +IUSE="${IUSE} libclamav oav" +IUSE="${IUSE} selinux" +#--------------------------------------------------------------------------- +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 + http://samba.idealx.org" +#--------------------------------------------------------------------------- +SMBLDAP_TOOLS_VER=0.8.5 +VSCAN_VER=0.3.5 +# all vscan modules are being installed +#VSCAN_MODS="oav sophos fprotd fsav trend icap mksd kavp clamav nai" +#--------------------------------------------------------------------------- +_CVS="-${PV/_/}" +S=${WORKDIR}/${PN}${_CVS} +#--------------------------------------------------------------------------- +SRC_URI="mirror://samba/${PN}${_CVS}.tar.gz + oav? mirror://sourceforge/openantivirus/${PN}-vscan-${VSCAN_VER}.tar.bz2 + ldap? http://samba.idealx.org/dist/smbldap-tools-${SMBLDAP_TOOLS_VER}-3.tgz" +#--------------------------------------------------------------------------- +_COMMON_DEPS="dev-libs/popt + readline? sys-libs/readline + ldap? ( kerberos? ( virtual/krb5 ) ) + mysql? ( dev-db/mysql sys-libs/zlib ) + postgres? ( dev-db/postgresql sys-libs/zlib ) + xml? ( dev-libs/libxml2 sys-libs/zlib ) + xml2? ( dev-libs/libxml2 sys-libs/zlib ) + acl? sys-apps/acl + cups? net-print/cups + ldap? ( net-nds/openldap dev-perl/Crypt-SmbHash ) + pam? sys-libs/pam + python? dev-lang/python" +DEPEND="sys-devel/autoconf + >=sys-apps/sed-4 + ${_COMMON_DEPS}" +#IDEALX scripts are now using Net::LDAP +#selinux: bug #62907 +RDEPEND="ldap? dev-perl/perl-ldap ${_COMMON_DEPS} + selinux? ( sec-policy/selinux-samba )" +#--------------------------------------------------------------------------- +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" +#=========================================================================== +pkg_setup() { + ewarn "2004-11: new ebuild flags:" + ewarn " quotas: now disabled by default" + ewarn " winbind: now disabled by default" + ewarn " libclamav: (oav) don't use clamav daemon, just load libraries when needed" + ewarn "/etc/samba/private moved to /var/lib/samba/private" + ebeep + epause + local PRIVATEDIR=/var/lib/samba/private + local PRIVATE_SRC=/etc/samba/private + if [[ ! -r ${PRIVATEDIR}/secrets.tdb && -r ${PRIVATE_SRC}/secrets.tdb ]]; then + einfo "Copying ${PRIVATE_SRC}/* to ${PRIVATEDIR}/" + cp -af ${PRIVATE_SRC}/* ${D}${PRIVATEDIR}/ + fi +} +#=========================================================================== +src_unpack() { + local i + unpack ${A} || die + cd ${S} || die + # Clean up CVS --------------------------------------------------------- + find . -name .cvsignore | xargs rm -f + find . -name CVS | xargs rm -rf + # Add patch(es) -------------------------------------------------------- + epatch ${FILESDIR}/samba-3.0.x-python-setup.patch || die + #bug #44743 ------------------------------------------------------------ + if [ ${ARCH} = "amd64" -o ${ARCH} = "ppc" -o ${ARCH} = "ppc64" ]; then + cd ${S} && epatch ${FILESDIR}/samba-3.0.x-smbumount-uid32.patch + fi + #Fix for bug #27858 ---------------------------------------------------- + if [ ${ARCH} = "sparc" -o ${ARCH} = "ppc" -o ${ARCH} = "ppc64" ]; then + cd ${S}/source/include && epatch ${FILESDIR}/samba-2.2.8-statfs.patch + fi + #Bug #36200; sys-kernel/linux-headers dependent ------------------------ + sed -i -e 's:#define LINUX_QUOTAS_2:#define LINUX_QUOTAS_1:' \ + -e 's:::' \ + ${S}/source/smbd/quotas.c + #amd64 lib location is not lib32 nor lib ------------------------------- + cd ${S} || die + use amd64 && epatch ${FILESDIR}/samba-3.0.x-libdirsymlink.patch + # examples: to be copied as docs --------------------------------------- + rm -rf ${S}/examples.ORIG + cp -a ${S}/examples ${S}/examples.ORIG + # Prep samba-vscan source. + if use oav ; then + cd ${WORKDIR}/${PN}-vscan-${VSCAN_VER} + epatch ${FILESDIR}/vscan-${VSCAN_VER}-libclamav.patch + cp -a ${WORKDIR}/${PN}-vscan-${VSCAN_VER} ${S}/examples/VFS + fi + #----------------------------------------------------------------------- + cd ${S}/source + echo "Running autoconf ..." + autoconf || die +} +#=========================================================================== +my_configure() { + local myconf="$1" + #----------------------------------------------------------------------- + for info_var in myconf CFLAGS LDFLAGS; do + einfo "${info_var} is: ${!info_var}" + done + #----------------------------------------------------------------------- + #default_{static,shared}_modules|source/configure + cd ${S}/source + econf \ + --prefix=/usr \ + --libdir=/usr/lib/samba \ + --with-libdir=/usr/lib/samba \ + --with-swatdir=/usr/share/doc/${PF}/swat \ + --localstatedir=/var \ + --with-piddir=/var/run/samba \ + --with-lockdir=/var/cache/samba \ + --with-logfilebase=/var/log/samba \ + --sysconfdir=/etc/samba \ + --with-configdir=/etc/samba \ + --with-privatedir=/var/lib/samba/private \ + \ + --enable-static \ + --enable-shared \ + --with-manpages-langs=en \ + --without-spinlocks \ + --with-libsmbclient \ + --with-automount \ + --with-smbmount \ + --with-syslog \ + --with-idmap \ + --host=${CHOST} \ + ${myconf} || die + # Show install dirs ---------------------------------------------------- + einfo "Dir conf:" + emake showlayout + # serialized headers make ---------------------------------------------- + make proto +} +#=========================================================================== +src_compile() { + local myconf + local mymods + #mymods="nisplussam" #this is deprecated... + #----------------------------------------------------------------------- + use xml || use xml2 && mymods="xml,${mymods}" + use mysql && mymods="mysql,${mymods}" + use postgres && mymods="pgsql,${mymods}" + [ -n "${mymods}" ] && myconf="--with-expsam=${mymods}" + use acl \ + && myconf="${myconf} --with-acl-support" \ + || myconf="${myconf} --without-acl-support" + use pam \ + && myconf="${myconf} --with-pam --with-pam_smbpass" \ + || myconf="${myconf} --without-pam --without-pam_smbpass" + use cups \ + && myconf="${myconf} --enable-cups" \ + || myconf="${myconf} --disable-cups" + use ldap \ + && myconf="${myconf} --with-ldap" \ + || myconf="${myconf} --without-ldap" + #this is for old samba 2.x compat + #myconf="${myconf} --with-ldapsam" + myconf="${myconf} --without-ldapsam" + use quotas \ + && myconf="${myconf} --with-quotas --with-sys-quotas" \ + || myconf="${myconf} --without-quotas --without-sys-quotas" + use winbind \ + && myconf="${myconf} --with-winbind" \ + || myconf="${myconf} --without-winbind" + use python \ + && myconf="${myconf} --with-python=yes" \ + || myconf="${myconf} --with-python=no" + use readline \ + && myconf="${myconf} --with-readline" \ + || myconf="${myconf} --without-readline" + #----------------------------------------------------------------------- + # Removing: bug #64815 states that ads in amd64 is now ok + ###if [ "${ARCH}" != "amd64" ]; then + ### use kerberos && use ldap \ + ### && myconf="${myconf} --with-ads" \ + ### || myconf="${myconf} --without-ads" + ###else + ### myconf="${myconf} --without-ads" + ###fi + use kerberos && use ldap \ + && myconf="${myconf} --with-ads" \ + || myconf="${myconf} --without-ads" + #----------------------------------------------------------------------- + append-ldflags -L/usr/$(get_libdir) # lib64 location + append-ldflags -Wl,-z,now # lib preload + # SUID configure ------------------------------------------------------- + my_configure "${myconf}" + # SUID compile --------------------------------------------------------- + for file in smbmnt smbumount; do + einfo "LD: BIND_NOW: bin/${file}" + rm -f bin/${file} + emake bin/${file} || die "LD: BIND_NOW: bin/${file} compile error" + done + for file in mount.cifs; do + einfo "LD: BIND_NOW: bin/${file}" + gcc ${CFLAGS} ${LDFLAGS} client/${file}.c -o bin/${file} || die "LD: BIND_NOW: bin/${file} compile error" + done + # CONFIGURE ------------------------------------------------------------ + LDFLAGS=${LDFLAGS/-Wl,-z,now/} #lib preload change must affect suid only! + my_configure "${myconf}" + # Compile main SAMBA pieces -------------------------------------------- + einfo "make everything" && emake everything || die "SAMBA make everything error" + einfo "make rpctorture" && emake rpctorture || ewarn "rpctorture didn't build" + # build smbget --------------------------------------------------------- + einfo "smbget" + emake bin/smbget; assert "smbget compile error" + # Build selected samba-vscan plugins ----------------------------------- + if use oav; then + cd ${S}/examples/VFS/${PN}-vscan-${VSCAN_VER} + my_conf="--prefix=/usr --libdir=/usr/lib/samba" + use libclamav && my_conf="${my_conf} --with-libclamav" + ./configure ${my_conf} + assert "bad ${PN}-vscan-${VSCAN_VER} ./configure" + emake # ${VSCAN_MODS} + fi +} +#=========================================================================== +src_install() { + local i #for cicles + local extra_bins="debug2html smbfilter talloctort mount.cifs smbget" + #smbsh editreg + extra_bins="${extra_bins} smbtorture msgtest masktest locktest \ + locktest2 nsstest vfstest rpctorture" + # ---------------------------------------------------------------------- + cd ${S}/source + make DESTDIR=${D} install-everything + # Extra binary files, testing/torture progs ---------------------------- + exeinto /usr/bin + for i in ${extra_bins}; do + [ -x ${S}/source/bin/${i} ] && doexe ${S}/source/bin/${i} && \ + einfo "Extra binaries: ${i}" + done + # Installing these setuid-root allows users to (un)mount smbfs/cifs ---- + for i in /usr/bin/smbumount /usr/bin/smbmnt /usr/bin/mount.cifs; do + fperms 4111 ${i} || die "No perms: ${i}" + einfo "suid: ${i}" + done + # Nsswitch extensions. Make link for wins and winbind resolvers -------- + exeinto /lib + doexe ${S}/source/nsswitch/libnss_wins.so + ( cd ${D}/lib; ln -s libnss_wins.so libnss_wins.so.2 ) + if use winbind; then + doexe ${S}/source/nsswitch/libnss_winbind.so + ( cd ${D}/lib; ln -s libnss_winbind.so libnss_winbind.so.2 ) + exeinto /lib/security && doexe ${S}/source/nsswitch/pam_winbind.so + fi + exeinto /lib/security + use pam && doexe ${S}/source/bin/pam_smbpass.so + # 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 /usr/lib/samba/libsmbclient.so /usr/lib/libsmbclient.so.0 + dosym /usr/lib/samba/libsmbclient.so /usr/lib/libsmbclient.so + # make the smb backend symlink for cups printing support.. + if use cups; then + dodir /usr/lib/cups/backend + dosym /usr/bin/smbspool /usr/lib/cups/backend/smb + fi + # Install IDEALX scripts for LDAP backend administration --------------- + if use ldap; then + # corrections as per bug #41796 + cd ${WORKDIR}/smbldap-tools-${SMBLDAP_TOOLS_VER} + exeinto /usr/share/samba/scripts; doexe smbldap-* + exeinto /etc/samba ; doexe smbldap_tools.pm + insinto /etc/smbldap-tools ; doins *.conf + fperms 644 /etc/smbldap-tools/smbldap.conf + fperms 600 /etc/smbldap-tools/smbldap_bind.conf + eval `perl '-V:installarchlib'` + dodir ${installarchlib} + #dosym /etc/samba/smbldap_conf.pm ${installarchlib} + #dosym /etc/samba/smbldap_conf.pm /usr/share/samba/scripts + dosym /etc/samba/smbldap_tools.pm ${installarchlib} + dosym /etc/samba/smbldap_tools.pm /usr/share/samba/scripts + if [ -f mkntpwd/mkntpwd ]; then + exeinto /usr/sbin ; doexe mkntpwd/mkntpwd + fi + fi + # VFS plugin modules --------------------------------------------------- + if use oav; then + #exeinto /usr/lib/samba/vfs + #doexe ${S}/examples/VFS/${PN}-vscan-${VSCAN_VER}/vscan-*.so + cd ${S}/examples/VFS/${PN}-vscan-${VSCAN_VER} + make install DESTDIR=${D} || die "VFS: vscan error" + insinto /etc/samba + doins ${S}/examples/VFS/${PN}-vscan-${VSCAN_VER}/openantivirus/*conf + fi + # Python extensions ---------------------------------------------------- + if use python; then + cd ${S}/source + 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 + #doins ${FILESDIR}/recycle.conf #obsolete: see bug #68315 + insinto /etc/pam.d + newins ${FILESDIR}/samba.pam samba + use winbind && doins ${FILESDIR}/system-auth-winbind + insinto /etc/xinetd.d + newins ${FILESDIR}/swat.xinetd swat + exeinto /etc/init.d; newexe ${FILESDIR}/samba-init samba + insinto /etc/conf.d; newins ${FILESDIR}/samba-conf samba + if use ldap; then + insinto /etc/openldap/schema + doins ${S}/examples/LDAP/samba.schema + fi + # dirs ----------------------------------------------------------------- + diropts -m0700 + local PRIVATE_DST=/var/lib/samba/private + dodir ${PRIVATE_DST} + touch ${D}${PRIVATE_DST}/.keep + diropts -m1777 + dodir /var/spool/samba + touch ${D}/var/spool/samba/.keep + diropts -m0755 + dodir /var/{log,run,cache}/samba + dodir /var/lib/samba/{netlogon,profiles} + dodir /var/lib/samba/printers/{W32X86,WIN40,W32ALPHA,W32MIPS,W32PPC} + touch ${D}/var/{log,run,cache}/samba/.keep + touch ${D}/var/lib/samba/{netlogon,profiles}/.keep + touch ${D}/var/lib/samba/printers/{W32X86,WIN40,W32ALPHA,W32MIPS,W32PPC}/.keep + # docs ----------------------------------------------------------------- + docinto "" + dodoc ${S}/COPYING ${S}/Manifest ${S}/README ${S}/Roadmap ${S}/WHATSNEW.txt + docinto examples + dodoc ${FILESDIR}/nsswitch.conf-wins + use winbind && dodoc ${FILESDIR}/nsswitch.conf-winbind + cp -a ${S}/examples.ORIG/* ${D}/usr/share/doc/${PF}/examples + if use oav; then + docinto ${PN}-vscan-${VSCAN_VER} + cd ${WORKDIR}/${PN}-vscan-${VSCAN_VER} + dodoc AUTHORS COPYING ChangeLog FAQ INSTALL NEWS README TODO + dodoc */*.conf + fi + if use ldap; then + docinto smbldap-tools-${SMBLDAP_TOOLS_VER} + cd ${WORKDIR}/smbldap-tools-${SMBLDAP_TOOLS_VER} + dodoc CONTRIBUTORS COPYING ChangeLog FILES INFRA INSTALL README TODO + 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 + # moving manpages ------------------------------------------------------ + mv ${D}/usr/man ${D}/usr/share/man +} +#=========================================================================== +pkg_postinst() { + # touch /etc/samba/smb.conf so that people installing samba just + # to mount smb shares don't get annoying warnings all the time.. + #[ ! -e ${ROOT}/etc/samba/smb.conf ] && touch ${ROOT}/etc/samba/smb.conf + + 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'" + 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 /var/lib/samba/private " + 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 "" + fi +} + -- 2.26.2