From d0fafa709f2b77dc0e70c99118520000965e4b5a Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 4 Mar 2024 17:43:01 +0000 Subject: gentoo auto-resync : 04:03:2024 - 17:43:01 --- net-dns/Manifest.gz | Bin 8037 -> 8037 bytes net-dns/djbdns/Manifest | 7 +- net-dns/djbdns/djbdns-1.05-r39.ebuild | 1 + ...-dnscache-configurable-truncate-size-nov6.patch | 47 ++++++------ ...ns-dnscache-configurable-truncate-size-v6.patch | 8 +++ .../djbdns/files/implicit-declarations-nov6.patch | 79 +++++++++++++++++++++ 6 files changed, 113 insertions(+), 29 deletions(-) create mode 100644 net-dns/djbdns/files/implicit-declarations-nov6.patch (limited to 'net-dns') diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz index 80874a355d66..80048f7ddd4c 100644 Binary files a/net-dns/Manifest.gz and b/net-dns/Manifest.gz differ diff --git a/net-dns/djbdns/Manifest b/net-dns/djbdns/Manifest index 21b49c8c87af..fed85e22bf1f 100644 --- a/net-dns/djbdns/Manifest +++ b/net-dns/djbdns/Manifest @@ -7,10 +7,11 @@ AUX CVE2008-4392_0002-dnscache-cache-soa-records.patch 2944 BLAKE2B 22d0fa17c99e AUX CVE2009-0858_0001-check-response-domain-name-length.patch 366 BLAKE2B 9f3b6644c0eba4d9df771f0bfcc80ab0d0b1768de75743ba0e5d6e55b90c3aaab38adaa2eaef6505d80b47bf8c0f63f282a76b384bae8194e65e8009985a7893 SHA512 aa5fe75be9db07b25e313145a209a06a05693141c1dd850987e80062e22014056e3055efee4d219475c9a51f25c04a7a46b3d7a2fb3976226e66585cef076f83 AUX CVE2012-1191_0001-ghost-domain-attack.patch 642 BLAKE2B 0d20b60b4f606a84f1006f426c3e1df8a83cb7e9e5804be38fec4d4b2c35a8e4932a7b941f5edaf4a4b5a559bbb09d595116b3fd841ad8f0a795a7c65f5759f8 SHA512 44e205b9a19dbbd405cb57b119f307e5bbdba8fa1124187b53848791c1538f7c01dab43cb34b9332d3258756eb3c0606d36e8b18adcff3c814f0f2cff4ec6822 AUX djbdns-dnscache-configurable-truncate-manpages.patch 1437 BLAKE2B 9ce45b62daeaf5d7a20ed3753da637d42837d2fd572a71b410e68c2c6ed5807fa5d0f7dd47a1cb7c5fa5af3b86eed69800f19c8b190f9a6c0c256493094cfa1c SHA512 464cf51a40317bb5a055463a3ccd0806a7d90b8b8ec02e95082a66e9decbb28714e8af6bf761bdf3f48dd33b9863381a2f0a4a6438a72d43ceeaa8e50d305dd8 -AUX djbdns-dnscache-configurable-truncate-size-nov6.patch 2593 BLAKE2B 0409e8d348e79a3bdc7ae87f75842f6745fffee33e582b1d9774dbe4ecfafd4e59c955433ace10461f21fa4880bfe1ec8a442e15e72b8a52d9d6f597ef257719 SHA512 7125c7ebd611480f128de22be4b9107891f4b214473330b4d20ccc98fb97c15615f491a0a634fde4c2b75546c793ecedd19ba122549de8d1a8cd94b00c37ea22 -AUX djbdns-dnscache-configurable-truncate-size-v6.patch 2790 BLAKE2B ed38363682825a359ed9e4efdf2ef901eeac23f68e460ffb0eb345e1f3e31d957483327ede549361ea007b09c5bf38d9135f4b235adc71734443eadf3bdff0c2 SHA512 31f57daf38db944e79969e4fce2fcd8caa6c4cea900503dbbd268d2b9c68c7bdff8ae029bf8fc12868494d6715d224df638149838e61c2b745e4a89e34c6a639 +AUX djbdns-dnscache-configurable-truncate-size-nov6.patch 2005 BLAKE2B 01637f9b3c94831cb31688faa35a099b23d79dd57a3292d53b7b9a1b33f7feabb1fa64b6ad8578e760ace13a4de7a9e3c8d8d22588c74433774928cd87261216 SHA512 c8e1a01089d45952babff325339074c5235308a5f2788bdde967b3dc015d86f3687b589d1e8c17bb97a52f1893d94bd190a449711ab206988852c02b6715a895 +AUX djbdns-dnscache-configurable-truncate-size-v6.patch 2943 BLAKE2B 00e8547f0918ee29d1c1f38f67ea9fcacc2a773fd3d874690c588d71e6dfbc0405101e49039c231122660b8168039a6dce9012857e8d8b1aa59cee7747720dda SHA512 0aba025b163cd727b80711888cf8f329ca3f0dc14fa0b1de8f2c94bd5051ed02d5c3c84069fcc539baa797871309a1f42932e664bcd3e456831c26be19d5f5fa AUX dnsroots.patch 296 BLAKE2B 8a4375b01aab95400dd85966b6b2ddaf5734307fa66710778d5e8a1d5cce4692baad16a2b6ce0a9a85b7fb90c56ca1ab964fa0d7b57e899616fee23aaeec1029 SHA512 2c745f2545d791ed6646406e749ef8e85c30b4546657ce241c413103e42cf3cfb5001c46481bd2966390563a9cc42e53e44519747350da2b8bb0fdf1d0f5c62e AUX dnstracesort.patch 327 BLAKE2B 483b4a4407b3df88d91a3474a5ba29080d5e0f12c87f97052ce4dfa481f8bb3a3307c923c78f2664aa2154ca41c58c5d4159f8db81161c323198f8b177774bc1 SHA512 ae9cd51f24041aed135b5ba88d1efd0310b8095bccd6fb60a986756b460a4f98a93e163c3ddae7c146d56a9d41778d17449f772b91fdc58d9e69523cf6c2a6e9 +AUX implicit-declarations-nov6.patch 1590 BLAKE2B 8bd687e92e22fa195d585664c254b280741602d939ff23e05ecbf4183bef05ea093580754568c2cb4e2c11015c147d92924526fd537d0dcd6d97b459507e24ec SHA512 d22e3b14c8410fbebe329002451b21a28d36a9df021000f1f0a6f8d0a3e36295fb413b7299c923dc674b14abbd7ddb08e9bd5f694326ff0a6c75146702ded6b8 AUX increase-cname-recustion-depth.patch 1164 BLAKE2B 1bf7bc18ea55ac7aa4c1fe04d2345e7448bfd7f233938fbb1fcc95818cc1063493d2a4cb3c1519d7d4ea661844fbe80fbfc5ec0dc6e76ba3ccd0b4ea9d8f923e SHA512 a6ff23d44697ebe920bab7be58618f73dbbdd8cde4af4ac3e7455ee2b34a18f94cb2491b4b9ca306525aa5ee43e724f7b0ddddd58ac2702bd3cf75e0bb160431 AUX srv_record_support.patch 5423 BLAKE2B 28167fbf8b404b926e484a4cf93ddf4b1ff450be23dad032e91d286497d7eee06793d6161d9a242fbe315ff969398cc532df816b2ae4462108d67593d2b90bcc SHA512 2efedc7c7aaa209bb4a9d65ef1b28934d68c216fd428a27a099ba4801e8be04e1417bdbbf0077088264cd8bc3eb2441855c96890189d8d73804243e6ca4d0851 AUX string_length_255.patch 299 BLAKE2B 083d963d8d67baec402321c7fb8be2e485985ce03daea1d198912204dda6a90b794d5df3519b4177de8720122b46600cc9fe669f265cf9b81c75e4335ae081d6 SHA512 b451d23e1a45636dfae7cf69c64e3edde6b655bc0c7407586429e0d8282f17ef6215c6c33a6d238115c39d34fa57fa7699a7a10f146344c677fde10c0e207ac3 @@ -19,5 +20,5 @@ DIST djbdns-1.05-man.tar.gz 17170 BLAKE2B 2fef7e1be8a427b2c426c2af58bf4c22795e64 DIST djbdns-1.05-test32.diff.xz 31096 BLAKE2B 0bd6948ba3930f7d6e657f91ff76b1101fa7bb8f3da6849344c2230622fce6c15354e632a9140fefafee5986b522fb85c77c70ac64821d280043d1cd3564be2a SHA512 ed5ea46e3346841a8e8b6a77756c1dba53dab5636f73cf495bf1a182c393bef83d6035f6af26fb903baa75ee689db4abae222b6f85a7e245eb59f9c805163774 DIST djbdns-1.05.tar.gz 85648 BLAKE2B 51918fcc8944e64e72709636ee7d56975a138a2806e22c019fa836770de3a338bb8f682216b89c09d6b2861c2423e60e28dc60639f5a86aca2040e1788e4cf5c SHA512 20f066402801d7bec183cb710a5bc51e41f1410024741e5803e26f68f2c13567e48eba793f233dfab903459c3335bc169e24b99d66a4c64e617e1f0779732fa9 EBUILD djbdns-1.05-r38.ebuild 3865 BLAKE2B 48ad84b7063fe3bad4f85a31cabf347cf190184d8ba53a1f58e41a687dcdf4ab4073a2e81745f475eeeb5eb2e9b4d90db2525e9db76fbd43e3669be435722f03 SHA512 cde9e09279e6934bd862d3e8962b2aa40348eeff2bb1ba03c7d4b8788ffc9a895a484bd7fee63b0ead42dadfb34c8cc26f700056f3417f2c26565fb443a5e2a2 -EBUILD djbdns-1.05-r39.ebuild 4065 BLAKE2B aadaf8e41ea316127057ee6d4d1a64c13eedf7177846734f15234d5c69029c33c1645a80b6a08b90e69c1cf6217bf45894b5b05fa61174ce49bedc62d486829e SHA512 659101dd17d786259449273d62779a087036d1a7d26c4872baf7f0a16e5fd2eaaa702dffffbf2b9985482e6896307c085b2bd4283edc4bb168a8980a8f1cfc6d +EBUILD djbdns-1.05-r39.ebuild 4115 BLAKE2B ec258c39c219fe7cef2c16b46e262f6745ecb304db1533860b1bab230bf6ef526e24013ec61a71d4644d4d36ebde1ed21e897569ad0905e2b0dec2aa06be99d6 SHA512 37c8ce729284ead4db6ff3fca34c5840902899ac0e07501317fa1c809349b35f06f3ceff671a4e04fd0bdb619f3d1d3e071b7fe0a25f1b568fa8f5548b54a91d MISC metadata.xml 452 BLAKE2B c17e56cddeb305abd668ddffa1589e95184c03ea619102e2b82cb05febdfc21bfcbf1cffc8274f9ead52bcb4e1a5e3aa7d715261c9692c538872587d02ce929f SHA512 9bb5e5f836dd077e476f3035c5aed99ff5965472c8a3a2ac61e18d8a715985cd71dcdc7a9775ba9bda86008156db2c50172697d847629e9abd57eaef423ef0ac diff --git a/net-dns/djbdns/djbdns-1.05-r39.ebuild b/net-dns/djbdns/djbdns-1.05-r39.ebuild index 2801d37b2612..77ba586d70d9 100644 --- a/net-dns/djbdns/djbdns-1.05-r39.ebuild +++ b/net-dns/djbdns/djbdns-1.05-r39.ebuild @@ -59,6 +59,7 @@ src_prepare() { ) else PATCHES=(${PATCHES[@]} + "${FILESDIR}/implicit-declarations-nov6.patch" # Fix CVE2008-4392 (no ipv6) "${FILESDIR}/CVE2008-4392_0001-dnscache-merge-similar-outgoing-queries-r1.patch" "${FILESDIR}/CVE2008-4392_0002-dnscache-cache-soa-records.patch" diff --git a/net-dns/djbdns/files/djbdns-dnscache-configurable-truncate-size-nov6.patch b/net-dns/djbdns/files/djbdns-dnscache-configurable-truncate-size-nov6.patch index 9f16531a5441..d855c212d198 100644 --- a/net-dns/djbdns/files/djbdns-dnscache-configurable-truncate-size-nov6.patch +++ b/net-dns/djbdns/files/djbdns-dnscache-configurable-truncate-size-nov6.patch @@ -1,22 +1,8 @@ -From: Jaco Kroon -Date: Tue, 24 Oct 2023 06:36:10 +0200 -Subject: [PATCH] dnscache: Enable larger truncation - -This variation conflicts with the IPv6 patch. - -This is a workaround for https://forum.mikrotik.com/viewtopic.php?t=200627 -where Mikrotik doesn't fall back if the UDP response is truncated. - -This is done by enabling larger (configurable) than 512 byte responses on UDP -such that Mikrotik doesn't have a need to revert to TCP. Since it's impossible -to truly know the maximum size of a DNS response trivially this is made -configurable and the upper limit is arbitrarily capped to 16KB. - -Signed-off-by: Jaco Kroon -diff -bru djbdns-1.05.o/dnscache.c djbdns-1.05/dnscache.c ---- djbdns-1.05.o/dnscache.c 2024-02-23 08:05:00.037623680 +0200 -+++ djbdns-1.05/dnscache.c 2024-02-23 08:18:26.320580927 +0200 -@@ -52,6 +52,7 @@ +diff --git a/dnscache.c b/dnscache.c +index 8c899a3..8b10571 100644 +--- a/dnscache.c ++++ b/dnscache.c +@@ -51,6 +51,7 @@ static char myipincoming[4]; static char buf[1024]; uint64 numqueries = 0; @@ -24,7 +10,7 @@ diff -bru djbdns-1.05.o/dnscache.c djbdns-1.05/dnscache.c static int udp53; -@@ -77,7 +78,7 @@ +@@ -77,7 +78,7 @@ void u_respond(int j) { if (!u[j].active) return; response_id(u[j].id); @@ -33,7 +19,7 @@ diff -bru djbdns-1.05.o/dnscache.c djbdns-1.05/dnscache.c socket_send4(udp53,response,response_len,u[j].ip,u[j].port); log_querydone(&u[j].active,response_len); u[j].active = 0; --uactive; -@@ -430,6 +431,15 @@ +@@ -431,6 +432,15 @@ int main() if (!cache_init(cachesize)) strerr_die3x(111,FATAL,"not enough memory for cache of size ",x); @@ -49,10 +35,19 @@ diff -bru djbdns-1.05.o/dnscache.c djbdns-1.05/dnscache.c if (env_get("HIDETTL")) response_hidettl(); if (env_get("FORWARDONLY")) -diff -Nbrau djbdns-1.05.o/server.c djbdns-1.05/server.c ---- djbdns-1.05.o/server.c 2001-02-11 23:11:45.000000000 +0200 -+++ djbdns-1.05/server.c 2024-02-23 08:19:40.020855813 +0200 -@@ -83,6 +83,7 @@ +diff --git a/server.c b/server.c +index e486fe1..63ad11c 100644 +--- a/server.c ++++ b/server.c +@@ -2,6 +2,7 @@ + #include "case.h" + #include "env.h" + #include "buffer.h" ++#include "scan.h" + #include "strerr.h" + #include "ip4.h" + #include "uint16.h" +@@ -83,6 +84,7 @@ int main() { char *x; int udp53; @@ -60,7 +55,7 @@ diff -Nbrau djbdns-1.05.o/server.c djbdns-1.05/server.c x = env_get("IP"); if (!x) -@@ -105,11 +106,19 @@ +@@ -105,11 +107,19 @@ int main() buffer_putsflush(buffer_2,starting); diff --git a/net-dns/djbdns/files/djbdns-dnscache-configurable-truncate-size-v6.patch b/net-dns/djbdns/files/djbdns-dnscache-configurable-truncate-size-v6.patch index 291ebe4f5c44..cea01ebd30d1 100644 --- a/net-dns/djbdns/files/djbdns-dnscache-configurable-truncate-size-v6.patch +++ b/net-dns/djbdns/files/djbdns-dnscache-configurable-truncate-size-v6.patch @@ -53,6 +53,14 @@ Only in djbdns-1.05/: .dnscache.c.swp diff -bru djbdns-1.05.o/server.c djbdns-1.05/server.c --- djbdns-1.05.o/server.c 2023-10-20 00:34:15.778688116 +0200 +++ djbdns-1.05/server.c 2023-10-20 00:43:31.519954643 +0200 +@@ -2,6 +2,7 @@ + #include "case.h" + #include "env.h" + #include "buffer.h" ++#include "scan.h" + #include "strerr.h" + #include "ip4.h" + #include "uint16.h" @@ -94,6 +94,7 @@ int *udp53; unsigned int off; diff --git a/net-dns/djbdns/files/implicit-declarations-nov6.patch b/net-dns/djbdns/files/implicit-declarations-nov6.patch new file mode 100644 index 000000000000..8c749b2cec7a --- /dev/null +++ b/net-dns/djbdns/files/implicit-declarations-nov6.patch @@ -0,0 +1,79 @@ +Fix the build with -Werror=implicit-function-declarations + +diff --git a/chkshsgr.c b/chkshsgr.c +index 2b942d8..2d4e5f4 100644 +--- a/chkshsgr.c ++++ b/chkshsgr.c +@@ -1,3 +1,5 @@ ++#include ++#include + #include "exit.h" + + int main() +diff --git a/dnsq.c b/dnsq.c +index 533e6af..fd9fe78 100644 +--- a/dnsq.c ++++ b/dnsq.c +@@ -1,3 +1,5 @@ ++#include ++ + #include "uint16.h" + #include "strerr.h" + #include "buffer.h" +diff --git a/dnsqr.c b/dnsqr.c +index ff8ea6e..01bfe65 100644 +--- a/dnsqr.c ++++ b/dnsqr.c +@@ -1,3 +1,5 @@ ++#include ++ + #include "uint16.h" + #include "strerr.h" + #include "buffer.h" +diff --git a/hier.c b/hier.c +index 4aef75b..c7c8766 100644 +--- a/hier.c ++++ b/hier.c +@@ -1,5 +1,11 @@ + #include "auto_home.h" + ++/* implemented in install.c and/or instcheck.c */ ++void c(char*, char*, char*, int, int, int); ++void h(char*, int, int, int); ++void d(char*, char*, int, int, int); ++ ++ + void hier() + { + c("/","etc","dnsroots.global",-1,-1,0644); +diff --git a/prot.c b/prot.c +index 0a8a373..1c56e9c 100644 +--- a/prot.c ++++ b/prot.c +@@ -1,3 +1,5 @@ ++#include ++#include + #include "hasshsgr.h" + #include "prot.h" + +diff --git a/seek_set.c b/seek_set.c +index d08d4f3..47c61e4 100644 +--- a/seek_set.c ++++ b/seek_set.c +@@ -1,4 +1,5 @@ + #include ++#include + #include "seek.h" + + #define SET 0 /* sigh */ +diff --git a/utime.c b/utime.c +index 4b7984f..be6c936 100644 +--- a/utime.c ++++ b/utime.c +@@ -1,5 +1,6 @@ + #include + #include ++#include + #include "scan.h" + #include "exit.h" + -- cgit v1.2.3