Use a separate makefule patch for net-dns/djbdns-1.05-r29.

diff --git a/net-dns/djbdns/Manifest b/net-dns/djbdns/Manifest
index 9e8caffd10b140bb47d3659aa04585cc833d5015..719176a64415fdb683cecd3035c26731c68efc78 100644 (file)
--- a/net-dns/djbdns/Manifest
+++ b/net-dns/djbdns/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX 1.05-errno.patch 238 SHA256 40e01efac08e95bf87b46e2d86378b0a60c234c64080b7f42039178ac6de61af SHA512 a4d58f88933bf567e6b23ed519c6605ed9f7be7f517062b47efb2a073bbac86e1753f4c359f35505777d8ab1259120ac3ff97d8c1c037ff379b144fd47730903 WHIRLPOOL 0f4ab6f25ec21c0da8b7b2fb5fa1be2f3b57027067b5a83f5bf95508b3a0242a8cd31e115f24ba01efe129755d993f7b9c91cbc4d2a4a71629be8cbc5b7502b1
 AUX CVE2008-4392_0001-dnscache-merge-similar-outgoing-queries-ipv6-test25.patch 9944 SHA256 720e6027b1f2d6baac37f6fb4b35b882cd464c9e30b5b99844cbadb9bf723f6d SHA512 6d69e3a04730c1d2ac5d1a48468332d44792f4d7ebb0c68391391ac04cc7e32f7b5c1d0e2308a34c68e1382eb55dfeef3e5fbf5b01fb28e128af45549b9f9534 WHIRLPOOL 7f458b204608cce4c706380bc094e09be9a8e42e55e3ab8fcb18ba60c745f2aa803d0ca56339dece054996d273c62fb211246d54388edfb3fcdd9476731616ef
 AUX CVE2008-4392_0001-dnscache-merge-similar-outgoing-queries-ipv6.patch 10049 SHA256 56c7db6c5bed3200e1f6e4995018c96158085f2f7169c7b148c7c034ddff8111 SHA512 b6eb87ca334abdcff4f5159fb80cc28150f3cc1e0d20cf6a7aa13dacfdc3ad00d250e035bb3294b691d6b5edd8c76365f5c13e1bf322a070c36c7a0960683761 WHIRLPOOL a67d154f213648602fcc2f85dd69cdae7dae1fab93884347fd5454f292ba59f58901b4b0fb5e5ab04f1111273efcce4bfa4a879945ae26abfadaf3195cc9948d
@@ -13,6 +10,7 @@ AUX dnscache-setup 6013 SHA256 dcf78d102db9b6407a7886f01b830a5509724ce4540068444
 AUX dnsroots.patch 296 SHA256 9fe0552708f6cacd2ace4dca21e3f393acc01e73ac9e2b622aa4fe3a5874fe48 SHA512 2c745f2545d791ed6646406e749ef8e85c30b4546657ce241c413103e42cf3cfb5001c46481bd2966390563a9cc42e53e44519747350da2b8bb0fdf1d0f5c62e WHIRLPOOL 44ef58d43e35c33cf78439cefe9e5888f4f27f2151b36b7192aea0730eb3f0d5f7f9591dd6831c6aa286b23415f8e0cdc67a498d175a4583701f5f8ab795ac50
 AUX dnstracesort.patch 327 SHA256 f1d83e1365f68571fa4e007d5219720f8d65eb3730040a087fceb0ce2d8806bf SHA512 ae9cd51f24041aed135b5ba88d1efd0310b8095bccd6fb60a986756b460a4f98a93e163c3ddae7c146d56a9d41778d17449f772b91fdc58d9e69523cf6c2a6e9 WHIRLPOOL 4006c47b039623c8bba8718716a442a3d2dc1705936f83cd1556e4b49cc3de0dc7c6e828e908130bc7584809f551fac68f12f466e21cefd666076db8e63d4399
 AUX headtail.patch 1780 SHA256 28ebe521132fe35559273b6542505ab4f0bb7b7ccb88585522e4cc2fe8376dd4 SHA512 0f2625d59f432983ea5c94952957bb08da42ad36dc4c50e0d33ccfe8059f5605650dbb8c22a058b9bd1d75e7032ea5f9ca319a0a2ce5496b1b2129bf9d3f4bdc WHIRLPOOL 400af928a07688b9569e0a71098bdbb18d788c26e8225f4f037ac87cde87f0deb0c8f4f5d9326f4777abca395e8434fc57466df46fe6e3911ba3402e0b5b3ce3
+AUX makefile-parallel-test25.patch 2828 SHA256 7fb572ac45d089ddc8a69789c857c13cb84f6a51023544e94459b624282a896b SHA512 0bb89b7141f74906f4bebf5ccc46dad5a4f9147048bfebd78f84a10b0d09f20c75ddb5e935d3e26ba9ce4f51c30270140dd635ab9e8d5ffdfb2aed94399cbe71 WHIRLPOOL 025222dc59da657e87fc9522dcec75f9f35ce405b78e0cd38d96c11470ae36732f1c616c617b63132c4b0ef51b0f5d1b8fd85eb12bb776c8f46000180e2bd104
 AUX makefile-parallel.patch 2182 SHA256 cec0762d0f3a1469b854bcfc0af6bb42b5bf2d81b623dcfa7c7e9bf516f28fec SHA512 82dbddb67160e4bc38c223cfa6f5377dfa3b79aed24bf7c8a6e429766885b400c31c0ee2e0391ef1561a3d0dc935e999b291d792e10acc96c1f4d32ddc95ac74 WHIRLPOOL 55935e24af2fd5b3adcd43e7ae7fb13a9679984c28f652fa34356cbca10356584a065f299bd2c77f14f238ae50a93b8ff515711b493bf2d425c8a179b9417a5f
 AUX string_length_255.patch 299 SHA256 c9b8d0065cfe6d4a9ad460c31c2a75bcce17bfb8001f4448e3464dea07524401 SHA512 b451d23e1a45636dfae7cf69c64e3edde6b655bc0c7407586429e0d8282f17ef6215c6c33a6d238115c39d34fa57fa7699a7a10f146344c677fde10c0e207ac3 WHIRLPOOL 123bdee78c90909936a9af779925cb1da37b83a30e84cad7516f1ca8cf47d9a6445ec39103eb076dc834ec65976004f8bf9aabe63dfffd9604e1b70907c4bcb6
 AUX tinydns-setup 3212 SHA256 2d4e144e5408793f1d5ffa23abc510a04e449a6306965c1a35fb8956a419696f SHA512 87dd97cd84f7d2515fb9c28921c9860ee92d41048ea0b32c904166b8799cfa828cb77161701b1dbb6af8de2c23df9e36de251a90900ce00fe12c439917dffe1c WHIRLPOOL 77c373f001d8ed742663e2d8dd62b5697a61b5debe6c38720ab64b09d63338fdeee08caa89992dbac0ac676b45fb3fbbe193da453114a659282a4f119d8f0c23
@@ -23,17 +21,6 @@ DIST djbdns-1.05.tar.gz 85648 SHA256 3ccd826a02f3cde39be088e1fc6aed9fd57756b8f97
 EBUILD djbdns-1.05-r26.ebuild 3961 SHA256 80630b561baa77dbf96cc61b3f2eb1c027765e5d47c324434760adfc5f4cd572 SHA512 24e6e144537011324fbeacaafd27e2698d61bd6d68f0644cd56e6909b5297ee92f4f592c8e9cfd81198e7d7285b2de7dd188d2b376a6235b7dd8b45436b826b4 WHIRLPOOL 68afe576c37866e845d9febb38f38c12da6509a1252b9f8d34f4ead91068b0505160163987d7b3244aa5b7c11b25918191478bc9f652c452a8b40d2e774f8331
 EBUILD djbdns-1.05-r27.ebuild 3250 SHA256 fcb155fe18abe95182f7aad59ae418007c0d2907109da515f6437f239108987b SHA512 c2975d4d4aa505dcaae89c22dbcff2c0f6b5001f3d43ba1fa55e9b4966dce6be7806627061b64f5f76734fe1f7aa49c94c3da3774ae0aa4f1fa7ea4a89342d19 WHIRLPOOL 7d1640db149b5d416118d8c490ae82d7bc034ea0a1f18ecd96df003d1f596249df3987b6c57e5f522cba32faa88dc25104ce1ca0cbe1c5b310c322e3c8b6c050
 EBUILD djbdns-1.05-r28.ebuild 4044 SHA256 420d8cb1cc2886c28bc7671cce5180947fc9a1de01d1292412b26c18cb8e164d SHA512 d82bcfabcb5a4207ed9f8c47859c377c0e6d06fd099bfe4aa12b536280b4f6196e30b6102844b79a9493d9e255359f1accf69603a9c19a7780a32a39f823a624 WHIRLPOOL 761b0a01ba8fcc08df9b976abf8966d07dc3eaf90a4a15d87245d54771927fe7041852d6a9bf82696bad4197121357f525c23b63e8e900ab733517c2210a73a0
-EBUILD djbdns-1.05-r29.ebuild 4250 SHA256 66ed974f26a1243fa3e22819688373bd0735722404e74cffdb1a41a5de2718eb SHA512 8bce0fb53256450e5c54221399d8e0e3b083036b56bf9d71fdd39f85f24892946a74cd9112e39710dcf0f739baeece80f5e7c9fc1a6a3b69e29d27657e20a212 WHIRLPOOL 0f0f164db79a13d2a168133719cecff9459e03ae6942286fccfb7a43bc7baa09f5c4080ad8a7839add1d03b4c56a45735b93d45c8a0e4f42d34212ffe748dbdd
+EBUILD djbdns-1.05-r29.ebuild 4165 SHA256 40d144573b568db8f987b99e1d0ad11c254541fccbe286ebf3ef3714f07c2e07 SHA512 b973f42a08062a25fcf0159c6e525a7494b8a753d0f826c3445f1df03e6da4bc1583129c07e36d6504911570dd50800cc6cd4572d0d33e947dfa36b5dc11dd49 WHIRLPOOL 6086fa44358cfd42a5ff24f1502dabcf7092b80e28aa8857b870ea7fe981a714f049b99ab82e60e217586721741611562d760ee3609ec2e5db1cdf2ce53dd7e2
 MISC ChangeLog 23321 SHA256 d5baf4216222e932af00d8e16106bfc50638e3c40140f07f2021e05e0fdc379e SHA512 df5a5187705d7c01bc7a65b72edaaaa08b94757e36ec6750fb52cab7fc983353659e5f2ad6eea9878401613f08d2746fffbc332b7ff87b7f053ae7e4a89858e7 WHIRLPOOL da31574f153ed488de206852251b49b6d4bacf6ec94b48e6dfc8d50136aa5e1ae74325d6fdd31e0f18b6343f98a9d89847e565a0be69866b8af04cca52f1cec0
 MISC metadata.xml 230 SHA256 3e0eae03231007dbb4fe0b289ba7f2bbcae601e58701665162548029933f6be1 SHA512 f0395378896dfdc3161b587248f933ddccfb6e3493a5010b281444b5602a6c6846d0ca618f43a362406ad084e7b479b304291fb122bd87a01173502d03833d70 WHIRLPOOL 24c4a89f282aab3a772a2311806d98ec308a3acea4b56c76cefcdf8ee9cb965c912cbad3a24f0127f8cfcecb4ded0f68ff264caac26a9030857ef1ae4e33356f
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iQEcBAEBCAAGBQJTx8PbAAoJEA2sAkrWKOU27MkH/3avV5wWbT+0tB1eNrDRxJGD
-pc/N9gtbf+p8dr4IfFtgUXEh8jIYdRb1NSpKKr6TWuzUatyMr3RqN27eLyjK3Qv/
-WBj50GExLtfkJ7qZ/O9z3dqrvrCIVglaj3HaT/mcGLWXvWszdSouBa7rg7t/i0oQ
-O426yCP2smSuKR33iV6VTAHbxJxzcH+G9SHky0SneD5F2zbsI6S7TrwRDkEZiy5d
-JN+SMIDYtc72lZmi7Lb6TofoDTEwLxbUwjENGtDOpTBPYvOOQ8erT6z8UhqNrwdz
-BXUz47PT5fA+Mq2+N5gCGqciynihXg2QaydmU93qZG79lJ9MDTU/PAeCrvm3z5g=
-=BQCh
------END PGP SIGNATURE-----

diff --git a/net-dns/djbdns/djbdns-1.05-r29.ebuild b/net-dns/djbdns/djbdns-1.05-r29.ebuild
index 1a2f6bb6820c7f373e3cc2ed6fcf6caf3c4b8913..f495cec57e96756d364aa6655549b608ec3a2fd2 100644 (file)
--- a/net-dns/djbdns/djbdns-1.05-r29.ebuild
+++ b/net-dns/djbdns/djbdns-1.05-r29.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/djbdns/djbdns-1.05-r29.ebuild,v 1.3 2014/07/17 12:37:40 nimiux Exp $
+# $Header: $
 
 EAPI=5
 inherit eutils flag-o-matic readme.gentoo toolchain-funcs user
@@ -48,7 +48,7 @@ src_prepare() {
                epatch \
                        "${FILESDIR}/CVE2008-4392_0001-dnscache-merge-similar-outgoing-queries-ipv6-${IPV6_PATCH}.patch" \
                        "${FILESDIR}/CVE2008-4392_0002-dnscache-cache-soa-records-ipv6.patch" \
-                       "${FILESDIR}/makefile-parallel.patch"
+                       "${FILESDIR}/makefile-parallel-${IPV6_PATCH}.patch"
 
                cd "${S}-noipv6" || die
        fi

diff --git a/net-dns/djbdns/files/makefile-parallel-test25.patch b/net-dns/djbdns/files/makefile-parallel-test25.patch
new file mode 100644 (file)
index 0000000..2754729
--- /dev/null
+++ b/net-dns/djbdns/files/makefile-parallel-test25.patch
@@ -0,0 +1,91 @@
+diff --git a/Makefile b/Makefile
+index 9ebf4c8..fe5ed73 100644
+--- a/Makefile
++++ b/Makefile
+@@ -212,7 +212,7 @@ warn-auto.sh choose.sh conf-home
+       chmod 755 choose
+ 
+ clientloc.o: \
+-compile clientloc.c open.h byte.h cdb.h ip6.h
++compile clientloc.c open.h byte.h cdb.h uint32.h ip6.h
+       ./compile clientloc.c
+ 
+ compile: \
+@@ -336,7 +336,7 @@ taia.h tai.h uint64.h taia.h
+ 
+ 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
+ 
+@@ -859,15 +859,15 @@ trylsock.c compile load
+       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: \
+@@ -875,7 +875,7 @@ compile socket_bind6.c sockaddr_in6.h haveip6.h byte.h socket.h uint16.h uint32.
+       ./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: \
+@@ -883,11 +883,11 @@ compile socket_connect6.c byte.h socket.h uint16.h uint32.h
+       ./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: \
+@@ -895,7 +895,7 @@ compile socket_recv6.c sockaddr_in6.h haveip6.h byte.h socket.h uint16.h uint32.
+       ./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: \
+@@ -903,7 +903,7 @@ compile socket_send6.c byte.h socket.h uint16.h uint32.h ip6.h haveip6.h error.h
+       ./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: \
+@@ -911,7 +911,7 @@ compile socket_tcp6.c ndelay.h socket.h uint16.h uint32.h haveip6.h
+       ./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: \