Revbump theoretically fixing the ipv6 issues.

[mjo-overlay.git] / net-dns / djbdns / djbdns-1.05-r26.ebuild

diff --git a/net-dns/djbdns/djbdns-1.05-r25.ebuild b/net-dns/djbdns/djbdns-1.05-r26.ebuild
similarity index 94%
rename from net-dns/djbdns/djbdns-1.05-r25.ebuild
rename to net-dns/djbdns/djbdns-1.05-r26.ebuild
index 8e8da1641e57a2b37ba66653c8e71d71493817cf..718bd12381f3421b5b152135ccf7604675f74d3a 100644 (file)
--- a/net-dns/djbdns/djbdns-1.05-r25.ebuild
+++ b/net-dns/djbdns/djbdns-1.05-r26.ebuild
@@ -44,26 +44,27 @@ src_prepare() {
        # Fix CVE2009-0858
        epatch "${FILESDIR}/CVE2009-0858_0001-check-response-domain-name-length.patch"
 
+       # Fix CVE2008-4392
+       epatch \
+               "${FILESDIR}/CVE2008-4392_0001-dnscache-merge-similar-outgoing-queries.patch" \
+               "${FILESDIR}/CVE2008-4392_0002-dnscache-cache-soa-records.patch"
+
        if use ipv6; then
                elog "At present dnstrace does NOT support IPv6. It will"\
-                    "be compiled without IPv6 support."
+                        "be compiled without IPv6 support."
                cp -pR "${S}" "${S}-noipv6"
                # Careful -- >=test21 of the IPv6 patch includes the errno patch
                epatch "${DISTDIR}/${P}-${IPV6_PATCH}.diff.bz2"
 
-               # Fix CVE2008-4392
+               # Parts of the ipv6 patch fail due to the CVE2008-4392 fix above.
+               # The following two patches fix those hunks.
                epatch \
-                       "${FILESDIR}/CVE2008-4392_0001-dnscache-merge-similar-outgoing-queries-ipv6.patch" \
-                       "${FILESDIR}/CVE2008-4392_0002-dnscache-cache-soa-records-ipv6.patch"
+                       "${FILESDIR}/query.h-mjo.patch" \
+                       "${FILESDIR}/query.c-mjo.patch"
 
                cd "${S}-noipv6"
        fi
 
-       # Fix CVE2008-4392
-       epatch \
-               "${FILESDIR}/CVE2008-4392_0001-dnscache-merge-similar-outgoing-queries.patch" \
-               "${FILESDIR}/CVE2008-4392_0002-dnscache-cache-soa-records.patch"
-
        epatch "${FILESDIR}/${PV}-errno.patch"
 
        if [[ -n "${DJBDNS_PATCH_DIR}" && -d "${DJBDNS_PATCH_DIR}" ]]