From feb5d87f0ced2b2443de66efac7f84419a96e347 Mon Sep 17 00:00:00 2001 From: Victor Ostorga Date: Wed, 29 Jun 2011 17:53:04 +0000 Subject: Version bump to 3.5.9 bug #373445 , Adding notes to smb.conf.default #352869 (Portage version: 2.1.9.42/cvs/Linux i686) --- net-fs/samba/ChangeLog | 8 +- net-fs/samba/files/3.5/smb.conf.default.patch | 86 +++++ net-fs/samba/samba-3.5.9.ebuild | 445 ++++++++++++++++++++++++++ 3 files changed, 538 insertions(+), 1 deletion(-) create mode 100644 net-fs/samba/files/3.5/smb.conf.default.patch create mode 100644 net-fs/samba/samba-3.5.9.ebuild (limited to 'net-fs') diff --git a/net-fs/samba/ChangeLog b/net-fs/samba/ChangeLog index ce2438dcf123..c4d5dd0ae51e 100644 --- a/net-fs/samba/ChangeLog +++ b/net-fs/samba/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-fs/samba # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.471 2011/05/05 17:24:10 vostorga Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.472 2011/06/29 17:53:04 vostorga Exp $ + +*samba-3.5.9 (29 Jun 2011) + + 29 Jun 2011; Víctor Ostorga + +files/3.5/smb.conf.default.patch, +samba-3.5.9.ebuild: + Version bump to 3.5.9 bug #373445 , Adding notes to smb.conf.default #352869 05 May 2011; Víctor Ostorga samba-3.4.12.ebuild, samba-3.4.13.ebuild, samba-3.5.8.ebuild, samba-3.5.8-r1.ebuild: diff --git a/net-fs/samba/files/3.5/smb.conf.default.patch b/net-fs/samba/files/3.5/smb.conf.default.patch new file mode 100644 index 000000000000..e9d62db164f4 --- /dev/null +++ b/net-fs/samba/files/3.5/smb.conf.default.patch @@ -0,0 +1,86 @@ +--- samba-3.5.9/examples/smb.conf.default 2011-06-14 05:17:28.000000000 -0600 ++++ /etc/samba/smb.conf.default 2011-06-29 10:12:13.000000000 -0600 +@@ -61,11 +61,11 @@ + # otherwise the user "nobody" is used + ; guest account = pcguest + + # this tells Samba to use a separate log file for each machine + # that connects +- log file = /usr/local/samba/var/log.%m ++ log file = /var/log/samba/log.%m + + # Put a capping on the size of the log files (in Kb). + max log size = 50 + + # Use password server option only with security = server +@@ -79,19 +79,22 @@ + # Specifies the Active Directory realm the host is part of + ; realm = MY_REALM + + # Backend to store user information in. New installations should + # use either tdbsam or ldapsam. smbpasswd is available for backwards +-# compatibility. tdbsam requires no further configuration. ++# compatibility. tdbsam requires no further configuration. If you're ++# migrating from < samba 3.4, you'll have to convert your old user ++# passwords to the new backend with the command: ++# pdbedit -i smbpasswd:/var/lib/samba/private/smbpasswd -e + ; passdb backend = tdbsam + + # Using the following line enables you to customise your configuration + # on a per machine basis. The %m gets replaced with the netbios name + # of the machine that is connecting. + # Note: Consider carefully the location in the configuration file of + # this line. The included file is read at that point. +-; include = /usr/local/samba/lib/smb.conf.%m ++; include = /etc/samba/smb.conf.%m + + # Configure Samba to use multiple interfaces + # If you have multiple network interfaces then you must list them + # here. See the man page for details. + ; interfaces = 192.168.12.2/24 192.168.13.2/24 +@@ -164,29 +167,29 @@ + writable = yes + + # Un-comment the following and create the netlogon directory for Domain Logons + ; [netlogon] + ; comment = Network Logon Service +-; path = /usr/local/samba/lib/netlogon ++; path = /var/lib/samba/netlogon + ; guest ok = yes + ; writable = no + ; share modes = no + + + # Un-comment the following to provide a specific roving profile share + # the default is to use the user's home directory + ;[Profiles] +-; path = /usr/local/samba/profiles ++; path = /var/lib/samba/profiles + ; browseable = no + ; guest ok = yes + + + # NOTE: If you have a BSD-style print system there is no need to + # specifically define each individual printer + [printers] + comment = All Printers +- path = /usr/spool/samba ++ path = /var/spool/samba + browseable = no + # Set public = yes to allow user 'guest account' to print + guest ok = no + writable = no + printable = yes +@@ -202,11 +205,11 @@ + # the "staff" group + ;[public] + ; comment = Public Stuff + ; path = /home/samba + ; public = yes +-; writable = no ++; writable = yes + ; printable = no + ; write list = @staff + + # Other examples. + # diff --git a/net-fs/samba/samba-3.5.9.ebuild b/net-fs/samba/samba-3.5.9.ebuild new file mode 100644 index 000000000000..eb56bee7f846 --- /dev/null +++ b/net-fs/samba/samba-3.5.9.ebuild @@ -0,0 +1,445 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.5.9.ebuild,v 1.1 2011/06/29 17:53:04 vostorga Exp $ + +EAPI=4 + +inherit pam versionator multilib eutils + +MY_PV=${PV/_/} +MY_P="${PN}-${MY_PV}" + +DESCRIPTION="Library bits of the samba network filesystem" +HOMEPAGE="http://www.samba.org/" +SRC_URI="mirror://samba/${P}.tar.gz + http://dev.gentoo.org/~dagger/files/smb_traffic_analyzer_v2.diff.bz2" +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +IUSE="acl addns ads +aio avahi caps +client cluster cups debug doc examples fam + ldap ldb +netapi pam quota +readline +server +smbclient smbsharemodes smbtav2 + swat syslog winbind" + +DEPEND="dev-libs/popt + !net-fs/samba-client + !net-fs/samba-libs + !net-fs/samba-server + !net-fs/cifs-utils + sys-libs/talloc + sys-libs/tdb + virtual/libiconv + ads? ( virtual/krb5 sys-fs/e2fsprogs + client? ( sys-apps/keyutils ) ) + avahi? ( net-dns/avahi[dbus] ) + caps? ( sys-libs/libcap ) + client? ( !net-fs/mount-cifs + dev-libs/iniparser ) + cluster? ( >=dev-db/ctdb-1.0.114_p1 ) + cups? ( net-print/cups ) + debug? ( dev-libs/dmalloc ) + fam? ( virtual/fam ) + ldap? ( net-nds/openldap ) + pam? ( virtual/pam + winbind? ( dev-libs/iniparser ) + ) + readline? ( >=sys-libs/readline-5.2 ) + syslog? ( virtual/logger )" + +RDEPEND="${DEPEND}" + +# Disable tests since we don't want to build that much here +RESTRICT="test" + +SBINPROGS="" +BINPROGS="" +KRBPLUGIN="" +PLUGINEXT=".so" +SHAREDMODS="" + +S="${WORKDIR}/${MY_P}/source3" + +# TODO: +# - enable iPrint on Prefix/OSX and Darwin? +# - selftest-prefix? selftest? +# - AFS? + +CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)" + +REQUIRED_USE=" + ads? ( ldap ) + swat? ( server ) +" + +pkg_setup() { + if use server ; then + SBINPROGS="${SBINPROGS} bin/smbd bin/nmbd" + BINPROGS="${BINPROGS} bin/testparm bin/smbstatus bin/smbcontrol bin/pdbedit + bin/profiles bin/sharesec bin/eventlogadm" + + use smbtav2 && BINPROGS="${BINPROGS} bin/smbta-util" + use swat && SBINPROGS="${SBINPROGS} bin/swat" + use winbind && SBINPROGS="${SBINPROGS} bin/winbindd" + use ads && use winbind && KRBPLUGIN="${KRBPLUGIN} bin/winbind_krb5_locator" + fi + + if use client ; then + BINPROGS="${BINPROGS} bin/smbclient bin/net bin/smbget bin/smbtree + bin/nmblookup bin/smbpasswd bin/rpcclient bin/smbcacls bin/smbcquotas + bin/ntlm_auth" + + use ads && SBINPROGS="${SBINPROGS} bin/cifs.upcall" + fi + + use cups && BINPROGS="${BINPROGS} bin/smbspool" + use ldb && BINPROGS="${BINPROGS} bin/ldbedit bin/ldbsearch bin/ldbadd bin/ldbdel bin/ldbmodify bin/ldbrename"; + + if use winbind ; then + BINPROGS="${BINPROGS} bin/wbinfo" + SHAREDMODS="${SHAREDMODS}idmap_rid,idmap_hash" + use ads && SHAREDMODS="${SHAREDMODS},idmap_ad" + use ldap && SHAREDMODS="${SHAREDMODS},idmap_ldap,idmap_adex" + fi + + if use winbind && + [[ $(tc-getCC)$ == *gcc* ]] && + [[ $(gcc-major-version)$(gcc-minor-version) -lt 43 ]] + then + eerror "It is a known issue that ${P} will not build with " + eerror "winbind use flag enabled when using gcc < 4.3 ." + eerror "Please use at least the latest stable gcc version." + die "Using sys-devel/gcc < 4.3 with winbind use flag." + fi +} + +src_prepare() { + cp "${FILESDIR}/samba-3.4.2-lib.tevent.python.mk" "../lib/tevent/python.mk" + + # ensure that winbind has correct ldflags (QA notice) + sed -i \ + -e 's|LDSHFLAGS="|LDSHFLAGS="\\${LDFLAGS} |g' \ + configure || die "sed failed" + + epatch "${CONFDIR}"/${PN}-3.5.6-kerberos-dummy.patch + use smbtav2 && cd "${WORKDIR}/${P}" && epatch "${WORKDIR}"/smb_traffic_analyzer_v2.diff + cd "${WORKDIR}/${MY_P}" && epatch "${CONFDIR}"/${PN}-3.5.8-uclib-build.patch + epatch "${CONFDIR}"/smb.conf.default.patch +} + +src_configure() { + local myconf + + # Filter out -fPIE + [[ ${CHOST} == *-*bsd* ]] && myconf+=" --disable-pie" + + # Upstream refuses to make this configurable + use caps && export ac_cv_header_sys_capability_h=yes || export ac_cv_header_sys_capability_h=no + + # use_with doesn't accept 2 USE-flags + if use client && use ads ; then + myconf+=" --with-cifsupcall" + else + myconf+=" --without-cifsupcall" + fi + + # Notes: + # - automount is only needed in conjunction with NIS and we don't have that + # anymore => LDAP? + # - --without-dce-dfs and --without-nisplus-home can't be passed to configure but are disabled by default + econf ${myconf} \ + --with-piddir=/var/run/samba \ + --sysconfdir=/etc/samba \ + --localstatedir=/var \ + $(use_enable debug developer) \ + --enable-largefile \ + --enable-socket-wrapper \ + --enable-nss-wrapper \ + $(use_enable swat) \ + $(use_enable debug dmalloc) \ + $(use_enable cups) \ + --disable-iprint \ + $(use_enable fam) \ + --enable-shared-libs \ + --disable-dnssd \ + $(use_enable avahi) \ + --with-fhs \ + --with-privatedir=/var/lib/samba/private \ + --with-rootsbindir=/var/cache/samba \ + --with-lockdir=/var/cache/samba \ + --with-swatdir=/usr/share/doc/${PF}/swat \ + --with-configdir=/etc/samba \ + --with-logfilebase=/var/log/samba \ + --with-pammodulesdir=$(getpam_mod_dir) \ + --without-afs \ + --without-fake-kaserver \ + --without-vfs-afsacl \ + $(use_with ldap) \ + $(use_with ads) \ + $(use_with ads krb5 /usr) \ + $(use_with ads dnsupdate) \ + --without-automount \ + $(use_with client cifsmount) \ + $(use_with client cifsumount) \ + $(use_with pam) \ + $(use_with pam pam_smbpass) \ + $(use_with syslog) \ + $(use_with quota quotas) \ + $(use_with quota sys-quotas) \ + --without-utmp \ + --without-lib{talloc,tdb} \ + $(use_with netapi libnetapi) \ + $(use_with smbclient libsmbclient) \ + $(use_with smbsharemodes libsmbsharemodes) \ + $(use_with addns libaddns) \ + $(use_with cluster ctdb /usr) \ + $(use_with cluster cluster-support) \ + $(use_with acl acl-support) \ + $(use_with aio aio-support) \ + --with-sendfile-support \ + $(use_with winbind) \ + --with-shared-modules=${SHAREDMODS} \ + --without-included-popt \ + --without-included-iniparser +} + +src_compile() { + # compile libs + if use addns ; then + einfo "make addns library" + emake libaddns + fi + if use netapi ; then + einfo "make netapi library" + emake libnetapi + fi + if use smbclient ; then + einfo "make smbclient library" + emake libsmbclient + fi + if use smbsharemodes ; then + einfo "make smbsharemodes library" + emake libsmbsharemodes + fi + + # compile modules + emake modules + + # compile pam moudles + if use pam ; then + einfo "make pam modules" + emake pam_modules + fi + + # compile winbind nss modules + if use winbind ; then + einfo "make nss modules" + emake nss_modules + fi + + # compile utilities + if [ -n "${BINPROGS}" ] ; then + einfo "make binprogs" + emake ${BINPROGS} + fi + if [ -n "${SBINPROGS}" ] ; then + einfo "make sbinprogs" + emake ${SBINPROGS} + fi + + if [ -n "${KRBPLUGIN}" ] ; then + einfo "make krbplugin" + emake ${KRBPLUGIN}${PLUGINEXT} + fi + + if use client ; then + einfo "make {,u}mount.cifs" + emake bin/{,u}mount.cifs + fi +} + +src_install() { + # install libs + if use addns ; then + einfo "install addns library" + emake installlibaddns DESTDIR="${D}" + fi + if use netapi ; then + einfo "install netapi library" + emake installlibnetapi DESTDIR="${D}" + fi + if use smbclient ; then + einfo "install smbclient library" + emake installlibsmbclient DESTDIR="${D}" + fi + if use smbsharemodes ; then + einfo "install smbsharemodes library" + emake installlibsmbsharemodes DESTDIR="${D}" + fi + + # install modules + emake installmodules DESTDIR="${D}" + + if use pam ; then + einfo "install pam modules" + emake installpammodules DESTDIR="${D}" + + if use winbind ; then + newpamd "${CONFDIR}/system-auth-winbind.pam" system-auth-winbind + doman ../docs/manpages/pam_winbind.8 + fi + + newpamd "${CONFDIR}/samba.pam" samba + dodoc pam_smbpass/README + fi + + # Nsswitch extensions. Make link for wins and winbind resolvers + if use winbind ; then + einfo "install libwbclient" + emake installlibwbclient DESTDIR="${D}" + dolib.so ../nsswitch/libnss_wins.so + dosym libnss_wins.so /usr/$(get_libdir)/libnss_wins.so.2 + dolib.so ../nsswitch/libnss_winbind.so + dosym libnss_winbind.so /usr/$(get_libdir)/libnss_winbind.so.2 + einfo "install libwbclient related manpages" + doman ../docs/manpages/idmap_rid.8 + doman ../docs/manpages/idmap_hash.8 + if use ldap ; then + doman ../docs/manpages/idmap_adex.8 + doman ../docs/manpages/idmap_ldap.8 + fi + if use ads ; then + doman ../docs/manpages/idmap_ad.8 + fi + fi + + # install binaries + insinto /usr + for prog in ${SBINPROGS} ; do + dosbin ${prog} + doman ../docs/manpages/${prog/bin\/}* + done + + for prog in ${BINPROGS} ; do + dobin ${prog} + doman ../docs/manpages/${prog/bin\/}* + done + + # install krbplugin + if [ -n "${KRBPLUGIN}" ] ; then + if has_version app-crypt/mit-krb5 ; then + insinto /usr/$(get_libdir)/krb5/plugins/libkrb5 + doins ${KRBPLUGIN}${PLUGINEXT} + elif has_version app-crypt/heimdal ; then + insinto /usr/$(get_libdir)/plugin/krb5 + doins ${KRBPLUGIN}${PLUGINEXT} + fi + insinto /usr + for prog in ${KRBPLUGIN} ; do + doman ../docs/manpages/${prog/bin\/}* + done + fi + + # install server components + if use server ; then + doman ../docs/manpages/vfs* ../docs/manpages/samba.7 + + diropts -m0700 + keepdir /var/lib/samba/private + + diropts -m1777 + keepdir /var/spool/samba + + diropts -m0755 + keepdir /var/{cache,log}/samba + keepdir /var/lib/samba/{netlogon,profiles} + keepdir /var/lib/samba/printers/{W32X86,WIN40,W32ALPHA,W32MIPS,W32PPC,X64,IA64,COLOR} + keepdir /usr/$(get_libdir)/samba/{auth,pdb,rpc,idmap,nss_info,gpext} + + newconfd "${CONFDIR}/samba.confd" samba + newinitd "${CONFDIR}/samba.initd" samba + + insinto /etc/samba + doins "${CONFDIR}"/{smbusers,lmhosts} + + if use ldap ; then + insinto /etc/openldap/schema + doins ../examples/LDAP/samba.schema + fi + + if use swat ; then + insinto /etc/xinetd.d + newins "${CONFDIR}/swat.xinetd" swat + script/installswat.sh "${D}" "${ROOT}/usr/share/doc/${PF}/swat" "${S}" + fi + + dodoc ../MAINTAINERS ../README* ../Roadmap ../WHATSNEW.txt ../docs/THANKS + fi + + # install client files ({u,}mount.cifs into /) + if use client ; then + into / + dosbin bin/{u,}mount.cifs + doman ../docs/manpages/{u,}mount.cifs.8 + fi + + # install the spooler to cups + if use cups ; then + dosym /usr/bin/smbspool $(cups-config --serverbin)/backend/smb + fi + + # install misc files + insinto /etc/samba + doins ../examples/smb.conf.default + doman ../docs/manpages/smb.conf.5 + + insinto /usr/"$(get_libdir)"/samba + doins ../codepages/{valid.dat,upcase.dat,lowcase.dat} + + # install docs + if use doc ; then + dohtml -r ../docs/htmldocs/* + dodoc ../docs/*.pdf + fi + + # install examples + if use examples ; then + insinto /usr/share/doc/${PF}/examples + + if use smbclient ; then + doins -r ../examples/libsmbclient + fi + + if use winbind ; then + doins -r ../examples/pam_winbind ../examples/nss + fi + + if use server ; then + cd ../examples + doins -r auth autofs dce-dfs LDAP logon misc pdb \ + perfcounter printer-accounting printing scripts tridge \ + validchars VFS + fi + fi + + # Remove empty installation directories + rmdir --ignore-fail-on-non-empty \ + "${D}/usr/$(get_libdir)/samba" \ + "${D}/usr"/{sbin,bin} \ + "${D}/usr/share"/{man,locale,} \ + "${D}/var"/{run,lib/samba/private,lib/samba,lib,cache/samba,cache,} \ + # || die "tried to remove non-empty dirs, this seems like a bug in the ebuild" +} + +pkg_postinst() { + elog "The default value of 'wide links' has been changed to 'no' in samba 3.5" + elog "to avoid an insecure default configuration" + elog "('wide links = yes' and 'unix extensions = yes'). For more details," + elog "please see http://www.samba.org/samba/news/symlink_attack.html ." + elog "" + elog "An EXPERIMENTAL implementation of the SMB2 protocol has been added." + elog "SMB2 can be enabled by setting 'max protocol = smb2'. SMB2 is a new " + elog "implementation of the SMB protocol used by Windows Vista and higher" + elog "" + elog "For further information make sure to read the release notes at" + elog "http://samba.org/samba/history/${P}.html and " + elog "http://samba.org/samba/history/${PN}-3.5.0.html" +} -- cgit v1.2.3-65-gdbad