1 |
commit: 8bf57aa52a012990cc0b2fb1686d0cf69b676abd |
2 |
Author: Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp> |
3 |
AuthorDate: Sat Feb 28 23:32:41 2015 +0000 |
4 |
Commit: Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp> |
5 |
CommitDate: Sat Feb 28 23:32:41 2015 +0000 |
6 |
URL: http://sources.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=8bf57aa5 |
7 |
|
8 |
freebsd-sources-10.1.0.9999-r2: security fix CVE-2015-1414 |
9 |
|
10 |
--- |
11 |
sys-freebsd/freebsd-sources/Manifest | 3 ++- |
12 |
.../files/freebsd-sources-10.1-cve-2015-1414.patch | 15 +++++++++++++++ |
13 |
...99-r1.ebuild => freebsd-sources-10.1.0.9999-r2.ebuild} | 3 ++- |
14 |
3 files changed, 19 insertions(+), 2 deletions(-) |
15 |
|
16 |
diff --git a/sys-freebsd/freebsd-sources/Manifest b/sys-freebsd/freebsd-sources/Manifest |
17 |
index 0742fde..b595b90 100644 |
18 |
--- a/sys-freebsd/freebsd-sources/Manifest |
19 |
+++ b/sys-freebsd/freebsd-sources/Manifest |
20 |
@@ -5,6 +5,7 @@ AUX freebsd-sources-10.0-clang34.patch 838 SHA256 2f1b02ff11ac48958857fa07168ea2 |
21 |
AUX freebsd-sources-10.0-gentoo.patch 713 SHA256 13588f0572ba95c86beb755ce3d681c963e220694e3c0b3aae29faf05f8479da SHA512 98b8d1bf033b9bd7147f10e5bb4a39ac4883ec02ef0cc3825541ff11cb9bfe5e7722e7b8dcefe4c356f9fb0f86ec5cad6fbf9b80dbfd04149142fea5f8712d4d WHIRLPOOL 6372ec9abb566d06db174dd20785ab1768487ac2d57799fabad2d45cb77418f0e39aa0bad745c873e1c50de86a70fa80890f7f2f377f6a53f4fd5b7a6fa49edf |
22 |
AUX freebsd-sources-10.1-cve-2014-8612.patch 2097 SHA256 c8ade882a39dd8f65c34b175457cdd93be6eafea67ffb5f977435d48a19b6b68 SHA512 b233ae1d249bdbf516aba611d081a5a6ccaaab32f9e281cce65136c68c6a47362eac33398d6849a45e4e1c30f02a482287d6339069d29ece0aa5c4d9101e24a4 WHIRLPOOL 4713b4d896c561d47686b9f1d53a7e3c912fc58c8039529f0ae244b2cc533aabf20f386a1f9bc8632849ebd084d3739b6be55d4f39a00d484d5d230755497b69 |
23 |
AUX freebsd-sources-10.1-cve-2014-8613.patch 4181 SHA256 61b5e717e88671ecc3da9c2b11d4c6d5ddc26f529ed19cb8ce588743cd00af9d SHA512 30deeb82af385abb0b57cc02752e72d8dda37688df99038910f04558ab064624cb576b1989ba8a7674e3a9046f9607be90596d9bdfb2f28900568291b0f96717 WHIRLPOOL 1073a364805b0ef8377dae6e3cd1665de6e4e99612549081fd794a4d92b4b4ee583a68e66f089340dc35129e3fb0bcf00b14b5b71304b6dac744d9a852530fbe |
24 |
+AUX freebsd-sources-10.1-cve-2015-1414.patch 463 SHA256 969674297e3afbacbd3e15fc6621c813149ab044964d47b936761f04f8ff0bd6 SHA512 5668d18c0abcaad53547394bca18fa1060372cd7f59fd35265778ad74bd331ed08fd8c0b0e48fb338bf8d08c427af1b40315855c7d83c9e3c1917b2f22de1f92 WHIRLPOOL ca93b5f794aac22a23c0e14853813439ce9e0a26847aeec3498bf01c7e10cc1829ddde1a2d5d1291bf2a610773846bfef9217199da1a249d4e7df9f4e44a3e46 |
25 |
AUX freebsd-sources-6.0-flex-2.5.31.patch 826 SHA256 8aaf240a344106fc5434fd098eb6555a554d16513b71c95f93a93388021c3d99 SHA512 7183b1923019df12849e7d3984c4227d65275077cf95c3b0719b99dc852234eb3813db0e69e9c34bdfca45a59f7340209211d0b7a2a5074c2d1ad8ea0a3a3f64 WHIRLPOOL 620ae55a54333c55e44247aad76be467bdfa491dac646f65dc0e0b6b1a95fe8edf5087e9ed68abeac1ef6db1a91c0e673342bf44f8753b6b8a5dce889137cdcc |
26 |
AUX freebsd-sources-6.1-ntfs.patch 1043 SHA256 2eb0e22bea267d7ac41c3dec81682d3cc1f1744316ea39342e2aaae1f2dca469 SHA512 5401b50ed93bd9155b8adc3f0d6ec81b6e48431bb950cdf468be2e918553e19cd88a1988cdad49be2a34a1db44419cb9eb7067ff0fb1feb8b3f6373aa3c262ad WHIRLPOOL bf4821beae08e002f290286bc290b2bfeac86db46c1597232f06a23e505d720e34841393d9fb4d7276ff7b98c1c133aae5d58c3ec7b8f12712b51260b981bd14 |
27 |
AUX freebsd-sources-7.0-tmpfs_whiteout_stub.patch 1015 SHA256 7857fc90c6d5ed28d848146d50ab5bcd01f79ad3480ad1335929f08e45afbc44 SHA512 9dc96b967869efd7480785977764e879bf50978b5e609867e678574f9ed1476695690832bdb725eaebc8d93e83b4a0b3fe9f23b94e2de072a6540a168b13c4a7 WHIRLPOOL 6841f24f2d3ff569ff0e7bd4d628955c9b61b41aa039bdd1e736fa82f737842101c212d8ae8961d1db335e53ba332cdbec1d021a4c57520e426926981bca4512 |
28 |
@@ -24,5 +25,5 @@ AUX freebsd-sources-9.2-gentoo-gcc.patch 506 SHA256 7457421478066b686dabc9a072ea |
29 |
AUX freebsd-sources-9.2-gentoo.patch 716 SHA256 9a196adef145f57bf960b936f69065f6793df55420ef010c04f76578eb5d1e23 SHA512 3f6d9c4e2e3ee34058bc44ffae87c1de82e70f03d31635f27e477437f3ad4e003d2f3d6c4ab393d18dfc8eeab4cbc0af4a25227ca5d48bcd579dc07bbe3bd7f1 WHIRLPOOL 4b0207d4ffffda9daa88663b638b542acb2f567284ef4456cd18fe74770793666bb5e9de34f02b1dbf29fa79d8bae9305ad84d5cf378510004b926beacb7250d |
30 |
AUX freebsd-sources-cve-2012-0217.patch 856 SHA256 9b752e65a29b2b9a4a1412765d69d00310c05508af1cfa6d8d3c16d545bb3ffe SHA512 b1ac18cae23b81fd5ab2fcb44bb9f9808d6eb80f52b8572b81296fdd0b18edee62460520bc753848283d67e13367bf99775a2a5c6cf0272def9cdff6ec6fa4d9 WHIRLPOOL 27e4d0647c5275b77123bef6b866ac841af4b1b547fc663f776da82a7889995eba21b930adeabf2a71b3fbe053d2af5583cbdb6e8fd16a0379d10214d24b9121 |
31 |
AUX freebsd-sources-cve-2012-4576.patch 561 SHA256 c3ad42e10164eaa3d928fd11a68b5ab490981b5d4684315e7e78c582e680d6c2 SHA512 451fb9be983672fa8d85d34bf13b67e70ac4bbda44da0c16ee484349bcf4e9ad795f66c36b5216bbcf022f709727dc19760e9f23b001a5768d9fa15dbad8122a WHIRLPOOL 2f261add2b2d9014782198b564a807f1a61917e0fbe91354ce5b1a685b27e312e699b7dc799f1653c952864633be84dda110e37f74378a3c5f1c5aacacb6811d |
32 |
-EBUILD freebsd-sources-10.1.0.9999-r1.ebuild 3905 SHA256 ed67bd4830ae5025d242c8d9648c533073278f3ef29e5d09a59cb6a570e3d638 SHA512 90bc1ef547ef4564b75ec8bcb391d9a2f75b24588939f3f35811eb26ca3b7abd04e40a4cb32b9211652fffdc2adfa9bb5050461af4b0a6806ed422a0cf1d60be WHIRLPOOL 08256f4b8badad44b6a8e48a47e80b878f8653528a8bc962f1da9bd8218c92eb82bb5364a1d25fe58e2def929120c89e210dcb6374d77a57cf5dbb306499e3ed |
33 |
+EBUILD freebsd-sources-10.1.0.9999-r2.ebuild 3951 SHA256 3e5071a1dc764809739680dcb3fc123c34362e90531eb4efacec4a17b39bb389 SHA512 eef5c568e1009ba26408d7059d27d737f1f9777ecc3d1e553ed299f513244f20aa2ab01b1eec66a50064138d1c8fced7830660a94a3f8d6a0bf60cd8e4d647ef WHIRLPOOL 6504ffef793b3118751070ee7827fb8203603f2162304e92f525e9c7d6eeed7c4a8eb00af6875eafd2d50de5bfbfedcbd19956cc43e66a2812760f3a31f6f6b5 |
34 |
MISC metadata.xml 410 SHA256 f29a086ab076d7e7924571990c4cab73cce2aec303e10cf3be057dfa0c8b27fd SHA512 d949aac7499d418fce878c099d47713112e1856346dbf7478e95c14f37a5f2c2fbd580a21b2330712e439d5be235bc2de69ac182bd46c1727e95fbb3b081dd0f WHIRLPOOL ffc6ba7653dfa4be5d63231043a64c85a3ad2409f98b8e1f9cf03dd51edb84b1ed0add5a613e591e9f2409c92e3be08e8b3f7f2073fa45f362c19ef72ec7f63d |
35 |
|
36 |
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 |
37 |
new file mode 100644 |
38 |
index 0000000..eeb65e0 |
39 |
--- /dev/null |
40 |
+++ b/sys-freebsd/freebsd-sources/files/freebsd-sources-10.1-cve-2015-1414.patch |
41 |
@@ -0,0 +1,15 @@ |
42 |
+Index: sys/netinet/igmp.c |
43 |
+=================================================================== |
44 |
+--- sys/netinet/igmp.c (revision 278973) |
45 |
++++ sys/netinet/igmp.c (working copy) |
46 |
+@@ -1533,8 +1533,8 @@ igmp_input(struct mbuf *m, int off) |
47 |
+ case IGMP_VERSION_3: { |
48 |
+ struct igmpv3 *igmpv3; |
49 |
+ uint16_t igmpv3len; |
50 |
+- uint16_t srclen; |
51 |
+- int nsrc; |
52 |
++ uint16_t nsrc; |
53 |
++ int srclen; |
54 |
+ |
55 |
+ IGMPSTAT_INC(igps_rcv_v3_queries); |
56 |
+ igmpv3 = (struct igmpv3 *)igmp; |
57 |
|
58 |
diff --git a/sys-freebsd/freebsd-sources/freebsd-sources-10.1.0.9999-r1.ebuild b/sys-freebsd/freebsd-sources/freebsd-sources-10.1.0.9999-r2.ebuild |
59 |
similarity index 97% |
60 |
rename from sys-freebsd/freebsd-sources/freebsd-sources-10.1.0.9999-r1.ebuild |
61 |
rename to sys-freebsd/freebsd-sources/freebsd-sources-10.1.0.9999-r2.ebuild |
62 |
index a139b6d..ad398cc 100644 |
63 |
--- a/sys-freebsd/freebsd-sources/freebsd-sources-10.1.0.9999-r1.ebuild |
64 |
+++ b/sys-freebsd/freebsd-sources/freebsd-sources-10.1.0.9999-r2.ebuild |
65 |
@@ -44,7 +44,8 @@ PATCHES=( "${FILESDIR}/${PN}-9.0-disable-optimization.patch" |
66 |
"${FILESDIR}/${PN}-9.0-sysctluint.patch" |
67 |
"${FILESDIR}/${PN}-9.2-gentoo-gcc.patch" |
68 |
"${FILESDIR}/${PN}-10.1-cve-2014-8612.patch" |
69 |
- "${FILESDIR}/${PN}-10.1-cve-2014-8613.patch" ) |
70 |
+ "${FILESDIR}/${PN}-10.1-cve-2014-8613.patch" |
71 |
+ "${FILESDIR}/${PN}-10.1-cve-2015-1414.patch" ) |
72 |
|
73 |
pkg_setup() { |
74 |
# Force set CC=clang. when using gcc, aesni fails to build. |