net-dns/djbdns: new revision with updated ipv6 patch.

The new ipv6 patch corrects a logic error, but now also includes a bunch
of other Makefile dependency fixes, obsoleting one of our own
patches. One of the CVE patches has once again been manually rebased,
and I dropped the "headtail" patch in favor of sed to avoid a new
conditional patch.

Signed-off-by: Michael Orlitzky <mjo@gentoo.org>

3 files changed, 24 insertions, 18 deletions

diff --git a/net-dns/djbdns/Manifest b/net-dns/djbdns/Manifest
index 7892a331568a..8ba71a5953bf 100644
--- a/net-dns/djbdns/Manifest
+++ b/net-dns/djbdns/Manifest
@@ -1,4 +1,4 @@
 DIST djbdns-1.05-man.tar.gz 17170 BLAKE2B 2fef7e1be8a427b2c426c2af58bf4c22795e64d03e0f605ca333e38f187ff65b333e88a7cea0e8a9ec867b446b5ca34a5c97dd24ae18b28ee4c747f2fd1f1608 SHA512 98af7bd9033a2205fbbc0f23b7eab45b9756f6ceff5199a62952e19c89c9fe3c03495cb6f8621d388f883c40650309a1509095417df3f54af21a71350c4aa183
 DIST djbdns-1.05-test28.diff.xz 22072 BLAKE2B fff6c13220adfa056a0ac5942ff9385d83b75f8622adaebab65f557a2ca8d014fe3c255fe55ba9afca56b24880b7cd28597b26b5bcc3bbbd3ef9f581b67004fd SHA512 7fbfeda10221a0a09897c2e744df5606c83113c394ce055d822b0d8733873d72567a88c37905d21c7d2395170fc12b9e9eb133a941aa809f1b9856872ab48230
-DIST djbdns-1.05-test29.diff.xz 28884 BLAKE2B cff7dd55d68eb33a7f8725898469f39b7a1109c7a081e00b0465d599e0ea462e888f510b98a37a31190dfadb2006c6ba2f42311e235e1d9456f745dd756035a9 SHA512 f3fda79813f0067aadc399b1b8af9b33b179ee212fee188119ad2e3d8fced3b31dbd4d2a83922a138da523bb6d6784c3d98105053f9267e7e4f41cf77b76ce88
+DIST djbdns-1.05-test32.diff.xz 31096 BLAKE2B 0bd6948ba3930f7d6e657f91ff76b1101fa7bb8f3da6849344c2230622fce6c15354e632a9140fefafee5986b522fb85c77c70ac64821d280043d1cd3564be2a SHA512 ed5ea46e3346841a8e8b6a77756c1dba53dab5636f73cf495bf1a182c393bef83d6035f6af26fb903baa75ee689db4abae222b6f85a7e245eb59f9c805163774
 DIST djbdns-1.05.tar.gz 85648 BLAKE2B 51918fcc8944e64e72709636ee7d56975a138a2806e22c019fa836770de3a338bb8f682216b89c09d6b2861c2423e60e28dc60639f5a86aca2040e1788e4cf5c SHA512 20f066402801d7bec183cb710a5bc51e41f1410024741e5803e26f68f2c13567e48eba793f233dfab903459c3335bc169e24b99d66a4c64e617e1f0779732fa9
diff --git a/net-dns/djbdns/djbdns-1.05-r36.ebuild b/net-dns/djbdns/djbdns-1.05-r37.ebuild
index 115ca72ded0b..95606086af30 100644
--- a/net-dns/djbdns/djbdns-1.05-r36.ebuild
+++ b/net-dns/djbdns/djbdns-1.05-r37.ebuild
@@ -6,7 +6,7 @@ inherit readme.gentoo-r1 toolchain-funcs
 
 DESCRIPTION="Collection of DNS client/server software"
 HOMEPAGE="https://cr.yp.to/djbdns.html"
-IPV6_PATCH="test29"
+IPV6_PATCH="test32"
 
 SRC_URI="http://cr.yp.to/djbdns/${P}.tar.gz
 	http://smarden.org/pape/djb/manpages/${P}-man.tar.gz
@@ -36,7 +36,6 @@ src_unpack() {
 }
 
 PATCHES=(
-	"${FILESDIR}/headtail-r1.patch"
 	"${FILESDIR}/dnsroots.patch"
 	"${FILESDIR}/dnstracesort.patch"
 	"${FILESDIR}/string_length_255.patch"
@@ -53,9 +52,8 @@ src_prepare() {
 			# The big ipv6 patch.
 			"${WORKDIR}/${P}-${IPV6_PATCH}.diff"
 			# Fix CVE2008-4392 (ipv6)
-			"${FILESDIR}/CVE2008-4392_0001-dnscache-merge-similar-outgoing-queries-ipv6-test29.patch"
+			"${FILESDIR}/CVE2008-4392_0001-dnscache-merge-similar-outgoing-queries-ipv6-test32.patch"
 			"${FILESDIR}/CVE2008-4392_0002-dnscache-cache-soa-records-ipv6-test29.patch"
-			"${FILESDIR}/makefile-parallel-test25.patch"
 		)
 	else
 		PATCHES=(${PATCHES[@]}
@@ -68,6 +66,14 @@ src_prepare() {
 	fi
 
 	default
+
+	# Change "head -X" to the posix-compatible "head -nX" within the
+	# Makefile. We do this with sed instead of a patch because the ipv6
+	# patch uses some of the surrounding lines; we'd need two versions
+	# of the patch.
+	sed -i Makefile \
+		-e 's/head[[:space:]]\{1,\}\-\([0-9]\{1,\}\)/head -n\1/g' \
+		|| die 'failed to sed head in the Makefile'
 }
 
 src_compile() {
diff --git a/net-dns/djbdns/files/CVE2008-4392_0001-dnscache-merge-similar-outgoing-queries-ipv6-test29.patch b/net-dns/djbdns/files/CVE2008-4392_0001-dnscache-merge-similar-outgoing-queries-ipv6-test32.patch
index 866b3cc51317..3dd47fbeb147 100644
--- a/net-dns/djbdns/files/CVE2008-4392_0001-dnscache-merge-similar-outgoing-queries-ipv6-test29.patch
+++ b/net-dns/djbdns/files/CVE2008-4392_0001-dnscache-merge-similar-outgoing-queries-ipv6-test32.patch
@@ -1,8 +1,8 @@
 diff --git a/Makefile b/Makefile
-index b89243a..626a829 100644
+index cee69a5..5afa9dc 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -348,11 +348,11 @@ stralloc.h iopause.h taia.h tai.h uint64.h taia.h
+@@ -351,11 +351,11 @@ iopause.h taia.h tai.h uint64.h
  	./compile dns_txt.c
  
  dnscache: \
@@ -16,16 +16,17 @@ index b89243a..626a829 100644
  	env.a alloc.a buffer.a libtai.a unix.a byte.a  `cat \
  	socket.lib`
  
-@@ -373,7 +373,7 @@ compile dnscache.c env.h exit.h scan.h strerr.h error.h ip4.h \
- 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
+@@ -374,7 +374,8 @@ dnscache.o: \
+ compile dnscache.c env.h exit.h scan.h strerr.h error.h ip4.h ip6.h \
+ uint16.h uint64.h socket.h uint32.h dns.h stralloc.h gen_alloc.h \
+ iopause.h taia.h tai.h byte.h roots.h fmt.h query.h alloc.h \
+-response.h cache.h ndelay.h log.h okclient.h droproot.h openreadclose.h
++response.h cache.h ndelay.h log.h okclient.h droproot.h openreadclose.h \
++maxclient.h
  	./compile dnscache.c
  
  dnsfilter: \
-@@ -751,11 +751,16 @@ qlog.o: \
+@@ -750,10 +751,15 @@ qlog.o: \
  compile qlog.c buffer.h qlog.h uint16.h
  	./compile qlog.c
  
@@ -36,10 +37,9 @@ index b89243a..626a829 100644
 +
  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
+ uint32.h byte.h dns.h stralloc.h gen_alloc.h iopause.h taia.h tai.h \
+-uint16.h dd.h alloc.h response.h query.h ip6.h
++uint16.h dd.h alloc.h response.h query.h ip6.h qmerge.h
  	./compile query.c
  
  random-ip: \