Fix FreeBSD Errata. Fix build failure with USE=zfs, reported by NP-Hardass. https://github.com/gentoo/gentoo-portage-rsync-mirror/pull/121 by nigoro.

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

8 files changed, 67 insertions, 268 deletions

diff --git a/sys-freebsd/freebsd-sources/ChangeLog b/sys-freebsd/freebsd-sources/ChangeLog
index fb5f038f2fde..b948ea8743b8 100644
--- a/sys-freebsd/freebsd-sources/ChangeLog
+++ b/sys-freebsd/freebsd-sources/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for sys-freebsd/freebsd-sources
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/ChangeLog,v 1.110 2015/04/10 13:34:44 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/ChangeLog,v 1.111 2015/05/24 08:45:46 mgorny Exp $
+
+*freebsd-sources-10.1-r3 (24 May 2015)
+
+  24 May 2015; Michał Górny <mgorny@gentoo.org> +freebsd-sources-10.1-r3.ebuild,
+  -files/freebsd-sources-10.1-cve-2014-8612.patch,
+  -files/freebsd-sources-10.1-cve-2014-8613.patch,
+  -files/freebsd-sources-10.1-cve-2015-1414.patch,
+  -files/freebsd-sources-10.1-cve-2015-2923.patch,
+  -files/freebsd-sources-10.1-en-1501-vt.patch, -freebsd-sources-10.1-r2.ebuild:
+  Fix FreeBSD Errata. Fix build failure with USE=zfs, reported by NP-Hardass.
+  https://github.com/gentoo/gentoo-portage-rsync-mirror/pull/121 by nigoro.
 
 *freebsd-sources-10.1-r2 (10 Apr 2015)
 
diff --git a/sys-freebsd/freebsd-sources/Manifest b/sys-freebsd/freebsd-sources/Manifest
index 4334025ab193..aafcccfa6f36 100644
--- a/sys-freebsd/freebsd-sources/Manifest
+++ b/sys-freebsd/freebsd-sources/Manifest
@@ -3,11 +3,6 @@ Hash: SHA256
 
 AUX config-GENTOO 73 SHA256 04a7695383baa247120cfd39f399b62c9d9b66682b79bc9bc1117f0aeb95b858 SHA512 436e1e1cb4077488cd1e054a96598c1c6dc2fda5c060d2d6c1bf2986b534016c86ea2afee0dcf883b4bde6946625596ea474a273013b18fdfa5538ebcfe6ea54 WHIRLPOOL 467ed565c0c6b508185f3c7d9a2031ce1861573614ba6fd5db7d6825fdaaabf23b9be1daef035d7fea9fa66f9d92ba17267085e894db66d8c9f49ed4ca9f16b9
 AUX freebsd-sources-10.0-gentoo.patch 713 SHA256 13588f0572ba95c86beb755ce3d681c963e220694e3c0b3aae29faf05f8479da SHA512 98b8d1bf033b9bd7147f10e5bb4a39ac4883ec02ef0cc3825541ff11cb9bfe5e7722e7b8dcefe4c356f9fb0f86ec5cad6fbf9b80dbfd04149142fea5f8712d4d WHIRLPOOL 6372ec9abb566d06db174dd20785ab1768487ac2d57799fabad2d45cb77418f0e39aa0bad745c873e1c50de86a70fa80890f7f2f377f6a53f4fd5b7a6fa49edf
-AUX freebsd-sources-10.1-cve-2014-8612.patch 2097 SHA256 c8ade882a39dd8f65c34b175457cdd93be6eafea67ffb5f977435d48a19b6b68 SHA512 b233ae1d249bdbf516aba611d081a5a6ccaaab32f9e281cce65136c68c6a47362eac33398d6849a45e4e1c30f02a482287d6339069d29ece0aa5c4d9101e24a4 WHIRLPOOL 4713b4d896c561d47686b9f1d53a7e3c912fc58c8039529f0ae244b2cc533aabf20f386a1f9bc8632849ebd084d3739b6be55d4f39a00d484d5d230755497b69
-AUX freebsd-sources-10.1-cve-2014-8613.patch 4181 SHA256 61b5e717e88671ecc3da9c2b11d4c6d5ddc26f529ed19cb8ce588743cd00af9d SHA512 30deeb82af385abb0b57cc02752e72d8dda37688df99038910f04558ab064624cb576b1989ba8a7674e3a9046f9607be90596d9bdfb2f28900568291b0f96717 WHIRLPOOL 1073a364805b0ef8377dae6e3cd1665de6e4e99612549081fd794a4d92b4b4ee583a68e66f089340dc35129e3fb0bcf00b14b5b71304b6dac744d9a852530fbe
-AUX freebsd-sources-10.1-cve-2015-1414.patch 463 SHA256 969674297e3afbacbd3e15fc6621c813149ab044964d47b936761f04f8ff0bd6 SHA512 5668d18c0abcaad53547394bca18fa1060372cd7f59fd35265778ad74bd331ed08fd8c0b0e48fb338bf8d08c427af1b40315855c7d83c9e3c1917b2f22de1f92 WHIRLPOOL ca93b5f794aac22a23c0e14853813439ce9e0a26847aeec3498bf01c7e10cc1829ddde1a2d5d1291bf2a610773846bfef9217199da1a249d4e7df9f4e44a3e46
-AUX freebsd-sources-10.1-cve-2015-2923.patch 872 SHA256 318babf3961a2b99ea5453a5e2b65e4918279110b8c59ee54741ec4d689de227 SHA512 15a938c0c092bd7d40417d18c57401b0e0fea3c9a5976dea55e1fd2329ac5987016a719c7d8a078ce950b49b2096a26a058b5f7c7ba525430a975ab8fe68cb64 WHIRLPOOL 271b0750ddd3a8a88c18dc4e97e601f68419b6ff3ba9d4c0f5611153e945ecbcaea586ed8bb740ab00836370951ba977dc65739b55984fa5e08ecb70079d309d
-AUX freebsd-sources-10.1-en-1501-vt.patch 877 SHA256 0dccdea4622599a50010a5dc7ebd411ad4c662e4a0f387f6faf43550269e9c61 SHA512 caf4b7587d3555aea8291578de03bb158e71ffa42ec323fd8736ea9b690eeac42084d8909a97ea39352573bb78e97fb4f367f2968e70970d68006c82726329a1 WHIRLPOOL a4ca24f7a91e98a97ba2b0d9a5e7c6297baf7ed501582d3f70b180cf596d6d4ccf058b1843abb60c448f17e95ed68ae0d1efa7deff0269c76abadfd3ede0533a
 AUX freebsd-sources-6.0-flex-2.5.31.patch 826 SHA256 8aaf240a344106fc5434fd098eb6555a554d16513b71c95f93a93388021c3d99 SHA512 7183b1923019df12849e7d3984c4227d65275077cf95c3b0719b99dc852234eb3813db0e69e9c34bdfca45a59f7340209211d0b7a2a5074c2d1ad8ea0a3a3f64 WHIRLPOOL 620ae55a54333c55e44247aad76be467bdfa491dac646f65dc0e0b6b1a95fe8edf5087e9ed68abeac1ef6db1a91c0e673342bf44f8753b6b8a5dce889137cdcc
 AUX freebsd-sources-6.1-ntfs.patch 1043 SHA256 2eb0e22bea267d7ac41c3dec81682d3cc1f1744316ea39342e2aaae1f2dca469 SHA512 5401b50ed93bd9155b8adc3f0d6ec81b6e48431bb950cdf468be2e918553e19cd88a1988cdad49be2a34a1db44419cb9eb7067ff0fb1feb8b3f6373aa3c262ad WHIRLPOOL bf4821beae08e002f290286bc290b2bfeac86db46c1597232f06a23e505d720e34841393d9fb4d7276ff7b98c1c133aae5d58c3ec7b8f12712b51260b981bd14
 AUX freebsd-sources-7.0-tmpfs_whiteout_stub.patch 1015 SHA256 7857fc90c6d5ed28d848146d50ab5bcd01f79ad3480ad1335929f08e45afbc44 SHA512 9dc96b967869efd7480785977764e879bf50978b5e609867e678574f9ed1476695690832bdb725eaebc8d93e83b4a0b3fe9f23b94e2de072a6540a168b13c4a7 WHIRLPOOL 6841f24f2d3ff569ff0e7bd4d628955c9b61b41aa039bdd1e736fa82f737842101c212d8ae8961d1db335e53ba332cdbec1d021a4c57520e426926981bca4512
@@ -39,8 +34,16 @@ AUX freebsd-sources-9.1-tcp.patch 1249 SHA256 a51412349a8724931cfc749150e3c07802
 AUX freebsd-sources-9.2-gentoo-gcc.patch 506 SHA256 7457421478066b686dabc9a072ea1a30da8878014d0799220557820fd3a4bbe8 SHA512 cf553ad66b5a55dd2383a55c9a3c5c852985c4842244569aef91596a98481ca12c6189dfdd5fb2badcbe7901a87c81a3e0432cbf10add66dfb481ddcf38ebdcf WHIRLPOOL 42be74cafdad3e43815f638144b3ef8e89a7a95d791a312899a24387bf6a9cbc08acb0b30855d45fed607c6b73a3632afe1a44fb2bcd5738f76a7cf444b39218
 AUX freebsd-sources-9.2-gentoo.patch 716 SHA256 9a196adef145f57bf960b936f69065f6793df55420ef010c04f76578eb5d1e23 SHA512 3f6d9c4e2e3ee34058bc44ffae87c1de82e70f03d31635f27e477437f3ad4e003d2f3d6c4ab393d18dfc8eeab4cbc0af4a25227ca5d48bcd579dc07bbe3bd7f1 WHIRLPOOL 4b0207d4ffffda9daa88663b638b542acb2f567284ef4456cd18fe74770793666bb5e9de34f02b1dbf29fa79d8bae9305ad84d5cf378510004b926beacb7250d
 AUX freebsd-sources-cve-2012-0217.patch 856 SHA256 9b752e65a29b2b9a4a1412765d69d00310c05508af1cfa6d8d3c16d545bb3ffe SHA512 b1ac18cae23b81fd5ab2fcb44bb9f9808d6eb80f52b8572b81296fdd0b18edee62460520bc753848283d67e13367bf99775a2a5c6cf0272def9cdff6ec6fa4d9 WHIRLPOOL 27e4d0647c5275b77123bef6b866ac841af4b1b547fc663f776da82a7889995eba21b930adeabf2a71b3fbe053d2af5583cbdb6e8fd16a0379d10214d24b9121
+DIST freebsd-cddl-10.1.tar.xz 1203704 SHA256 8dab2c642c942fab76db0a5e6223fb1bee172d60f26190a81eb752b12ee9e3bf SHA512 1351e7b0b449917dca7267df2a549e1807f9acf76c0023ca917e9757e5bb1ec2dca867dd0bb1abd6a3b02b26a16ffde28768dc074beb1f43df5453c0611d5ffc WHIRLPOOL 1fb03e4d1b891e0f15ca08a49e0f346b1d609a59ecb1ddabb993ad6ee73017f2f2f0b3e41d56f79e0915d678d59eda5b8886ad9c3da1b2bb0d34165a21f4a387
 DIST freebsd-contrib-10.1.tar.xz 55446392 SHA256 c518005bc333788dfde2c9d67fd7069c7d49e48f8de7c3f44ad9178902705d79 SHA512 b9f36a478f66bae1626c63f5731228e565be7a41576f0ede9d7660cb69d584a3bb5cf37ff7f8dcafbfd737bf4cedf27cff7e97c8e26b4d77db78a9433db8d1cd WHIRLPOOL 359bda77e92699c4adb6641d699b45812933b8f97090e547a1d201cbb358e611961c5dc33b66eb2ff6516c4207a835923b5c3bebd80710ba1966361a54e42f1f
 DIST freebsd-sources-9.1-en-13-03.patch 32571 SHA256 8bafbaba1b23f4651a9e578dbbb3b8d9b4a0a28dc1702f6dc17a40728b861595 SHA512 013a21da3618da9098020c85abe42d99e4eeb8d6b9b818cd5c6d27ee2ea2d31b60ad4521e73cb996f2f5c99fd0f34bd4a35458977264c51e79f4f53bfca6e7cc WHIRLPOOL c7b0a56efd9cebecde56590cacb1ee743845ce13577505255deca44c167d679ce94c759cfb363c26a5f2a9fc16dfc06d17eea18d638fd72c21ec0fdd81a71c5f
+DIST freebsd-sources-EN-1501-vt.patch 877 SHA256 0dccdea4622599a50010a5dc7ebd411ad4c662e4a0f387f6faf43550269e9c61 SHA512 caf4b7587d3555aea8291578de03bb158e71ffa42ec323fd8736ea9b690eeac42084d8909a97ea39352573bb78e97fb4f367f2968e70970d68006c82726329a1 WHIRLPOOL a4ca24f7a91e98a97ba2b0d9a5e7c6297baf7ed501582d3f70b180cf596d6d4ccf058b1843abb60c448f17e95ed68ae0d1efa7deff0269c76abadfd3ede0533a
+DIST freebsd-sources-EN-1505-ufs.patch 9811 SHA256 a589df05e8532bbe302282ba11e9d6caa50107b1673291218be48241ac3bcc3a SHA512 f24786afa6fafce28ec7221a71cc879119d0fa06a63e3c051aa7ecd609ed58360421b41918208d5182ab95a81da6ecdff6070d7b7ca6a2263aff3ce95c87ca26 WHIRLPOOL 0618d6c72c6980efe4169a02fc221aed072c0fdca22499457f90b64b31248390d2de2b5d845fed33f328cd3a36a03899a6b19857047f8ee1e087f03e7b4559a4
+DIST freebsd-sources-SA-1502-sctp.patch 2097 SHA256 c8ade882a39dd8f65c34b175457cdd93be6eafea67ffb5f977435d48a19b6b68 SHA512 b233ae1d249bdbf516aba611d081a5a6ccaaab32f9e281cce65136c68c6a47362eac33398d6849a45e4e1c30f02a482287d6339069d29ece0aa5c4d9101e24a4 WHIRLPOOL 4713b4d896c561d47686b9f1d53a7e3c912fc58c8039529f0ae244b2cc533aabf20f386a1f9bc8632849ebd084d3739b6be55d4f39a00d484d5d230755497b69
+DIST freebsd-sources-SA-1503-sctp.patch 4181 SHA256 61b5e717e88671ecc3da9c2b11d4c6d5ddc26f529ed19cb8ce588743cd00af9d SHA512 30deeb82af385abb0b57cc02752e72d8dda37688df99038910f04558ab064624cb576b1989ba8a7674e3a9046f9607be90596d9bdfb2f28900568291b0f96717 WHIRLPOOL 1073a364805b0ef8377dae6e3cd1665de6e4e99612549081fd794a4d92b4b4ee583a68e66f089340dc35129e3fb0bcf00b14b5b71304b6dac744d9a852530fbe
+DIST freebsd-sources-SA-1504-igmp-errata.patch 1105 SHA256 de2a7a42a8212754f716629e52e1572f7bd7b274dfd999bda680ba813bcbf54e SHA512 89f3627bdbaa31c5e3b189bc6bb914bff69e54d3f6bf8caaa24f4067db3aba48d8b901146c7eeb186da5426ff7c9e9229ff9ef197bbd45f8bf1011348c30343c WHIRLPOOL aea0b508c992740094599c516aa6987c1a47c302ffb4a3a0f31b66148f63a21b76921be393caf9c10840152dc6bb4aa4d64e7e65725cc9c00a643e8f3d926957
+DIST freebsd-sources-SA-1504-igmp.patch 463 SHA256 969674297e3afbacbd3e15fc6621c813149ab044964d47b936761f04f8ff0bd6 SHA512 5668d18c0abcaad53547394bca18fa1060372cd7f59fd35265778ad74bd331ed08fd8c0b0e48fb338bf8d08c427af1b40315855c7d83c9e3c1917b2f22de1f92 WHIRLPOOL ca93b5f794aac22a23c0e14853813439ce9e0a26847aeec3498bf01c7e10cc1829ddde1a2d5d1291bf2a610773846bfef9217199da1a249d4e7df9f4e44a3e46
+DIST freebsd-sources-SA-1509-ipv6.patch 872 SHA256 318babf3961a2b99ea5453a5e2b65e4918279110b8c59ee54741ec4d689de227 SHA512 15a938c0c092bd7d40417d18c57401b0e0fea3c9a5976dea55e1fd2329ac5987016a719c7d8a078ce950b49b2096a26a058b5f7c7ba525430a975ab8fe68cb64 WHIRLPOOL 271b0750ddd3a8a88c18dc4e97e601f68419b6ff3ba9d4c0f5611153e945ecbcaea586ed8bb740ab00836370951ba977dc65739b55984fa5e08ecb70079d309d
 DIST freebsd-sys-10.1.tar.xz 33703720 SHA256 51d19f65846387140744d73ece99a81c35e554ee11b361fabb008e8b0c7451ed SHA512 9625cd876912c303bed6403e1a7694a4b3923783eba306ba19c6e31f2fe5c39c3287746b808d136bec05e11a1eaf5d63e4016797c145140fbeb09c68ae7f4a9b WHIRLPOOL a352b4f846c5e7ba849dfd7acc22637aec8594ce3ac19f975f20659ba6d1a091ca417be4f6973c87d39c8c8d5b0aa1e7cc09afa5cc4ad7cdbc3d47f50e61e428
 DIST freebsd-sys-8.2.tar.bz2 25835329 SHA256 0c6c7b61aae94db2931f985d5899f3bca78fc8ffab6b598fbaa158142d676f16 SHA512 6ea4516a5c52e25c4f993f7acb875463a5caea93dbdf250c5d48eee95fff226956e9f030cab7e341b5e6a132325bc3dbf93dcb4b1185acb011918e50b1a22be3 WHIRLPOOL 870deeff877c6b9fc812a4260e4fdbb6715a5dc2065cab3bfbf2a42d876f6654703ccb124275a4e2c410cef48f3db02b63cc76059eccf9cf90244826f35b7a15
 DIST freebsd-sys-9.1.tar.bz2 32588103 SHA256 b93a7ac8334ac16cc9f60665048e5ef812c0a6c62f10d0b0a674aec3f56516a8 SHA512 7dc9d9e00dde8f592bb171f4386d02b655b73cb4f153fe5ec063d010a148ef0639eae0dcdb3eeb09ecd1e3653c69e49a2d261329fa6d0381d2ddabe258ddde6d WHIRLPOOL c8348344dfb14bad64bd3a78ee615ddd29203175b292233254f8ba175e7a3fb7218af6f95f7b4dbf394c0354bafe9d8bb0c21cdf0ceaeb697214964b280469b3
@@ -49,7 +52,7 @@ DIST freebsd-sys-9.2_rc1.tar.bz2 34377450 SHA256 0db609374f4922e026779331a3299cf
 DIST freebsd-sys-9.2_rc2.tar.bz2 34381761 SHA256 2cf28a18adf0d22c0d141f2ee0c7a8b4167a232b2f488389a1b9777c0fc3259f SHA512 1ac4ae1e04f44bbe9687722fc21633e7ea5e0990327f079dfb3239dca1fc6f92a587e4f5d9fa4ec6112b99ce57297f5394303d5907b04f7a3eaeff7a1c71bac0 WHIRLPOOL 734a3911efcc3253bf8e04eb57130b227b38f9e8666aeb50fc608af42ed8ca080016b3062d59ddc585890693bdb64d4a90a0fa7287a0bc62ede4ad445140223f
 DIST freebsd-sys-9.2_rc3.tar.bz2 34386428 SHA256 86fd03137f39a8544174dd26f4096da022c1ecfa447a1e7c9e4e241428b94947 SHA512 233181db24063e6afe1dc3e17280e2b89a39529961814640bd52d6efa1bd9f9212ab2a467266df7cd1c52654e1759f124df5d4fa439862397816623d46f3af40 WHIRLPOOL 4d7a065decda622550b16b2583b133f9b3d42aca4e6707a53012bbac9e5eb62b2fbdfc84d9cc0b666c9685e8f9abd6c9b7c9f46ce23e7b16a90a05530f45cc9b
 DIST freebsd-ubin-10.1.tar.xz 1918648 SHA256 92d09ffb4de7cf955e9937ebd39f1cf0c8ff9e0fe0bdef4f30b6003241849361 SHA512 18507ca084294d9ce6e858914e0d37371217c0aeafda9633268a90b9efc7c8c6709a271e3e2c279d14d74d03162c257ec0ccedeb0f4aae4513baeca82fcec409 WHIRLPOOL 23649e668ff2cadd5f16fe5c2fb2b4e14d261dec32c24c232a41a7e88363cc16c97f7226affc25e35ff31865fa632cfbf49fb1ab2375786942d2e5949670685e
-EBUILD freebsd-sources-10.1-r2.ebuild 4221 SHA256 6ff56a2f89939ad901a00a1e46c893bab1ecdfc97d5282d86e3e7831a27dab3b SHA512 0eb189c870cbf78006ffb600863f5a90ea379fdb5e6738af28de8ef148e919154a4f4f47a06dcabd89b3b2dbdbf5e021361c4a47879066ff234d796b0fd191fa WHIRLPOOL 97c1aa97a8eed181da7b8062673294ffd576b7d6f1df2e4984d95356504c44483a2abc7d414de96a98c36bcfd098183e6792fb79497ac2a5f1e52f870dc66a5f
+EBUILD freebsd-sources-10.1-r3.ebuild 4838 SHA256 d3fa3ddcc218deb289d9e1469c6bfc950046d2ebda3839baf1c780d1f5946d79 SHA512 0584939dc33accde70ed0f578c707143cac0d00bf428dfbaf9db14253f3e5fc8f17b8dbc3e0cd10812fd97103f0dd592d60702815ad260a20343dc78528df4ea WHIRLPOOL 4d552ee4167d66b3edbfd8db0f40d61756b84e1427be2ba75bd901c6f4d9316b3689c89539bb78271c4061e1badc345856348342568bf5177811d19246263a67
 EBUILD freebsd-sources-8.2-r2.ebuild 3801 SHA256 1766a68e4f3191690a805d89280250a549fdbe0ef08ca9962c0aa46256ff0762 SHA512 85b3793d6042a4db9409dd42e90e37e67d880d5ff5996834b467662c60febab7a63d9f13176b549fa93a8aa4ae212f80e42e0742c16de910e5f3c85b06ef3059 WHIRLPOOL 91deb75cdfb47e561cbf842a2ca70be4ea4af4216c1a97e598f6bdc3b9c796d822c7ba5cba8edced1a6a43a2a9bd15e7d31e8d9b292965d24792bc88a557ac15
 EBUILD freebsd-sources-9.1-r3.ebuild 2648 SHA256 40075f5d40a1f1d1cb53cce9fba58a45cfdf3fc358b379ff5f502bda21e7c010 SHA512 f51c6eb2d56f8207ecf77ccd7630e5fa3c78db6d30bf21dc84d0c602643a68e0b10e67824c161b198a8d1311ad34543ec5ec1c71008c86c21b71c9e05a417272 WHIRLPOOL 9c5f574e177e52cca80466f51a27fa6341c29db4970a70e0d9ab26a76e66328fac70c0ce99df63d2ed8ee26f6153da9f1a4a94c76f1a0aa792094e19e3524e00
 EBUILD freebsd-sources-9.1-r9.ebuild 3189 SHA256 cf16bf2ff54bc8ca37e42581c2d40cff0771c4fa527d08ed4c440817fe98d267 SHA512 a918e8f72abd21851c547c8c86843f8c89c3b1b3e92f7d34a30fbfb7681a4b4dc30690c176b0e8f8840f1ad082bf48de0eeb199062ec475ca8a5708fa8071e90 WHIRLPOOL a00bb3b64f4d0a2952a0df5f4b3bb82103eedbf29adad611f7090fa593f247dcc025613ba1f49c22698e3aeb396bf93843679490071b4e04bdf8498ddb4f09b0
@@ -57,24 +60,24 @@ EBUILD freebsd-sources-9.2.ebuild 3142 SHA256 a2e5782e94e9a309f212e52c5b994a712a
 EBUILD freebsd-sources-9.2_rc1.ebuild 3146 SHA256 a5ff139aa2daf1ee0f7294195b26ac0e3b39c9bab9c25c3bcb2fa361a609bb9b SHA512 a2e9a234d522d858f1a0b5a6ffd26a4742319d36d6034bb2f1d79b343fdc3b67eddda62c38214760ca347a0308685526cbf45149d418bea2e2fe994efa58a30a WHIRLPOOL 02bb6b335165e85597f1227a63cdc55bc7df796819764a74623764e44ec09098cedec2750c3b21d053cfd36acf11eea2a0b19808c858afd4882d82947f2c33e3
 EBUILD freebsd-sources-9.2_rc2.ebuild 3146 SHA256 c70294b76b6ee163b413eed0270bb53294c77d5015d2dabd4d526f49e2c67e7f SHA512 392af1b6eaef5b493ac9fc568a1fe4f067cd12e9bd45f2bf79fd5602cddc4ce7f7543dc243d556e4ecd35733cf5d68573562082c014175a33ea702094c2974f9 WHIRLPOOL db8f01671a1c248e68f1aafa3f814856ef986df06fe02952fff029b6b66f12602edcb962640a2e76574778d40e04ed6bdc822b7daf24d8f2946dc108b8a565d4
 EBUILD freebsd-sources-9.2_rc3.ebuild 3146 SHA256 543d274c0ede9a96e3442cb5c4fe50990b60a5dfd8d597fb9eda9167ee79e38b SHA512 cd1c298137cc28237288e3a03f44a79e50685085784057491400db5fe2b2d3bf2d78f379b65ec7d196522a092c960675829f83ea25cf7fbae29a5ddbc1426e5a WHIRLPOOL f054a506e354216344b8dc3baccf18302267e0f5cbd1e8d3a1bb0749d94268bf157d05d07c6ac93dee20f11d4af6e5c1f76b6f3846fc21ab0c03dc02df0c70fb
-MISC ChangeLog 27980 SHA256 3cf879fbe9da085ad5349b234042a0063353afff47a210d1a9b5f17b91063878 SHA512 6a8d3a5514aba1694c4668c44e920e23f8d9d64866ddfe3937e7916a344652a4306605d8f29f8fa9beede6c026623590f1bfeaefeae490a0341ce92e29e580e0 WHIRLPOOL c125f327b03442f4fad89a2b787fc0efb8608e4353650b640b93873ec8ebed80a8e4c0ec414e9264d76710e5e0511afcaec18e600a7b03634156e741240a0fa1
+MISC ChangeLog 28543 SHA256 8c5b032fe7605e5fcad4d88dd3b2d61ef1f87f751bb396a75be901659903e674 SHA512 df01d6dcac112197188c638e2b6a3d08932608873e4c007bc15a793c6d7fbaa8c2d5d8ffb4f3811aa4c6ffbf12f652e3c01316722db5a0035f3925b839215258 WHIRLPOOL 66758b0d6ea42c5374fa185913d948840a7fcc3d3b84c4cc9bdcf94cba378563761891708a51f5bd6fad5ee9572a2c368771bebab944fb8bca60ffb2d78a68ce
 MISC metadata.xml 442 SHA256 17c155d89c131666e8d51f90a65e90de3c5c7ebcb0d82cf867b88f973636a839 SHA512 8460234a38bd7c449ab40a2053a5f83ebdb633befdd21dab64074ba8c5e7202ebb6bed39e6c65940d4ce35bd806ca0e481159263124e96e01e6f802aeabeaaff WHIRLPOOL 5127cb0e07ff5a52af42b943bc978608ae512af28ce18a0ee319f7143a0b2addb0d0633fe203050a9a8faab66145d2454352dd1367c2c0a21d6d18b9bc8407bd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQJ8BAEBCABmBQJVJ9F1XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJVYY+9XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOLJEP/1vDuIIW7kpu51Z/KKvLeWpm
-iQt9EhC/QR1TG77lLbcmb6WdMQ+5wpHPbpaHYIgPigPhMHZfR3jbBMuBC2FsQvQ/
-dHLh7eC9+VetjacG+2TRhih2APEaa83cu+rV53w3On1pL921JSi2idND1fIZTtD0
-4HPk42oMzP9OBcRpFunAuXoRaETRl3aHATMPAH8OsHkVqh4w+b3V5eT5TlolkmBV
-BzdR/UXlOj2vS2ctsbzEXmnxZzY49dtovc8wvaRlBwz2I/asYg32bq9hgq7G4a4V
-BDkf5v5R3N6ba4RAIoVZFRpPzOniBW9YrwK7FXR1TO/A7zGI4LHPYTXFMD2xz0TN
-Vf7cISBJL8CSjdWm+Qw5uylTCcrHHlr5OV+dzdFfHwAKnhhqgElalmBQKN5y7Q+H
-7z2ejpR19PS99w32t62szmS4kOSbPg1O2NMUJwKfs5RhtFKZtmqibdpLadTXrO7G
-ZZVNgu3cpWb1TZIbUfN9zHTjvLlm6CiA7dJPA5GwagFGZQEW6w2waQABdfxo6dDO
-El4xdtaaTpvhWgbELpZgQL9WQzrEPolBdmSMmGAW0AMSN5WgZRxcryGBWr4o/uUs
-YuNLQC5ZvGarhYzsEJI2w+VsN0uEyTwkAYG+F0ZhxfwTkC5RqxTZUpk9ceC8IRtn
-PQBUK+iqGA96ZoBkT1Yh
-=ogNJ
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOh7oP/1vGQyef9ja09b/mbp66ScKU
+2PaebQPH54mI21jEnD2PU+swztDJFImy5q7KcK6l/5pn579lCd+180atioUUrg22
+Q0QK+P+/sizQHtGENdBHiUDVV6isStRRIS7UBpQPyjsKf1JDAoqoZIuyfaCaHytH
+5W4LxoEBRxWYDzJmWo00aUoiIKf4lrqqSccdox11oLy5p3DOFMUidw4q26I97r46
+Ud1tyqM64NwmR3KpNDCwhalAXdTAFSeS85f4jy61DxG+oQI468yqAokHvGx6VBdr
+ahc3uCRG/VrHBfyHKx5I9x1BrjbM5oa3pVSFeaBLkG2nAZbGVO0JmmkJyt+T2YOS
+h6hGg2XX3sOKMJQf1qglF1tGS4G2bl1NGfbqHWQGkgbe83vx+XGsy1rEZI39dYal
+S5NJMDMTyaVKMEXQ+/MZ5yGaB1kSHXiHwG2OY9l+ZeZJuWTbHzqwgQ5w3ay4+gmc
+VNdwJZXwGxuFZbUVUpLeeuK1zFmmpv0JbopkFrgCjhAdr+q7m/2i0Nmq8eTRc5kz
+mUh4uMKrKBGH0Fejctzf58vLTNBojzsadz39iOvQU7DQ2koEZ1nSYKbiE0EpauvR
+TYpY5iqls9nJB4hIM4doAK28MK/fQzFE96Z8/TwL1hn2s5GfLKxGO3UV0bXnb0sM
+nazWjksbWdHssEJZG3ap
+=XltF
 -----END PGP SIGNATURE-----
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-10.1-cve-2014-8612.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-10.1-cve-2014-8612.patch
deleted file mode 100644
index 7c615d3682b2..000000000000
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-10.1-cve-2014-8612.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-Index: sys/netinet/sctp_usrreq.c
-===================================================================
---- sys/netinet/sctp_usrreq.c	(revision 277788)
-+++ sys/netinet/sctp_usrreq.c	(working copy)
-@@ -1863,8 +1863,9 @@ flags_out:
- 			SCTP_CHECK_AND_CAST(av, optval, struct sctp_stream_value, *optsize);
- 			SCTP_FIND_STCB(inp, stcb, av->assoc_id);
- 			if (stcb) {
--				if (stcb->asoc.ss_functions.sctp_ss_get_value(stcb, &stcb->asoc, &stcb->asoc.strmout[av->stream_id],
--				    &av->stream_value) < 0) {
-+				if ((av->stream_id >= stcb->asoc.streamoutcnt) ||
-+				    (stcb->asoc.ss_functions.sctp_ss_get_value(stcb, &stcb->asoc, &stcb->asoc.strmout[av->stream_id],
-+				    &av->stream_value) < 0)) {
- 					SCTP_LTRACE_ERR_RET(inp, NULL, NULL, SCTP_FROM_SCTP_USRREQ, EINVAL);
- 					error = EINVAL;
- 				} else {
-@@ -4032,8 +4033,9 @@ sctp_setopt(struct socket *so, int optname, void *
- 			SCTP_CHECK_AND_CAST(av, optval, struct sctp_stream_value, optsize);
- 			SCTP_FIND_STCB(inp, stcb, av->assoc_id);
- 			if (stcb) {
--				if (stcb->asoc.ss_functions.sctp_ss_set_value(stcb, &stcb->asoc, &stcb->asoc.strmout[av->stream_id],
--				    av->stream_value) < 0) {
-+				if ((av->stream_id >= stcb->asoc.streamoutcnt) ||
-+				    (stcb->asoc.ss_functions.sctp_ss_set_value(stcb, &stcb->asoc, &stcb->asoc.strmout[av->stream_id],
-+				    av->stream_value) < 0)) {
- 					SCTP_LTRACE_ERR_RET(inp, NULL, NULL, SCTP_FROM_SCTP_USRREQ, EINVAL);
- 					error = EINVAL;
- 				}
-@@ -4043,10 +4045,12 @@ sctp_setopt(struct socket *so, int optname, void *
- 					SCTP_INP_RLOCK(inp);
- 					LIST_FOREACH(stcb, &inp->sctp_asoc_list, sctp_tcblist) {
- 						SCTP_TCB_LOCK(stcb);
--						stcb->asoc.ss_functions.sctp_ss_set_value(stcb,
--						    &stcb->asoc,
--						    &stcb->asoc.strmout[av->stream_id],
--						    av->stream_value);
-+						if (av->stream_id < stcb->asoc.streamoutcnt) {
-+							stcb->asoc.ss_functions.sctp_ss_set_value(stcb,
-+							    &stcb->asoc,
-+							    &stcb->asoc.strmout[av->stream_id],
-+							    av->stream_value);
-+						}
- 						SCTP_TCB_UNLOCK(stcb);
- 					}
- 					SCTP_INP_RUNLOCK(inp);
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-10.1-cve-2014-8613.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-10.1-cve-2014-8613.patch
deleted file mode 100644
index 1e2fe912335c..000000000000
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-10.1-cve-2014-8613.patch
+++ /dev/null
@@ -1,119 +0,0 @@
-Index: sys/netinet/sctp_input.c
-===================================================================
---- sys/netinet/sctp_input.c	(revision 277788)
-+++ sys/netinet/sctp_input.c	(working copy)
-@@ -3649,6 +3649,9 @@ sctp_handle_stream_reset_response(struct sctp_tcb
- 					/* huh ? */
- 					return (0);
- 				}
-+				if (ntohs(respin->ph.param_length) < sizeof(struct sctp_stream_reset_response_tsn)) {
-+					return (0);
-+				}
- 				if (action == SCTP_STREAM_RESET_RESULT_PERFORMED) {
- 					resp = (struct sctp_stream_reset_response_tsn *)respin;
- 					asoc->stream_reset_outstanding--;
-@@ -4037,7 +4040,7 @@ __attribute__((noinline))
- 	    sctp_handle_stream_reset(struct sctp_tcb *stcb, struct mbuf *m, int offset,
-         struct sctp_chunkhdr *ch_req)
- {
--	int chk_length, param_len, ptype;
-+	uint16_t remaining_length, param_len, ptype;
- 	struct sctp_paramhdr pstore;
- 	uint8_t cstore[SCTP_CHUNK_BUFFER_SIZE];
- 	uint32_t seq = 0;
-@@ -4050,7 +4053,7 @@ __attribute__((noinline))
- 	int num_param = 0;
- 
- 	/* now it may be a reset or a reset-response */
--	chk_length = ntohs(ch_req->chunk_length);
-+	remaining_length = ntohs(ch_req->chunk_length) - sizeof(struct sctp_chunkhdr);
- 
- 	/* setup for adding the response */
- 	sctp_alloc_a_chunk(stcb, chk);
-@@ -4088,20 +4091,27 @@ strres_nochunk:
- 	ch->chunk_length = htons(chk->send_size);
- 	SCTP_BUF_LEN(chk->data) = SCTP_SIZE32(chk->send_size);
- 	offset += sizeof(struct sctp_chunkhdr);
--	while ((size_t)chk_length >= sizeof(struct sctp_stream_reset_tsn_request)) {
-+	while (remaining_length >= sizeof(struct sctp_paramhdr)) {
- 		ph = (struct sctp_paramhdr *)sctp_m_getptr(m, offset, sizeof(pstore), (uint8_t *) & pstore);
--		if (ph == NULL)
-+		if (ph == NULL) {
-+			/* TSNH */
- 			break;
-+		}
- 		param_len = ntohs(ph->param_length);
--		if (param_len < (int)sizeof(struct sctp_stream_reset_tsn_request)) {
--			/* bad param */
-+		if ((param_len > remaining_length) ||
-+		    (param_len < (sizeof(struct sctp_paramhdr) + sizeof(uint32_t)))) {
-+			/* bad parameter length */
- 			break;
- 		}
--		ph = (struct sctp_paramhdr *)sctp_m_getptr(m, offset, min(param_len, (int)sizeof(cstore)),
-+		ph = (struct sctp_paramhdr *)sctp_m_getptr(m, offset, min(param_len, sizeof(cstore)),
- 		    (uint8_t *) & cstore);
-+		if (ph == NULL) {
-+			/* TSNH */
-+			break;
-+		}
- 		ptype = ntohs(ph->param_type);
- 		num_param++;
--		if (param_len > (int)sizeof(cstore)) {
-+		if (param_len > sizeof(cstore)) {
- 			trunc = 1;
- 		} else {
- 			trunc = 0;
-@@ -4113,6 +4123,9 @@ strres_nochunk:
- 		if (ptype == SCTP_STR_RESET_OUT_REQUEST) {
- 			struct sctp_stream_reset_out_request *req_out;
- 
-+			if (param_len < sizeof(struct sctp_stream_reset_out_request)) {
-+				break;
-+			}
- 			req_out = (struct sctp_stream_reset_out_request *)ph;
- 			num_req++;
- 			if (stcb->asoc.stream_reset_outstanding) {
-@@ -4126,6 +4139,9 @@ strres_nochunk:
- 		} else if (ptype == SCTP_STR_RESET_ADD_OUT_STREAMS) {
- 			struct sctp_stream_reset_add_strm *str_add;
- 
-+			if (param_len < sizeof(struct sctp_stream_reset_add_strm)) {
-+				break;
-+			}
- 			str_add = (struct sctp_stream_reset_add_strm *)ph;
- 			num_req++;
- 			sctp_handle_str_reset_add_strm(stcb, chk, str_add);
-@@ -4132,6 +4148,9 @@ strres_nochunk:
- 		} else if (ptype == SCTP_STR_RESET_ADD_IN_STREAMS) {
- 			struct sctp_stream_reset_add_strm *str_add;
- 
-+			if (param_len < sizeof(struct sctp_stream_reset_add_strm)) {
-+				break;
-+			}
- 			str_add = (struct sctp_stream_reset_add_strm *)ph;
- 			num_req++;
- 			sctp_handle_str_reset_add_out_strm(stcb, chk, str_add);
-@@ -4156,6 +4175,9 @@ strres_nochunk:
- 			struct sctp_stream_reset_response *resp;
- 			uint32_t result;
- 
-+			if (param_len < sizeof(struct sctp_stream_reset_response)) {
-+				break;
-+			}
- 			resp = (struct sctp_stream_reset_response *)ph;
- 			seq = ntohl(resp->response_seq);
- 			result = ntohl(resp->result);
-@@ -4167,7 +4189,11 @@ strres_nochunk:
- 			break;
- 		}
- 		offset += SCTP_SIZE32(param_len);
--		chk_length -= SCTP_SIZE32(param_len);
-+		if (remaining_length >= SCTP_SIZE32(param_len)) {
-+			remaining_length -= SCTP_SIZE32(param_len);
-+		} else {
-+			remaining_length = 0;
-+		}
- 	}
- 	if (num_req == 0) {
- 		/* we have no response free the stuff */
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-10.1-cve-2015-1414.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-10.1-cve-2015-1414.patch
deleted file mode 100644
index eeb65e04147e..000000000000
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-10.1-cve-2015-1414.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: sys/netinet/igmp.c
-===================================================================
---- sys/netinet/igmp.c	(revision 278973)
-+++ sys/netinet/igmp.c	(working copy)
-@@ -1533,8 +1533,8 @@ igmp_input(struct mbuf *m, int off)
- 		case IGMP_VERSION_3: {
- 				struct igmpv3 *igmpv3;
- 				uint16_t igmpv3len;
--				uint16_t srclen;
--				int nsrc;
-+				uint16_t nsrc;
-+				int srclen;
- 
- 				IGMPSTAT_INC(igps_rcv_v3_queries);
- 				igmpv3 = (struct igmpv3 *)igmp;
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-10.1-cve-2015-2923.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-10.1-cve-2015-2923.patch
deleted file mode 100644
index 430e1b192ab1..000000000000
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-10.1-cve-2015-2923.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Index: sys/netinet6/nd6_rtr.c
-===================================================================
---- sys/netinet6/nd6_rtr.c	(revision 280920)
-+++ sys/netinet6/nd6_rtr.c	(working copy)
-@@ -296,8 +296,16 @@ nd6_ra_input(struct mbuf *m, int off, int icmp6len
- 	}
- 	if (nd_ra->nd_ra_retransmit)
- 		ndi->retrans = ntohl(nd_ra->nd_ra_retransmit);
--	if (nd_ra->nd_ra_curhoplimit)
--		ndi->chlim = nd_ra->nd_ra_curhoplimit;
-+	if (nd_ra->nd_ra_curhoplimit) {
-+		if (ndi->chlim < nd_ra->nd_ra_curhoplimit)
-+			ndi->chlim = nd_ra->nd_ra_curhoplimit;
-+		else if (ndi->chlim != nd_ra->nd_ra_curhoplimit) {
-+			log(LOG_ERR, "RA with a lower CurHopLimit sent from "
-+			    "%s on %s (current = %d, received = %d). "
-+			    "Ignored.\n", ip6_sprintf(ip6bufs, &ip6->ip6_src),
-+			    if_name(ifp), ndi->chlim, nd_ra->nd_ra_curhoplimit);
-+		}
-+	}
- 	dr = defrtrlist_update(&dr0);
-     }
- 
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-10.1-en-1501-vt.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-10.1-en-1501-vt.patch
deleted file mode 100644
index ef2d235240f3..000000000000
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-10.1-en-1501-vt.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Index: sys/dev/vt/vt_core.c
-===================================================================
---- sys/dev/vt/vt_core.c	(revision 278106)
-+++ sys/dev/vt/vt_core.c	(working copy)
-@@ -1719,14 +1719,16 @@ skip_thunk:
- 		}
- 		VT_UNLOCK(vd);
- 		return (EINVAL);
--	case VT_WAITACTIVE:
-+	case VT_WAITACTIVE: {
-+		unsigned int idx;
-+
- 		error = 0;
- 
--		i = *(unsigned int *)data;
--		if (i > VT_MAXWINDOWS)
-+		idx = *(unsigned int *)data;
-+		if (idx > VT_MAXWINDOWS)
- 			return (EINVAL);
--		if (i != 0)
--			vw = vd->vd_windows[i - 1];
-+		if (idx > 0)
-+			vw = vd->vd_windows[idx - 1];
- 
- 		VT_LOCK(vd);
- 		while (vd->vd_curwindow != vw && error == 0)
-@@ -1733,6 +1735,7 @@ skip_thunk:
- 			error = cv_wait_sig(&vd->vd_winswitch, &vd->vd_lock);
- 		VT_UNLOCK(vd);
- 		return (error);
-+	}
- 	case VT_SETMODE: {    	/* set screen switcher mode */
- 		struct vt_mode *mode;
- 		struct proc *p1;
diff --git a/sys-freebsd/freebsd-sources/freebsd-sources-10.1-r2.ebuild b/sys-freebsd/freebsd-sources/freebsd-sources-10.1-r3.ebuild
index ed7b2632bbc9..961c043b092b 100644
--- a/sys-freebsd/freebsd-sources/freebsd-sources-10.1-r2.ebuild
+++ b/sys-freebsd/freebsd-sources/freebsd-sources-10.1-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/freebsd-sources-10.1-r2.ebuild,v 1.1 2015/04/10 13:34:44 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/freebsd-sources-10.1-r3.ebuild,v 1.1 2015/05/24 08:45:46 mgorny Exp $
 
 EAPI=5
 
@@ -11,11 +11,22 @@ SLOT="0"
 
 IUSE="+build-kernel debug dtrace profile zfs"
 
+# Security Advisory and Errata patches.
+UPSTREAM_PATCHES=( "SA-15:02/sctp.patch"
+	"SA-15:03/sctp.patch"
+	"SA-15:04/igmp.patch"
+	"SA-15:04/igmp-errata.patch"
+	"SA-15:09/ipv6.patch"
+	"EN-15:01/vt.patch"
+	"EN-15:05/ufs.patch" )
+
 if [[ ${PV} != *9999* ]]; then
 	KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 	SRC_URI="http://dev.gentoo.org/~mgorny/dist/freebsd/${RV}/${SYS}.tar.xz
 		http://dev.gentoo.org/~mgorny/dist/freebsd/${RV}/${CONTRIB}.tar.xz
-		http://dev.gentoo.org/~mgorny/dist/freebsd/${RV}/${UBIN}.tar.xz"
+		http://dev.gentoo.org/~mgorny/dist/freebsd/${RV}/${UBIN}.tar.xz
+		zfs? ( http://dev.gentoo.org/~mgorny/dist/freebsd/${RV}/${CDDL}.tar.xz )
+		$(freebsd_upstream_patches)"
 fi
 
 RDEPEND="dtrace? ( >=sys-freebsd/freebsd-cddl-9.2_rc1 )
@@ -45,13 +56,6 @@ PATCHES=( "${FILESDIR}/${PN}-9.0-disable-optimization.patch"
 	"${FILESDIR}/${PN}-9.0-sysctluint.patch"
 	"${FILESDIR}/${PN}-9.2-gentoo-gcc.patch" )
 
-# Fix Security Advisory and Errata.
-PATCHES+=( "${FILESDIR}/${PN}-10.1-cve-2014-8612.patch"
-	"${FILESDIR}/${PN}-10.1-cve-2014-8613.patch"
-	"${FILESDIR}/${PN}-10.1-cve-2015-1414.patch"
-	"${FILESDIR}/${PN}-10.1-cve-2015-2923.patch"
-	"${FILESDIR}/${PN}-10.1-en-1501-vt.patch" )
-
 pkg_setup() {
 	# Force set CC=clang. when using gcc, aesni fails to build.
 	use sparc-fbsd || export CC=clang
@@ -120,7 +124,11 @@ src_install() {
 	fi
 
 	insinto "/usr/src/sys"
-	doins -r "${S}/"*
+	doins -r "${S}/".
+	if use zfs ; then
+		insinto "/usr/src/cddl"
+		doins -r "${WORKDIR}/cddl/".
+	fi
 }
 
 pkg_preinst() {
@@ -135,4 +143,17 @@ pkg_preinst() {
 		ewarn "we need gcc-4.1 to compile the kernel correctly :/"
 		ewarn "Please compile all modules you need into the kernel"
 	fi
+
+	ewarn "If you want manual compile (not recommended), please don't forget the following step."
+	if ! use sparc-fbsd ; then
+		ewarn "export CC=clang"
+		ewarn "export CXX=clang++"
+	fi
+	if ! use zfs ; then
+		ewarn "export WITHOUT_CDDL="
+		ewarn "Note, Please set USE=zfs if you want to enable modules of CDDL license."
+	fi
+	if ! use dtrace && ! has_version '>=sys-freebsd/freebsd-cddl-9.2_beta1' ; then
+		ewarn "GENERIC config require sys-freebsd/freebsd-cddl. Please emerge it."
+	fi
 }