From cca568e72715a5dfb5abc662d48a0e67a9780ef1 Mon Sep 17 00:00:00 2001 From: Christian Andreetta Date: Fri, 8 Oct 2004 14:02:49 +0000 Subject: stable on x86 and amd64. Note on sendfile(2) (bug #66656). ADS and krb5 on amd64 also (bug #64815) --- net-fs/samba/ChangeLog | 6 +++++- net-fs/samba/Manifest | 6 +++--- net-fs/samba/files/digest-samba-3.0.7-r1 | 4 ++-- net-fs/samba/samba-3.0.7-r1.ebuild | 25 ++++++++++++++++--------- 4 files changed, 26 insertions(+), 15 deletions(-) (limited to 'net-fs') diff --git a/net-fs/samba/ChangeLog b/net-fs/samba/ChangeLog index 6b694a614232..154e2e9c72c0 100644 --- a/net-fs/samba/ChangeLog +++ b/net-fs/samba/ChangeLog @@ -1,6 +1,10 @@ # 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.113 2004/10/01 06:56:04 geoman Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.114 2004/10/08 14:02:49 satya Exp $ + + 08 Oct 2004; Christian Andreetta samba-3.0.7-r1.ebuild: + stable on x86 and amd64. Note on sendfile(2) (bug #66656). ADS and krb5 on + amd64 also (bug #64815) 01 Oct 2004; Stephen P. Becker samba-3.0.7.ebuild: stable on mips to satisfy repoman deps - stop breaking our stable tree diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest index c22910e7f289..9489946c0828 100644 --- a/net-fs/samba/Manifest +++ b/net-fs/samba/Manifest @@ -1,8 +1,8 @@ MD5 0f2b3715779f8739d02f8b519e36524c samba-3.0.7.ebuild 13960 -MD5 f7e00c69911dcebb88fef82f523eb43a samba-3.0.7-r1.ebuild 14905 +MD5 a774fde91c97bd9dac0eedda501c2cf7 samba-3.0.7-r1.ebuild 15251 MD5 ff95f42a18dbd93253827cfe721e2752 samba-3.0.6-r4.ebuild 14236 MD5 96097259afe1bf45d54e2d64c55635f9 samba-3.0.6-r3.ebuild 14191 -MD5 08cdb25dabb1f4db23ab60088cfdf467 ChangeLog 21673 +MD5 3f01bb81488ed75fdc5dc01c5a45cc23 ChangeLog 21853 MD5 41299f246433a1a55c8fccc77ccd709e metadata.xml 491 MD5 ccc96fcdc7493be42da52364061c6c17 files/winbind-init 484 MD5 fcebd975211fecf647f6cecf26ba5c96 files/samba-3.0.4.patch 8086 @@ -31,7 +31,7 @@ MD5 2539fea7a9f177544b05ee84f7dac0e2 files/smb.conf.example-samba3.gz 7840 MD5 bf268fdddc8ef677b6fa78661a094eac files/samba-3.0.6-samba.schema 16044 MD5 e767027dcb6844f85b56cb874c6c72d6 files/digest-samba-3.0.6-r3 203 MD5 e767027dcb6844f85b56cb874c6c72d6 files/digest-samba-3.0.6-r4 203 -MD5 a6cb7ea67d2a4fa00cb2d5dba0710cc3 files/digest-samba-3.0.7-r1 203 +MD5 5674f3d9b2f2e643f85ed0737baaaa7f files/digest-samba-3.0.7-r1 203 MD5 8c1f1e3655e12b85102ce257f3efad62 files/smb.conf.example-samba3 20762 MD5 9560b7e29d3a65db029fc1800e84abcc files/samba-pdb_ldap-exop.patch 3921 MD5 3685eadb817d185b06476eca6c0c15c4 files/smbusers 204 diff --git a/net-fs/samba/files/digest-samba-3.0.7-r1 b/net-fs/samba/files/digest-samba-3.0.7-r1 index 09d0212c5614..0f351259eefd 100644 --- a/net-fs/samba/files/digest-samba-3.0.7-r1 +++ b/net-fs/samba/files/digest-samba-3.0.7-r1 @@ -1,3 +1,3 @@ -MD5 5906341429e64214909865a4be92e4ab samba-3.0.7.tar.gz 15012667 +MD5 a3e74c3cbb3303dcc92f037fdb35ff20 samba-3.0.7.tar.gz 15012667 MD5 5f173d549014985d681478897135915b samba-vscan-0.3.5.tar.bz2 161982 -MD5 998ece1ac96680d75cebe6f0352f56b9 smbldap-tools-0.8.5.tgz 271436 +MD5 dbd622492aa0f1942979963467cc1d9a smbldap-tools-0.8.5.tgz 271436 diff --git a/net-fs/samba/samba-3.0.7-r1.ebuild b/net-fs/samba/samba-3.0.7-r1.ebuild index fdde2a5900bb..834d7d10d649 100644 --- a/net-fs/samba/samba-3.0.7-r1.ebuild +++ b/net-fs/samba/samba-3.0.7-r1.ebuild @@ -1,6 +1,6 @@ # 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.7-r1.ebuild,v 1.4 2004/09/27 15:46:47 satya Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.0.7-r1.ebuild,v 1.5 2004/10/08 14:02:49 satya Exp $ inherit eutils flag-o-matic #--------------------------------------------------------------------------- @@ -46,7 +46,7 @@ RDEPEND="ldap? dev-perl/perl-ldap ${_COMMON_DEPS} #--------------------------------------------------------------------------- LICENSE="GPL-2" SLOT="0" -KEYWORDS="~arm ~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" +KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86" #=========================================================================== src_unpack() { local i @@ -161,13 +161,17 @@ src_compile() { && myconf="${myconf} --with-readline" \ || myconf="${myconf} --without-readline" #----------------------------------------------------------------------- - if [ "${ARCH}" != "amd64" ]; then - use kerberos && use ldap \ - && myconf="${myconf} --with-ads" \ - || myconf="${myconf} --without-ads" - else - myconf="${myconf} --without-ads" - fi + # 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 @@ -352,6 +356,9 @@ pkg_postinst() { ewarn " 3.0.7: param: 'winbind enable local accounts' is now" ewarn " disabled by default" 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 "" 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" -- cgit v1.2.3-65-gdbad