Add patches for the two latest security advisories for FreeBSD kernel.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

5 files changed, 166 insertions, 6 deletions

diff --git a/sys-freebsd/freebsd-sources/ChangeLog b/sys-freebsd/freebsd-sources/ChangeLog
index e9694d8382c0..35ddfeb03269 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-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/ChangeLog,v 1.49 2009/05/22 13:50:44 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/ChangeLog,v 1.50 2009/06/26 05:50:20 aballier Exp $
+
+*freebsd-sources-7.2-r1 (26 Jun 2009)
+
+  26 Jun 2009; Alexis Ballier <aballier@gentoo.org>
+  +freebsd-sources-7.2-r1.ebuild, +files/freebsd-sources-7.2-ipv6.patch,
+  +files/freebsd-sources-7.2-pipe.patch:
+  Add patches for the two latest security advisories for FreeBSD kernel.
 
 *freebsd-sources-7.2 (22 May 2009)
 
diff --git a/sys-freebsd/freebsd-sources/Manifest b/sys-freebsd/freebsd-sources/Manifest
index 775c14c39115..0a1f26f414e2 100644
--- a/sys-freebsd/freebsd-sources/Manifest
+++ b/sys-freebsd/freebsd-sources/Manifest
@@ -32,6 +32,8 @@ AUX freebsd-sources-7.1-sparc64.patch 513 RMD160 53b026e81bac9942491aa6566332944
 AUX freebsd-sources-7.1-subnet-route-pr40133.patch 546 RMD160 b6b1df97612860dbb8d281926f133348a0409f47 SHA1 fd1b1b8637cd49d5d2ae2a6448db66e87f1a2515 SHA256 e9ccfb24bb05122ec939f6ecbbee0447fe9281c3a7d80387402e058315435673
 AUX freebsd-sources-7.1-types.h-fix.patch 371 RMD160 d514196ccf1ba246a158b5f421f009d96d2dd8c4 SHA1 b04bec25903446c20bdfd144796fe9924f9ba39f SHA256 9e745fcfe046c405a365d8d0db8763867f0a618952f7d6bab4c76a8c82273473
 AUX freebsd-sources-7.2-debug-O2.patch 771 RMD160 9cebbeb3aa9a58c2fccb51baf2a9b3238db2bfce SHA1 5325bdebc7dc50ea615e5b019e1bf473c42630af SHA256 ad1fdd8a6dd53186793d70b65e1b37e3d3e7a4e50c32069aa535ae9f8e9aded8
+AUX freebsd-sources-7.2-ipv6.patch 858 RMD160 fae14bbcd3d5c2c6ff76f845cd34a50c6a32e640 SHA1 fa8b9f415d943d1bd1d6c9d672262d8a368ffba5 SHA256 909842ecf21d7a369b0f9445082142920c9021d978ad33858a92a23d33478151
+AUX freebsd-sources-7.2-pipe.patch 771 RMD160 093b002265a7fa086c92972c1a99db6cf5f81d71 SHA1 03e8d28acd80ac4ffa47e8492f14b50124de5dfb SHA256 7f8b87ef0d7ba883627823709746cc02fb8590d4a81d1b2dd76803b40aa9190b
 AUX freebsd-sources-7.2-sparc64.patch 446 RMD160 70e36ed7ab84e743ceae47135e400b4c42085f58 SHA1 9983471737dba92625941dad5b250b1dda4d26bb SHA256 cc6d10c593c4f0122f9b9f55b80981bfd4fcd009e69606119d2eea62d94afa69
 AUX freebsd-sources-gentoo.patch 1191 RMD160 1c8ce1849d767a995f075fe43b7313b341bd0805 SHA1 abe5d4ff186d1b9b6ad6d7af6be359563e81183b SHA256 e5e7186858259e7d6d21e925dde640a68b27255cf69ab089ee82675568e7d9a7
 DIST freebsd-sys-6.2.tar.bz2 18344936 RMD160 784230e22ccaf09933ef3f053ff29cc3e579786a SHA1 161b7a4d165665deb1c4434c356b5f610a72a83a SHA256 a754371d88601aaab7152bb3d127bd3777db912e13a26a866e13ba34934c5e5b
@@ -39,13 +41,14 @@ DIST freebsd-sys-7.1.tar.bz2 22471627 RMD160 2e09c51d3ffaaf62bd2fbeed8dd949a1463
 DIST freebsd-sys-7.2.tar.bz2 23005928 RMD160 0ecdff9fbefe9e16325e09a76310ca2b4a7751b8 SHA1 1c2d6894371a8650288ebf1a4831a4b08c2e4f09 SHA256 38e1fc670b8438be42947b1512ca7d10b0f8c62c58d3234afd8ce2e55b6cae11
 EBUILD freebsd-sources-6.2-r5.ebuild 3965 RMD160 4f877e3779c32711d781d8cd2ed579286c24ab3a SHA1 062afd930996a8bc037712584e9dcd041bf31bcd SHA256 59ff17393a1291a1d67000f1f66d7d4601c5cef644db4b9a0c7da56009ffb2fe
 EBUILD freebsd-sources-7.1-r1.ebuild 3769 RMD160 f2e4786513e396db3c32895ce3b6a8e95b5272c7 SHA1 de398b7520be41dacfb36b9d89ea9cbefa5992e8 SHA256 8e496132d0285ba1846f7695d89cce4fc80e8d693068865f5d36ec9573231889
+EBUILD freebsd-sources-7.2-r1.ebuild 3810 RMD160 e83293cdd4ec45f8633cf9093e7170231af52f75 SHA1 5e5d4db3a5a96575323bddfb34ba822927190726 SHA256 00fc92bd55620c9dcf5758c95d1f4f26e40c9003abcb10de73919a4dca84738f
 EBUILD freebsd-sources-7.2.ebuild 3721 RMD160 901ef05d61d35dc797d703bdcc4475fd277d0280 SHA1 532ec0489b846aaccebe8a1ced86c51a2de60e39 SHA256 e3c8238b6bdc864bff3902d9b79b164abe069d72849505467b000d1a21add1bf
-MISC ChangeLog 13773 RMD160 65e68d1a616329c2e53a1cd67b9ba0ad7232f9d8 SHA1 ce2bd4f3bbad52a7a3e27921c12a5d224e9e0fe7 SHA256 8177d5964a6a279bb09899da8520d258ec3f78f3ea21484184d2bb3874a65d34
+MISC ChangeLog 14052 RMD160 e1d93fe7e7dea4ba2c2a060843894249f11a92d4 SHA1 5ed85bd306f533847e3451e1c7e4d6277a7beb55 SHA256 896c11e08cfd23c1818c11f4efc756e3193016b7d7d461158380b2ace32fb992
 MISC metadata.xml 156 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 SHA1 d9d9d4f2b5afc58339ea3e562fca490156935f1f SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
+Version: GnuPG v2.0.12 (GNU/Linux)
 
-iEYEARECAAYFAkoWrbgACgkQvFcC4BYPU0rl8gCeKGbOHlK4k9mZuYHMoy+1+ge1
-ySUAn0fLr7KIdut00NS2M3sluhB1pWDb
-=JIp7
+iEYEARECAAYFAkpEYVgACgkQvFcC4BYPU0r1dgCgoDejYcYMWATlRSdP6NPXePuc
+Aw8AnR4ANRaBkQay6pEfSLTe4c+NbTLg
+=PXy3
 -----END PGP SIGNATURE-----
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-7.2-ipv6.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-7.2-ipv6.patch
new file mode 100644
index 000000000000..de8e0ac27c9b
--- /dev/null
+++ b/sys-freebsd/freebsd-sources/files/freebsd-sources-7.2-ipv6.patch
@@ -0,0 +1,25 @@
+http://security.freebsd.org/advisories/FreeBSD-SA-09:10.ipv6.asc
+
+Index: sys/netinet6/in6.c
+===================================================================
+RCS file: /home/ncvs/src/sys/netinet6/in6.c,v
+retrieving revision 1.109
+diff -p -u -I__FBSDID -I$FreeBSD -u -r1.109 in6.c
+--- sys/netinet6/in6.c	27 May 2009 14:11:23 -0000	1.109
++++ sys/netinet6/in6.c	8 Jun 2009 18:02:59 -0000
+@@ -215,6 +215,7 @@ in6_control(struct socket *so, u_long cm
+ 	case SIOCSRTRFLUSH_IN6:
+ 	case SIOCSDEFIFACE_IN6:
+ 	case SIOCSIFINFO_FLAGS:
++	case SIOCSIFINFO_IN6:
+ 		if (td != NULL) {
+ 			error = priv_check(td, PRIV_NETINET_ND6);
+ 			if (error)
+@@ -223,7 +224,6 @@ in6_control(struct socket *so, u_long cm
+ 		/* FALLTHROUGH */
+ 	case OSIOCGIFINFO_IN6:
+ 	case SIOCGIFINFO_IN6:
+-	case SIOCSIFINFO_IN6:
+ 	case SIOCGDRLST_IN6:
+ 	case SIOCGPRLST_IN6:
+ 	case SIOCGNBRINFO_IN6:
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-7.2-pipe.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-7.2-pipe.patch
new file mode 100644
index 000000000000..4b7db0298a20
--- /dev/null
+++ b/sys-freebsd/freebsd-sources/files/freebsd-sources-7.2-pipe.patch
@@ -0,0 +1,18 @@
+http://security.freebsd.org/advisories/FreeBSD-SA-09:09.pipe.asc
+
+Index: sys/kern/sys_pipe.c
+===================================================================
+RCS file: /home/ncvs/src/sys/kern/sys_pipe.c,v
+retrieving revision 1.201
+diff -p -u -I__FBSDID -I$FreeBSD -r1.201 sys_pipe.c
+--- sys/kern/sys_pipe.c	10 Mar 2009 21:28:43 -0000	1.201
++++ sys/kern/sys_pipe.c	5 Jun 2009 07:53:01 -0000
+@@ -761,6 +761,8 @@ pipe_build_write_buffer(wpipe, uio)
+ 	pmap = vmspace_pmap(curproc->p_vmspace);
+ 	endaddr = round_page((vm_offset_t)uio->uio_iov->iov_base + size);
+ 	addr = trunc_page((vm_offset_t)uio->uio_iov->iov_base);
++	if (endaddr < addr)
++		return (EFAULT);
+ 	for (i = 0; addr < endaddr; addr += PAGE_SIZE, i++) {
+ 		/*
+ 		 * vm_fault_quick() can sleep.  Consequently,
diff --git a/sys-freebsd/freebsd-sources/freebsd-sources-7.2-r1.ebuild b/sys-freebsd/freebsd-sources/freebsd-sources-7.2-r1.ebuild
new file mode 100644
index 000000000000..15e20f642626
--- /dev/null
+++ b/sys-freebsd/freebsd-sources/freebsd-sources-7.2-r1.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/freebsd-sources-7.2-r1.ebuild,v 1.1 2009/06/26 05:50:20 aballier Exp $
+
+inherit bsdmk freebsd flag-o-matic
+
+DESCRIPTION="FreeBSD kernel sources"
+SLOT="${PVR}"
+KEYWORDS="~sparc-fbsd ~x86-fbsd"
+
+IUSE="symlink"
+
+SRC_URI="mirror://gentoo/${SYS}.tar.bz2"
+
+RDEPEND=">=sys-freebsd/freebsd-mk-defs-7.0"
+DEPEND=""
+
+RESTRICT="strip binchecks"
+
+S="${WORKDIR}/sys"
+
+MY_PVR="${PVR}"
+
+[[ ${MY_PVR} == "${RV}" ]] && MY_PVR="${MY_PVR}-r0"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# This replaces the gentoover patch, it doesn't need reapply every time.
+	sed -i -e 's:^REVISION=.*:REVISION="'${PVR}'":' \
+		-e 's:^BRANCH=.*:BRANCH="Gentoo":' \
+		-e 's:^VERSION=.*:VERSION="${TYPE} ${BRANCH} ${REVISION}":' \
+		"${S}/conf/newvers.sh"
+
+	# __FreeBSD_cc_version comes from FreeBSD's gcc.
+	# on 7.0-RELEASE it's 700003.
+	sed -e "s:-D_KERNEL:-D_KERNEL -D__FreeBSD_cc_version=700004:g" \
+		-i "${S}/conf/kern.pre.mk" \
+		-i "${S}/conf/kmod.mk" || die "Couldn't set __FreeBSD_cc_version"
+
+	epatch "${FILESDIR}/${PN}-7.0-gentoo.patch"
+	epatch "${FILESDIR}/${PN}-6.0-flex-2.5.31.patch"
+	epatch "${FILESDIR}/${PN}-7.1-asm.patch"
+	epatch "${FILESDIR}/${PN}-7.0-werror.patch"
+	epatch "${FILESDIR}/${PN}-7.2-sparc64.patch"
+	epatch "${FILESDIR}/${PN}-6.1-ntfs.patch"
+	epatch "${FILESDIR}/${PN}-7.2-debug-O2.patch"
+	epatch "${FILESDIR}/${PN}-7.1-types.h-fix.patch"
+	epatch "${FILESDIR}/${PN}-7.1-subnet-route-pr40133.patch"
+	epatch "${FILESDIR}/${PN}-7.1-includes.patch"
+	epatch "${FILESDIR}/${PN}-7.2-pipe.patch"
+	epatch "${FILESDIR}/${PN}-7.2-ipv6.patch"
+
+	# Disable SSP for the kernel
+	grep -Zlr -- -ffreestanding "${S}" | xargs -0 sed -i -e \
+		"s:-ffreestanding:-ffreestanding $(test-flags -fno-stack-protector -fno-stack-protector-all):g"
+
+	# By adding -DGENTOO_LIVECD to CFLAGS activate this stub
+	# vop_whiteout to tmpfs, so it can be used as an overlay
+	# unionfs filesystem over the cd9660 readonly filesystem.
+	epatch "${FILESDIR}/${PN}-7.0-tmpfs_whiteout_stub.patch"
+
+	# See http://sourceware.org/bugzilla/show_bug.cgi?id=5391
+	# ld doesn't provide symbols constructed as the __start_set_(s) ones
+	# are on FreeBSD modules.
+	# This patch adds code to generate a list of these and adds them
+	# as undefined references to ld's commandline to get them.
+	# Without this kernel modules will not load.
+	epatch "${FILESDIR}/${PN}-7.1-binutils_link.patch"
+}
+
+src_compile() {
+	einfo "Nothing to compile.."
+}
+
+src_install() {
+	insinto "/usr/src/sys-${MY_PVR}"
+	doins -r "${S}/"*
+}
+
+pkg_postinst() {
+	if [[ ! -L "${ROOT}/usr/src/sys" ]]; then
+		einfo "/usr/src/sys symlink doesn't exist; creating symlink to sys-${MY_PVR}..."
+		ln -sf "sys-${MY_PVR}" "${ROOT}/usr/src/sys" || \
+			eerror "Couldn't create ${ROOT}/usr/src/sys symlink."
+		# just in case...
+		[[ -L ""${ROOT}/usr/src/sys-${RV}"" ]] && rm "${ROOT}/usr/src/sys-${RV}"
+		ln -sf "sys-${MY_PVR}" "${ROOT}/usr/src/sys-${RV}" || \
+			eerror "Couldn't create ${ROOT}/usr/src/sys-${RV} symlink."
+	elif use symlink; then
+		einfo "Updating /usr/src/sys symlink to sys-${MY_PVR}..."
+		rm "${ROOT}/usr/src/sys" "${ROOT}/usr/src/sys-${RV}" || \
+			eerror "Couldn't remove previous symlinks, please fix manually."
+		ln -sf "sys-${MY_PVR}" "${ROOT}/usr/src/sys" || \
+			eerror "Couldn't create ${ROOT}/usr/src/sys symlink."
+		ln -sf "sys-${MY_PVR}" "${ROOT}/usr/src/sys-${RV}" || \
+			eerror "Couldn't create ${ROOT}/usr/src/sys-${RV} symlink."
+	fi
+
+	if use sparc-fbsd ; then
+		ewarn "WARNING: kldload currently causes kernel panics"
+		ewarn "on sparc64. This is probably a gcc-4.1 issue, but"
+		ewarn "we need gcc-4.1 to compile the kernel correctly :/"
+		ewarn "Please compile all modules you need into the kernel"
+	fi
+}