Disabling dmalloc support in samba, it crashes due to re-definition of many structure...

Package-Manager: portage-2.1.10.3/cvs/Linux i686

diff --git a/net-fs/samba/ChangeLog b/net-fs/samba/ChangeLog
index bc02130d2fdf2fab967efe6c29e4a8fcca48b50a..71d90c96311e1d5a75fc5a2d24f09de6f22bbd5a 100644 (file)
--- a/net-fs/samba/ChangeLog
+++ b/net-fs/samba/ChangeLog
@@ -1,6 +1,10 @@
 # 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.481 2011/08/15 13:28:08 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.482 2011/08/15 17:14:37 vostorga Exp $
+
+  15 Aug 2011; Víctor Ostorga <vostorga@gentoo.org> samba-3.5.11.ebuild:
+  Disabling dmalloc support in samba, it crashes due to re-definition of many
+  structures, bug #318285
 
   15 Aug 2011; Jeroen Roovers <jer@gentoo.org> samba-3.5.11.ebuild:
   Stable for HPPA (bug #377909).

diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index 9447c0d9d8103037d44f621c72c9c85606422629..dc34797c330361765d457ef497c3ddf50fb4a9bf 100644 (file)
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -43,15 +43,15 @@ DIST samba-4.0.0alpha11.tar.gz 13917363 RMD160 3ec5597de6a2c80eaa426712101777fa9
 DIST smb_traffic_analyzer_v2.diff.bz2 12226 RMD160 82f6d443d289253a184e5f5dda17d865cb79b2b5 SHA1 1dd5100447cb827aacb8bb18bf88b7b10955a38c SHA256 1bae7eafbe8ac2382313d5ab9d43d73ba64b63a714f0f588516952d476fb868d
 EBUILD samba-3.4.12.ebuild 11868 RMD160 f4a947beec3cceb95e1241991a827e673913aee3 SHA1 76ef9617d3604eb6941a13bae2f92e2816bdc223 SHA256 b72494103bf6f78691ec952bd878687b56671a1914e305a56a4728d22a410bb1
 EBUILD samba-3.4.14.ebuild 11879 RMD160 3a4d7efbacac572151763c6e9f9e74e9738f969d SHA1 0147125a72bc06fbea0e01f416b6ab0d9707b2dc SHA256 8210ed5c7a21f7e01f29cc92679a451a31e98d84f0eab44c26e30aaa80576e69
-EBUILD samba-3.5.11.ebuild 12102 RMD160 51d2c038c667a4bb0707ed05ee9b69c451efb528 SHA1 14655bbf9c0fa5bf75d8da82ef1d0ae2a2711cba SHA256 7bfaa5668091c5c14a67723e0ae6f71bfd044e3b02f842c6eb63e8d079bf674f
+EBUILD samba-3.5.11.ebuild 12046 RMD160 5c0c61f5569f9ffb9cde8c23f3abbc829d544bce SHA1 a657cbfead5173c45020d6621c31d470edc014ff SHA256 1e1aa43f3ba634cc46e61bb476d3cd482c2b773af1b952d0cd36ea8a74b9e395
 EBUILD samba-3.6.0.ebuild 11300 RMD160 3fd945a8330839a61ee266c1e6f5482e70471fe2 SHA1 7237a324a76e9560629460afdd368339343c0042 SHA256 430bf06dc0aa8ae1dc2a52cccaa445a013af2da42ede16bc75f08c72830efa0d
 EBUILD samba-4.0.0_alpha11.ebuild 4231 RMD160 efebbeed51868bf0cf51f6151b531f3e65834db2 SHA1 49169a33b69d1a69ecc102d8010c7b11f9256117 SHA256 02427fccf34de0f6aea8960d664b85a51fb80cce7bd107bc53111df386fb0660
-MISC ChangeLog 81101 RMD160 bb2a4e28e27bc12d3dd834c084f96ccaf1e23d26 SHA1 706ec2f76a5c94c175f4a3db7d7e52c50a1dbfbe SHA256 9804396517f0f3f8a07e75a1f7fe70eed651def2adea9679f40a28b6030eb29b
+MISC ChangeLog 81285 RMD160 e353f5e03c2a2a4ec63cab7b8555689eab0e801b SHA1 938ed6e40638338c49341cddd0c71d297395bbfb SHA256 03c47fe8f4d0edc50b08c0dd12d5802e45ff408d749e8ae2e3ee66e860909e39
 MISC metadata.xml 1435 RMD160 cbeae62707473b88127daa6170e8ca58861ef38b SHA1 32ff9e4f94646cc85bca64f208ea19faae1e2075 SHA256 bdff2271efdf94275d1a6096c48407c0372e088b10f85f19b989b18d50c2a5f0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk5JHu0ACgkQVWmRsqeSphN3WgCfZurknz8v9zZZZG1/mNs4ZYxu
-ezMAnjkYWsJCyasXTXScRx8Ek65Gr0Ow
-=jcBf
+iEYEARECAAYFAk5JVAcACgkQKQaZ7OJe4zZsSgCfWDmFx102EfuY6NOSVAgobmoP
+bN4An35BC58yUWXc8je5LNzEgN/nV0tg
+=D2yW
 -----END PGP SIGNATURE-----

diff --git a/net-fs/samba/samba-3.5.11.ebuild b/net-fs/samba/samba-3.5.11.ebuild
index c206fb2da67fdc667d9ec3c9e380744e53381c12..dfcae6dd96a7e94eb0693b326a5fda9c5d98dc78 100644 (file)
--- a/net-fs/samba/samba-3.5.11.ebuild
+++ b/net-fs/samba/samba-3.5.11.ebuild
@@ -1,6 +1,6 @@
 # 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.11.ebuild,v 1.3 2011/08/15 13:28:08 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.5.11.ebuild,v 1.4 2011/08/15 17:14:37 vostorga Exp $
 
 EAPI=4
 
@@ -36,7 +36,6 @@ DEPEND="dev-libs/popt
                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
@@ -154,7 +153,6 @@ src_configure() {
                --enable-socket-wrapper \
                --enable-nss-wrapper \
                $(use_enable swat) \
-               $(use_enable debug dmalloc) \
                $(use_enable cups) \
                --disable-iprint \
                $(use_enable fam) \