Switch the order of two tests in a patch to match -r23.

diff --git a/net-dns/djbdns/Manifest b/net-dns/djbdns/Manifest
index 242c0caba9ab54841e1d6b2594b97df943cc0613..3d99e526ea50abb63353cf24ecf9d9fe7da411c8 100644 (file)
--- a/net-dns/djbdns/Manifest
+++ b/net-dns/djbdns/Manifest
@@ -10,7 +10,7 @@ AUX dnstracesort.patch 327 RMD160 aaa564aa9cb0dcad4ebb64121c82bf50fda64254 SHA1
 AUX headtail.patch 1780 RMD160 332af6647e08f3b792bd1b7821974f15041a6b58 SHA1 1b996c6cbe5df1c981f998d004d066ae344bfba8 SHA256 28ebe521132fe35559273b6542505ab4f0bb7b7ccb88585522e4cc2fe8376dd4
 AUX ipv6-mjo.patch 98657 RMD160 dcd108bbc4e7daeedc1fcf3db52ad5bb6b35e457 SHA1 04200398a9d44cfd11765f8a47498427c5297b0f SHA256 880e12f3918553aa5b01a3313e3d2358a693ad66dafdb318ed3ca1a4ba94d9ec
 AUX makefile-uint32-fix.patch 2182 RMD160 afd5adceab59dc98c586117b6bcfd5897c4c7959 SHA1 f7870e42bd6caa7a48ba783b379be18b5e4d369c SHA256 50b69740ba1ff65b772b7fd7a31ac1b9eebd1481eba271c7d0822a7e43f671d6
-AUX query.c-mjo.patch 2639 RMD160 377fbe09cd8609beda4c82da6eabbe418e0bae0c SHA1 de18b0b87469fe384f72a9b706818d7bd814c933 SHA256 446aac14b2a581bd74dead473aa2612a681a1b8e7cbd6e83c4b3eca2f7e1cc5d
+AUX query.c-mjo.patch 2639 RMD160 772a86799fe82c544637e02d0924cbc8439ea58c SHA1 6b056f99210193135d21ef2fc17043dca5f2da5a SHA256 e5e99180745fd0a7e9cc5a062cb9afff058e69dac3dc3cfb72683a5ab63cd6a6
 AUX query.h-mjo.patch 807 RMD160 f122f9925cbb9c7b3ef1fc78a754e6c9286e167d SHA1 f8c87f616fb0781b47d3a6c6a70afb246d832bfd SHA256 9b5516ff83eed4927c83d89c587efb778e328baaaa2fc7928f042e91ad7efb34
 AUX string_length_255.patch 299 RMD160 df613f1287f6581c963e969eec7fcaec638e2b58 SHA1 bb9e2f7aafed265887ac47d35cc022ef25d7b5f9 SHA256 c9b8d0065cfe6d4a9ad460c31c2a75bcce17bfb8001f4448e3464dea07524401
 AUX tinydns-setup 3206 RMD160 16679596e3902c8eda4c9605b0fef6e778cdee63 SHA1 e222c22f924882a3b2d496f7d8fbdf61eb4eb0e8 SHA256 73c0610f15e9bbec1998d10eafe4222277eb8cbaf0c58e802f998e9f7b25bbea

diff --git a/net-dns/djbdns/files/query.c-mjo.patch b/net-dns/djbdns/files/query.c-mjo.patch
index e05d48e8a3dabbc327eceffe6cc1fdc5df3d42e8..3eaa49e604a1cadcaba4552881b0359e5d576293 100644 (file)
--- a/net-dns/djbdns/files/query.c-mjo.patch
+++ b/net-dns/djbdns/files/query.c-mjo.patch
@@ -39,7 +39,7 @@
 +      }
 +    }
 + 
-+     if (!typematch(DNS_T_ANY,dtype) && !typematch(DNS_T_AXFR,dtype) && !typematch(DNS_T_CNAME,dtype) && !typematch(DNS_T_NS,dtype) && !typematch(DNS_T_PTR,dtype) && !typematch(DNS_T_A,dtype) && !typematch(DNS_T_MX,dtype) && !typematch(DNS_T_AAAA,dtype) && !typematch(DNS_T_SOA,dtype)) {      
++     if (!typematch(DNS_T_ANY,dtype) && !typematch(DNS_T_AXFR,dtype) && !typematch(DNS_T_CNAME,dtype) && !typematch(DNS_T_NS,dtype) && !typematch(DNS_T_PTR,dtype) && !typematch(DNS_T_A,dtype) && !typematch(DNS_T_MX,dtype) && !typematch(DNS_T_SOA,dtype) && !typematch(DNS_T_AAAA,dtype)) {      
        byte_copy(key,2,dtype);
        cached = cache_get(key,dlen + 2,&cachedlen,&ttl);
        if (cached && (cachedlen || byte_diff(dtype,2,DNS_T_ANY))) {