Undefine strdup and strndup macros (bug #534768 by Toralf Förster).

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

4 files changed, 45 insertions, 13 deletions

diff --git a/dev-libs/dmalloc/ChangeLog b/dev-libs/dmalloc/ChangeLog
index 15a93b143d3c..822b7de4e9a8 100644
--- a/dev-libs/dmalloc/ChangeLog
+++ b/dev-libs/dmalloc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/dmalloc
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/dmalloc/ChangeLog,v 1.68 2013/03/15 18:17:12 jer Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/dmalloc/ChangeLog,v 1.69 2015/01/07 15:14:35 jer Exp $
+
+*dmalloc-5.5.2-r6 (07 Jan 2015)
+
+  07 Jan 2015; Jeroen Roovers <jer@gentoo.org> -dmalloc-5.5.2-r5.ebuild,
+  +dmalloc-5.5.2-r6.ebuild, +files/dmalloc-5.5.2-string-macros.patch:
+  Undefine strdup and strndup macros (bug #534768 by Toralf Förster).
 
 *dmalloc-5.5.2-r5 (15 Mar 2013)
 
diff --git a/dev-libs/dmalloc/Manifest b/dev-libs/dmalloc/Manifest
index 04b57b994382..1ede4de55b2d 100644
--- a/dev-libs/dmalloc/Manifest
+++ b/dev-libs/dmalloc/Manifest
@@ -4,16 +4,17 @@ Hash: SHA256
 AUX dmalloc-5.5.2-Makefile.in.patch 13855 SHA256 2f7c44a1f8e48b90c255a6d72748d629a30aebcdf7adfedc50f1067a65dfa7fc SHA512 6a8bc9fabafc22b390696df5573d94a71080215627a1c67e45b5b8805fb240165c0961bd9175d6f7b2e5914aecf9dd680de14f744b099a750699f1ca391d86d7 WHIRLPOOL e7f5ae37c2b55088aa1eb1affd660a55958e1fd260043f38750eca9a8045a5822b0eb3a83ead5ce554a478b885f8ac3bc1336926a6d72b34c341b9a3dcbfa63e
 AUX dmalloc-5.5.2-ar.patch 390 SHA256 151f5402ac69f688b93c921c09218f2da14e9e012092efc73addddcf69b0c3d7 SHA512 79c1a2b4a0ffa43da2e3e49bb10ce0defe58a33f881bcb356ac72c386ad870903bb12c37ddb0e3fcd30ee60d74e8ddae69eb4f5eec1d080008cba3a1a40f9626 WHIRLPOOL d97c6df359c345a33b0d01a51e3b4eade62d39a901a70f86226e9ffe663b607dbb37c79beb7ac618fcf75d6e55e1b2a1553f33e7c05d9bb0124875a56d5a5ba3
 AUX dmalloc-5.5.2-cxx.patch 546 SHA256 f9aaa8905f4961667f19dcd429993ae2712004e1bc8413cd284f5edc76c7a13a SHA512 370ff73c4af16d7b4cb5e15a88f3cafcc16494df7df50c4494b1e34ed687f1385b774431cc94a9ba75ef96f2828f75501ee2d0addc9d3e34d4f718ac94ae5f6d WHIRLPOOL c04ae4f9896554422419b27f07408378d531a135120b18376f6f69bb3798d2c88753681ce6190f30c91c8f7b875502e53ece056dcbb3b83de03472690b7ccb5d
+AUX dmalloc-5.5.2-string-macros.patch 367 SHA256 b249ff54dc11c22667d006b3f36bd757f07826641cbfb87efba9036c27e3b169 SHA512 61d0015e7997ecad97e722a1b308ec90e996e9d53b9f475c911f1d9eb929d8007881e52699e9f3427c5cecb9f0b2d202d12a7d607d23434913afbef455f08617 WHIRLPOOL adfe6df6d75a7667f6746fad8b62669c40da8fe4e35a5c089de45947e6663411d5ce6c77023774c4f01c8418d8e1f1796bbaff69165f18ffad934e6c1e704508
 AUX dmalloc-5.5.2-threads.patch 165 SHA256 07db111964d4ad6ffd6d05764ebfd887023128098fa0946be61292a0070c2237 SHA512 b561c715c19604128c046b36bfe09794922176ce1cd12947da277631a410bbc19c5a1f7e998f0b61d7564e3b7516bee0fb4deddb13e036bb9e667f3502e56d0e WHIRLPOOL 5499a29d7b7b0cb6711418d14db843c8a085d5779041633d480bdc8694340e52c9b0377bfd588aa808dda6b13e99b4da6e461b635a4a8eb29664db24470a2d76
 DIST dmalloc-5.5.2.tgz 666608 SHA256 d3be5c6eec24950cb3bd67dbfbcdf036f1278fae5fd78655ef8cdf9e911e428a SHA512 96bb94aeb2bc3220f652b5294bdf8592b984cb2a53e5f02b2b8d52450c3396d18651f334644cdfff9c85a8c0d0cedc7f6a18b9d70497b2c6b5f85dbd1e827b93 WHIRLPOOL 4427dfb595b82bf4b7a3edd6a0a61da54fd7b7abf84a238dee3cef6ab3e0b9a27a34c7219ae938155da9908762c217cca52e9ac6710543bb37ca8dcf72749a73
 EBUILD dmalloc-5.5.2-r4.ebuild 1885 SHA256 3737a93d4d719ede9aa23ee723e57691add9ad8d535b24b01046444a5c01e125 SHA512 291e1a340c1612e142a9316d0d2630876f0fd14d3f791858c6d55192e2dd6439be66b05d95848863281952ee5a5f27a58942e60f9eb36684741a9d8208134f33 WHIRLPOOL 3a2e7070b58c2f87eaf10e1b888ebe06f5bdf1b5866bc61dc061fdaf6b7ef3a7629f3bd234af25f85f6dc07dea1ca3faa213d044b6d8355c247a9523de50872f
-EBUILD dmalloc-5.5.2-r5.ebuild 1988 SHA256 c844b21622dfebb39676ec8edcf6755b83fdf663e05cdf6285e517f40cab82b5 SHA512 17e3a1d3a58f77eb78fd3894af2c9c01f51ee14dc2cb4e2956342892cd0e86a8f01e8468635b5fd3f789e2369227353eba062ebf0a4e605b94d508d306e5d5ee WHIRLPOOL 0083d1a2e65d977bbd70764c8242099c4c6c73673ebcc5b886d4687cf8670e36963c096347449f69a87b854815a59dd2c303d966d7b90bd0c3f8a2de4a072cf5
-MISC ChangeLog 9390 SHA256 4a89dda68919180f1da30de24ef57e5f1a9b871dfce18d6a954761ed12ed05f4 SHA512 79e0d64c8d3d327bac6f2c9ebc3878ef9346d8881ed0cc32d9a91e09e1a56a615895951894705921e24e5bc8352b36f699f022bf2e6995cfa82c2f83107eff45 WHIRLPOOL 920413e96e888a0092172cbbff751fa87adb96c554228a1804689b28cfc4f02feddef13a2f5185950ff290f86d60ff0b9568694fea9f282e3952dd99cb7de66d
+EBUILD dmalloc-5.5.2-r6.ebuild 2049 SHA256 7a54fb8707f473ab73beec1cde18b8a3a064b7356d416237f55954822a36663f SHA512 979cb92a2832ac6069843d72b69d7efd4c0d55c036fd2a27df4f13952a23b6696cad16f2c8ee9d7ca96281312d32cf1a38f8753b916158ff2e04bcc92945824b WHIRLPOOL c5256487a4748f728448d40aaf380b9e4c9d3a7a5da0d9521f001bbf4cea32223e56ec25383aa4f159b89d049206298adee3c867dbc5360885c440cb4593df44
+MISC ChangeLog 9638 SHA256 c5c278ca66daa77aa355a6bbabf5139d747b4022f821c8117fdc6a921112d116 SHA512 5b56dc62cbfce8a1d45361f124af11446756ebfbd0fd5fb603c0576b744f61231a6378c5480b5e5a41761ca82b5e723c4edd3eba593bc546e5a429fd3944c033 WHIRLPOOL 94ec6c094eefea751f32644ff249b16ae179d2b5bfa3d3ae386717966268bf4c77df9dde95abae03e3038ecdd1e9b9130a70c3729b1d11d6ed4d308fcb12cbd7
 MISC metadata.xml 230 SHA256 529c3320b250d179bb9e9ae651a88ba3f2a1bca78cd1ab07d5aef28d571960ce SHA512 a7a1138a00026b873623549a80248ee704c039921fd65203098c1f81c9c4532f142de26a2743720e6a108273f4ac547a8707909f3e6001dd5844b0e7e275dba7 WHIRLPOOL dc42bdbbe8863903771b14c2511223d0a3c2c94d543cc2e211269312e522bc6cb352af4568a4a307ad1163c6feb8852d61652694ae00616f6abbdcecf840d5d7
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2
 
-iEYEAREIAAYFAlFDZaoACgkQVWmRsqeSphOeoACfZ0kYc9cVlX1RGUsZcocC/Vrz
-v+AAn3tlIZo68MdILI3kFYTdbBui90Pj
-=3kTE
+iEYEAREIAAYFAlStTV0ACgkQVWmRsqeSphP2LACfaqhV7bptLDJPH1EeBjl0EbkN
+L00An0n2IRg7wFi5FiNP+5M7TLa52FAp
+=SHxn
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/dmalloc/dmalloc-5.5.2-r5.ebuild b/dev-libs/dmalloc/dmalloc-5.5.2-r6.ebuild
index a66b5c4d3186..30210545ced0 100644
--- a/dev-libs/dmalloc/dmalloc-5.5.2-r5.ebuild
+++ b/dev-libs/dmalloc/dmalloc-5.5.2-r6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/dmalloc/dmalloc-5.5.2-r5.ebuild,v 1.1 2013/03/15 18:17:12 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/dmalloc/dmalloc-5.5.2-r6.ebuild,v 1.1 2015/01/07 15:14:35 jer Exp $
 
 EAPI=5
 inherit autotools eutils multilib toolchain-funcs
@@ -24,17 +24,24 @@ src_prepare() {
 	# - Use DESTDIR.
 	# - Fix SONAME and NEEDED.
 	epatch "${FILESDIR}"/${P}-Makefile.in.patch
+
 	# - Broken test, always returns false.
 	epatch "${FILESDIR}"/${P}-cxx.patch
 	epatch "${FILESDIR}"/${P}-ar.patch
+
 	# - Add threads support.
 	use threads && epatch "${FILESDIR}"/${P}-threads.patch
+
+	# strdup() strndup() macros
+	epatch "${FILESDIR}"/${P}-string-macros.patch
+
 	# Respect CFLAGS/LDFLAGS. #337429
-	sed -i Makefile.in \
+	sed -i \
 		-e '/libdmalloc/ s:$(CC):& $(CFLAGS) $(LDFLAGS):g' \
 		-e 's|ar cr|$(AR) cr|g' \
-		|| die "sed Makefile.in"
-	# - Run autoconf for -cxx.patch.
+		Makefile.in || die
+
+	# Run autoconf for -cxx.patch.
 	eautoconf
 }
 
diff --git a/dev-libs/dmalloc/files/dmalloc-5.5.2-string-macros.patch b/dev-libs/dmalloc/files/dmalloc-5.5.2-string-macros.patch
new file mode 100644
index 000000000000..e3d4eb78fe52
--- /dev/null
+++ b/dev-libs/dmalloc/files/dmalloc-5.5.2-string-macros.patch
@@ -0,0 +1,18 @@
+--- a/dmalloc.h.3
++++ b/dmalloc.h.3
+@@ -405,6 +405,7 @@
+  *
+  * string -> String we are duplicating.
+  */
++#undef strdup
+ extern
+ char	*strdup(const char *string);
+ #endif /* ifndef DMALLOC_STRDUP_MACRO */
+@@ -429,6 +430,7 @@
+  *
+  * len -> Length of the string to duplicate.
+  */
++#undef strndup
+ extern
+ char	*strndup(const char *string, const DMALLOC_SIZE len);
+