Remove two unused patches.

Package-Manager: portage-2.2.8-r2/cvs/Linux x86_64
Manifest-Sign-Key: 0x6F48D3DA05C2DADB!

4 files changed, 21 insertions, 435 deletions

diff --git a/net-dns/djbdns/ChangeLog b/net-dns/djbdns/ChangeLog
index 10e49d31db2a..ce090dfdc2e6 100644
--- a/net-dns/djbdns/ChangeLog
+++ b/net-dns/djbdns/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-dns/djbdns
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/djbdns/ChangeLog,v 1.154 2014/09/05 21:49:41 mjo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/djbdns/ChangeLog,v 1.155 2014/10/02 13:01:13 mjo Exp $
+
+  02 Oct 2014; Michael Orlitzky <mjo@gentoo.org>
+  -files/CVE2008-4392_0001-dnscache-merge-similar-outgoing-queries-ipv6.patch,
+  -files/makefile-parallel.patch:
+  Remove two unused patches.
 
   05 Sep 2014; Michael Orlitzky <mjo@gentoo.org> -files/djbdns-setup,
   -files/dnscache-setup, -files/tinydns-setup:
diff --git a/net-dns/djbdns/Manifest b/net-dns/djbdns/Manifest
index 3b3a48db95d4..41b6c6345244 100644
--- a/net-dns/djbdns/Manifest
+++ b/net-dns/djbdns/Manifest
@@ -3,7 +3,6 @@ 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
 AUX CVE2008-4392_0001-dnscache-merge-similar-outgoing-queries.patch 9914 SHA256 b5e030e96ed98d96d36c39e3466e04d98d39c5f1c7e94254ea3da5e99381eed6 SHA512 cbec128b021a341c68906289ca02d3a7fe088c8b3835f2ae3dbb581ad6520712eb344d66e11bb82368dbca2e93e46facd4e10d121fc091099b3a7bfd5e6d081e WHIRLPOOL eafd062004f19a21026be48512b13c627b86dd3f101e00fc15837005a1b2d70a9d92547881974cb1cfdb3fb8a819eea73c1fefa6d2dafacf635a9e98acf9ad4e
 AUX CVE2008-4392_0002-dnscache-cache-soa-records-ipv6.patch 3043 SHA256 0e6312ab8408d98bc3e6d1b1cddc36f51a5cd092db14bd3f84a8f47d08070c27 SHA512 f830bfd2fabd4d9b4e2649bcc4061d656d4645b93829415d070b26c6a22e8e17d941666b8e776947bf9a8ef93007f77d8be57fc9911dcc6dc2b7ac607d556ba0 WHIRLPOOL 0cca02943cf7eb95f5d33863144f5c9500bdb5c9928416cf043accf91461bc4baa31dc34b3a320a8a72ca3adcb79806d92e5c81343b719706d2242c825df05f7
 AUX CVE2008-4392_0002-dnscache-cache-soa-records.patch 2944 SHA256 1cd7b848305646d3015d8f2817acdced65894b8ab6e9dacb02077acebc50841b SHA512 f65ca7dfc8e85f469f22d72a1c79126c35243dc077abf4b688eb7d057f19456dc8a3665f558a8a3c1908f96fa1838792aa1bc317d2e89f4953020828c05926e6 WHIRLPOOL 1c7edee4de746283d53517bbcac7936ed69276865e7d78f4d7b2aa6175b534e474005cc3cf2fc85bc956508a6583a527fec5a68221b47c38922b356ae40fb69b
@@ -12,30 +11,29 @@ AUX dnsroots.patch 296 SHA256 9fe0552708f6cacd2ace4dca21e3f393acc01e73ac9e2b622a
 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
 DIST djbdns-1.05-man.tar.gz 17170 SHA256 ba1c58f14bc928908d8618230f400d73cfe2200ed800a272b63048e3e50be569 SHA512 98af7bd9033a2205fbbc0f23b7eab45b9756f6ceff5199a62952e19c89c9fe3c03495cb6f8621d388f883c40650309a1509095417df3f54af21a71350c4aa183 WHIRLPOOL b611e37e7422a4ae405fa15a4b9ff7eb8d0007d81310d044bc1982fe70dada1e4646cf22832e8e5320bae8d2e328eb87d59eb51c3d390f1089f30548053b839b
 DIST djbdns-1.05-test25.diff.bz2 20376 SHA256 28c88de08822894cf252e54ed3be9abfdf4f492644ff74a7c479340bdce051ea SHA512 41cca597dba971010b9844071e0349d3a4b25cc4b144e12721b0bc8250589fb374e40ece8908f1081762597048179b1177e88b9a5f97be0b47b63e3183e654bb WHIRLPOOL d531001511ead02f51558909b13e14734f013213e0f13ec7589876878928bd4057f917e004e8d37955c2965aeba5d92a9fc481f2f9ac48c08edaeb9bb9b821d9
 DIST djbdns-1.05.tar.gz 85648 SHA256 3ccd826a02f3cde39be088e1fc6aed9fd57756b8f970de5dc99fcd2d92536b48 SHA512 20f066402801d7bec183cb710a5bc51e41f1410024741e5803e26f68f2c13567e48eba793f233dfab903459c3335bc169e24b99d66a4c64e617e1f0779732fa9 WHIRLPOOL 0fb67d19fcbf1cf21debcedfd3456d9cb9160079631ae1995e94aa9db3969ae02927f215ee8a5f03b34a6523cb9e3abebabf23e08e95eb1efdb626eb8b10312f
 EBUILD djbdns-1.05-r29.ebuild 4260 SHA256 60cbd30b862d210f4d5cb3254d36de19093d6a5b70ee4af34f5cff7a64a08f39 SHA512 051cb153f5b98d4dcea5d7e25ab21e7faf7f98ac6141e8c80d997414f82924e1a52cf00d59f1aa723455e20d789e1e8f5ac825cdccd0bf9e960a049efbcfc30c WHIRLPOOL 6f46c42b42ee71f5ab2c5e346d435d6bc2a736adcd9b022fbb7e5e9386be5afe83c02f838d18eeffcb22f1fbfb1d752f5174e13c9d5a76d610d191003db8defa
-MISC ChangeLog 24399 SHA256 a9f2e40619d454222b1fe5a30cd4f51b9d358002f2105d9ddb2fb88753839a67 SHA512 573d149ce3f0cc6b6c2f11dc66c031d264fcdc5843d00d960cb4ce9ccd9ca13528e47977a81ddd197dfa5aa2553e2b905d749010f9f6bf9a76afaa025f478e15 WHIRLPOOL 2bf073f0b0a1747ec27ac8f5c65079504fb5eeb3033083a6608e8ae72452e3d95f7bd0cf909f623bdf3600edf2afd2bb80ba303878c7097450dfec7eb2222eb9
+MISC ChangeLog 24591 SHA256 bd7cea7ee60d3b23a4237890cb7177badf25f2ab4e7cc2fc1d09c84a0d5e5ea4 SHA512 dc2a8de1fc1dcb81b47f9238591c3f9b4f868cd56f8df555da8ba9b50977f57effc8de820819a6500bb3a1fdf679b2b25ec2e46e6593604e5980f37830f48ded WHIRLPOOL 99609e4a688b4bedaaaf572b6987389cd7620672abe662a22d568f3030c64bf2fd8bc59484867fdcf23165392b19ddf25fce5912f59bd9dfee781a3eeec72e72
 MISC metadata.xml 230 SHA256 3e0eae03231007dbb4fe0b289ba7f2bbcae601e58701665162548029933f6be1 SHA512 f0395378896dfdc3161b587248f933ddccfb6e3493a5010b281444b5602a6c6846d0ca618f43a362406ad084e7b479b304291fb122bd87a01173502d03833d70 WHIRLPOOL 24c4a89f282aab3a772a2311806d98ec308a3acea4b56c76cefcdf8ee9cb965c912cbad3a24f0127f8cfcecb4ded0f68ff264caac26a9030857ef1ae4e33356f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJUCi/2XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJULUygXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQxNEU5RDcyRDdCMUFGREVGQzBCNDFDMUY2
-RjQ4RDNEQTA1QzJEQURCAAoJEG9I09oFwtrb43IP/R8l0eaTO9zV72jcgZLMFK+r
-E6VT81u7HMFytlVfmPwarI3QB1RaORPCt6JXPcD+PvIiHQhyhlDTTlR7JnidyzSe
-dq888cPmuU2r0KGEs5stgo+l4AceGClIygIRiGrxa4dBifRslkrJgWRYh2bvqkGN
-eAkaUgjp6JmVByGdjVYXld8mXIQRCKrc6dIe+aAyU0HXGQTvFN5Hzpxb0Pp9nL6Y
-EowfiqPFzDj+MXYGKHGNpxxcXRNaIMFzMEiO0a+zvckGOFS75wD/yALZLKHGrzgh
-P5/TOUjBQEGVwuEl2+HWxBcfTUWIHY30DkIrssh0I+8gFlPDbaGr1samqk3PQqC6
-D2nfryocgfc/HzjmAAJehtTNXGYPspbbCEhFiUEGQL8i5GbIFEWF07Jq+LLx13BP
-TzRjpFVOVPb9ppDsoOlhcbzmKr9apsE92KJQyJY3LjEDyvyzmq2rLqs9mrOqoZx1
-O7GH8kRl15jipBagH0cf6XJSsdXoYG3xiJKlGaPAkV/2uS/g/dzB/F5STVpOAAaD
-biBkMFhg7WfRcF75ArpyJJUvvyJ0UGpRbaCUoE7TyqWl/q6KuaRkNazIvhJpqx6T
-cG44pHOQ/0Oa/4z4v83J5TgOpgJ/p1YxN3ikDUf3B/FXKmG+h+i97W9Lc0USagjQ
-dVhkkOaLaPdB1uOdXPWd
-=0dOA
+RjQ4RDNEQTA1QzJEQURCAAoJEG9I09oFwtrb2joP+QHxRqsn/Z/AA4i5r6Ww3Ufc
+fCWjXyJw6NU3GTjP0TQ/eYHbp+ffLrHnebawTaF3hDOv2DuRJZhWohfwjIrKmV3A
+pyFzmuvPxm8PcyBQrrA5Bz7EPN9XoWdmoANgdSv97vGRzpm5Oc/wem54xsliSH/a
+0JKLdd3ESn5WHWlAsC1FuuZkfeGcLb00ap98LQHfv+qFLldidUZstLjYDAPerMeO
+1/kDWWM1ISi2bIjMMS7kO3LGBW0WWVTATQ/8KFTEFM3a7lmntk+yfioS8AplV8xR
+Zk3eR8WsL3Plxs5hug5HzIkiN1iJHSAFILABaGTxkkNzZKJQJ9x+dpQfFXbKHbrt
+dCpiz7pmEgZo/NXkyYYBR8PDoV+SqNpITAOK7T0J1uKCUagXt+8nXoevoZCL8oF5
+eff9VE8kJgqyr7TmbhJSmt/W6x6qEB6XKG0o5za5ej8zOQ9d/KLRluC9wtuW5QUS
+DQvPxv6SB7eTbq0pKbansArgFueVx6zRRCiHNjBksGkUgmrZ2pbbzj50sVatcClT
+O2sjJOgz5DkmFNShZp5I4WFuvYZjpUTRAunxwy5SsNFpkzp31YLm5Vlf0VrpbE/a
+yf67Dow1ohFLlwcEHXLG6FZNBMdbitNEvwlGn8v5uFT2gv0q32x/z6QSQJ41Anse
+yhexiSqUm8m0j3YgZjzP
+=SuzW
 -----END PGP SIGNATURE-----
diff --git a/net-dns/djbdns/files/CVE2008-4392_0001-dnscache-merge-similar-outgoing-queries-ipv6.patch b/net-dns/djbdns/files/CVE2008-4392_0001-dnscache-merge-similar-outgoing-queries-ipv6.patch
deleted file mode 100644
index 86baac8b494b..000000000000
--- a/net-dns/djbdns/files/CVE2008-4392_0001-dnscache-merge-similar-outgoing-queries-ipv6.patch
+++ /dev/null
@@ -1,337 +0,0 @@
-diff -urNp a/Makefile b/Makefile
---- a/Makefile	2009-03-19 11:01:40.782348427 -0700
-+++ b/Makefile	2009-03-19 11:05:27.659346849 -0700
-@@ -342,11 +342,11 @@ stralloc.h iopause.h taia.h tai.h uint64
- 	./compile dns_txt.c
- 
- dnscache: \
--load dnscache.o droproot.o okclient.o log.o cache.o query.o \
-+load dnscache.o droproot.o okclient.o log.o cache.o query.o qmerge.o \
- response.o dd.o roots.o iopause.o prot.o dns.a env.a alloc.a buffer.a \
- libtai.a unix.a byte.a socket.lib
- 	./load dnscache droproot.o okclient.o log.o cache.o \
--	query.o response.o dd.o roots.o iopause.o prot.o dns.a \
-+	query.o qmerge.o response.o dd.o roots.o iopause.o prot.o dns.a \
- 	env.a alloc.a buffer.a libtai.a unix.a byte.a  `cat \
- 	socket.lib`
- 
-@@ -367,7 +367,7 @@ compile dnscache.c env.h exit.h scan.h s
- uint16.h uint64.h socket.h uint16.h dns.h stralloc.h gen_alloc.h \
- iopause.h taia.h tai.h uint64.h taia.h taia.h byte.h roots.h fmt.h \
- iopause.h query.h dns.h uint32.h alloc.h response.h uint32.h cache.h \
--uint32.h uint64.h ndelay.h log.h uint64.h okclient.h droproot.h
-+uint32.h uint64.h ndelay.h log.h uint64.h okclient.h droproot.h maxclient.h
- 	./compile dnscache.c
- 
- dnsfilter: \
-@@ -745,11 +745,16 @@ qlog.o: \
- compile qlog.c buffer.h qlog.h uint16.h
- 	./compile qlog.c
- 
-+qmerge.o: \
-+compile qmerge.c qmerge.h dns.h stralloc.h gen_alloc.h iopause.h \
-+taia.h tai.h uint64.h log.h maxclient.h
-+	./compile qmerge.c
-+
- query.o: \
- compile query.c error.h roots.h log.h uint64.h case.h cache.h \
- uint32.h uint64.h byte.h dns.h stralloc.h gen_alloc.h iopause.h \
- taia.h tai.h uint64.h taia.h uint64.h uint32.h uint16.h dd.h alloc.h \
--response.h uint32.h query.h dns.h uint32.h
-+response.h uint32.h query.h dns.h uint32.h qmerge.h
- 	./compile query.c
- 
- random-ip: \
-diff -urNp a/dnscache.c b/dnscache.c
---- a/dnscache.c	2009-03-19 11:01:40.786597556 -0700
-+++ b/dnscache.c	2009-03-19 11:05:27.675225701 -0700
-@@ -23,6 +23,7 @@
- #include "log.h"
- #include "okclient.h"
- #include "droproot.h"
-+#include "maxclient.h"
- 
- long interface;
- 
-@@ -59,7 +60,6 @@ uint64 numqueries = 0;
- 
- static int udp53;
- 
--#define MAXUDP 200
- static struct udpclient {
-   struct query q;
-   struct taia start;
-@@ -136,7 +136,6 @@ void u_new(void)
- 
- static int tcp53;
- 
--#define MAXTCP 20
- struct tcpclient {
-   struct query q;
-   struct taia start;
-diff -urNp a/log.c b/log.c
---- a/log.c	2009-03-19 11:01:40.791597427 -0700
-+++ b/log.c	2009-03-19 11:05:27.676224153 -0700
-@@ -149,6 +149,13 @@ void log_tx(const char *q,const char qty
-   line();
- }
- 
-+void log_tx_piggyback(const char *q, const char qtype[2], const char *control)
-+{
-+  string("txpb ");
-+  logtype(qtype); space(); name(q); space(); name(control);
-+  line();
-+}
-+
- void log_cachedanswer(const char *q,const char type[2])
- {
-   string("cached "); logtype(type); space();
-diff -urNp a/log.h b/log.h
---- a/log.h	2001-02-11 13:11:45.000000000 -0800
-+++ b/log.h	2009-03-19 11:05:27.676224153 -0700
-@@ -18,6 +18,7 @@ extern void log_cachednxdomain(const cha
- extern void log_cachedns(const char *,const char *);
- 
- extern void log_tx(const char *,const char *,const char *,const char *,unsigned int);
-+extern void log_tx_piggyback(const char *,const char *,const char *);
- 
- extern void log_nxdomain(const char *,const char *,unsigned int);
- extern void log_nodata(const char *,const char *,const char *,unsigned int);
-diff -urNp a/maxclient.h b/maxclient.h
---- a/maxclient.h	1969-12-31 16:00:00.000000000 -0800
-+++ b/maxclient.h	2009-03-19 11:05:27.676224153 -0700
-@@ -0,0 +1,7 @@
-+#ifndef MAXCLIENT_H
-+#define MAXCLIENT_H
-+
-+#define MAXUDP 200
-+#define MAXTCP 20
-+
-+#endif /* MAXCLIENT_H */
-diff -urNp a/qmerge.c b/qmerge.c
---- a/qmerge.c	1969-12-31 16:00:00.000000000 -0800
-+++ b/qmerge.c	2009-03-19 11:05:27.677221627 -0700
-@@ -0,0 +1,115 @@
-+#include "qmerge.h"
-+#include "byte.h"
-+#include "log.h"
-+#include "maxclient.h"
-+
-+#define QMERGE_MAX (MAXUDP+MAXTCP)
-+struct qmerge inprogress[QMERGE_MAX];
-+
-+static
-+int qmerge_key_init(struct qmerge_key *qmk, const char *q, const char qtype[2],
-+    const char *control)
-+{
-+  if (!dns_domain_copy(&qmk->q, q)) return 0;
-+  byte_copy(qmk->qtype, 2, qtype);
-+  if (!dns_domain_copy(&qmk->control, control)) return 0;
-+  return 1;
-+}
-+
-+static
-+int qmerge_key_equal(struct qmerge_key *a, struct qmerge_key *b)
-+{
-+  return
-+    byte_equal(a->qtype, 2, b->qtype) &&
-+    dns_domain_equal(a->q, b->q) &&
-+    dns_domain_equal(a->control, b->control);
-+}
-+
-+static
-+void qmerge_key_free(struct qmerge_key *qmk)
-+{
-+  dns_domain_free(&qmk->q);
-+  dns_domain_free(&qmk->control);
-+}
-+
-+void qmerge_free(struct qmerge **x)
-+{
-+  struct qmerge *qm;
-+
-+  qm = *x;
-+  *x = 0;
-+  if (!qm || !qm->active) return;
-+
-+  qm->active--;
-+  if (!qm->active) {
-+    qmerge_key_free(&qm->key);
-+    dns_transmit_free(&qm->dt);
-+  }
-+}
-+
-+int qmerge_start(struct qmerge **qm, const char servers[64], int flagrecursive,
-+    const char *q, const char qtype[2], const char localip[4],
-+    const char *control)
-+{
-+  struct qmerge_key k;
-+  int i;
-+  int r;
-+
-+  qmerge_free(qm);
-+
-+  byte_zero(&k, sizeof k);
-+  if (!qmerge_key_init(&k, q, qtype, control)) return -1;
-+  for (i = 0; i < QMERGE_MAX; i++) {
-+    if (!inprogress[i].active) continue;
-+    if (!qmerge_key_equal(&k, &inprogress[i].key)) continue;
-+    log_tx_piggyback(q, qtype, control);
-+    inprogress[i].active++;
-+    *qm = &inprogress[i];
-+    qmerge_key_free(&k);
-+    return 0;
-+  }
-+
-+  for (i = 0; i < QMERGE_MAX; i++)
-+    if (!inprogress[i].active)
-+      break;
-+  if (i == QMERGE_MAX) return -1;
-+
-+  log_tx(q, qtype, control, servers, 0);
-+  r = dns_transmit_start(&inprogress[i].dt, servers, flagrecursive, q, qtype, localip);
-+  if (r == -1) { qmerge_key_free(&k); return -1; }
-+  inprogress[i].active++;
-+  inprogress[i].state = 0;
-+  qmerge_key_free(&inprogress[i].key);
-+  byte_copy(&inprogress[i].key, sizeof k, &k);
-+  *qm = &inprogress[i];
-+  return 0;
-+}
-+
-+void qmerge_io(struct qmerge *qm, iopause_fd *io, struct taia *deadline)
-+{
-+  if (qm->state == 0) {
-+    dns_transmit_io(&qm->dt, io, deadline);
-+    qm->state = 1;
-+  }
-+  else {
-+    io->fd = -1;
-+    io->events = 0;
-+  }
-+}
-+
-+int qmerge_get(struct qmerge **x, const iopause_fd *io, const struct taia *when)
-+{
-+  int r;
-+  struct qmerge *qm;
-+
-+  qm = *x;
-+  if (qm->state == -1) return -1; /* previous error */
-+  if (qm->state == 0) return 0; /* no packet */
-+  if (qm->state == 2) return 1; /* already got packet */
-+
-+  r = dns_transmit_get(&qm->dt, io, when);
-+  if (r == -1) { qm->state = -1; return -1; } /* error */
-+  if (r == 0) { qm->state = 0; return 0; } /* must wait for i/o */
-+  if (r == 1) { qm->state = 2; return 1; } /* got packet */
-+  return -1; /* bug */
-+}
-diff -urNp a/qmerge.h b/qmerge.h
---- a/qmerge.h	1969-12-31 16:00:00.000000000 -0800
-+++ b/qmerge.h	2009-03-19 11:05:27.678227481 -0700
-@@ -0,0 +1,24 @@
-+#ifndef QMERGE_H
-+#define QMERGE_H
-+
-+#include "dns.h"
-+
-+struct qmerge_key {
-+  char *q;
-+  char qtype[2];
-+  char *control;
-+};
-+
-+struct qmerge {
-+  int active;
-+  struct qmerge_key key;
-+  struct dns_transmit dt;
-+  int state; /* -1 = error, 0 = need io, 1 = need get, 2 = got packet */
-+};
-+
-+extern int qmerge_start(struct qmerge **,const char *,int,const char *,const char *,const char *,const char *);
-+extern void qmerge_io(struct qmerge *,iopause_fd *,struct taia *);
-+extern int qmerge_get(struct qmerge **,const iopause_fd *,const struct taia *);
-+extern void qmerge_free(struct qmerge **);
-+
-+#endif /* QMERGE_H */
-diff -urNp a/query.c b/query.c
---- a/query.c	2009-03-19 11:01:40.792597346 -0700
-+++ b/query.c	2009-03-19 11:24:43.152221609 -0700
-@@ -84,7 +84,7 @@ static void cleanup(struct query *z)
-   int j;
-   int k;
- 
--  dns_transmit_free(&z->dt);
-+  qmerge_free(&z->qm);
-   for (j = 0;j < QUERY_MAXALIAS;++j)
-     dns_domain_free(&z->alias[j]);
-   for (j = 0;j < QUERY_MAXLEVEL;++j) {
-@@ -619,14 +619,8 @@ static int doit(struct query *z,int stat
-   if (j == 256) goto SERVFAIL;
- 
-   dns_sortip6(z->servers[z->level],256);
--  if (z->level) {
--    log_tx(z->name[z->level],DNS_T_A,z->control[z->level],z->servers[z->level],z->level);
--    if (dns_transmit_start(&z->dt,z->servers[z->level],flagforwardonly,z->name[z->level],DNS_T_A,z->localip) == -1) goto DIE;
--  }
--  else {
--    log_tx(z->name[0],z->type,z->control[0],z->servers[0],0);
--    if (dns_transmit_start(&z->dt,z->servers[0],flagforwardonly,z->name[0],z->type,z->localip) == -1) goto DIE;
--  }
-+  dtype = z->level ? DNS_T_A : z->type;
-+  if (qmerge_start(&z->qm,z->servers[z->level],flagforwardonly,z->name[z->level],dtype,z->localip,z->control[z->level]) == -1) goto DIE;
-   return 0;
- 
- 
-@@ -640,10 +634,10 @@ static int doit(struct query *z,int stat
- 
-   HAVEPACKET:
-   if (++z->loop == 100) goto DIE;
--  buf = z->dt.packet;
--  len = z->dt.packetlen;
-+  buf = z->qm->dt.packet;
-+  len = z->qm->dt.packetlen;
- 
--  whichserver = z->dt.servers + 16 * z->dt.curserver;
-+  whichserver = z->qm->dt.servers + 16 * z->qm->dt.curserver;
-   control = z->control[z->level];
-   d = z->name[z->level];
-   dtype = z->level ? DNS_T_A : z->type;
-@@ -1050,7 +1044,7 @@ int query_start(struct query *z,char *dn
- 
- int query_get(struct query *z,iopause_fd *x,struct taia *stamp)
- {
--  switch(dns_transmit_get(&z->dt,x,stamp)) {
-+  switch(qmerge_get(&z->qm,x,stamp)) {
-     case 1:
-       return doit(z,1);
-     case -1:
-@@ -1061,5 +1055,5 @@ int query_get(struct query *z,iopause_fd
- 
- void query_io(struct query *z,iopause_fd *x,struct taia *deadline)
- {
--  dns_transmit_io(&z->dt,x,deadline);
-+  qmerge_io(z->qm,x,deadline);
- }
-diff -urNp a/query.h b/query.h
---- a/query.h	2009-03-19 11:01:40.793597403 -0700
-+++ b/query.h	2009-03-19 11:05:27.681222487 -0700
-@@ -1,7 +1,7 @@
- #ifndef QUERY_H
- #define QUERY_H
- 
--#include "dns.h"
-+#include "qmerge.h"
- #include "uint32.h"
- 
- #define QUERY_MAXLEVEL 5
-@@ -21,7 +21,7 @@ struct query {
-   uint32 scope_id;
-   char type[2];
-   char class[2];
--  struct dns_transmit dt;
-+  struct qmerge *qm;
- } ;
- 
- extern int query_start(struct query *,char *,char *,char *,char *,unsigned int);
diff --git a/net-dns/djbdns/files/makefile-parallel.patch b/net-dns/djbdns/files/makefile-parallel.patch
deleted file mode 100644
index 51c0317eca94..000000000000
--- a/net-dns/djbdns/files/makefile-parallel.patch
+++ /dev/null
@@ -1,80 +0,0 @@
---- 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: \