diff options
| -rw-r--r-- | sys-freebsd/freebsd-sources/ChangeLog | 9 | ||||
| -rw-r--r-- | sys-freebsd/freebsd-sources/Manifest | 31 | ||||
| -rw-r--r-- | sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-tcp.patch | 32 | ||||
| -rw-r--r-- | sys-freebsd/freebsd-sources/freebsd-sources-9.1-r7.ebuild (renamed from sys-freebsd/freebsd-sources/freebsd-sources-9.1-r6.ebuild) | 5 |
4 files changed, 59 insertions, 18 deletions
diff --git a/sys-freebsd/freebsd-sources/ChangeLog b/sys-freebsd/freebsd-sources/ChangeLog index 7ea36a51a53b..368feb53990b 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.103 2014/04/12 07:01:49 naota Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/ChangeLog,v 1.104 2014/05/08 05:24:56 naota Exp $ + +*freebsd-sources-9.1-r7 (08 May 2014) + + 08 May 2014; Naohiro Aota <naota@gentoo.org> + +files/freebsd-sources-9.1-tcp.patch, +freebsd-sources-9.1-r7.ebuild, + -freebsd-sources-9.1-r6.ebuild: + Add a patch for CVE-2014-3000. #509170 *freebsd-sources-9.1-r6 (12 Apr 2014) diff --git a/sys-freebsd/freebsd-sources/Manifest b/sys-freebsd/freebsd-sources/Manifest index fa721bee3601..d25fd4b1296d 100644 --- a/sys-freebsd/freebsd-sources/Manifest +++ b/sys-freebsd/freebsd-sources/Manifest @@ -25,6 +25,7 @@ AUX freebsd-sources-9.1-mmap-2014.patch 758 SHA256 cfc0663e536972ced5a45b5ff491b 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.1-tcp.patch 1249 SHA256 a51412349a8724931cfc749150e3c07802126382a6ce5dbbc6617e4f81188e7a SHA512 46a2039ef4c000447ce22cd64515cffa34615e6980fba9f493c9cf527f45012f1d6128aadce401b3620667bfe9191d70c4c415f8e2d2c08617453822f73a029e WHIRLPOOL 6e81938c55e2a40f4d75a53f4bfeac1c4183feebf023bcc320c0179dbf802151cc5f04dde9302e233eff86c33fdca8a6e80dda70d47d0d762da61e22782b1b0d 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 @@ -37,27 +38,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-r6.ebuild 3044 SHA256 10ff2213dbe4a0665d2ac602497be74ec92e048dd237af32466539cd217fe1fe SHA512 ace0782741754041edc7164008c3c3bd114699646dab01c8687b0dddc18d49adad307372e30f409a20bf90c1f103f8f08e9e42e926f3b19b2c2906b77ea0dc6a WHIRLPOOL 2f78928a3905811b5afca907494caa1d73af5abee3ca576efd0f64fe538c65ec29f29c9892023590e0edf91fc5d79caa403208b8ca6d2520a2bab5f9ea9cedd1 +EBUILD freebsd-sources-9.1-r7.ebuild 3079 SHA256 f960deabaffa26376323946c9ecec98b1be470888a5d76b08977dad7c2dafd03 SHA512 b644b2b05c7855484791410eb94e974a1a60d6af708ac4b0d6b5817be57b5e70a1d4695600289969239dd78de6608391051dcbab519c383598506c1c17fac1b7 WHIRLPOOL 0cd74aa9521d02b3b327d3c3c597f05a32df1cde8f2a8ed04b98ada54cfb46f40e463034871029cd2d01e3d55945c0776dddc6a80b9827733e5e3e50e4416a1c 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 25963 SHA256 8bd2372998b557182a03b376c356223030c898171cf6d407cc38a3d03b197a77 SHA512 9b7c989fc048c7c79aa2f162b796344d89c5d349b670cff02bfbcffeb577df1cbd35f60b05ed19334fb081eb89c5366f95baf22206e68564e45515b444d6cb22 WHIRLPOOL 7b0a94aa1fc861d718248902f4329cb69631154e75c388aa5083d74acc592de5702052cddd12d68257e27c9d102a980e52f2355891d7d362414bfcca3af455fb +MISC ChangeLog 26197 SHA256 686021621f52a2754bfa0f86c3549549098db5f9d12b8550b800a720a35e2e5c SHA512 97c4ad4cdba21c5ea1e070b88adc01fbb1faa98fce6814c66e05dac72c88c1f559e0857aa1b86cbef39fabcd50a574dee97fa3533480d2a28bdb2fbc9a9fd5d4 WHIRLPOOL e3f1b6588718c48df787948c31e8b9696803d48f3ec884934c52b65a3129481458583d16c0f9025712c41d1f9b17cd7d5a46b866fe1ff3f6524658686e741517 MISC metadata.xml 315 SHA256 d827e7310cb93578d5712b15f74a56b5cd98854e350fbc29a17dad0222ee955e SHA512 f8dc2ef7a14a4c3c34136b313802e982d57c606d3aa47fc51c59cd3840ebb9df3db17f40176354348e154891027477f97da6d72a3723613334ffe7852ea5bbd3 WHIRLPOOL 88483c7555215eda8091f4adcd9148a1079307a7ada08f6caa45bb482aa6dbbee291c96e24b4a35f915c944803fafaed1a6a8c85fc899071eb9f577f4e80049c -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) -iQIcBAEBCAAGBQJTSOTjAAoJEDYO1FT4VRUUb28P/2117pVygW8kUhwbpBF8Vn5h -5FSQPk7Pbypzzu7f1d42fW6AeLcraoWLzIh50+WgKHjLO9WyZHPwvevH6VwqtE4p -U+Cr44ZJcfZqu3HIg+9MDKECvLhUOqYKCplrBH+qzLHyBCjTnwbSSECUptSWmjYF -Jd70n2zM/p9kksMOv6E3VQs+ESYsuXHCJld4LgNjpD1grWyDCUj4vq4DFdz5rgwN -C4bDT2yYBUvRLJCuP73OtXRbxf+Pnc8r36vHV3ixY75GeZ4KHtHYUwCCjZmNUnmg -xduCK5ocUP7Q38YA50DUiZEW0l3C5Q6jQE2QJxH6H/jL/Yida9HDc8f6TLKJ2vvq -zVzqkR8p6EqkR9VDQDmJ+8q5M2djXzP3+LpunIv1W5kUI25FKZvgO4yoif/k1A0R -5gXfvqQOxFOJT7J5hHBGJxowSDcmSzb/NZYk2knmqv0DtbcweoByJS7fr/z43zzx -E1oa/z444g2eZatwLdDar69tmpbK5jcXgQ1HCCtktXGRMXkgZLUXbEk1CsY6xBTZ -yWc3WCriuMOP6KSOQJYWuVYnE26TxILlVmAPIh8VdGhwOwvTzEw5WFjHMbw95DpN -OIPQRf/NsmhAjree4Rk4YZaDTbpJB//N7JwtA9UT0p5mu1mA3UoTa+WoBLsq1KGZ -aztuWZVxYPG4Xmq5AQvH -=oqbJ +iQIcBAEBCAAGBQJTaxUpAAoJEDYO1FT4VRUUvRMP/Rz+NimfA1r82G3FLunzxLwl +C3zzmfgJZDWMjGrJsbc2cKG0M9rhY5/d4gz6jrOcEbAYBBIYja6TwL56snpVp5XB +IeT0hpRkoC8Yt4dlR7uqyKCzz4rq6lWv6GmLgdIguZnpk5G3IXYtMEFXDasB0E1I +BleYryq/wNFSj13cEKfSfSW+H4ofIIpaWO6Ju0XRrAEpYjHRmdOLQtgsm8qdcX5w +aGTkFuGWi9wMXVMH5dgypkErJg9QDvNKs3qsJamevaSYi4GQEw3dNeGJYGvjcTgh +AM0KwYrxAUjP69DUREUsCxL4XQ6hSFjeiFhgsUGlQ6k6O6Bl5LOEP1FvjAq0WCvA +oiD4QbnzVAg++ctuMfNGZGNY7rlzZpio0lyRS3/Ne3y7ysuBBUDdBbWwfhvZ+woM +LekNv2ajn0v8C4MaCQHbx0ZeKGxU7n9dFwm1fUMK38PMUD1plTw2C8AWY5RtFC8s +CG0+oGh21aD4o1dpDM80bNDz2u1yvNIprAn5MdgCSZ5IISHfMeGw8D02Y6y0Jbhf +m1JwUTxm691ScA8MNQoRXEb+Q8LYxRvsSYhCHsUAhxTwmYd5YjdnxoJG8Sgv4SMH +jttogjwWJgKcwYC+4o0C4TfN0cbaWnTWUiZ9Jud8zO6aTcsRAFOfaYRr3J0HWv0S +Nw9FH0mt89e0D5Ed23wG +=BUhN -----END PGP SIGNATURE----- diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-tcp.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-tcp.patch new file mode 100644 index 000000000000..2f82a5f98a58 --- /dev/null +++ b/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-tcp.patch @@ -0,0 +1,32 @@ +Index: sys/netinet/tcp_reass.c +=================================================================== +--- sys/netinet/tcp_reass.c (revision 264836) ++++ sys/netinet/tcp_reass.c (working copy) +@@ -211,7 +211,7 @@ tcp_reass(struct tcpcb *tp, struct tcphdr *th, int + * Investigate why and re-evaluate the below limit after the behaviour + * is understood. + */ +- if (th->th_seq != tp->rcv_nxt && ++ if ((th->th_seq != tp->rcv_nxt || !TCPS_HAVEESTABLISHED(tp->t_state)) && + tp->t_segqlen >= (so->so_rcv.sb_hiwat / tp->t_maxseg) + 1) { + V_tcp_reass_overflows++; + TCPSTAT_INC(tcps_rcvmemdrop); +@@ -234,7 +234,7 @@ tcp_reass(struct tcpcb *tp, struct tcphdr *th, int + */ + te = uma_zalloc(V_tcp_reass_zone, M_NOWAIT); + if (te == NULL) { +- if (th->th_seq != tp->rcv_nxt) { ++ if (th->th_seq != tp->rcv_nxt || !TCPS_HAVEESTABLISHED(tp->t_state)) { + TCPSTAT_INC(tcps_rcvmemdrop); + m_freem(m); + *tlenp = 0; +@@ -282,7 +282,8 @@ tcp_reass(struct tcpcb *tp, struct tcphdr *th, int + TCPSTAT_INC(tcps_rcvduppack); + TCPSTAT_ADD(tcps_rcvdupbyte, *tlenp); + m_freem(m); +- uma_zfree(V_tcp_reass_zone, te); ++ if (te != &tqs) ++ uma_zfree(V_tcp_reass_zone, te); + tp->t_segqlen--; + /* + * Try to present any queued data diff --git a/sys-freebsd/freebsd-sources/freebsd-sources-9.1-r6.ebuild b/sys-freebsd/freebsd-sources/freebsd-sources-9.1-r7.ebuild index 229ca340f452..7806f0c93fa5 100644 --- a/sys-freebsd/freebsd-sources/freebsd-sources-9.1-r6.ebuild +++ b/sys-freebsd/freebsd-sources/freebsd-sources-9.1-r7.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-r6.ebuild,v 1.1 2014/04/12 07:01:49 naota Exp $ +# $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 $ inherit bsdmk freebsd flag-o-matic @@ -39,7 +39,8 @@ PATCHES=( "${FILESDIR}/${PN}-9.0-disable-optimization.patch" "${FILESDIR}/${PN}-9.1-cve-2013-5710.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-mmap-2014.patch" + "${FILESDIR}/${PN}-9.1-tcp.patch" ) src_unpack() { freebsd_src_unpack |