Add patch to deal with CVE-2013-3266. #468422

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

4 files changed, 40 insertions, 8 deletions

diff --git a/sys-freebsd/freebsd-sources/ChangeLog b/sys-freebsd/freebsd-sources/ChangeLog
index 58fdb6db150b..415a2b3c67e7 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-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/ChangeLog,v 1.82 2013/01/29 13:11:14 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/ChangeLog,v 1.83 2013/05/07 14:18:08 naota Exp $
+
+*freebsd-sources-9.1-r1 (07 May 2013)
+
+  07 May 2013; Naohiro Aota <naota@gentoo.org>
+  +files/freebsd-sources-9.1-cve-2013-3266.patch,
+  +freebsd-sources-9.1-r1.ebuild, -freebsd-sources-9.1.ebuild:
+  Add patch to deal with CVE-2013-3266. #468422
 
   29 Jan 2013; Alexis Ballier <aballier@gentoo.org> freebsd-sources-9.1.ebuild:
   Install to /usr/src/PN-RV to ease upgrades, bug #454414 by Yuta SATOH
diff --git a/sys-freebsd/freebsd-sources/Manifest b/sys-freebsd/freebsd-sources/Manifest
index 115e47ee98f2..b9bed6078c99 100644
--- a/sys-freebsd/freebsd-sources/Manifest
+++ b/sys-freebsd/freebsd-sources/Manifest
@@ -30,6 +30,7 @@ AUX freebsd-sources-9.0-disable-optimization.patch 927 SHA256 e8ad8d8ed1f729b7b2
 AUX freebsd-sources-9.0-gentoo.patch 1194 SHA256 251178d014e62fbc3f20c26dd0e78401cc6691a848facd3ff2c7418ed7a43f22 SHA512 0c06b2e18ee8e97c8cc17eeaa50bd77a8a4fed0982cdc2f5cf3446b6020436bb91da256e8765a72ba4d384ebcb494f0b14c5302c4b956f540ff7374b6f55eea6 WHIRLPOOL 77a8bb44b6a18927eb21876672ece0bbfb79a57e29ea56df0eb484e5de37780156652330f03acfa7b8311b836d16ace56d52466a975cc036c3143c2994b14986
 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-cve-2013-3266.patch 535 SHA256 3ddd63716570d7a08956228d3f2b165e80380d3062cecfa9ed781696542cf7e2 SHA512 04f421724d79a2e8c5a23120a44601bd611b938e4452d064034b7cf91ab36e2b019e3a12af62d5bd180a5da30ca59886f90aeb6f1255dcd2124285aec6b65fa7 WHIRLPOOL e12449b21f4a3200da65d815bdc33972e9aa7b2941560fba13a634be9baad4246b635ee87510a09dee123b65ea614ed57f17e482ba41a0ea2c986e579d75f3a9
 AUX freebsd-sources-9.1-gentoo.patch 743 SHA256 f75e451259933aac8028ad0a2b6d9ee43d21bf40f7309e556d139c7a125392bd SHA512 9a7abc263c87134534d6f5a727e08c5f5c34b0272b8b03ddb89daf2ea27e4ec1e46d59202347e4b4154ac617e8c8fa8c29be95d498b54e392680b96fdd10cb6c WHIRLPOOL 237fbd8f3770442cc2692a2b62e83ecc732f54510d267a575a388de778f4b5c22a778d6fd8a69822ff8e782118c936e843e845c6461b0694ab357b261608a86e
 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
@@ -42,13 +43,23 @@ EBUILD freebsd-sources-7.2-r3.ebuild 3943 SHA256 f6b279fd482a0b156924fc23fbb7a11
 EBUILD freebsd-sources-8.0.ebuild 3671 SHA256 4b9c2b8f9a800697543e942138914a7784f3e111dc33db7dfe8daa31c37b3262 SHA512 89a9b735d64b24e192e546154d066d7ad4492054bc1c5079b64eae01c7ec992295d911a4fe55ea05a77885a4549775a3d85e1ed4f6d87560db1509bd2ed28b43 WHIRLPOOL 7be82aae09e023fc1cb25fb8f9ebee963c5874d2223e75fef878d167d7df967ee9356a710666a6f563ebf377e18cace1eab1017f7778f69bc23a63e59d54f883
 EBUILD freebsd-sources-8.2-r2.ebuild 3801 SHA256 1766a68e4f3191690a805d89280250a549fdbe0ef08ca9962c0aa46256ff0762 SHA512 85b3793d6042a4db9409dd42e90e37e67d880d5ff5996834b467662c60febab7a63d9f13176b549fa93a8aa4ae212f80e42e0742c16de910e5f3c85b06ef3059 WHIRLPOOL 91deb75cdfb47e561cbf842a2ca70be4ea4af4216c1a97e598f6bdc3b9c796d822c7ba5cba8edced1a6a43a2a9bd15e7d31e8d9b292965d24792bc88a557ac15
 EBUILD freebsd-sources-9.0-r5.ebuild 3500 SHA256 9c08ac66025fd0dff16233546f408581e92f0c9c77fd9d803668cd451d86b4a5 SHA512 90e7cef893c4e096e916eceff6b4263330c20cc11ac0f7469e9f190c4e0aea0f781ed604cee9b3956b774389b7c4ae5776fadbb4400e8efb4aa8416ac528d3ff WHIRLPOOL 0e11564b0bd7e6978a03e96600d4ab32b7d07f197c7ba98374c1785dd1e7e65b60061770505d208b59472696a80b107b5f2e73612897ca8d94330e9b4a40ffaa
-EBUILD freebsd-sources-9.1.ebuild 2525 SHA256 f596ff32a38a09b6f0dd7ccf8d137231a1032fd5869ae19f4d146280d2753075 SHA512 eb6e794e1308501f0af53a7e8aaf8d6e0cfbd063fcfe2953f193448da3c8002eb0352887ffad506291addd49c62f853d442be8581e306ffb82e6974d8901b224 WHIRLPOOL 8022d14dbfaa3384abd9a482d463a7a1e416c77a849d871b18b0a6a75fe66633922bdf4068663ce10b6218e1a97ff7f3d7f0c5ba9423fb921de0848da0263774
-MISC ChangeLog 21308 SHA256 05b55ea0f108d8dfb4f5d9bd6c89b67167ed5cae074fe68c81cc8b0dc6f5dcef SHA512 55c5a9de2b05035da3330474bb9ec4efd56fe3cf01687fc007a4b832a6bf78c6f0f7cff7dd57036bc39e3fd590302d7693197db32e218898b5f8f2d4c5dc1ed9 WHIRLPOOL f541dc9aa2a76aa9727d63f05d9b668a0090826c2496b89511e8ba2e3137ace9587ad782ec3c021c4db0802cb2a232ceafd4546187fe59f958368c0093a217cb
+EBUILD freebsd-sources-9.1-r1.ebuild 2570 SHA256 de6e26cbba0a2ba614197ca9c0e3f79c52a8a0ac75a4f0472e1f8b8b5e30ef02 SHA512 987fe570befbdd30fad2bea293c5901be8320cf67139a44b2c1119493c9889d82cd6ce41dd0b2faa18328389e0ad4c91c846218a02d7e82eb76f1ee0b4f5b315 WHIRLPOOL 094fbec11a470f1a4ec2237487c7333a0dd0d824decbaaea1ac47486ca9c7ba317e4e1204c91753f9a4f8e650d74d3e5ec2d01a74f4ce1a8636f946100ba22e4
+MISC ChangeLog 21553 SHA256 5bb389b81797b708c247e9a651c39a6780b0e64edfd9362e43ba8563637a5029 SHA512 7cfe45553b36a1366b467d02169b2d1c68b7f6fd178b2483adbb80f937eb814c713acf987d31f1b6b1649d5682d1d828515da052d98e7d63c94efdd8006262ed WHIRLPOOL 57320c4bd32e161ce0329fa6925e71c52c94347183204089d57f8af27ddd0906d8b4a17bf96ed421283e002eabf5c41b5554ddc2b92628ef31608636eb0ca2f4
 MISC metadata.xml 156 SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 SHA512 aecca1f1d4eff88d6d0ebb895d3529e0ac602e488368880f4fde751dd5b8768cccb8ed9cb1bbea36fc47a5169e50afb9b40ac3f608a5a4e4838e9f3c64255714 WHIRLPOOL bea666b5dcd6e8f24c75b7331c3bcfffe66c054d5c29e21b09c1ea7232b1a3bbd564c2e294b639a8c61e6bcbe3ede92b55cbb12e5e7208dad0bc334842ba4d84
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlEHynMACgkQvFcC4BYPU0oCGQCdH5mABtk0nwdjI+CPD3bV1LZZ
-6RUAn07RCLTfC/pwZG1ID8IEvBy8demW
-=HqvO
+iQIcBAEBCAAGBQJRiQ0vAAoJEDYO1FT4VRUUMqYQAKGE4JADECeAtIp0xaE0gF62
+xYp5HRVQAPILOQvE3YVesI6FLnYOwjqR28wFUbOqz2LqbYmpsFgmbVyOYCAcm63e
+a87vNR72i7lC80HWRcczgjkuWf6RnoCOfsNVg6ALoOMf4gwHo64jprOhmy7U4NG/
+TjZ68yYR5lb0P1H7sxIf6wJNSzsjqi1L4gkSeHLwiFOOy9zuLOR5x73fONXNvmhD
+QxN27Tdfy8VD1+l1Uq5lL3FGyWPl/eVAMQE1vrItP9MnnfpOICYPVad9lXL4dJ1e
+yIVtt3Qw1nbNfOaWvjl0iG0jdkgMBpaKrXS5ueL4eQrzYjWgkGvKJyABkshQo+mW
+VyOa1jQ/AyIz7IEHadHKot9zxWlMWxh971u+TUg72m61rJDsRXJf3575F4e0aaSt
+m+NitceHy9VOuOQerWS19YbFwrpaodKYRqrRpJmppwxZSuVWzXHx/ze+j/4QDYrY
+d7GwaYpIXy8KWSGpg62aWlox+u/8RrXcmiI81DUUWv+q5fhekkYW7uoUGD8yCnPm
+R8DZeQuQiOmdtpjXmxm11V+S/jbMeTxJdTC8xtXJT7VO0KyKnrhtOWw2b824ad/k
+nWPy5xmTMWZdxDpPNVf1XdOFS4LF6tVa9otaUwktBgs6Cn5ER4CZJAMwfGDv/zJo
+eh+ONYz0uEZqeZy1y/1f
+=he5k
 -----END PGP SIGNATURE-----
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-cve-2013-3266.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-cve-2013-3266.patch
new file mode 100644
index 000000000000..0d1a89419e5f
--- /dev/null
+++ b/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-cve-2013-3266.patch
@@ -0,0 +1,13 @@
+Index: sys/fs/nfsserver/nfs_nfsdport.c
+===================================================================
+--- sys/fs/nfsserver/nfs_nfsdport.c	(revision 249651)
++++ sys/fs/nfsserver/nfs_nfsdport.c	(working copy)
+@@ -1568,6 +1568,8 @@ nfsrvd_readdir(struct nfsrv_descript *nd, int isdg
+ 			nd->nd_repstat = NFSERR_BAD_COOKIE;
+ #endif
+ 	}
++	if (!nd->nd_repstat && vp->v_type != VDIR)
++		nd->nd_repstat = NFSERR_NOTDIR;
+ 	if (nd->nd_repstat == 0 && cnt == 0) {
+ 		if (nd->nd_flag & ND_NFSV2)
+ 			/* NFSv2 does not have NFSERR_TOOSMALL */
diff --git a/sys-freebsd/freebsd-sources/freebsd-sources-9.1.ebuild b/sys-freebsd/freebsd-sources/freebsd-sources-9.1-r1.ebuild
index 1dcf6dbba18d..2f254d83b253 100644
--- a/sys-freebsd/freebsd-sources/freebsd-sources-9.1.ebuild
+++ b/sys-freebsd/freebsd-sources/freebsd-sources-9.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 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.ebuild,v 1.2 2013/01/29 13:11:14 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/freebsd-sources-9.1-r1.ebuild,v 1.1 2013/05/07 14:18:08 naota Exp $
 
 inherit bsdmk freebsd flag-o-matic
 
@@ -27,7 +27,8 @@ 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}-7.0-tmpfs_whiteout_stub.patch" )
+	"${FILESDIR}/${PN}-7.0-tmpfs_whiteout_stub.patch"
+	"${FILESDIR}/${PN}-9.1-cve-2013-3266.patch" )
 
 src_unpack() {
 	freebsd_src_unpack