diff options
author | Robert Piasek <dagger@gentoo.org> | 2011-03-23 11:04:30 +0000 |
---|---|---|
committer | Robert Piasek <dagger@gentoo.org> | 2011-03-23 11:04:30 +0000 |
commit | 0925fd14e88cc1412fe6b2b3e8cb2c872a2afd19 (patch) | |
tree | d6b7b57ea760a7103f317a62286fbe750a5a5942 /net-fs | |
parent | Add upstream patch to fix building with USE=-ipv6; thanks to Andreas Schürch... (diff) | |
download | historical-0925fd14e88cc1412fe6b2b3e8cb2c872a2afd19.tar.gz historical-0925fd14e88cc1412fe6b2b3e8cb2c872a2afd19.tar.bz2 historical-0925fd14e88cc1412fe6b2b3e8cb2c872a2afd19.zip |
Added Samba Traffic Analyzer V2 backport. Acked by Patrick.
Package-Manager: portage-2.1.9.44/cvs/Linux x86_64
Diffstat (limited to 'net-fs')
-rw-r--r-- | net-fs/samba/ChangeLog | 8 | ||||
-rw-r--r-- | net-fs/samba/Manifest | 6 | ||||
-rw-r--r-- | net-fs/samba/metadata.xml | 1 | ||||
-rw-r--r-- | net-fs/samba/samba-3.5.8-r1.ebuild | 444 |
4 files changed, 456 insertions, 3 deletions
diff --git a/net-fs/samba/ChangeLog b/net-fs/samba/ChangeLog index 6f5b21e204cb..06d49c38f334 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.466 2011/03/15 16:01:17 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.467 2011/03/23 11:04:30 dagger Exp $ + +*samba-3.5.8-r1 (23 Mar 2011) + + 23 Mar 2011; Robert Piasek <dagger@gentoo.org> +samba-3.5.8-r1.ebuild, + metadata.xml: + Add Samba Traffic Analyzer v2 backport. Acked by Patrick. 15 Mar 2011; Tomáš Chvátal <scarabeus@gentoo.org> samba-3.5.8.ebuild: Enable aio by default + tiny whitespace for readability. Acked by Patrick. diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest index f5d53c800b93..63af542d0afe 100644 --- a/net-fs/samba/Manifest +++ b/net-fs/samba/Manifest @@ -27,10 +27,12 @@ DIST samba-3.4.9.tar.gz 34850281 RMD160 1c724ac3bee4f1a5b547a89cd5f899226aac6717 DIST samba-3.5.7.tar.gz 30815040 RMD160 f903a40aeffffa0ca142cfce3bb4ecced5c0bc29 SHA1 335c6e97858f0a6db5559a398c980df39a5f6f7c SHA256 9a1836b3c5a89059783e70d77b80a277d26d328615012a84f1b0580aa813b09d DIST samba-3.5.8.tar.gz 30721269 RMD160 02703bbaf7d7e7b9786a2228fe6085143c99251a SHA1 ffb71de38442eee14aafb44f819671354dc5cce9 SHA256 331e3f2806edcad853b48f4b1e653367ad9a6ce1ab5ed486c03a6bf614882796 DIST samba-4.0.0alpha11.tar.gz 13917363 RMD160 3ec5597de6a2c80eaa426712101777fa92786b5c SHA1 8ed2befbbd45f6501d9e6036bcdfb332431a7b4f SHA256 ec9f4a9153b9e2c233420642ee98a8b944322e8b39a9b6912430fb24e88b81b9 +DIST smb_traffic_analyzer_v2.diff.bz2 12226 RMD160 82f6d443d289253a184e5f5dda17d865cb79b2b5 SHA1 1dd5100447cb827aacb8bb18bf88b7b10955a38c SHA256 1bae7eafbe8ac2382313d5ab9d43d73ba64b63a714f0f588516952d476fb868d EBUILD samba-3.4.12.ebuild 11861 RMD160 750f8afe059cdc815a5c1cefda7539ff7ca28969 SHA1 ef4a379e61668d63b100f4ec962ab89e890dd3ca SHA256 f7308d692377f503e4ee60927508a29645ca5b6a6cbfafa659a053a5b77cf194 EBUILD samba-3.4.9.ebuild 11819 RMD160 b190b483b2cf1291a209b55c4717635bcdd9b056 SHA1 77fd940d2d182fe16b35fb67cf662da16a6cd103 SHA256 c03939f60782a74b50532ed4cad936ffa595392ad2529f897f49dd9407210263 EBUILD samba-3.5.7.ebuild 12721 RMD160 40ae76d07c6aad5ef12fd1542394dad01cc69979 SHA1 a47b572132f9724f70f685ace260696154c67da7 SHA256 8d9c3f5da0a9f336533a03d64717fb054458e68e28d96049b79bf956452819a3 +EBUILD samba-3.5.8-r1.ebuild 12950 RMD160 945ed915be88b8cec2bc341e50ee4ee3f77a284f SHA1 7035892773440bebaffcae2bbcc0726bebcc31fa SHA256 19c11c7ad5d30f4a7f1546d55f2d1465c5136b2994a50e5da1063296b9702a9e EBUILD samba-3.5.8.ebuild 12729 RMD160 88956016de7cca429a9fc56993bfb43b634b3ac0 SHA1 09011aa0e312be1be93e05c75c4bb6fc5b160a37 SHA256 03118d35562237cf15ae20beb201505a9cab39c1eab3652ea65635d9110437d0 EBUILD samba-4.0.0_alpha11.ebuild 4231 RMD160 efebbeed51868bf0cf51f6151b531f3e65834db2 SHA1 49169a33b69d1a69ecc102d8010c7b11f9256117 SHA256 02427fccf34de0f6aea8960d664b85a51fb80cce7bd107bc53111df386fb0660 -MISC ChangeLog 77842 RMD160 8e05e94f3a7c55fa210f4cb6d0c4bc1e3d8d2b53 SHA1 4f981e0dc359e2c928d30a4b878a5c148fa75170 SHA256 5df3f6470f311bc5d4e23fa5019c73fa5f337da407ff8b76823a81051d84ab15 -MISC metadata.xml 1365 RMD160 2f64795a1d7d7c42fef60ebf208dd7b857786e47 SHA1 5c76d183a1f4f77832415fce1eb02e7ee4ecea2f SHA256 adffcfd42c6c2895909ba3eb6dda9a398d9d499fbced64c6c65d51ac71a0374b +MISC ChangeLog 78020 RMD160 b84297e591f9d37d28569d2a9815d810230cd9cf SHA1 026c31880d4d638d46a63f2fd6746ea33497c446 SHA256 45f5c46655cecbcbdd4738b8aa1d3eb4bb11cf6a442efb78a92606adc139a5c3 +MISC metadata.xml 1435 RMD160 cbeae62707473b88127daa6170e8ca58861ef38b SHA1 32ff9e4f94646cc85bca64f208ea19faae1e2075 SHA256 bdff2271efdf94275d1a6096c48407c0372e088b10f85f19b989b18d50c2a5f0 diff --git a/net-fs/samba/metadata.xml b/net-fs/samba/metadata.xml index 6024bcfbf9ec..3289e14490fb 100644 --- a/net-fs/samba/metadata.xml +++ b/net-fs/samba/metadata.xml @@ -25,5 +25,6 @@ Samba is an Open Source/Free Software suite that provides seamless file and prin <flag name="quota">Enables support for user quotas</flag> <flag name="smbclient">Enable smbclient tool</flag> <flag name="smbsharemodes">Enable special smb share modes (?) </flag> + <flag name="smbtav2">Enable Samba Traffic Analyzer version 2 </flag> </use> </pkgmetadata> diff --git a/net-fs/samba/samba-3.5.8-r1.ebuild b/net-fs/samba/samba-3.5.8-r1.ebuild new file mode 100644 index 000000000000..b63f77b0583e --- /dev/null +++ b/net-fs/samba/samba-3.5.8-r1.ebuild @@ -0,0 +1,444 @@ +# 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.8-r1.ebuild,v 1.1 2011/03/23 11:04:30 dagger Exp $ + +EAPI="2" + +inherit pam confutils 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 ) + 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)" + +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 + + confutils_use_depend_all ads ldap + confutils_use_depend_all swat server +} + +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 +} + +src_configure() { + local myconf + + # Filter out -fPIE + [[ ${CHOST} == *-*bsd* ]] && myconf="${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="${myconf} --with-cifsupcall" + else + myconf="${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 || die "emake libaddns failed" + fi + if use netapi ; then + einfo "make netapi library" + emake libnetapi || die "emake libnetapi failed" + fi + if use smbclient ; then + einfo "make smbclient library" + emake libsmbclient || die "emake libsmbclient failed" + fi + if use smbsharemodes ; then + einfo "make smbsharemodes library" + emake libsmbsharemodes || die "emake libsmbsharemodes failed" + fi + + # compile modules + emake modules || die "building modules failed" + + # compile pam moudles + if use pam ; then + einfo "make pam modules" + emake pam_modules || die "emake pam_modules failed"; + fi + + # compile winbind nss modules + if use winbind ; then + einfo "make nss modules" + emake nss_modules || die "emake nss_modules failed"; + fi + + # compile utilities + if [ -n "${BINPROGS}" ] ; then + einfo "make binprogs" + emake ${BINPROGS} || die "emake binprogs failed"; + fi + if [ -n "${SBINPROGS}" ] ; then + einfo "make sbinprogs" + emake ${SBINPROGS} || die "emake sbinprogs failed"; + fi + + if [ -n "${KRBPLUGIN}" ] ; then + einfo "make krbplugin" + emake ${KRBPLUGIN}${PLUGINEXT} || die "emake krbplugin failed"; + fi + + if use client ; then + einfo "make {,u}mount.cifs" + emake bin/{,u}mount.cifs || die "emake {,u}mount.cifs failed" + fi +} + +src_install() { + # install libs + if use addns ; then + einfo "install addns library" + emake installlibaddns DESTDIR="${D}" || die "emake install libaddns failed" + fi + if use netapi ; then + einfo "install netapi library" + emake installlibnetapi DESTDIR="${D}" || die "emake install libnetapi failed" + fi + if use smbclient ; then + einfo "install smbclient library" + emake installlibsmbclient DESTDIR="${D}" || die "emake install libsmbclient failed" + fi + if use smbsharemodes ; then + einfo "install smbsharemodes library" + emake installlibsmbsharemodes DESTDIR="${D}" || die "emake install libsmbsharemodes failed" + fi + + # install modules + emake installmodules DESTDIR="${D}" || die "installing modules failed" + + if use pam ; then + einfo "install pam modules" + emake installpammodules DESTDIR="${D}" || die "emake installpammodules failed" + + 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}" || die "emake installlibwbclient failed" + 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} || die "installing ${prog} failed" + doman ../docs/manpages/${prog/bin\/}* || die "doman failed" + done + + for prog in ${BINPROGS} ; do + dobin ${prog} || die "installing ${prog} failed" + doman ../docs/manpages/${prog/bin\/}* || die "doman failed" + 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} || die "installing + ${KRBPLUGIN}${PLUGINEXT} failed" + elif has_version app-crypt/heimdal ; then + insinto /usr/$(get_libdir)/plugin/krb5 + doins ${KRBPLUGIN}${PLUGINEXT} || die "installing + ${KRBPLUGIN}${PLUGINEXT} failed" + fi + insinto /usr + for prog in ${KRBPLUGIN} ; do + doman ../docs/manpages/${prog/bin\/}* || die "doman failed" + 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}" \ + || die "installing swat failed" + 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 || die "u/mount.cifs not around" + doman ../docs/manpages/{u,}mount.cifs.8 || die "can't create man pages" + 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 "${CONFDIR}"/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" +} |