Log Message:
Add DJB's patch to fix the axfrdns bug reported by Matthew Dempsky,
described here:

http://article.gmane.org/gmane.network.djbdns/13864

Add mutually exclusive options, both by Jeff King, to address the
dnscache poisoning weaknesses described in CVE-2008-4392:

* "djbdns-qmerge1" (from http://www.your.org/dnscache/)
* "djbdns-qmerge2" (from \ 
http://article.gmane.org/gmane.network.djbdns/13965)

Both options are included because qmerge1 is better tested but has
known shortcomings, while qmerge2 is probably more correct but (as
yet) less well tested.

Bump PKGREVISION.