fix bug #399141

Package-Manager: portage-2.2.0_alpha85/cvs/Linux i686

5 files changed, 32 insertions, 22 deletions

diff --git a/net-fs/samba/ChangeLog b/net-fs/samba/ChangeLog
index 32653bd93a1c..e1007db83f1f 100644
--- a/net-fs/samba/ChangeLog
+++ b/net-fs/samba/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-fs/samba
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.497 2012/01/31 07:55:35 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.498 2012/02/05 01:56:24 ottxor Exp $
+
+  05 Feb 2012; Christoph Junghans <ottxor@gentoo.org> samba-3.5.11.ebuild,
+  samba-3.5.12.ebuild, samba-3.6.3.ebuild:
+  fix bug #399141
 
   31 Jan 2012; Tomáš Chvátal <scarabeus@gentoo.org> samba-3.6.3.ebuild:
   Fix the gcc check. Closes bug #392893.
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index d908b0e94c87..82e9cadfa559 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -32,27 +32,21 @@ DIST samba-3.6.3.tar.gz 28993737 RMD160 fd04fd5897f0f34f257c504de911e1ab34ff3e25
 DIST samba-4.0.0alpha11.tar.gz 13917363 RMD160 3ec5597de6a2c80eaa426712101777fa92786b5c SHA1 8ed2befbbd45f6501d9e6036bcdfb332431a7b4f SHA256 ec9f4a9153b9e2c233420642ee98a8b944322e8b39a9b6912430fb24e88b81b9
 DIST samba-4.0.0alpha17.tar.gz 20749528 RMD160 d7fda13f4d1b18c871c916487966e97f65034e06 SHA1 7c5877c6559cb4ac8fe9047d245c40448e9ad3cb SHA256 6c3a238d2ae1a98177f87465b263e34d9fb7198bf86c21a69b5276c3fea6cf09
 DIST smb_traffic_analyzer_v2.diff.bz2 12226 RMD160 82f6d443d289253a184e5f5dda17d865cb79b2b5 SHA1 1dd5100447cb827aacb8bb18bf88b7b10955a38c SHA256 1bae7eafbe8ac2382313d5ab9d43d73ba64b63a714f0f588516952d476fb868d
-EBUILD samba-3.5.11.ebuild 12171 RMD160 cd2d5a7a37ef849e18469036a2ff36d3ad8f16d8 SHA1 10cc9db14e8b83ae524cce8dca9b85e22b6ea79b SHA256 93a9b6e32522673486435a4f4671242c1047ad199d7c30466ddd3b548688a305
-EBUILD samba-3.5.12.ebuild 12183 RMD160 3a74327b1f7e4773f7ab9fd4f7e2a92756319c9b SHA1 2d9ff85903dcb12e432504c6f1876dd76ceacf05 SHA256 f790ef2d4f5b7b64fd30663ab842caefc414442c320781b409f1de224cb29d25
-EBUILD samba-3.6.3.ebuild 11363 RMD160 4b10bfe1ab171f6ad463ef50d2194ba9c4dfb96b SHA1 d1a40cccf06fc6c64046046acd606e1cce9ec8c0 SHA256 3fa9a173a54ce0ef741ac90b67058dedd6348e538f15b6f9e7ffe499d3e7ba61
+EBUILD samba-3.5.11.ebuild 12343 RMD160 6c11448139efb7e6d4589acd31954c52faa05f4d SHA1 e59e7324df1ca43bc25c4919074d7d53f74a27d4 SHA256 c07278b1c82c2b256c6f27d4536e408a4c9e21ce0147b400a3c098c8db2059e9
+EBUILD samba-3.5.12.ebuild 12353 RMD160 141a5299e9f07b6f223c1980d5b0f4b638372ee3 SHA1 f72dc2f1c1215866b5120c87c7aa6385b1531494 SHA256 4920bda3354e8777aed484612e9926352e34909e815018ae4213835d1fa29848
+EBUILD samba-3.6.3.ebuild 11531 RMD160 cf05e557255bf3b56ecf837c8d1bda1c2643f0de SHA1 54fa4a2fd5824ab7537d49b18f724d0b67932a30 SHA256 c1d19480a0d12867f0a1e6ce5699120bc55e8a0b5725dbf5781dd01928ead476
 EBUILD samba-4.0.0_alpha11.ebuild 4231 RMD160 93f8fee4d9633d7541e112ff4e29acc7ba883dd0 SHA1 1863c5b92d457757964401cd0f9d89dc45d40e2b SHA256 88079c3ad65eea307dd9e870c57157fea04489fd7790b58337d8cd6b65ed2f94
 EBUILD samba-4.0.0_alpha17.ebuild 3224 RMD160 ab1766aeec51b23a04f51a64df67302e6060cc91 SHA1 dfab3f334677883d959652327ea460611af1b838 SHA256 b3880fed7783530514a8bedbd70f005b4275ca82a3586900c0a457b913de59d6
-MISC ChangeLog 83563 RMD160 e1466a3a2779670768a5af1498835a4c410ffe4d SHA1 3597fa1cb020eaada2bc6b6d17e9cd6d00717818 SHA256 eb74d1eae78b4961c8ce14ee810dc326d93b58069fa350faa95fe9b6a101203b
+MISC ChangeLog 83697 RMD160 e37957c2e10d9bed5672a5e3030d17b38f0309ec SHA1 9cc12f9d1a39119247821763392559cc33687f38 SHA256 909a3db984ed2bfb31023c3d6ecf7e8eb364c2967f7dfd7a9d9205dffa6aab74
 MISC metadata.xml 1616 RMD160 30ca62a74056e762ab9cbdbd988d762cf53fa155 SHA1 05766875bb3132da9857ce944d8f94cfbabe65e3 SHA256 5f4d121826fd55bc58092da3d0597991a27fcf3f5e0dffd1af11c9984994fe40
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBAgAGBQJPJ58LAAoJEOSiRoyO7jvoBloP/1fS9ryrVm9Hsa2dxWEwG95z
-EYU5irojGhPEBvOq+1QQ8+jbfoc8dQiEsN5Zz2JYTqh9dFvYeSQG3xj83Maucm0f
-oieQDDRhFACA7mG9q04Ft5DsLtSXMBBuywO66r0scdRyP7vha8mmYIpuzxAnMaXj
-0pHJdvVZQzYva8D7q4IfR1x5ez58kNN0tV9XXhDVZPzizY1fUyKksV8Yw+cRrHbc
-ocaga68GlNCqdRGxSanWc9gfLE2wIG78SSAk1PH8GzXhtA/4SBmyHeViVdpDBySJ
-SWcGTH59PeEpQYriOW14t6YIY+wW3HO/XE+ItGZKm0Q+KotlCkqxFT6iUctmYYx7
-iBQOp1O2flb6bkHJ0uwxkoXKgQXphqWJ1Ehn7nk7n10KJOzsN4hXyEMC1hzrJ2c2
-iKmpxxPE0mNSxaCVYBR1CGu/qro2PECStNsxsfSClbvZZRdM//Pv2uyghLt9ANGD
-byFHvD5rsM26MtOIbp/ZWD+fhL+1D7M5qyN7u0DyokdeieaJ9CE9NyVgisEpXzvP
-YbisByqjs9Ql3OpfcxTZ9e4RHQ2V81dLCGkomrRxkUHPmp52UFo/Cn5A6Bw8fK1P
-nBQoOTGVVGwU/ePLB95eMdN9brih5nlU+z6IK/SuM0oBCusYxed8kRnxKwvS9imo
-CWXbwYyItzANuUDFRNll
-=Ak+D
+iQEcBAEBAgAGBQJPLeHPAAoJEOeBhlrCAAWGUp8H/2qhRDJEZD9OsheBcXdPtpJL
++Za5RUzVoXoTU0vigDItuGPz0M0HjY7L32qKyEfO5oPPV1ubp2GoiJoo5t+OHAZL
+RsEfz4kA6FXe4hXoYnvuGIUcDf8W6ueB+XHSFJa2yQ/AKPhnvy+Wrmy74NHmu7QE
+TLMUi+gNHX5ClySiFYcnv9BnDAMJAXih9FTy5XitS605G0OorXZYxVV+XzbZBDGB
+T2pLuqXDdSR2V/M/SIKvxTubWeFgf3SHl9HnItiBQ8Bu6RqJV3XTzgEJ6MxqmzWG
+A5Fs/6+yjafMX5Qo0074TWV9ZF7RXjhl/lWRIHQRpEjzziVffUz36SgtrPZMWjM=
+=bM7I
 -----END PGP SIGNATURE-----
diff --git a/net-fs/samba/samba-3.5.11.ebuild b/net-fs/samba/samba-3.5.11.ebuild
index 675111546b4a..67ac2af2ae44 100644
--- 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
+# Copyright 1999-2012 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.10 2011/11/03 09:24:01 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.5.11.ebuild,v 1.11 2012/02/05 01:56:24 ottxor Exp $
 
 EAPI=4
 
@@ -146,6 +146,10 @@ src_configure() {
 		myconf+=" --without-cifsmount --without-cifsumount"
 	fi
 
+	#bug #399141 wrap newer iniparser version
+	has_version ">=dev-libs/iniparser-3.0.0" && \
+		export CPPFLAGS+=" -Diniparser_getstr\(d,i\)=iniparser_getstring\(d,i,NULL\)"
+
 	# Notes:
 	# - automount is only needed in conjunction with NIS and we don't have that
 	# anymore => LDAP?
diff --git a/net-fs/samba/samba-3.5.12.ebuild b/net-fs/samba/samba-3.5.12.ebuild
index 434373104b1a..42cc86d2e078 100644
--- a/net-fs/samba/samba-3.5.12.ebuild
+++ b/net-fs/samba/samba-3.5.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.5.12.ebuild,v 1.1 2012/01/30 13:21:54 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.5.12.ebuild,v 1.2 2012/02/05 01:56:24 ottxor Exp $
 
 EAPI=4
 
@@ -146,6 +146,10 @@ src_configure() {
 		myconf+=" --without-cifsmount --without-cifsumount"
 	fi
 
+	#bug #399141 wrap newer iniparser version
+	has_version ">=dev-libs/iniparser-3.0.0" && \
+		export CPPFLAGS+=" -Diniparser_getstr\(d,i\)=iniparser_getstring\(d,i,NULL\)"
+
 	# Notes:
 	# - automount is only needed in conjunction with NIS and we don't have that
 	# anymore => LDAP?
diff --git a/net-fs/samba/samba-3.6.3.ebuild b/net-fs/samba/samba-3.6.3.ebuild
index 17fa5ada3248..8d7774b12247 100644
--- a/net-fs/samba/samba-3.6.3.ebuild
+++ b/net-fs/samba/samba-3.6.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.6.3.ebuild,v 1.2 2012/01/31 07:55:35 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.6.3.ebuild,v 1.3 2012/02/05 01:56:24 ottxor Exp $
 
 EAPI=4
 
@@ -133,6 +133,10 @@ src_configure() {
 	# Upstream refuses to make this configurable
 	use caps && export ac_cv_header_sys_capability_h=yes || export ac_cv_header_sys_capability_h=no
 
+	#bug #399141 wrap newer iniparser version
+	has_version ">=dev-libs/iniparser-3.0.0" && \
+		export CPPFLAGS+=" -Diniparser_getstr\(d,i\)=iniparser_getstring\(d,i,NULL\)"
+
 	# Notes:
 	# - automount is only needed in conjunction with NIS and we don't have that
 	# anymore => LDAP?