Add patch to deal with FreeBSD SA 11:05. #408889

Package-Manager: portage-2.2.0_alpha89/cvs/FreeBSD i386

4 files changed, 74 insertions, 9 deletions

diff --git a/sys-freebsd/freebsd-sources/ChangeLog b/sys-freebsd/freebsd-sources/ChangeLog
index 3119f83ad09f..738774f9eec5 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-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/ChangeLog,v 1.63 2012/03/30 15:49:23 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/ChangeLog,v 1.64 2012/04/02 10:13:19 naota Exp $
+
+*freebsd-sources-8.2-r1 (02 Apr 2012)
+
+  02 Apr 2012; Naohiro Aota <naota@gentoo.org>
+  +files/freebsd-sources-8.2-unix2.patch, +freebsd-sources-8.2-r1.ebuild,
+  -freebsd-sources-8.2.ebuild:
+  Add patch to deal with FreeBSD SA 11:05. #408889
 
   30 Mar 2012; Alexis Ballier <aballier@gentoo.org>
   -freebsd-sources-9.0_rc1.ebuild, -freebsd-sources-9.0_rc2.ebuild,
diff --git a/sys-freebsd/freebsd-sources/Manifest b/sys-freebsd/freebsd-sources/Manifest
index 3ba71e80a5d7..9a9bf8c752a5 100644
--- a/sys-freebsd/freebsd-sources/Manifest
+++ b/sys-freebsd/freebsd-sources/Manifest
@@ -25,6 +25,7 @@ AUX freebsd-sources-8.0-sparc64.patch 450 RMD160 d712559b603cd8d92f9c4e21eb3696c
 AUX freebsd-sources-8.0-subnet-route-pr40133.patch 548 RMD160 51be284cf04c41d0ff89148582d98c2e130abc27 SHA1 9ee460dd7b27b2afef2bf8eb68c4bd395e85f66d SHA256 091764c97f4148d2245c24dcfabebd53ef0b4f3175a140fd5b1132788e718ca1
 AUX freebsd-sources-8.0-werror.patch 718 RMD160 a216ab16df0e4ce896cfe1cfa7ccc4a4376151e7 SHA1 449b058d0b2672436973575e326b3f7c5a90820d SHA256 a8675081639004d576be3c9f2cdb11d586290dc65db4fc9b0ec4da5fe57392bd
 AUX freebsd-sources-8.0-zfs.patch 926 RMD160 be94ae9270060e3892071695e0abcf95d420a59f SHA1 bb2c34cbd9fa6f510e1b19c213f720b213373244 SHA256 d9cf38d074ac26b04f8a36abc4c2a6c8fca52bc16d1cbcd1f87c8c233a0a64f5
+AUX freebsd-sources-8.2-unix2.patch 1642 RMD160 0ddbf08159fe3d99fde9d07ac624a07a53cad81b SHA1 a86aade71970678609d1966dc229ec519c71e3e6 SHA256 6dd35d13a13f5e9333557a84b56c89fc4988d55bc3267cca72e8ca8ca169ce61
 AUX freebsd-sources-9.0-gentoo.patch 1194 RMD160 1933e7ca85b65d8f81622c01d1b3374fa9072319 SHA1 30992a38173c1732ec1f05fe6c19ac961717917c SHA256 251178d014e62fbc3f20c26dd0e78401cc6691a848facd3ff2c7418ed7a43f22
 DIST freebsd-sys-7.2.tar.bz2 23005928 RMD160 0ecdff9fbefe9e16325e09a76310ca2b4a7751b8 SHA1 1c2d6894371a8650288ebf1a4831a4b08c2e4f09 SHA256 38e1fc670b8438be42947b1512ca7d10b0f8c62c58d3234afd8ce2e55b6cae11
 DIST freebsd-sys-8.0.tar.bz2 22552771 RMD160 08f5b09dc0b4353658a309e9e1198dbab1f5ab83 SHA1 9c5e4bdc7af2b9947c55751325880c27f80df225 SHA256 2d822bdeecbbea660aea06ba147a23878cbae7f0640b0b822552d6fa1836d8c9
@@ -32,14 +33,14 @@ DIST freebsd-sys-8.2.tar.bz2 25835329 RMD160 e8fe34f792c1102fe237af7c87ba9c259cd
 DIST freebsd-sys-9.0.tar.bz2 30369960 RMD160 137ac728d78767eae184ac0bf00014d1bfeffc37 SHA1 cc09df384bd519ddf39254605a5ad80f702f3d68 SHA256 1c5e2181db9e92209933b1de9488109d88f0b2f15d07ee37aa491920e1990a54
 EBUILD freebsd-sources-7.2-r3.ebuild 3943 RMD160 3ac41528e8eb22a186114f2b767b33a6f25372ba SHA1 0b0df74007a6cf813292a1a056e4433676e4d2c7 SHA256 f6b279fd482a0b156924fc23fbb7a110b156d7c61a583e25817c1afa3f48b3a8
 EBUILD freebsd-sources-8.0.ebuild 3671 RMD160 6655f21db26ee64b50ce019816667bfe18ee4017 SHA1 00c9a13a48c92554ae49adebd725fde59a3da704 SHA256 4b9c2b8f9a800697543e942138914a7784f3e111dc33db7dfe8daa31c37b3262
-EBUILD freebsd-sources-8.2.ebuild 3602 RMD160 d0b19d1350a6452b219fdae8b9140d2cbd7588b2 SHA1 9c489a1c74909d9adea8aedb7c874adbf455fb6c SHA256 00496f511c658f4e10ebb0d4f911a5b4163c40901c32d07cb48d4b5fb3530a7a
+EBUILD freebsd-sources-8.2-r1.ebuild 3701 RMD160 8a12d0abc7d37a19b7cc0447ff2b3bcebdb84a75 SHA1 69d144943d701f2a852324ddbbea1c0705c9fbc0 SHA256 6a5414a83ca2a406b92ba1a3f96467d311469a86c40fdfbf41a8810526e21d43
 EBUILD freebsd-sources-9.0.ebuild 3556 RMD160 53e9559d2e0e6b16d682a9a92829fc3b4592860c SHA1 a46033c252b7da3d469037ede474c90b3e60f86c SHA256 e2c40666aafa493f422b83eb73627a35a2e861b2a6e2436429703cbf2f2a7751
-MISC ChangeLog 17409 RMD160 6771b3030a72ade75e9c129a4cb6c95ac97e4c0d SHA1 09c2345ae52b4cb42c65ddecffab8e4ea61f844a SHA256 ff70a77d967e8f6f3bc9d08d55cb586848d252a70f8930ea1ec3bc95bb930adb
+MISC ChangeLog 17649 RMD160 16dbe2751c24d6c790a489c1109b89f3f0981e78 SHA1 d689bf4796bc5a31eddb93aad38ce38b9e73f397 SHA256 4f604a105ad043484f13429ccfd2f80af884ce90f85289eec1bd4fd0f29fa18c
 MISC metadata.xml 156 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 SHA1 d9d9d4f2b5afc58339ea3e562fca490156935f1f SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.18 (FreeBSD)
 
-iEYEARECAAYFAk911gkACgkQvFcC4BYPU0rp6ACfczPJOMACjRD6pfhfRmsj4Fx1
-yskAoLo+diGmTeXU4HTSK6Hr5H1S/JM9
-=9/b0
+iEYEARECAAYFAk95e8cACgkQGpDnPLSHuMDPWwCgkaFXaAerMXwmQ6q1aa1grxM+
+1B0An2lUUe9ozMrbcVHeQSFTU31sIM65
+=S/Mm
 -----END PGP SIGNATURE-----
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-8.2-unix2.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-8.2-unix2.patch
new file mode 100644
index 000000000000..50dacd0e5a49
--- /dev/null
+++ b/sys-freebsd/freebsd-sources/files/freebsd-sources-8.2-unix2.patch
@@ -0,0 +1,55 @@
+Index: sys/kern/uipc_usrreq.c
+===================================================================
+--- sys/kern/uipc_usrreq.c	(revision 225745)
++++ sys/kern/uipc_usrreq.c	(working copy)
+@@ -462,6 +462,8 @@
+ 	unp = sotounpcb(so);
+ 	KASSERT(unp != NULL, ("uipc_bind: unp == NULL"));
+ 
++	if (soun->sun_len > sizeof(struct sockaddr_un))
++		return (EINVAL);
+ 	namelen = soun->sun_len - offsetof(struct sockaddr_un, sun_path);
+ 	if (namelen <= 0)
+ 		return (EINVAL);
+@@ -1252,6 +1254,8 @@
+ 	unp = sotounpcb(so);
+ 	KASSERT(unp != NULL, ("unp_connect: unp == NULL"));
+ 
++	if (nam->sa_len > sizeof(struct sockaddr_un))
++		return (EINVAL);
+ 	len = nam->sa_len - offsetof(struct sockaddr_un, sun_path);
+ 	if (len <= 0)
+ 		return (EINVAL);
+Index: sys/compat/linux/linux_socket.c
+===================================================================
+--- sys/compat/linux/linux_socket.c	(revision 225919)
++++ sys/compat/linux/linux_socket.c	(working copy)
+@@ -104,6 +104,7 @@
+ 	int oldv6size;
+ 	struct sockaddr_in6 *sin6;
+ #endif
++	int namelen;
+ 
+ 	if (*osalen < 2 || *osalen > UCHAR_MAX || !osa)
+ 		return (EINVAL);
+@@ -166,6 +167,20 @@
+ 		}
+ 	}
+ 
++	if ((bdom == AF_LOCAL) && (*osalen > sizeof(struct sockaddr_un))) {
++		for (namelen = 0;
++		    namelen < *osalen - offsetof(struct sockaddr_un, sun_path);
++		    namelen++)
++			if (!((struct sockaddr_un *)kosa)->sun_path[namelen])
++				break;
++		if (namelen + offsetof(struct sockaddr_un, sun_path) >
++		    sizeof(struct sockaddr_un)) {
++			error = EINVAL;
++			goto out;
++		}
++		alloclen = sizeof(struct sockaddr_un);
++	}
++
+ 	sa = (struct sockaddr *) kosa;
+ 	sa->sa_family = bdom;
+ 	sa->sa_len = alloclen;
diff --git a/sys-freebsd/freebsd-sources/freebsd-sources-8.2.ebuild b/sys-freebsd/freebsd-sources/freebsd-sources-8.2-r1.ebuild
index c39b7386b11d..0ffa86a25486 100644
--- a/sys-freebsd/freebsd-sources/freebsd-sources-8.2.ebuild
+++ b/sys-freebsd/freebsd-sources/freebsd-sources-8.2-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/freebsd-sources-8.2.ebuild,v 1.1 2011/07/06 06:09:18 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/freebsd-sources-8.2-r1.ebuild,v 1.1 2012/04/02 10:13:19 naota Exp $
 
 inherit bsdmk freebsd flag-o-matic
 
@@ -52,6 +52,8 @@ src_unpack() {
 	epatch "${FILESDIR}/${PN}-7.1-types.h-fix.patch"
 	epatch "${FILESDIR}/${PN}-8.0-subnet-route-pr40133.patch"
 	epatch "${FILESDIR}/${PN}-7.1-includes.patch"
+	# http://security.FreeBSD.org/patches/SA-11:05/unix2.patch
+	epatch "${FILESDIR}"/${P}-unix2.patch
 
 	# By adding -DGENTOO_LIVECD to CFLAGS activate this stub
 	# vop_whiteout to tmpfs, so it can be used as an overlay