Really do what the previous commit should have.

diff --git a/net-dns/djbdns/Manifest b/net-dns/djbdns/Manifest
index 6736d1edb38dc3e6722ff7c4f280ddfd6eefe072..dd8c5736462b256696518923339344214ef9c997 100644 (file)
--- a/net-dns/djbdns/Manifest
+++ b/net-dns/djbdns/Manifest
@@ -9,11 +9,12 @@ AUX dnsroots-r25.patch 356 RMD160 a864738d886d20eb73f657b93bffccd6d4e758a7 SHA1
 AUX dnstracesort.patch 327 RMD160 aaa564aa9cb0dcad4ebb64121c82bf50fda64254 SHA1 cf8b7825d826bfd3f3314c848a8843c2a5a70ae3 SHA256 f1d83e1365f68571fa4e007d5219720f8d65eb3730040a087fceb0ce2d8806bf
 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 2608 RMD160 b5af23611b5ef12df44278893920b1917d9f7d5e SHA1 9be358adf5bc740b3e088a3b7e28de46352a344f SHA256 f167124a7ea1c36bf4c22fdfdfa6313e11c22f9b400606a5be9015f3c33e1579
 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
 DIST djbdns-1.05.tar.gz 85648 RMD160 a832cbfd93e4ccec6a565492a4ee0b3c1b4b68ed SHA1 2efdb3a039d0c548f40936aa9cb30829e0ce8c3d SHA256 3ccd826a02f3cde39be088e1fc6aed9fd57756b8f970de5dc99fcd2d92536b48
-EBUILD djbdns-1.05-r26.ebuild 3768 RMD160 c94720e5054877e70b839e5a9e6bd8ff2e318179 SHA1 21ff0b69ca766b5e7d88422acaee395b3758321e SHA256 95d7f41163d36c6c9384fec47be9b5da585d6753a268f3342809ca60e81730e6
+EBUILD djbdns-1.05-r27.ebuild 3943 RMD160 e0ea24a4fc6877196db8434b58937635dcc85e6e SHA1 eb4e924f5760d3ab07b2acf9e49de971e6ea7add SHA256 eef13e3bd4cd4977b6f245a8047e4050e2509b0d8a2e40a56e0fd6ef062a5963
 MISC ChangeLog 19007 RMD160 b7c920db6183b8ccfc4682e63b8de6dff63a1516 SHA1 707954ec763701361798825514a098015d83e2a1 SHA256 36df2a604799554de616aa70b1e9a9e730f024b2b3681813836d21bc387d03be
 MISC metadata.xml 232 RMD160 854b06094287201d0b98f2b21d36054db25d81cd SHA1 cc4f98e9ee0102aea687d71cf3af924cf156edbb SHA256 21382e863647add08888c924279a4b931b2b90ccd0cf5e526ee74a3d5e1fd0df

diff --git a/net-dns/djbdns/djbdns-1.05-r27.ebuild b/net-dns/djbdns/djbdns-1.05-r27.ebuild
index 3810514b1b80539db710c4c4d99ae71a0b75bbd2..9b19cdb1b00c6c7c14e2ad4f64275a895a78d297 100644 (file)
--- a/net-dns/djbdns/djbdns-1.05-r27.ebuild
+++ b/net-dns/djbdns/djbdns-1.05-r27.ebuild
@@ -54,6 +54,10 @@ src_prepare() {
                # Careful -- >=test21 of the IPv6 patch includes the errno patch
                epatch "${FILESDIR}/ipv6-mjo.patch"
 
+               # The ipv6 patch is a little sloppy in the Makefile.
+               # Anything depending on socket.h should depend on uint32.h as well.
+               epatch "${FILESDIR}/makefile-uint32-fix.patch"
+
                # Parts of the ipv6 patch fail due to the CVE2008-4392 fix above.
                # The following two patches fix those hunks.
                epatch \