diff -ur samba-2.2.5-r1.ebuild samba-2.2.6.ebuild --- samba-2.2.5-r1.ebuild 2002-10-17 12:44:14.000000000 +0200 +++ samba-2.2.6.ebuild 2002-10-17 14:34:22.000000000 +0200 @@ -14,7 +14,7 @@ >=sys-libs/pam-0.72 acl? ( sys-apps/acl ) cups? ( net-print/cups ) - ldap? ( =net-nds/openldap-2* ) + ldap? ( >=net-nds/openldap-2.1.6 ) ssl? ( >=dev-libs/openssl-0.9.6 )" DEPEND="${RDEPEND} @@ -27,13 +27,15 @@ src_unpack() { unpack ${A} ; cd ${S} - patch -p0 < ${FILESDIR}/samba-2.2.2-smbmount.diff || die + # patch -p0 < ${FILESDIR}/samba-2.2.2-smbmount.diff || die + #patch fails. Is it still needed ? Without it it seems to compile fine now (Same goes for rest src_unpack()) + #<rigo@home.nl> dd. 17-10-2002 # fix kerberos include file collision.. - cd ${S}/source/include - mv profile.h smbprofile.h - sed -e "s:profile\.h:smbprofile.h:" includes.h > includes.h.new - mv includes.h.new includes.h + #cd ${S}/source/include + #mv profile.h smbprofile.h + #sed -e "s:profile\.h:smbprofile.h:" includes.h > includes.h.new + #mv includes.h.new includes.h #cd ${S}/source #autoconf || die diff -ur openldap-2.0.25-r3.ebuild openldap-2.1.6.ebuild --- openldap-2.0.25-r3.ebuild 2002-10-17 13:06:18.000000000 +0200 +++ openldap-2.1.6.ebuild 2002-10-17 13:33:06.000000000 +0200 @@ -18,7 +18,7 @@ tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) ssl? ( >=dev-libs/openssl-0.9.6 ) readline? ( >=sys-libs/readline-4.1 ) - berkdb? ( >=sys-libs/db-3.2.9 ) + berkdb? ( >=sys-libs/db-4.1.24 ) gdbm? ( >=sys-libs/gdbm-1.8.0 )" RDEPEND="virtual/glibc Regards, Rogi
Created attachment 4781 [details] samba-2.2.6.tar.gz
Samba-2.2.6 depends on OpenLDAP-2.1.6 which depends on db4... db4 is not unmasked in portage yet. I will let you know as soon as I get some test builds up on the server.
<Snip releasenotes> This is the latest stable release of Samba. This is the version that all production Samba servers should be running for all current bug-fixes. There have been several issues addressed in this release including: * Fixes for MS-RPC printing issues affecting Windows 2000 clients * New support for smb.conf generation in SWAT * Inclusion of several performance enhancements (See --with-sendfile & and the modified smb.conf(5) parameters in these Release Notes) * Fixes for several file locking bugs and returned status codes New Parameters - - -------------- Refer to the smb.conf(5) man page for complete descriptions of new parameters. * profile acls (S) workaround for issue with WinXP SP1 and roaming user profiles Removed Parameters - - ------------------ * max packet (G) * packet size (G) Modified Parameters - - ------------------- * max xmit (G) new default value * large readwrite (G) new default value New ./configure Options - - ----------------------- --with-sendfile Enable experimental sendfile support --with-winbind-ldap-hack Enable winbindd_ldap_hack() functionality for Windows 2000 native mode domains </snip releasenotes>
hi. please assign samba bugs to me, as i maintain it. thanks!
thanks. the changes to openldap will have to wait some more.
I'm attaching a patch for the ebuild that does actually allow for 2.2.6 to compile successfully against openldap 2.0.25. The problem was that after sasl was removed as a compile option, samba-2.2.6-libresolv.patch wasn't applied. This results in samba not including libresolv in the compile process. Anyway, I used the modified ebuild to build 2.2.6-r1 on my machine with no problems.
Created attachment 5411 [details, diff] Patch for the ebuild
added matt's fix a while ago.
