Add Eratta patch #510532

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

4 files changed, 92 insertions, 18 deletions

diff --git a/sys-freebsd/freebsd-sources/ChangeLog b/sys-freebsd/freebsd-sources/ChangeLog
index 368feb53990b..16b958c8a9c5 100644
--- a/sys-freebsd/freebsd-sources/ChangeLog
+++ b/sys-freebsd/freebsd-sources/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-freebsd/freebsd-sources
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/ChangeLog,v 1.104 2014/05/08 05:24:56 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/ChangeLog,v 1.105 2014/05/19 02:22:37 naota Exp $
+
+*freebsd-sources-9.1-r8 (19 May 2014)
+
+  19 May 2014; Naohiro Aota <naota@gentoo.org>
+  +files/freebsd-sources-9.1-ciss.patch, +freebsd-sources-9.1-r8.ebuild,
+  -freebsd-sources-9.1-r7.ebuild:
+  Add Eratta patch #510532
 
 *freebsd-sources-9.1-r7 (08 May 2014)
 
diff --git a/sys-freebsd/freebsd-sources/Manifest b/sys-freebsd/freebsd-sources/Manifest
index d25fd4b1296d..62a38bd466f3 100644
--- a/sys-freebsd/freebsd-sources/Manifest
+++ b/sys-freebsd/freebsd-sources/Manifest
@@ -14,6 +14,7 @@ AUX freebsd-sources-8.2-unix2.patch 1642 SHA256 6dd35d13a13f5e9333557a84b56c89fc
 AUX freebsd-sources-9.0-disable-optimization.patch 927 SHA256 e8ad8d8ed1f729b7b22839a7af93b3dd667f257b05db95f408c48b270003a486 SHA512 0b74874d42eab95994309b922f37ebbf3706d01db6c447c9f062b03e64b77c7f793bc297150b539acdf39530a8afd91f4bf824a87c674dd625a59056656c614b WHIRLPOOL 86f9586a3f07118f95e5fbce1a65fdd3be8dd701ed1bee1379ed2133cef3d9473b437826a13ec2a53c73f7b3e1003256d912a45eb80c86195749a8cd08f9813c
 AUX freebsd-sources-9.0-ipv6refcount.patch 3259 SHA256 18186ef2f9fc020c0da053953b9e8c8629c2302082e0ee172dd7e84a7104bdd5 SHA512 04d89da7ab4c50d3405ff18eea49f94ffff34375c6333a6bb84bc81a63046ba12f384d256e010dc1b64a186650c7ad4702403ed933e6a678d2c5ee4238b56658 WHIRLPOOL c0511b2fec1f2ecc8a6e3aba23808a4c60a4c94f45693b6f21a30cb01386e24969fcc9b655584c78a501524579f7e266993fdd6d565525740f4f8e04f47b55a9
 AUX freebsd-sources-9.0-sysctluint.patch 403 SHA256 884fbc5d6d3766ea3d4609946f56072f36f95368dc13ee316c330a46d42f0c9e SHA512 f3a87cb187858bc6fd1bafda3c3bd7bbda52b07239a50a7c1aa201df2c52a58d4809e196b8799b1949c8ca1a556519d454ad1789358540e3a96cd480fc0a504c WHIRLPOOL 1fd9852d59378b3fa8682886085f4f63ccd2a57806161b9a3ccb0cbe0c465be2e5620ed57942a8687656859e1a9df17c7d298ea66ec037514bbe7707783aa9f8
+AUX freebsd-sources-9.1-ciss.patch 2067 SHA256 a450312394a9ed449144c1b320ec323f8fcd6cb744ad6c6862046b0fd5086e4e SHA512 5b8088644813d465443754f248e0068da1c53b4f947b7c1e584ae9dcd9b7b135a53edd70efc463b500aef74c4f8193e2d1d349b39ce183ed1f18284a2c2d7989 WHIRLPOOL 59f1324eaa98e11a094e4fe48e8ad8f468bc373691de101c5082630d1a69d10a3e6d904f3b6138a2107b0f35f37c16f07da575c1efb4bbfa22869a7cf328e5e2
 AUX freebsd-sources-9.1-cve-2013-3077.patch 1064 SHA256 2c0b8a4df43b3a2b15bbb33000f4c0e0e132901dfe5d5531a694a17b9e1fd7b8 SHA512 12244d1335ab626e4a391cdd1d435f9f002ec4142fa2a2a93832b554f03fff69de09e950c4e80c797fd0b568504a69e18341fd35bd952a56e01a05024de8206f WHIRLPOOL 01c9e9270eea92448de3754ab0d6dc2efdec4b8e06a00b0d86c550e318c07c8e4a5b2b32e645008713e399c20b96d5e91e740e5120f889050ab91416763be3fa
 AUX freebsd-sources-9.1-cve-2013-3266.patch 535 SHA256 3ddd63716570d7a08956228d3f2b165e80380d3062cecfa9ed781696542cf7e2 SHA512 04f421724d79a2e8c5a23120a44601bd611b938e4452d064034b7cf91ab36e2b019e3a12af62d5bd180a5da30ca59886f90aeb6f1255dcd2124285aec6b65fa7 WHIRLPOOL e12449b21f4a3200da65d815bdc33972e9aa7b2941560fba13a634be9baad4246b635ee87510a09dee123b65ea614ed57f17e482ba41a0ea2c986e579d75f3a9
 AUX freebsd-sources-9.1-cve-2013-5209.patch 645 SHA256 1b334cae7f7ac266785449bc34a8b4b652b961b7b77acc3488e418f4359b6041 SHA512 1ed132883d22aaf48be98dd9adaa48cea0023f3c986cedb45f986676f1c4a40d3d5463006f516d78fe77a408e5f4821cb7b26d8fbff7091bc2aad9faac2e728a WHIRLPOOL 8ea85c387106009ed4c5ac4652520d349cf403d6568d81aedcc05f81ebdb5ac0c287a188071bb7651b4e847d95abf9874bfc8710a025c9ea1c986993b6d4a0a9
@@ -38,27 +39,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-r7.ebuild 3079 SHA256 f960deabaffa26376323946c9ecec98b1be470888a5d76b08977dad7c2dafd03 SHA512 b644b2b05c7855484791410eb94e974a1a60d6af708ac4b0d6b5817be57b5e70a1d4695600289969239dd78de6608391051dcbab519c383598506c1c17fac1b7 WHIRLPOOL 0cd74aa9521d02b3b327d3c3c597f05a32df1cde8f2a8ed04b98ada54cfb46f40e463034871029cd2d01e3d55945c0776dddc6a80b9827733e5e3e50e4416a1c
+EBUILD freebsd-sources-9.1-r8.ebuild 3115 SHA256 878f57772cd0e19cd00b454a41aa3b005a44ba2c93d8d7959c4d74b3a8850eaf SHA512 15a9796fdae6f3e0fa9359cb4d1391ba44554763080f4d1c8a2301eb7d3ab5d3e4c41f15ef56aad4541727e8f59533992b8231ead427ccfd0a461ef47f398baa WHIRLPOOL 442ab945720ac2c39dc21f03c44101a5aab8c68d5a173c12de24f7e01fb2f67099f0fad2fdd2a4a31188a8101bfadd625d4547b5f61ecb11db47c33175e48c92
 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 26197 SHA256 686021621f52a2754bfa0f86c3549549098db5f9d12b8550b800a720a35e2e5c SHA512 97c4ad4cdba21c5ea1e070b88adc01fbb1faa98fce6814c66e05dac72c88c1f559e0857aa1b86cbef39fabcd50a574dee97fa3533480d2a28bdb2fbc9a9fd5d4 WHIRLPOOL e3f1b6588718c48df787948c31e8b9696803d48f3ec884934c52b65a3129481458583d16c0f9025712c41d1f9b17cd7d5a46b866fe1ff3f6524658686e741517
+MISC ChangeLog 26418 SHA256 4e2782369e7eb81ba152963e0f24007f5dda8c8fdbf46562a4e563fb2044fde7 SHA512 06f7aeac39ecda48cf7288f649a6c99ab1ae5970ef5dccbc69b7805d4c6c392c77052806350159d5c64fb7880e5626ead57b2c426e2adad6d556b97ec45eed1d WHIRLPOOL 2a4c4ca2a026fdcf1444600ffdcc4430b780a3378cd8117e4a3ab6dd236cc1c92de450dee0bd3ee55fd83ec32fb852100517712eb586119daf903cefa2ba5521
 MISC metadata.xml 315 SHA256 d827e7310cb93578d5712b15f74a56b5cd98854e350fbc29a17dad0222ee955e SHA512 f8dc2ef7a14a4c3c34136b313802e982d57c606d3aa47fc51c59cd3840ebb9df3db17f40176354348e154891027477f97da6d72a3723613334ffe7852ea5bbd3 WHIRLPOOL 88483c7555215eda8091f4adcd9148a1079307a7ada08f6caa45bb482aa6dbbee291c96e24b4a35f915c944803fafaed1a6a8c85fc899071eb9f577f4e80049c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTaxUpAAoJEDYO1FT4VRUUvRMP/Rz+NimfA1r82G3FLunzxLwl
-C3zzmfgJZDWMjGrJsbc2cKG0M9rhY5/d4gz6jrOcEbAYBBIYja6TwL56snpVp5XB
-IeT0hpRkoC8Yt4dlR7uqyKCzz4rq6lWv6GmLgdIguZnpk5G3IXYtMEFXDasB0E1I
-BleYryq/wNFSj13cEKfSfSW+H4ofIIpaWO6Ju0XRrAEpYjHRmdOLQtgsm8qdcX5w
-aGTkFuGWi9wMXVMH5dgypkErJg9QDvNKs3qsJamevaSYi4GQEw3dNeGJYGvjcTgh
-AM0KwYrxAUjP69DUREUsCxL4XQ6hSFjeiFhgsUGlQ6k6O6Bl5LOEP1FvjAq0WCvA
-oiD4QbnzVAg++ctuMfNGZGNY7rlzZpio0lyRS3/Ne3y7ysuBBUDdBbWwfhvZ+woM
-LekNv2ajn0v8C4MaCQHbx0ZeKGxU7n9dFwm1fUMK38PMUD1plTw2C8AWY5RtFC8s
-CG0+oGh21aD4o1dpDM80bNDz2u1yvNIprAn5MdgCSZ5IISHfMeGw8D02Y6y0Jbhf
-m1JwUTxm691ScA8MNQoRXEb+Q8LYxRvsSYhCHsUAhxTwmYd5YjdnxoJG8Sgv4SMH
-jttogjwWJgKcwYC+4o0C4TfN0cbaWnTWUiZ9Jud8zO6aTcsRAFOfaYRr3J0HWv0S
-Nw9FH0mt89e0D5Ed23wG
-=BUhN
+iQIcBAEBCAAGBQJTeWriAAoJEDYO1FT4VRUUp4oQAKBELkQCPHDykm/eF8g58ljK
+60wSeHhPlqob+DNUEWpaaSFSS8TqohsYvTp6pgVJGiNIxhrlT6/6wN0poBYMZMlu
+HdOG05JjTFx37mpSBGsHiowRskCpMWjXIU+GlY8CuTF6hCntKwND1wDGzd9tkh28
+afYOLTp5aIhStrZHXt/NmPUsajtvfJLILtgCeGZL189uD3n3DMVdPpbFmxOF3GFe
+2xZ+OMCDJAQH7aW7jdI32VU1f6hsAck2Kri2GIbmIeWBwuO+M3OqRE44uGh7uHz1
+KEQkIxu9YMYuVvyBKXnjGehHslzyLAW2OuxwdDGrrL09k79cb0jujntu9O4x8jBj
+Aec0qpAX2Po8pff1lx3DicMMmw+BO510jKEyxaNvz54agIZdoexuZp5bVdJEZ5CI
+oTwGV1yOza9vvqUhCKBPbhXvdIr4wqnFn8okX5f7jIdepQRicvwhbH+UHHy8LTYg
+sUxloAT21fTdA7YtJBPsYByNVMrjkIOjD8JcpnU/aIQP6SBBGXl3TO7squKIA9tC
+MM235LweNKyhYMVCNAItqnG6qJ3dUOMeGunzZ4mMcB7PAuf/PKmWFuNRPvNqE/6J
+4QnrSqthb90oLs+vjQL/5lxw5JbXoq5wHDwe9PRfbMJh/8Iru+VBT1J6Z6mvH7l0
+OW8bLNt0EtBfRriH9hzT
+=AD+/
 -----END PGP SIGNATURE-----
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-ciss.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-ciss.patch
new file mode 100644
index 000000000000..697984b92e74
--- /dev/null
+++ b/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-ciss.patch
@@ -0,0 +1,65 @@
+Index: sys/dev/ciss/ciss.c
+===================================================================
+--- sys/dev/ciss/ciss.c	(revision 264510)
++++ sys/dev/ciss/ciss.c	(revision 264511)
+@@ -180,8 +180,6 @@
+ static void	ciss_cam_poll(struct cam_sim *sim);
+ static void	ciss_cam_complete(struct ciss_request *cr);
+ static void	ciss_cam_complete_fixup(struct ciss_softc *sc, struct ccb_scsiio *csio);
+-static struct cam_periph *ciss_find_periph(struct ciss_softc *sc,
+-					   int bus, int target);
+ static int	ciss_name_device(struct ciss_softc *sc, int bus, int target);
+ 
+ /* periodic status monitoring */
+@@ -3398,27 +3396,6 @@
+ 
+ 
+ /********************************************************************************
+- * Find a peripheral attached at (target)
+- */
+-static struct cam_periph *
+-ciss_find_periph(struct ciss_softc *sc, int bus, int target)
+-{
+-    struct cam_periph	*periph;
+-    struct cam_path	*path;
+-    int			status;
+-
+-    status = xpt_create_path(&path, NULL, cam_sim_path(sc->ciss_cam_sim[bus]),
+-			     target, 0);
+-    if (status == CAM_REQ_CMP) {
+-	periph = cam_periph_find(path, NULL);
+-	xpt_free_path(path);
+-    } else {
+-	periph = NULL;
+-    }
+-    return(periph);
+-}
+-
+-/********************************************************************************
+  * Name the device at (target)
+  *
+  * XXX is this strictly correct?
+@@ -3427,12 +3404,22 @@
+ ciss_name_device(struct ciss_softc *sc, int bus, int target)
+ {
+     struct cam_periph	*periph;
++    struct cam_path	*path;
++    int			status;
+ 
+     if (CISS_IS_PHYSICAL(bus))
+ 	return (0);
+-    if ((periph = ciss_find_periph(sc, bus, target)) != NULL) {
++
++    status = xpt_create_path(&path, NULL, cam_sim_path(sc->ciss_cam_sim[bus]),
++			     target, 0);
++
++    if (status == CAM_REQ_CMP) {
++    	mtx_lock(&sc->ciss_mtx);
++	periph = cam_periph_find(path, NULL);
+ 	sprintf(sc->ciss_logical[bus][target].cl_name, "%s%d",
+ 		periph->periph_name, periph->unit_number);
++    	mtx_unlock(&sc->ciss_mtx);
++	xpt_free_path(path);
+ 	return(0);
+     }
+     sc->ciss_logical[bus][target].cl_name[0] = 0;
diff --git a/sys-freebsd/freebsd-sources/freebsd-sources-9.1-r7.ebuild b/sys-freebsd/freebsd-sources/freebsd-sources-9.1-r8.ebuild
index 7806f0c93fa5..7eccf479de4a 100644
--- a/sys-freebsd/freebsd-sources/freebsd-sources-9.1-r7.ebuild
+++ b/sys-freebsd/freebsd-sources/freebsd-sources-9.1-r8.ebuild
@@ -1,6 +1,6 @@
 # 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-r7.ebuild,v 1.1 2014/05/08 05:24:55 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/freebsd-sources-9.1-r8.ebuild,v 1.1 2014/05/19 02:22:37 naota Exp $
 
 inherit bsdmk freebsd flag-o-matic
 
@@ -40,7 +40,8 @@ PATCHES=( "${FILESDIR}/${PN}-9.0-disable-optimization.patch"
 	"${FILESDIR}/${PN}-9.1-cve-2014-1453.patch"
 	"${FILESDIR}/${PN}-9.1-random.patch"
 	"${FILESDIR}/${PN}-9.1-mmap-2014.patch"
-	"${FILESDIR}/${PN}-9.1-tcp.patch" )
+	"${FILESDIR}/${PN}-9.1-tcp.patch"
+	"${FILESDIR}/${PN}-9.1-ciss.patch" )
 
 src_unpack() {
 	freebsd_src_unpack