commit: f5db614c82cf25e4a2c59bc35212b5535fd34f2e
Author: Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
AuthorDate: Wed May 21 15:03:53 2014 +0000
Commit: Yuta SATOH <nigoro.gentoo <AT> 0x100 <DOT> com>
CommitDate: Wed May 21 15:03:53 2014 +0000
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=f5db614c
freebsd-sources-10.0.0.9999-r2: eratta fix FreeBSD-EN-14:05.ciss
---
sys-freebsd/freebsd-sources/Manifest | 3 +-
.../files/freebsd-sources-9.1-ciss.patch | 65 ++++++++++++++++++++++
...build => freebsd-sources-10.0.0.9999-r2.ebuild} | 3 +-
3 files changed, 69 insertions(+), 2 deletions(-)
diff --git a/sys-freebsd/freebsd-sources/Manifest
b/sys-freebsd/freebsd-sources/Manifest
index 083ef88..e6d6ae4 100644
--- a/sys-freebsd/freebsd-sources/Manifest
+++ b/sys-freebsd/freebsd-sources/Manifest
@@ -12,6 +12,7 @@ AUX freebsd-sources-9.0-gentoo.patch 1194 SHA256
251178d014e62fbc3f20c26dd0e7840
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-MFC-r239588.patch 3076 SHA256
c23f0f8b66c06e024413db49267d217225464c0f965d3ea4db07854c2e23458e SHA512
a11b6a7e7290a4c63dda13a15972cae57c21c0a23df8d3f7fe4679a2af273ea6b1be01b34e99148b4f61d83395f5453f65ccb3c2ebadfde57df02b9817e58e7b
WHIRLPOOL
5ca75d43686d051e2282226ee4a82cc7e855353e409c1b08f98ea6b6a7d01b37b3bfac93483e6d5bf4883783a2608b4bb327cc5629877d77d4e1f2a68f1574e0
+AUX freebsd-sources-9.1-ciss.patch 2067 SHA256
a450312394a9ed449144c1b320ec323f8fcd6cb744ad6c6862046b0fd5086e4e SHA512
5b8088644813d465443754f248e0068da1c53b4f947b7c1e584ae9dcd9b7b135a53edd70efc463b500aef74c4f8193e2d1d349b39ce183ed1f18284a2c2d7989
WHIRLPOOL
59f1324eaa98e11a094e4fe48e8ad8f468bc373691de101c5082630d1a69d10a3e6d904f3b6138a2107b0f35f37c16f07da575c1efb4bbfa22869a7cf328e5e2
AUX freebsd-sources-9.1-cve-2014-1453.patch 2239 SHA256
2605926b9a36cf2eecf65fc3bcc92ed772922562fdfebfd39c99137526f2a440 SHA512
27b48c96447cb961d2de3ad7f67a739ff78ee3904da508b2e6c1948d299090cb169bd3f289b0448e7d242c1c0d39fd5e5fc29700d92ba4877c3e6d013a6cd6a1
WHIRLPOOL
206c18f70756f77050c681ee4b14f7e0d0e38cac42d146ae0ccd9bd79a3977c4db57d1456c3bfe0294dad313eead5dfb748446e0fa401c98105ea53097505e45
AUX freebsd-sources-9.1-gentoo.patch 743 SHA256
f75e451259933aac8028ad0a2b6d9ee43d21bf40f7309e556d139c7a125392bd SHA512
9a7abc263c87134534d6f5a727e08c5f5c34b0272b8b03ddb89daf2ea27e4ec1e46d59202347e4b4154ac617e8c8fa8c29be95d498b54e392680b96fdd10cb6c
WHIRLPOOL
237fbd8f3770442cc2692a2b62e83ecc732f54510d267a575a388de778f4b5c22a778d6fd8a69822ff8e782118c936e843e845c6461b0694ab357b261608a86e
AUX freebsd-sources-9.1-tcp.patch 1249 SHA256
a51412349a8724931cfc749150e3c07802126382a6ce5dbbc6617e4f81188e7a SHA512
46a2039ef4c000447ce22cd64515cffa34615e6980fba9f493c9cf527f45012f1d6128aadce401b3620667bfe9191d70c4c415f8e2d2c08617453822f73a029e
WHIRLPOOL
6e81938c55e2a40f4d75a53f4bfeac1c4183feebf023bcc320c0179dbf802151cc5f04dde9302e233eff86c33fdca8a6e80dda70d47d0d762da61e22782b1b0d
@@ -19,6 +20,6 @@ AUX freebsd-sources-9.2-gentoo-gcc.patch 506 SHA256
7457421478066b686dabc9a072ea
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
AUX freebsd-sources-cve-2012-4576.patch 561 SHA256
c3ad42e10164eaa3d928fd11a68b5ab490981b5d4684315e7e78c582e680d6c2 SHA512
451fb9be983672fa8d85d34bf13b67e70ac4bbda44da0c16ee484349bcf4e9ad795f66c36b5216bbcf022f709727dc19760e9f23b001a5768d9fa15dbad8122a
WHIRLPOOL
2f261add2b2d9014782198b564a807f1a61917e0fbe91354ce5b1a685b27e312e699b7dc799f1653c952864633be84dda110e37f74378a3c5f1c5aacacb6811d
-EBUILD freebsd-sources-10.0.0.9999-r1.ebuild 3641 SHA256
cce2c6e2e62a0bc78ebdb826ef5ddd75987cb2ae45cfde1751013dcbef7c76d7 SHA512
a94e26610a8749944f5e5c8fcf4d30bd8997057729100a663fc733b523465f0256c866f1d0298d3a6aa41c2579230be2038148b0a53dd4b726625b56ab995de4
WHIRLPOOL
90076354fa4abbe64f629d65fb3de3fcd12aca359b56a42aa59e3a00316f0f1a7239cf8341846847f576635fe2ce0a7dfde2d41f2fb12e8420a104fdc3f4cf95
+EBUILD freebsd-sources-10.0.0.9999-r2.ebuild 3677 SHA256
ae9bc98713f63ed33d56f44cd697d98f0cfd17bcfa394bccbb1302331f0d66d0 SHA512
6cfc223be526a5fdb72b7cf2c7c05b46c9f1d9fd9d3d8b348933b6642dccdd036fa1320d8a8af7c0dee68f3c106fea09b6b6776b518a611b98dbb56fc612ba07
WHIRLPOOL
7212dc28d0b8fd7d9955f7c126911e7f05e4ef7f07d8ab61ff5784b0740c861f625ca7f394e8361aadc75dbc11f5a507a66a272094d7151422d1c7c073b82682
EBUILD freebsd-sources-9.9999.ebuild 3480 SHA256
53444c2041f38e45f405f11f3ca98f833ddaec78d0ec9fd2c4d11d2826455404 SHA512
0d77fbb0c7a02d04f728f728ae89b1839fa042aa29d28189bbf82f378dd909d711f04cad5e9aab2b7ba2796dd50526475f7842664d63d09452a6359b995ef795
WHIRLPOOL
032aa9f584e58d1431d542968b927b670b40668e6350e1c3b05e38357d4da0a922ee5bdade75c1d5ca51727b3930cbe1803dec36cabcf91057e4406db2bca9a8
MISC metadata.xml 410 SHA256
f29a086ab076d7e7924571990c4cab73cce2aec303e10cf3be057dfa0c8b27fd SHA512
d949aac7499d418fce878c099d47713112e1856346dbf7478e95c14f37a5f2c2fbd580a21b2330712e439d5be235bc2de69ac182bd46c1727e95fbb3b081dd0f
WHIRLPOOL
ffc6ba7653dfa4be5d63231043a64c85a3ad2409f98b8e1f9cf03dd51edb84b1ed0add5a613e591e9f2409c92e3be08e8b3f7f2073fa45f362c19ef72ec7f63d
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 0000000..697984b
--- /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-10.0.0.9999-r1.ebuild
b/sys-freebsd/freebsd-sources/freebsd-sources-10.0.0.9999-r2.ebuild
similarity index 98%
rename from sys-freebsd/freebsd-sources/freebsd-sources-10.0.0.9999-r1.ebuild
rename to sys-freebsd/freebsd-sources/freebsd-sources-10.0.0.9999-r2.ebuild
index e0b09e6..79ef331 100644
--- a/sys-freebsd/freebsd-sources/freebsd-sources-10.0.0.9999-r1.ebuild
+++ b/sys-freebsd/freebsd-sources/freebsd-sources-10.0.0.9999-r2.ebuild
@@ -45,7 +45,8 @@ PATCHES=( "${FILESDIR}/${PN}-9.0-disable-optimization.patch"
"${FILESDIR}/${PN}-9.2-gentoo-gcc.patch"
"${FILESDIR}/${PN}-7.0-tmpfs_whiteout_stub.patch"
"${FILESDIR}/${PN}-9.1-cve-2014-1453.patch"
- "${FILESDIR}/${PN}-9.1-tcp.patch" )
+ "${FILESDIR}/${PN}-9.1-tcp.patch"
+ "${FILESDIR}/${PN}-9.1-ciss.patch" )
pkg_setup() {
# Force set CC=clang. when using gcc, aesni fails to build.
