Apply a fix for FreeBSD-SA-15:09.ipv6. https://github.com/gentoo/gentoo-portage-rsync-mirror/pull/91 by nigoro.

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

4 files changed, 55 insertions, 20 deletions

diff --git a/sys-freebsd/freebsd-sources/ChangeLog b/sys-freebsd/freebsd-sources/ChangeLog
index 58ae308345d8..fb5f038f2fde 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-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/ChangeLog,v 1.109 2015/03/15 18:06:56 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/ChangeLog,v 1.110 2015/04/10 13:34:44 mgorny Exp $
+
+*freebsd-sources-10.1-r2 (10 Apr 2015)
+
+  10 Apr 2015; Michał Górny <mgorny@gentoo.org>
+  +files/freebsd-sources-10.1-cve-2015-2923.patch,
+  +freebsd-sources-10.1-r2.ebuild, -freebsd-sources-10.1-r1.ebuild:
+  Apply a fix for FreeBSD-SA-15:09.ipv6. https://github.com/gentoo/gentoo-
+  portage-rsync-mirror/pull/91 by nigoro.
 
   15 Mar 2015; Michał Górny <mgorny@gentoo.org> freebsd-sources-10.1-r1.ebuild:
   Support upgrades from 9.x. https://github.com/gentoo/gentoo-portage-rsync-
diff --git a/sys-freebsd/freebsd-sources/Manifest b/sys-freebsd/freebsd-sources/Manifest
index 531a8207d251..4334025ab193 100644
--- a/sys-freebsd/freebsd-sources/Manifest
+++ b/sys-freebsd/freebsd-sources/Manifest
@@ -6,6 +6,7 @@ AUX freebsd-sources-10.0-gentoo.patch 713 SHA256 13588f0572ba95c86beb755ce3d681c
 AUX freebsd-sources-10.1-cve-2014-8612.patch 2097 SHA256 c8ade882a39dd8f65c34b175457cdd93be6eafea67ffb5f977435d48a19b6b68 SHA512 b233ae1d249bdbf516aba611d081a5a6ccaaab32f9e281cce65136c68c6a47362eac33398d6849a45e4e1c30f02a482287d6339069d29ece0aa5c4d9101e24a4 WHIRLPOOL 4713b4d896c561d47686b9f1d53a7e3c912fc58c8039529f0ae244b2cc533aabf20f386a1f9bc8632849ebd084d3739b6be55d4f39a00d484d5d230755497b69
 AUX freebsd-sources-10.1-cve-2014-8613.patch 4181 SHA256 61b5e717e88671ecc3da9c2b11d4c6d5ddc26f529ed19cb8ce588743cd00af9d SHA512 30deeb82af385abb0b57cc02752e72d8dda37688df99038910f04558ab064624cb576b1989ba8a7674e3a9046f9607be90596d9bdfb2f28900568291b0f96717 WHIRLPOOL 1073a364805b0ef8377dae6e3cd1665de6e4e99612549081fd794a4d92b4b4ee583a68e66f089340dc35129e3fb0bcf00b14b5b71304b6dac744d9a852530fbe
 AUX freebsd-sources-10.1-cve-2015-1414.patch 463 SHA256 969674297e3afbacbd3e15fc6621c813149ab044964d47b936761f04f8ff0bd6 SHA512 5668d18c0abcaad53547394bca18fa1060372cd7f59fd35265778ad74bd331ed08fd8c0b0e48fb338bf8d08c427af1b40315855c7d83c9e3c1917b2f22de1f92 WHIRLPOOL ca93b5f794aac22a23c0e14853813439ce9e0a26847aeec3498bf01c7e10cc1829ddde1a2d5d1291bf2a610773846bfef9217199da1a249d4e7df9f4e44a3e46
+AUX freebsd-sources-10.1-cve-2015-2923.patch 872 SHA256 318babf3961a2b99ea5453a5e2b65e4918279110b8c59ee54741ec4d689de227 SHA512 15a938c0c092bd7d40417d18c57401b0e0fea3c9a5976dea55e1fd2329ac5987016a719c7d8a078ce950b49b2096a26a058b5f7c7ba525430a975ab8fe68cb64 WHIRLPOOL 271b0750ddd3a8a88c18dc4e97e601f68419b6ff3ba9d4c0f5611153e945ecbcaea586ed8bb740ab00836370951ba977dc65739b55984fa5e08ecb70079d309d
 AUX freebsd-sources-10.1-en-1501-vt.patch 877 SHA256 0dccdea4622599a50010a5dc7ebd411ad4c662e4a0f387f6faf43550269e9c61 SHA512 caf4b7587d3555aea8291578de03bb158e71ffa42ec323fd8736ea9b690eeac42084d8909a97ea39352573bb78e97fb4f367f2968e70970d68006c82726329a1 WHIRLPOOL a4ca24f7a91e98a97ba2b0d9a5e7c6297baf7ed501582d3f70b180cf596d6d4ccf058b1843abb60c448f17e95ed68ae0d1efa7deff0269c76abadfd3ede0533a
 AUX freebsd-sources-6.0-flex-2.5.31.patch 826 SHA256 8aaf240a344106fc5434fd098eb6555a554d16513b71c95f93a93388021c3d99 SHA512 7183b1923019df12849e7d3984c4227d65275077cf95c3b0719b99dc852234eb3813db0e69e9c34bdfca45a59f7340209211d0b7a2a5074c2d1ad8ea0a3a3f64 WHIRLPOOL 620ae55a54333c55e44247aad76be467bdfa491dac646f65dc0e0b6b1a95fe8edf5087e9ed68abeac1ef6db1a91c0e673342bf44f8753b6b8a5dce889137cdcc
 AUX freebsd-sources-6.1-ntfs.patch 1043 SHA256 2eb0e22bea267d7ac41c3dec81682d3cc1f1744316ea39342e2aaae1f2dca469 SHA512 5401b50ed93bd9155b8adc3f0d6ec81b6e48431bb950cdf468be2e918553e19cd88a1988cdad49be2a34a1db44419cb9eb7067ff0fb1feb8b3f6373aa3c262ad WHIRLPOOL bf4821beae08e002f290286bc290b2bfeac86db46c1597232f06a23e505d720e34841393d9fb4d7276ff7b98c1c133aae5d58c3ec7b8f12712b51260b981bd14
@@ -48,7 +49,7 @@ DIST freebsd-sys-9.2_rc1.tar.bz2 34377450 SHA256 0db609374f4922e026779331a3299cf
 DIST freebsd-sys-9.2_rc2.tar.bz2 34381761 SHA256 2cf28a18adf0d22c0d141f2ee0c7a8b4167a232b2f488389a1b9777c0fc3259f SHA512 1ac4ae1e04f44bbe9687722fc21633e7ea5e0990327f079dfb3239dca1fc6f92a587e4f5d9fa4ec6112b99ce57297f5394303d5907b04f7a3eaeff7a1c71bac0 WHIRLPOOL 734a3911efcc3253bf8e04eb57130b227b38f9e8666aeb50fc608af42ed8ca080016b3062d59ddc585890693bdb64d4a90a0fa7287a0bc62ede4ad445140223f
 DIST freebsd-sys-9.2_rc3.tar.bz2 34386428 SHA256 86fd03137f39a8544174dd26f4096da022c1ecfa447a1e7c9e4e241428b94947 SHA512 233181db24063e6afe1dc3e17280e2b89a39529961814640bd52d6efa1bd9f9212ab2a467266df7cd1c52654e1759f124df5d4fa439862397816623d46f3af40 WHIRLPOOL 4d7a065decda622550b16b2583b133f9b3d42aca4e6707a53012bbac9e5eb62b2fbdfc84d9cc0b666c9685e8f9abd6c9b7c9f46ce23e7b16a90a05530f45cc9b
 DIST freebsd-ubin-10.1.tar.xz 1918648 SHA256 92d09ffb4de7cf955e9937ebd39f1cf0c8ff9e0fe0bdef4f30b6003241849361 SHA512 18507ca084294d9ce6e858914e0d37371217c0aeafda9633268a90b9efc7c8c6709a271e3e2c279d14d74d03162c257ec0ccedeb0f4aae4513baeca82fcec409 WHIRLPOOL 23649e668ff2cadd5f16fe5c2fb2b4e14d261dec32c24c232a41a7e88363cc16c97f7226affc25e35ff31865fa632cfbf49fb1ab2375786942d2e5949670685e
-EBUILD freebsd-sources-10.1-r1.ebuild 4126 SHA256 1ed884e398684ad6e5814779c10fe13a60b7b50574a97672304fb5fe4b5f0658 SHA512 f12ad1281060c3fa4dca118d7d8e869108d8ec5220448d824372136598341b23e0fca9c27ac05be67018664c5cc96ecce6c07b17c80fe5d3faa630f4fffd9b47 WHIRLPOOL c8786821d8c0004a19495d00bc41fbfbe1b58d28b130822532335e489df34a5e4e176ab70863bf9ddf38a6293f63f226a2c51442c789ad06c5a576a91478205e
+EBUILD freebsd-sources-10.1-r2.ebuild 4221 SHA256 6ff56a2f89939ad901a00a1e46c893bab1ecdfc97d5282d86e3e7831a27dab3b SHA512 0eb189c870cbf78006ffb600863f5a90ea379fdb5e6738af28de8ef148e919154a4f4f47a06dcabd89b3b2dbdbf5e021361c4a47879066ff234d796b0fd191fa WHIRLPOOL 97c1aa97a8eed181da7b8062673294ffd576b7d6f1df2e4984d95356504c44483a2abc7d414de96a98c36bcfd098183e6792fb79497ac2a5f1e52f870dc66a5f
 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-r9.ebuild 3189 SHA256 cf16bf2ff54bc8ca37e42581c2d40cff0771c4fa527d08ed4c440817fe98d267 SHA512 a918e8f72abd21851c547c8c86843f8c89c3b1b3e92f7d34a30fbfb7681a4b4dc30690c176b0e8f8840f1ad082bf48de0eeb199062ec475ca8a5708fa8071e90 WHIRLPOOL a00bb3b64f4d0a2952a0df5f4b3bb82103eedbf29adad611f7090fa593f247dcc025613ba1f49c22698e3aeb396bf93843679490071b4e04bdf8498ddb4f09b0
@@ -56,24 +57,24 @@ EBUILD freebsd-sources-9.2.ebuild 3142 SHA256 a2e5782e94e9a309f212e52c5b994a712a
 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 27653 SHA256 2f9026875c7fef68e95370bec612f6d4ea925c4e99ebd78132e885dde61b1baf SHA512 501ea9182208e90984a21742540201f3a38be87bac9ae22d38fa501aa095078e79e66e13e5254ef6680d348c204ae1234292dde2d3236ddf4018df7d739602c3 WHIRLPOOL 5307cf3afe0ae01014e10df45e1c524aa076a5ae09a85f992b6b438b3d4c8bd5da41ba2f4aed2da6f18ce4cdb575f17ea5e22b3e5e73f4c28a6a71fe9246a19d
+MISC ChangeLog 27980 SHA256 3cf879fbe9da085ad5349b234042a0063353afff47a210d1a9b5f17b91063878 SHA512 6a8d3a5514aba1694c4668c44e920e23f8d9d64866ddfe3937e7916a344652a4306605d8f29f8fa9beede6c026623590f1bfeaefeae490a0341ce92e29e580e0 WHIRLPOOL c125f327b03442f4fad89a2b787fc0efb8608e4353650b640b93873ec8ebed80a8e4c0ec414e9264d76710e5e0511afcaec18e600a7b03634156e741240a0fa1
 MISC metadata.xml 442 SHA256 17c155d89c131666e8d51f90a65e90de3c5c7ebcb0d82cf867b88f973636a839 SHA512 8460234a38bd7c449ab40a2053a5f83ebdb633befdd21dab64074ba8c5e7202ebb6bed39e6c65940d4ce35bd806ca0e481159263124e96e01e6f802aeabeaaff WHIRLPOOL 5127cb0e07ff5a52af42b943bc978608ae512af28ce18a0ee319f7143a0b2addb0d0633fe203050a9a8faab66145d2454352dd1367c2c0a21d6d18b9bc8407bd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQJ8BAEBCABmBQJVBcpFXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJVJ9F1XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOkEIP/04eu0hKWBwtAsSNwrJVWAHW
-2DuFQbViRIrjzfHgV3e1NC0390tgTlRfuovk47Wv5+MRs3bHZADmVcdHN8mZQzJ+
-NQ3vx9clAY6kfzDX3hdbLJZrn5B9/VP5+KNDcVXhf+Q5aeqYL7xisemmtxyJj1bS
-EaYINx7E+Nvva/A/6nz4bJgMq6e7KzPqZHyWMTBXQ4afosnY5uCQt4y6lWRfp6dZ
-EDYJ9xGftlgsIeNDwnvVjUFd5QOIWeSgSg0G8+tk+cn4wWNzKHjU+CHs71CvUisP
-E232x8fcRN183kNo+7Ngtyo2rFW9y6+iz3BGNYNmdX6V4DKT/7tflYv1MpGbpMqT
-0lmAX+WPwp3p2tOft+mXQSnFmpA+vuiyL+UdPZKAx8iq9EgqupUmpLo5I27uVntK
-ZrteTHcpjAiTTCwJPYP9UCnimtW9TNJsFCC1cbWgTZJE8XPjY8uk/+AvZVxJr9Y2
-pfekQjBTc4Kybu5gzU5msqvA3qfLBIRNYyPJj7t0QOTOF6kWt9aqj7Q/5NahCSIa
-FPrlL7Qo0H6mXwAVYX7dOID4GQyWCyDt9PIKRShPcJ+PpqOglyCZD/lDZs8K4crj
-23Sft5cdt6k3DAomt6sSpfP32wnXW9wQpYJvVbXnmKI2mtUs+EVrNE4VHyEbjvWc
-LJhL38yJs9DvGyoFJPo5
-=Esc8
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOLJEP/1vDuIIW7kpu51Z/KKvLeWpm
+iQt9EhC/QR1TG77lLbcmb6WdMQ+5wpHPbpaHYIgPigPhMHZfR3jbBMuBC2FsQvQ/
+dHLh7eC9+VetjacG+2TRhih2APEaa83cu+rV53w3On1pL921JSi2idND1fIZTtD0
+4HPk42oMzP9OBcRpFunAuXoRaETRl3aHATMPAH8OsHkVqh4w+b3V5eT5TlolkmBV
+BzdR/UXlOj2vS2ctsbzEXmnxZzY49dtovc8wvaRlBwz2I/asYg32bq9hgq7G4a4V
+BDkf5v5R3N6ba4RAIoVZFRpPzOniBW9YrwK7FXR1TO/A7zGI4LHPYTXFMD2xz0TN
+Vf7cISBJL8CSjdWm+Qw5uylTCcrHHlr5OV+dzdFfHwAKnhhqgElalmBQKN5y7Q+H
+7z2ejpR19PS99w32t62szmS4kOSbPg1O2NMUJwKfs5RhtFKZtmqibdpLadTXrO7G
+ZZVNgu3cpWb1TZIbUfN9zHTjvLlm6CiA7dJPA5GwagFGZQEW6w2waQABdfxo6dDO
+El4xdtaaTpvhWgbELpZgQL9WQzrEPolBdmSMmGAW0AMSN5WgZRxcryGBWr4o/uUs
+YuNLQC5ZvGarhYzsEJI2w+VsN0uEyTwkAYG+F0ZhxfwTkC5RqxTZUpk9ceC8IRtn
+PQBUK+iqGA96ZoBkT1Yh
+=ogNJ
 -----END PGP SIGNATURE-----
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-10.1-cve-2015-2923.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-10.1-cve-2015-2923.patch
new file mode 100644
index 000000000000..430e1b192ab1
--- /dev/null
+++ b/sys-freebsd/freebsd-sources/files/freebsd-sources-10.1-cve-2015-2923.patch
@@ -0,0 +1,23 @@
+Index: sys/netinet6/nd6_rtr.c
+===================================================================
+--- sys/netinet6/nd6_rtr.c	(revision 280920)
++++ sys/netinet6/nd6_rtr.c	(working copy)
+@@ -296,8 +296,16 @@ nd6_ra_input(struct mbuf *m, int off, int icmp6len
+ 	}
+ 	if (nd_ra->nd_ra_retransmit)
+ 		ndi->retrans = ntohl(nd_ra->nd_ra_retransmit);
+-	if (nd_ra->nd_ra_curhoplimit)
+-		ndi->chlim = nd_ra->nd_ra_curhoplimit;
++	if (nd_ra->nd_ra_curhoplimit) {
++		if (ndi->chlim < nd_ra->nd_ra_curhoplimit)
++			ndi->chlim = nd_ra->nd_ra_curhoplimit;
++		else if (ndi->chlim != nd_ra->nd_ra_curhoplimit) {
++			log(LOG_ERR, "RA with a lower CurHopLimit sent from "
++			    "%s on %s (current = %d, received = %d). "
++			    "Ignored.\n", ip6_sprintf(ip6bufs, &ip6->ip6_src),
++			    if_name(ifp), ndi->chlim, nd_ra->nd_ra_curhoplimit);
++		}
++	}
+ 	dr = defrtrlist_update(&dr0);
+     }
+ 
diff --git a/sys-freebsd/freebsd-sources/freebsd-sources-10.1-r1.ebuild b/sys-freebsd/freebsd-sources/freebsd-sources-10.1-r2.ebuild
index c54b8bdb8f24..ed7b2632bbc9 100644
--- a/sys-freebsd/freebsd-sources/freebsd-sources-10.1-r1.ebuild
+++ b/sys-freebsd/freebsd-sources/freebsd-sources-10.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/freebsd-sources-10.1-r1.ebuild,v 1.2 2015/03/15 18:06:56 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/freebsd-sources-10.1-r2.ebuild,v 1.1 2015/04/10 13:34:44 mgorny Exp $
 
 EAPI=5
 
@@ -43,10 +43,13 @@ PATCHES=( "${FILESDIR}/${PN}-9.0-disable-optimization.patch"
 	"${FILESDIR}/${PN}-8.0-subnet-route-pr40133.patch"
 	"${FILESDIR}/${PN}-7.1-includes.patch"
 	"${FILESDIR}/${PN}-9.0-sysctluint.patch"
-	"${FILESDIR}/${PN}-9.2-gentoo-gcc.patch"
-	"${FILESDIR}/${PN}-10.1-cve-2014-8612.patch"
+	"${FILESDIR}/${PN}-9.2-gentoo-gcc.patch" )
+
+# Fix Security Advisory and Errata.
+PATCHES+=( "${FILESDIR}/${PN}-10.1-cve-2014-8612.patch"
 	"${FILESDIR}/${PN}-10.1-cve-2014-8613.patch"
 	"${FILESDIR}/${PN}-10.1-cve-2015-1414.patch"
+	"${FILESDIR}/${PN}-10.1-cve-2015-2923.patch"
 	"${FILESDIR}/${PN}-10.1-en-1501-vt.patch" )
 
 pkg_setup() {