new-dns/djbdns: Add new patch to fix parallel compilation issues wrt bug 362771.

Package-Manager: portage-2.2.0_alpha29/cvs/Linux x86_64

4 files changed, 106 insertions, 18 deletions

diff --git a/net-dns/djbdns/ChangeLog b/net-dns/djbdns/ChangeLog
index 4fa200d33ad7..b4fd60ac4a7b 100644
--- a/net-dns/djbdns/ChangeLog
+++ b/net-dns/djbdns/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-dns/djbdns
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/djbdns/ChangeLog,v 1.123 2011/04/04 18:58:49 c1pher Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/djbdns/ChangeLog,v 1.124 2011/04/11 13:08:57 c1pher Exp $
+
+  11 Apr 2011; Dane Smith <c1pher@gentoo.org> djbdns-1.05-r24.ebuild,
+  +files/makefile-parallel.patch:
+  Add patch to fix parallel make issues when USE="ipv6" wrt bug 362771.
+  Thanks
+  Michael for spotting and fixing this.
 
   04 Apr 2011; Dane Smith <c1pher@gentoo.org> djbdns-1.05-r24.ebuild:
   Remove parallel compilation workaround. Seems to be fixed upstream.
diff --git a/net-dns/djbdns/Manifest b/net-dns/djbdns/Manifest
index b3846202f957..290bf7da0472 100644
--- a/net-dns/djbdns/Manifest
+++ b/net-dns/djbdns/Manifest
@@ -13,28 +13,29 @@ AUX dnscache-setup 6007 RMD160 d5a29943ac29d84a8c83308a497721010ab017bc SHA1 764
 AUX dnsroots.patch 349 RMD160 c3be22070645e27a8c16e9f1dd268963b749c5f7 SHA1 f09404a752062956319b4ebb6d381588df467eba SHA256 99e8ef90a20f66fedf903aa13e3f5360010cf11c27c59dc53b967f02ffe06114
 AUX dnstracesort.patch 327 RMD160 aaa564aa9cb0dcad4ebb64121c82bf50fda64254 SHA1 cf8b7825d826bfd3f3314c848a8843c2a5a70ae3 SHA256 f1d83e1365f68571fa4e007d5219720f8d65eb3730040a087fceb0ce2d8806bf
 AUX headtail.patch 1780 RMD160 332af6647e08f3b792bd1b7821974f15041a6b58 SHA1 1b996c6cbe5df1c981f998d004d066ae344bfba8 SHA256 28ebe521132fe35559273b6542505ab4f0bb7b7ccb88585522e4cc2fe8376dd4
+AUX makefile-parallel.patch 2182 RMD160 8a175f29b6d14c0b8a2a7a9115d9a1b58e7ccef5 SHA1 111f0ee4503e8dd994bf9a6c093f86ad314c74a9 SHA256 cec0762d0f3a1469b854bcfc0af6bb42b5bf2d81b623dcfa7c7e9bf516f28fec
 AUX string_length_255.patch 299 RMD160 df613f1287f6581c963e969eec7fcaec638e2b58 SHA1 bb9e2f7aafed265887ac47d35cc022ef25d7b5f9 SHA256 c9b8d0065cfe6d4a9ad460c31c2a75bcce17bfb8001f4448e3464dea07524401
 AUX tinydns-setup 3206 RMD160 16679596e3902c8eda4c9605b0fef6e778cdee63 SHA1 e222c22f924882a3b2d496f7d8fbdf61eb4eb0e8 SHA256 73c0610f15e9bbec1998d10eafe4222277eb8cbaf0c58e802f998e9f7b25bbea
 DIST djbdns-1.05-test23.diff.bz2 18480 RMD160 33037f2a41abb49c305f3efec4402c6965c8b8b8 SHA1 34251597d211ff00791cb6546e8ef60d75ce5477 SHA256 e702f47b4a4c77fe5cec474a8219a072cfaaee07282650b7e0dd322ed82e8f33
 DIST djbdns-1.05.tar.gz 85648 RMD160 a832cbfd93e4ccec6a565492a4ee0b3c1b4b68ed SHA1 2efdb3a039d0c548f40936aa9cb30829e0ce8c3d SHA256 3ccd826a02f3cde39be088e1fc6aed9fd57756b8f970de5dc99fcd2d92536b48
 EBUILD djbdns-1.05-r23.ebuild 3684 RMD160 74a29155bc31f39a9b16d39c6711b585bef06601 SHA1 f5b2e17144d3c03a2845c9bc69eb6c1e5b8f830d SHA256 fe946870ccc68646c51783d040f5f985660764b53f71ab320df46f12a5c48cae
-EBUILD djbdns-1.05-r24.ebuild 3856 RMD160 c93f9d134fa88608cbb0256f32389b320b1dd120 SHA1 6895a63a5627912a4ee30c70e296141e83ece57b SHA256 cc2b95d305f72e1b29dfa6e368b40be880d7eb5e1eeb85bb4998ca66b286d162
-MISC ChangeLog 19557 RMD160 7183a3afc68c313d649d5701b894aec5cbda8ef7 SHA1 ca20bdf81350460b7713bea12331a217c7afe977 SHA256 1de23c91e155ca9c16283b4fbdf62c8b2d84dab66940b10f791d6e2f0da6b905
+EBUILD djbdns-1.05-r24.ebuild 3899 RMD160 45d28e6b4579720b3d4f8b774caa3c098c820a91 SHA1 797e4858ce8513ff23be7846c23245427959d90f SHA256 f73acefc7285e65b7a3ea7e030515f41751d0fdaa143c5a5bbd958a8634307d5
+MISC ChangeLog 19783 RMD160 9b9d24dc8567de1c50597ac06fd4a9a3c1372f47 SHA1 05d62cd0f2d60d1fbc39709665dc76787e317bfc SHA256 788d82411e840750ef0dbba4f47db0f80b7494aae602d41223007f046b06cca7
 MISC metadata.xml 399 RMD160 e428c6bbe8fa476817cdc8f00bbcd5990a9d645d SHA1 2215e63ddcac55ff5f449ffd4fa5f0389befb9a3 SHA256 99568cce63f5dacde89fab8b8c4c4c06699844d885dfb00943fb2a8fa2b16adc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBAgAGBQJNmhQ5AAoJEEsurZwMLhUxQ18P/jYj+xSupHsSMfArsjiWHnJX
-wES4kasCY+vpBAbOkFh035YzfGVuDmG0LkClALQDv43WCfkbXJeY6fx9/wq9LGXk
-zHecFZ9cjZHK1Xmx9yTL6isRI4mQpPeg+Ky0qEFhsYhfploawHg3Iu7JhDw6kSvE
-BXtxQj8KLMW9uX4iuy9Q30EeVv0LSvA8gv5hSwNPDLzEKI4Yzjd552bKZWMunGj3
-cVTJ8xmgpLENQFdXRFR69ik2dI+71VKO+ZiTvMoCzGCvy/EgQLcRI8+bHm+I+x+q
-kDnYf/4yB9cBXrVJTLov8NggU2fsMFLj6ylU+DxWKyv2zcb4s3+lqymrJcCmss4c
-Fywnz+uYk2klFeTkrjWhyLHg27BNScJDpMPITpfQXvh/4eFGnnIiD+G+N0ceKbOS
-UO13QqORCqqAimFNhDrBXTBjpig3VdDEQJeVF3/uhE7D5admX8Ti0osZAJZ2hF1p
-nFt7NdhNIbbSek84ZkUoeG1E4lqTYwUKApQ1eLF7g8rq1DEaSR9z72LDsMwQfKhW
-vmBLwGPY06brltOLCwjkXYda6eyLSaEGwPHpwmiZAV/KX3wRoNayaHbbqHdEOiMP
-O5TxbDQX7sVtAqPctTgRP7XU1gvn18TbA8Lixkjl8rzjsvUn7uyAOCQQ3eNhX2hS
-F5gC4ONrX9zSDPc5Jqnb
-=TFUn
+iQIcBAEBAgAGBQJNovysAAoJEEsurZwMLhUxjrYP/Rql0nTq4iBQoDSG8Oayo4n9
+sIfzF2VCaAdI1SYXWmjimL8DSLdrgoTrW0tRpxEoSMRTb/V4Xl9ADkC+W8C3gHYT
+81GQPUCd9YbqCTxDFwoteTHCqD8xTwzmCrlkNHfnP6bIQBelwkQLrwCGMml9y6+o
+ZY/2tOO/wzw49byEn4E8N66xFCvHOlKnxn4/fFnbgxE6TI85ex5sXe0vPGJD/o1i
+AWjY/GyREEtRdy4OvWELzIVsMwInVVoC/QKl71hgfdz/WIPa5DvGgH5XJ0zdTN3b
+81Tp11fjlIf1n9kP/kVe8RQhnhHSJ7aDe+JaPXm6oZ58xgXG4x0yW0Zxul/nLkV1
+lOLVczSo1rbXWmN4Ft+qJTuapLQZdoZgyeiokk0qVau7UME1Ka1GKO2tMNCCaygk
+OIIQgdw65ytOYGR81AzdkK6iC6yjgg38ejKNaZHMUaLDZYb8tHEix57kYQiL09aE
+c/SjkgSIFy02eo5LdRLAxdOTurH3t2ZXGVMmg/a4MQBOMb9go0e5iBpPDNAYFgCO
+/ySP59JXL/6bKZa0M+muI1Mf7cEfTFoYP7LDSyJhf9uSsGFjHAnGgEOBt0FVOpL1
+iQ0oHXLz6DzM57M5JHCtMCzUm8YV3A9lbQv2DZk7wMStqtrUnz+XqQQlfanT3U1n
+7IVSZqR5Euyyk6RXKAPw
+=4Vuz
 -----END PGP SIGNATURE-----
diff --git a/net-dns/djbdns/djbdns-1.05-r24.ebuild b/net-dns/djbdns/djbdns-1.05-r24.ebuild
index 84bd9960cccd..0c9f560acc00 100644
--- a/net-dns/djbdns/djbdns-1.05-r24.ebuild
+++ b/net-dns/djbdns/djbdns-1.05-r24.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-dns/djbdns/djbdns-1.05-r24.ebuild,v 1.3 2011/04/04 18:58:49 c1pher Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/djbdns/djbdns-1.05-r24.ebuild,v 1.4 2011/04/11 13:08:57 c1pher Exp $
 
 EAPI="2"
 inherit eutils flag-o-matic toolchain-funcs
@@ -54,7 +54,8 @@ src_prepare() {
 		# Fix CVE2008-4392
 		epatch \
 			"${FILESDIR}/CVE2008-4392_0001-dnscache-merge-similar-outgoing-queries-ipv6.patch" \
-			"${FILESDIR}/CVE2008-4392_0002-dnscache-cache-soa-records-ipv6.patch"
+			"${FILESDIR}/CVE2008-4392_0002-dnscache-cache-soa-records-ipv6.patch" \
+			"${FILESDIR}/makefile-parallel.patch"
 
 		cd "${S}-noipv6"
 	fi
diff --git a/net-dns/djbdns/files/makefile-parallel.patch b/net-dns/djbdns/files/makefile-parallel.patch
new file mode 100644
index 000000000000..51c0317eca94
--- /dev/null
+++ b/net-dns/djbdns/files/makefile-parallel.patch
@@ -0,0 +1,80 @@
+--- a/Makefile	2011-04-07 21:49:48.140645070 -0400
++++ b/Makefile	2011-04-07 22:24:06.595746444 -0400
+@@ -332,7 +332,7 @@
+ 
+ dns_transmit.o: \
+ compile dns_transmit.c socket.h uint16.h alloc.h error.h byte.h \
+-uint16.h dns.h stralloc.h gen_alloc.h iopause.h taia.h tai.h uint64.h \
++uint32.h dns.h stralloc.h gen_alloc.h iopause.h taia.h tai.h uint64.h \
+ taia.h
+ 	./compile dns_transmit.c
+ 
+@@ -860,15 +860,15 @@
+ 	rm -f trylsock.o trylsock
+ 
+ socket_accept.o: \
+-compile socket_accept.c byte.h socket.h uint16.h
++compile socket_accept.c byte.h socket.h uint16.h uint32.h
+ 	./compile socket_accept.c
+ 
+ socket_accept6.o: \
+-compile socket_accept6.c byte.h socket.h uint16.h
++compile socket_accept6.c byte.h socket.h uint16.h uint32.h
+ 	./compile socket_accept6.c
+ 
+ socket_bind.o: \
+-compile socket_bind.c byte.h socket.h uint16.h
++compile socket_bind.c byte.h socket.h uint16.h uint32.h
+ 	./compile socket_bind.c
+ 
+ socket_bind6.o: \
+@@ -876,7 +876,7 @@
+ 	./compile socket_bind6.c
+ 
+ socket_conn.o: \
+-compile socket_conn.c byte.h socket.h uint16.h
++compile socket_conn.c byte.h socket.h uint16.h uint32.h
+ 	./compile socket_conn.c
+ 
+ socket_connect6.o: \
+@@ -884,11 +884,11 @@
+ 	./compile socket_connect6.c
+ 
+ socket_listen.o: \
+-compile socket_listen.c socket.h uint16.h
++compile socket_listen.c socket.h uint16.h uint32.h
+ 	./compile socket_listen.c
+ 
+ socket_recv.o: \
+-compile socket_recv.c byte.h socket.h uint16.h
++compile socket_recv.c byte.h socket.h uint16.h uint32.h
+ 	./compile socket_recv.c
+ 
+ socket_recv6.o: \
+@@ -896,7 +896,7 @@
+ 	./compile socket_recv6.c
+ 
+ socket_send.o: \
+-compile socket_send.c byte.h socket.h uint16.h
++compile socket_send.c byte.h socket.h uint16.h uint32.h
+ 	./compile socket_send.c
+ 
+ socket_send6.o: \
+@@ -904,7 +904,7 @@
+ 	./compile socket_send6.c
+ 
+ socket_tcp.o: \
+-compile socket_tcp.c ndelay.h socket.h uint16.h
++compile socket_tcp.c ndelay.h socket.h uint16.h uint32.h
+ 	./compile socket_tcp.c
+ 
+ socket_tcp6.o: \
+@@ -912,7 +912,7 @@
+ 	./compile socket_tcp6.c
+ 
+ socket_udp.o: \
+-compile socket_udp.c ndelay.h socket.h uint16.h
++compile socket_udp.c ndelay.h socket.h uint16.h uint32.h
+ 	./compile socket_udp.c
+ 
+ socket_udp6.o: \