Add eratta patch. #498260

Package-Manager: portage-2.2.8/cvs/Linux x86_64
Manifest-Sign-Key: 0xF8551514

5 files changed, 79 insertions, 20 deletions

diff --git a/sys-freebsd/freebsd-sources/ChangeLog b/sys-freebsd/freebsd-sources/ChangeLog
index afdcb0d26000..ad321de0dd74 100644
--- a/sys-freebsd/freebsd-sources/ChangeLog
+++ b/sys-freebsd/freebsd-sources/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-freebsd/freebsd-sources
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/ChangeLog,v 1.101 2013/11/17 04:22:41 naota Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/ChangeLog,v 1.102 2014/01/18 01:09:56 naota Exp $
+
+*freebsd-sources-9.1-r5 (18 Jan 2014)
+
+  18 Jan 2014; Naohiro Aota <naota@gentoo.org>
+  +files/freebsd-sources-9.1-mmap-2014.patch,
+  +files/freebsd-sources-9.1-random.patch, +freebsd-sources-9.1-r5.ebuild,
+  -freebsd-sources-9.1-r4.ebuild:
+  Add eratta patch. #498260
 
 *freebsd-sources-9.1-r4 (17 Nov 2013)
 
diff --git a/sys-freebsd/freebsd-sources/Manifest b/sys-freebsd/freebsd-sources/Manifest
index 1dfa08397067..748d7359f792 100644
--- a/sys-freebsd/freebsd-sources/Manifest
+++ b/sys-freebsd/freebsd-sources/Manifest
@@ -20,8 +20,10 @@ AUX freebsd-sources-9.1-cve-2013-5209.patch 645 SHA256 1b334cae7f7ac266785449bc3
 AUX freebsd-sources-9.1-cve-2013-5691.patch 2854 SHA256 418cb39d555c036013cd87a2205d2b1b9e4c729f409b3bd4c509648282a0a993 SHA512 6c3342e79fe3de90d37d82415b186f5012597dfbc5f522f9aadfa5420d601e4e6042b899ed348b581537491d4c49d6b4959ca3b438f9bda454b8d9b494120534 WHIRLPOOL 7436a1c9402c2de662b98e3615d1a62f290a8638c597d671474dab005a60a5c5b162ea31603902568c9443ebd39a2631297b6e19bd26f343c808e086b78da263
 AUX freebsd-sources-9.1-cve-2013-5710.patch 704 SHA256 c076858b5dd9ab31be241144bef4de2824fa27599f7f114bcab9a2934436a1dd SHA512 a87d571aa060f435e0ac53816307703e300e16365df13c88be0a982d5851d3c224e0cc23b32ef61445413abda86762e0e43b964d475f1d816ca83d2c6b3f7d58 WHIRLPOOL 71bceec1fad2cde48cd32475805f96a33d9fef85ac8f3b69c601874514b6eef89479cf9b372bc8639d48a317dc5216bd7e2f2902570a148da865983845f5fbc6
 AUX freebsd-sources-9.1-gentoo.patch 743 SHA256 f75e451259933aac8028ad0a2b6d9ee43d21bf40f7309e556d139c7a125392bd SHA512 9a7abc263c87134534d6f5a727e08c5f5c34b0272b8b03ddb89daf2ea27e4ec1e46d59202347e4b4154ac617e8c8fa8c29be95d498b54e392680b96fdd10cb6c WHIRLPOOL 237fbd8f3770442cc2692a2b62e83ecc732f54510d267a575a388de778f4b5c22a778d6fd8a69822ff8e782118c936e843e845c6461b0694ab357b261608a86e
+AUX freebsd-sources-9.1-mmap-2014.patch 758 SHA256 cfc0663e536972ced5a45b5ff491b8590e95739ea6cd34687b9ca56e5d7e63b8 SHA512 fb1f28268355ad0a25705fecb7555222b53b04fd92b1b80af2db4b6f2ac02bf5a948ba0521d1674e31da57a1baf037fe0fe581c03a437d86325e185a8050aaa3 WHIRLPOOL 8995fb9d0751aa3c12bab79206f22c924ffe583060895c2cfc62e53ce89ce1cdde0f511e12e017209221075aa536e839ab68c241b8feffc26910c613aa8753ed
 AUX freebsd-sources-9.1-mmap.patch 676 SHA256 4adee0a45d519d93d4bd3554c6b685becbaac2bc5e89511f61260e85a914235e SHA512 0daff1ef440be8e4f841eeff8917a36591bd3f4c31d79feb4666f9c3d65d49ee180397b81b07753c8892efd76436bf19d2218979cef3847d3cd46bdfcf166d6b WHIRLPOOL a31b32fb6fe8d7ca4464abae9c444e62d6ff00b4d53beed7c81c89bf0e85e61cf1eed7e70c7861a3559432086a923926737c4f6a727d2e389745de045e6f30cb
 AUX freebsd-sources-9.1-nfsserver.patch 650 SHA256 b288a29155fbce8ac58460a3f64ce77b644c32ee54814e35086700d2fae3610a SHA512 e1d505440371d35722b3520212ded13acf5ccb433c18988aea08d8035881f633c04dedb912931684334154303731ad21ca849c02831f6b9122b54486fb5ab8fe WHIRLPOOL b4469dfb52ca87e95539bd63dcc36ba34c9a29b812b887ad9656c2adea7acee5ae6a14850d2f4733aff7248fb9d6d6107ea38f06365efba18f8f025506675de9
+AUX freebsd-sources-9.1-random.patch 792 SHA256 46d4035d31e8a64531e1893c08b8235ee92af002848a781d9f1af1a886f17fdc SHA512 6e7137a5b68ec92a6eaa5d6bbc1609794f7a71210331959135663bf4021b6cffcbf87f23b5d757956a1ff6907929012490bd85ca0ec37efbdfc2b70de108bc99 WHIRLPOOL db318323bd0d757ab0a97ef5e552ee38b9fe5eaf12f87769912abf16dda40b11692ae3715cd5fc34aa11d5ae226366b8bb63feff3067c539b9fc23a9ad14c840
 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
@@ -34,27 +36,27 @@ DIST freebsd-sys-9.2_rc2.tar.bz2 34381761 SHA256 2cf28a18adf0d22c0d141f2ee0c7a8b
 DIST freebsd-sys-9.2_rc3.tar.bz2 34386428 SHA256 86fd03137f39a8544174dd26f4096da022c1ecfa447a1e7c9e4e241428b94947 SHA512 233181db24063e6afe1dc3e17280e2b89a39529961814640bd52d6efa1bd9f9212ab2a467266df7cd1c52654e1759f124df5d4fa439862397816623d46f3af40 WHIRLPOOL 4d7a065decda622550b16b2583b133f9b3d42aca4e6707a53012bbac9e5eb62b2fbdfc84d9cc0b666c9685e8f9abd6c9b7c9f46ce23e7b16a90a05530f45cc9b
 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-r4.ebuild 2920 SHA256 64f1249af5127c53c25e571913e84cd9dad7bc346b03edc40b24d52ceb479e87 SHA512 de507f0c44d58751e92d109090edd7682bf3fe3888a3e03918e32a892cc2e66fa114479c6af144949d7ba70016f794da40a6e86e71d82cb148970e545552fe05 WHIRLPOOL 699fa4e2fc7fec9a65d7c0d40b47ec47706fb82a29ad6bd201217d90252e90bdeb4934b6655e9bd6cecafaa26398817ea74193fd8c3abc8a0db80017580965ad
+EBUILD freebsd-sources-9.1-r5.ebuild 2999 SHA256 c0a872d48f53b4b5bf7fd24ad033577e8178499a503b387ef107d0d07f3c30f4 SHA512 4343cb88b68199d47cd9ebabf931f01a25f7b2b6c8e5670097d272744bd45e3754bdf5483f006e2322da34b748e95defbf1abc65584c03488a22fc93cd88c479 WHIRLPOOL ba7db4b3c6d347f6332b9c09f38a0f8ce30ae11f973aa2224d6b56ba757634f1eab37533e86519759461573a0131fdc4d9b2dd311cdd6d5b5e419a0cac2f7fb3
 EBUILD freebsd-sources-9.2.ebuild 3142 SHA256 a2e5782e94e9a309f212e52c5b994a712a6f79da3593d61e23904ef5ecc8474b SHA512 15f64f50af66cee036a4de219642107364487e4873fed47583e47f45dbd4fb4eaac8a53459d12a4df21fad72bae7a76baf9b83c1a8fe72c77b3a6d9cf52193be WHIRLPOOL 0dd9e8a8a6798d78322b494ef289f64bd1e598d7c332f28fce58105ee79258dcfe58311d9a5db3a6c67b67a4e865d71b84d76fd3839dd69716bb41a04800b396
 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 25463 SHA256 3ba5be6f4fdd305b8d7b3d1e81cdd0b333d6ef6d3b0316503ca74b086987ba9c SHA512 1862b163b314c6b933286e290161083d626102a2d9b1f86e795eb4fbd8e8cd949feb6d2e770677d6daa602fb16fd38e4024f237d7a5fcef42ceda6d03e9bf2d1 WHIRLPOOL c6024eb8c1feb1770e855e76110622a8be86b06e12d3a37bae5de1753e199be65314ca23f7d83ec50c5e0e91b40fb735c958835585d874ae3699ff281ee40f79
+MISC ChangeLog 25733 SHA256 c9eac8f31077a8b1233c98b2b0b10dccfb9b17e81947d1d67bf730ffe87e20c2 SHA512 cc957aa9d1ee323c3f46642ca2de6d214564be24e36d223b23dd0c8aadfdaab82408c7f0706a1aada21e40d95093853688c19403591dd84d018ea83279ee70ac WHIRLPOOL 57f6ca1f3c1d306b5451f99783668eaf60060a298f8151f82522d6e7c7da1060357e6d86c6a5a3aa6e1312292598e3b626c9270ff43bd8be417d226e0804c852
 MISC metadata.xml 315 SHA256 d827e7310cb93578d5712b15f74a56b5cd98854e350fbc29a17dad0222ee955e SHA512 f8dc2ef7a14a4c3c34136b313802e982d57c606d3aa47fc51c59cd3840ebb9df3db17f40176354348e154891027477f97da6d72a3723613334ffe7852ea5bbd3 WHIRLPOOL 88483c7555215eda8091f4adcd9148a1079307a7ada08f6caa45bb482aa6dbbee291c96e24b4a35f915c944803fafaed1a6a8c85fc899071eb9f577f4e80049c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSiESZAAoJEDYO1FT4VRUUx7kP/3XVMciEz6bMoFeHCf0FyHQ4
-6dInAQ/VOASDtp1RTurkfrmtv5ppeDdgUUZyUeSHLfkmtMWOv5dh9O/7uIJB2Ek2
-b2u6fTKyZN3o7FE9mzF1ji70FvttqJ0JdSwwyQy81iuAlFIhRPGPT490fjXTg5E0
-cPBG6NFIiDXlFffcgicfhbpLWcIkrlGWyX0FVkv8xOgeH8/YVPAr+5DYMfv+fmh0
-5lqB8B6ObmZ7BfwlnJke7y+DV55YBEm1aKuVes1cfaOQQcrTVllSrcwJEw07KC+O
-QUNUMt2gm4Y7in/rJFt2YXiHT29eSZJBV2k5nkPyVp0/m21kOATgz48cOzEuSS6G
-qv4VNqd/hb+lL5tga9H41vG0ZP8wmM6TQhsfV/i7v2rrrWgI5KI777tmdXD+EQ18
-oJud9OMOZ7iToD+1S//TyJy11lqtsLEAHabxQXI+jcYhpZ71mqybGyNy3qU8lFSV
-IPtOhcZ1zPKHtXo2qWTm9x+RJHYXHD28Jy+9qdRZJ07nUQEZZXU7u9ZnAXdRUDry
-jSwNqO8EbcmSNmXJuhnXHG4Dejr+Hg5R5eBTnt1MELn2S439+ERf7rTWNLdB3Wb+
-49Kn/faezWmH61VdIQIBgkFvBe4gQ8lwsLUTjxLILf+93k1QevZ7SCS4teshTwGc
-exRbDZNH2qelDqzwoBYy
-=9Mf+
+iQIcBAEBCAAGBQJS2dRsAAoJEDYO1FT4VRUUhYAQAIm+mpAJDUuHi8WeZRqUmrTi
+2YiLzhgV9E+G8QGTIlGh3wYZW/tl7rvSjnvRuSrF2rcAVnForF4ArFAeEsURQlU/
+qaRLBYiyvtiLbmGNxhkF7Lidh6IhTiFtz6426xe1cpjIrdPcKQW255f9xBJcys9f
+g23HViU11X5lcKHQa7RUO+ODydDWkQ1X8vwIzn6xcPG3cGSU7Di+sGIoNsxY04no
+tgqwyVfTYKu2GlWaOUQIFyW2zxG/SNKHWlff+Umr7kUaMCvzkknrHtdMGmYKKqOl
+OSpPnNraebu5XTacObnnOMYeQ/E3Zq58WdEzujS+IeTYtG0FClblTHrii51qIv/E
+jSYJ40G1PeZ5ibgrC2SXa1KY8Jh15YDfDz8yQwQus+u3VTX3DGkGjQRqjUkq8phr
+XUlEBk/kdnu2+0r7s3In5LQhCSO/S+9XA8ofqKDBjaa30uw+rz+pEs830udeeqci
+d46zBZ4j90XpkDltgnnytmx8kk2kOs/jaQI5ZuHTlRHh47guQ8CEB/Yb7qTeYFOc
+k3/EkMnViPRzN9C6uuhUrJjgx4l3keg2sBiRGCuy1HKENiTg+CDppCCHZhM1wFPk
+7rBUoXrDmoZR+qJERmlKx7Xach5CRsaeo5TIhZW4rTZ9RcHl9e+HnDIgE4IoUPVZ
+nQS2lxc7s10ImFHjHXvP
+=lLw6
 -----END PGP SIGNATURE-----
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-mmap-2014.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-mmap-2014.patch
new file mode 100644
index 000000000000..fd4040a88166
--- /dev/null
+++ b/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-mmap-2014.patch
@@ -0,0 +1,20 @@
+Index: sys/vm/vm_map.c
+===================================================================
+--- sys/vm/vm_map.c	(revision 259950)
++++ sys/vm/vm_map.c	(revision 259951)
+@@ -1207,6 +1207,7 @@ charged:
+ 	}
+ 	else if ((prev_entry != &map->header) &&
+ 		 (prev_entry->eflags == protoeflags) &&
++		 (cow & (MAP_ENTRY_GROWS_DOWN | MAP_ENTRY_GROWS_UP)) == 0 &&
+ 		 (prev_entry->end == start) &&
+ 		 (prev_entry->wired_count == 0) &&
+ 		 (prev_entry->cred == cred ||
+@@ -3339,7 +3340,6 @@ vm_map_stack(vm_map_t map, vm_offset_t addrbos, vm
+ 	 * NOTE: We explicitly allow bi-directional stacks.
+ 	 */
+ 	orient = cow & (MAP_STACK_GROWS_DOWN|MAP_STACK_GROWS_UP);
+-	cow &= ~orient;
+ 	KASSERT(orient != 0, ("No stack grow direction"));
+ 
+ 	if (addrbos < vm_map_min(map) ||
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-random.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-random.patch
new file mode 100644
index 000000000000..bb3caba00137
--- /dev/null
+++ b/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-random.patch
@@ -0,0 +1,27 @@
+Index: sys/dev/random/probe.c
+===================================================================
+--- sys/dev/random/probe.c	(revision 260523)
++++ sys/dev/random/probe.c	(working copy)
+@@ -30,6 +30,8 @@ __FBSDID("$FreeBSD$");
+ 
+ #include <sys/types.h>
+ #include <sys/param.h>
++#include <sys/systm.h>
++#include <sys/kernel.h>
+ #include <sys/malloc.h>
+ #include <sys/random.h>
+ #include <sys/selinfo.h>
+@@ -57,7 +59,12 @@ random_ident_hardware(struct random_systat *systat
+ 	/* Then go looking for hardware */
+ #if defined(__amd64__) || (defined(__i386__) && !defined(PC98))
+ 	if (via_feature_rng & VIA_HAS_RNG) {
+-		*systat = random_nehemiah;
++		int enable;
++
++		enable = 0;
++		TUNABLE_INT_FETCH("hw.nehemiah_rng_enable", &enable);
++		if (enable)
++			*systat = random_nehemiah;
+ 	}
+ #endif
+ }
diff --git a/sys-freebsd/freebsd-sources/freebsd-sources-9.1-r4.ebuild b/sys-freebsd/freebsd-sources/freebsd-sources-9.1-r5.ebuild
index e84e8de60d4d..9d3dc868147b 100644
--- a/sys-freebsd/freebsd-sources/freebsd-sources-9.1-r4.ebuild
+++ b/sys-freebsd/freebsd-sources/freebsd-sources-9.1-r5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/freebsd-sources-9.1-r4.ebuild,v 1.1 2013/11/17 04:22:40 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/freebsd-sources-9.1-r5.ebuild,v 1.1 2014/01/18 01:09:56 naota Exp $
 
 inherit bsdmk freebsd flag-o-matic
 
@@ -36,7 +36,9 @@ PATCHES=( "${FILESDIR}/${PN}-9.0-disable-optimization.patch"
 	"${FILESDIR}/${PN}-9.1-cve-2013-3077.patch"
 	"${FILESDIR}/${PN}-9.1-cve-2013-5209.patch"
 	"${FILESDIR}/${PN}-9.1-cve-2013-5691.patch"
-	"${FILESDIR}/${PN}-9.1-cve-2013-5710.patch" )
+	"${FILESDIR}/${PN}-9.1-cve-2013-5710.patch"
+	"${FILESDIR}/${PN}-9.1-random.patch"
+	"${FILESDIR}/${PN}-9.1-mmap-2014.patch" )
 
 src_unpack() {
 	freebsd_src_unpack