Bump
authorPatrick Lauer <patrick@gentoo.org>
Tue, 11 May 2010 10:55:45 +0000 (10:55 +0000)
committerPatrick Lauer <patrick@gentoo.org>
Tue, 11 May 2010 10:55:45 +0000 (10:55 +0000)
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

net-fs/samba/ChangeLog
net-fs/samba/Manifest
net-fs/samba/samba-3.4.8.ebuild [new file with mode: 0644]

index ae4c33fc4003faaabdbcbcc017e4d3d4f2f53e39..d84904c15d80ccfd8af37d0f71cd9ac072b46579 100644 (file)
@@ -1,6 +1,11 @@
 # ChangeLog for net-fs/samba
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.410 2010/05/10 11:26:09 lxnay Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.411 2010/05/11 10:55:45 patrick Exp $
+
+*samba-3.4.8 (11 May 2010)
+
+  11 May 2010; Patrick Lauer <patrick@gentoo.org> +samba-3.4.8.ebuild:
+  Bump
 
 *samba-3.5.2-r1 (10 May 2010)
 
index b3e535654951297ca1e3dd2894a93bca1d871c3f..8374e55fffaba46fc3cb7c919c82fa129ee081b9 100644 (file)
@@ -55,6 +55,7 @@ AUX samba4.initd 634 RMD160 0d1028c3520102a7a2c4a7dd73723b66295db740 SHA1 cf2e0b
 DIST samba-3.0.37.tar.gz 23416703 RMD160 06b76ae22729e10c83d6af42d03b03ad69e49103 SHA1 5ec6bc6558b3c799f747eb49fbba019d5edf0cbd SHA256 bb67c0e13d4ccbd84b9200c8739393fdd9b3145b5aad216934dc670f0fcea266
 DIST samba-3.2.15.tar.gz 24435114 RMD160 0046aeaf5b91c34bbc9a387c714caf41ca84d1ae SHA1 52240aa9f2f5584f1978d788024fa2d6cb208e56 SHA256 84281fd1faeffee8558e49dff865dd382abbf78bc1be00f8cb5aa70aeea67d46
 DIST samba-3.4.6.tar.gz 34849318 RMD160 d94c6c85e1c30a160d3440630943fd0af2f8da72 SHA1 7896340d96a9c7f8a57d3a4c425bbbed78886f5c SHA256 c06504a5dcf6f0dea26c40869e7350af634500114052ddaf3590086cfbba6a16
+DIST samba-3.4.8.tar.gz 34851288 RMD160 a43d6fcfa3745754afca9d2c35682f69217b3040 SHA1 941daefd092e94eb9fb57d4617fcc6844c967317 SHA256 5237bc7a32e0eafd70b78c9cd6735e46dbad0c6f9794f50476b50dd1b43752d6
 DIST samba-3.5.0.tar.gz 30755153 RMD160 4c0169a3b5d1b7e08f10264a31165fcf94896de2 SHA1 68a6c2c47dd9e791ca58ad810fc5838fe0e27f35 SHA256 074217e5438affa45906f5e1395633a57f7cd25453adfdba9fa442bab7f3266f
 DIST samba-3.5.2.tar.gz 30777854 RMD160 711399686623d671461cba5738a6603b68ea0988 SHA1 f49733ea2fb9715bd4ec24d7ec96668cc6a97a1f SHA256 82dac9121a0c7ca8c4bb5dae036c060c2242d5bce7a8a67656f414eba921295e
 DIST samba-4.0.0alpha11.tar.gz 13917363 RMD160 3ec5597de6a2c80eaa426712101777fa92786b5c SHA1 8ed2befbbd45f6501d9e6036bcdfb332431a7b4f SHA256 ec9f4a9153b9e2c233420642ee98a8b944322e8b39a9b6912430fb24e88b81b9
@@ -62,8 +63,9 @@ DIST samba-vscan-0.3.6c-beta5.tar.gz 248183 RMD160 6929c30b57e342c4bdf6a6b432fbe
 EBUILD samba-3.0.37.ebuild 9995 RMD160 84b79edc774ea3053755016756724cf14e757691 SHA1 0676513a746314c5e537b4406e30da43f9531bc4 SHA256 f60a6f01b09319539da9fedb24652e4c0104d0ead9d3ae7fe741bf0910a5bb77
 EBUILD samba-3.2.15.ebuild 8586 RMD160 1b4e8d899150a548892ac7c91f0e6165f8ca0171 SHA1 660bdcb314a0d5fc0988fecf806952f0356e4065 SHA256 d5d9c1a5f56bb7c936c4aeae7c72cb16e1c1a92313670cd5131e56c20873a8b1
 EBUILD samba-3.4.6.ebuild 10341 RMD160 d78afcfaab13d86494b0f856f620d6932c86d617 SHA1 09266b2a48f6d2e1f0cec5e381df53e9ce7a00e7 SHA256 6f4909d163c9d48bc73295c44af162109ebf071c0627d83975f8b81b6d593c93
+EBUILD samba-3.4.8.ebuild 10343 RMD160 f52830e682b13fac4a95140eea953671b1fa81f5 SHA1 2e31a39916b159dd39f5d80e3bf17cde0f3a3765 SHA256 5c630fbc7e659a60266b6f970efe0723e6aabd3bc8d4913b0c8bca05f59647f2
 EBUILD samba-3.5.0.ebuild 10377 RMD160 8bb7f9bcfcd13002cd72733c0e52fa0480ebeb3a SHA1 1c0dc8330d747943135bb7d37e8eee3b3ec295fa SHA256 52a728a009223e74bcc6ab7e31dce0b8cbe1bf68463ceddfe49298d5fbd5b5a3
 EBUILD samba-3.5.2-r1.ebuild 10445 RMD160 bb1b2f5250de4b9f236a569789c622fe8a24c4fd SHA1 eb17a5f33d25f0317203a72eb35ec60b27916314 SHA256 4f1e292fa10e151334f83dbce750a8edccbe62bb05a2774b24edf30194ab7624
 EBUILD samba-4.0.0_alpha11.ebuild 4156 RMD160 d63bbf124c3fde8d264da490122a0826dda1aa13 SHA1 4bd67529b6094b91349e138614ba36075e5912c5 SHA256 619c7c38aa499083e3ee7ba06f681851b76a4456c1b8e8f3d4f3c998eaccda58
-MISC ChangeLog 68500 RMD160 8deaad715635e7d21bb6c095fef98cdf38fcdc58 SHA1 750f3aa6493b243e9dcedf7fdc06f36353aadab0 SHA256 2e22174071232e226723416a1a553a9d4c26659febd7f7dd1989c38c29e58414
+MISC ChangeLog 68609 RMD160 93e6f1aca9de3a8ad076495dc9183be0b6e90c9b SHA1 bcc90044f71c7bc267d45f04aadf89f015f90108 SHA256 133031268987f3a2e4c8f82a265412c679cd86b5e19a87ba524ce8f02edb563a
 MISC metadata.xml 1678 RMD160 fc5f6a9674053523edb993fda99f75789e995231 SHA1 7a3f710083ab340eb139281a0d9d94af1aaa4927 SHA256 afeddf0c54227bcdd40ccc67c65b5ee8809cbba447d0500773270d89de7d044e
diff --git a/net-fs/samba/samba-3.4.8.ebuild b/net-fs/samba/samba-3.4.8.ebuild
new file mode 100644 (file)
index 0000000..aed6a9a
--- /dev/null
@@ -0,0 +1,367 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.4.8.ebuild,v 1.1 2010/05/11 10:55:45 patrick Exp $
+
+EAPI="2"
+
+inherit pam confutils versionator multilib
+
+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"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~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 swat
+       syslog winbind "
+
+DEPEND="dev-libs/popt
+       !net-fs/samba-client
+       !net-fs/samba-libs
+       !net-fs/samba-server
+       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 )
+       cups? ( net-print/cups )
+       debug? ( dev-libs/dmalloc )
+       fam? ( dev-libs/libgamin )
+       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=""
+
+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 swat && SBINPROGS="${SBINPROGS} bin/swat"
+       use winbind && SBINPROGS="${SBINPROGS} bin/winbindd"
+       use ads && use winbind && SBIN_PROGS="${SBINPROGS} 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";
+use winbind && BINPROGS="${BINPROGS} bin/wbinfo"
+
+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() {
+       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"
+}
+
+src_configure() {
+       local myconf
+
+       # Filter out -fPIE
+       [[ ${CHOST} == *-*bsd* ]] || use hppa && 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 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) \
+               --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 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
+       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
+       dobin ${BINPROGS} || die "installing binaries failed"
+       for prog in ${BINPROGS} ; do
+               dobin ${prog} || die "installing ${prog} failed"
+               doman ../docs/manpages/${prog/bin\/}* || die "doman failed"
+       done
+
+       # 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
+       use cups && dosym /usr/bin/smbspool $(cups-config --serverbin)/backend/smb
+
+       # 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
+               einfo "install examples"
+               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
+                       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"
+}