Add patches for latest fbsd sec. advisory and errata.

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

5 files changed, 187 insertions, 6 deletions

diff --git a/sys-freebsd/freebsd-sources/ChangeLog b/sys-freebsd/freebsd-sources/ChangeLog
index 35ddfeb03269..a45a74ad4c2c 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.50 2009/06/26 05:50:20 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/ChangeLog,v 1.51 2009/10/16 13:05:27 aballier Exp $
+
+*freebsd-sources-7.2-r2 (16 Oct 2009)
+
+  16 Oct 2009; Alexis Ballier <aballier@gentoo.org>
+  +freebsd-sources-7.2-r2.ebuild, +files/freebsd-sources-7.2-devfs7.patch,
+  +files/freebsd-sources-7.2-null.patch:
+  Add patches for latest fbsd sec. advisory and errata.
 
 *freebsd-sources-7.2-r1 (26 Jun 2009)
 
diff --git a/sys-freebsd/freebsd-sources/Manifest b/sys-freebsd/freebsd-sources/Manifest
index 0a1f26f414e2..10d7a2020cde 100644
--- a/sys-freebsd/freebsd-sources/Manifest
+++ b/sys-freebsd/freebsd-sources/Manifest
@@ -32,7 +32,9 @@ 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-devfs7.patch 414 RMD160 e09e7ad20e3faec887b7a2af5f243bbc77637572 SHA1 4ea557bcf544ca52a057a6f8d5679a428a70265f SHA256 9144a5052d09ce2bf3a33ad09e27351dc115c98b055a9b7b735dcdc372632071
 AUX freebsd-sources-7.2-ipv6.patch 858 RMD160 fae14bbcd3d5c2c6ff76f845cd34a50c6a32e640 SHA1 fa8b9f415d943d1bd1d6c9d672262d8a368ffba5 SHA256 909842ecf21d7a369b0f9445082142920c9021d978ad33858a92a23d33478151
+AUX freebsd-sources-7.2-null.patch 1529 RMD160 b498b8ebdae7f59c35dc33552c601ba5e9793433 SHA1 0221e1be7d26039067e3a1b75eabdd16e3c99f9a SHA256 e617f280e8f957d6b0e1a09380ed7fc8370418b6b581fb2d49e09b1101f7c6c4
 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
@@ -42,13 +44,14 @@ DIST freebsd-sys-7.2.tar.bz2 23005928 RMD160 0ecdff9fbefe9e16325e09a76310ca2b4a7
 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-r2.ebuild 3898 RMD160 3963e6d5f19ae696bf023b31dc35d25667ced8fe SHA1 9bed9e5b0620a2d585cd57153464aa9087f799ec SHA256 b4d677644189b15b2b629fca1c46b02c9ff101ce2b736c42cf005d2a220191d2
 EBUILD freebsd-sources-7.2.ebuild 3721 RMD160 901ef05d61d35dc797d703bdcc4475fd277d0280 SHA1 532ec0489b846aaccebe8a1ced86c51a2de60e39 SHA256 e3c8238b6bdc864bff3902d9b79b164abe069d72849505467b000d1a21add1bf
-MISC ChangeLog 14052 RMD160 e1d93fe7e7dea4ba2c2a060843894249f11a92d4 SHA1 5ed85bd306f533847e3451e1c7e4d6277a7beb55 SHA256 896c11e08cfd23c1818c11f4efc756e3193016b7d7d461158380b2ace32fb992
+MISC ChangeLog 14316 RMD160 b8d29f2fd24c32e3021614db79d510da5948a417 SHA1 cefb25b50ee644aaac9a693c4767938cfd5a46ab SHA256 d64e2a10e337bdc2166b9e8ba6d02d659b336e17890968c0e904f66edf4fcf1c
 MISC metadata.xml 156 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 SHA1 d9d9d4f2b5afc58339ea3e562fca490156935f1f SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.12 (GNU/Linux)
+Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkpEYVgACgkQvFcC4BYPU0r1dgCgoDejYcYMWATlRSdP6NPXePuc
-Aw8AnR4ANRaBkQay6pEfSLTe4c+NbTLg
-=PXy3
+iEYEARECAAYFAkrYb50ACgkQvFcC4BYPU0qzZACgpNJJRTpyFL3R6LZE+vbHDlrZ
+ihQAn3p4XMf1A20AmE6mhoWJpBCYzVNn
+=pCF5
 -----END PGP SIGNATURE-----
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-7.2-devfs7.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-7.2-devfs7.patch
new file mode 100644
index 000000000000..e1fcefb028ce
--- /dev/null
+++ b/sys-freebsd/freebsd-sources/files/freebsd-sources-7.2-devfs7.patch
@@ -0,0 +1,15 @@
+http://security.freebsd.org/advisories/FreeBSD-SA-09:14.devfs.asc
+
+Index: sys/fs/devfs/devfs_vnops.c
+===================================================================
+--- sys/fs/devfs/devfs_vnops.c	(revision 192300)
++++ sys/fs/devfs/devfs_vnops.c	(revision 192301)
+@@ -890,6 +890,7 @@
+ 	if (fp != NULL) {
+ 		FILE_LOCK(fp);
+ 		fp->f_data = dev;
++		fp->f_vnode = vp;
+ 		FILE_UNLOCK(fp);
+ 	}
+ 	fpop = td->td_fpop;
+
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-7.2-null.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-7.2-null.patch
new file mode 100644
index 000000000000..16e5023806eb
--- /dev/null
+++ b/sys-freebsd/freebsd-sources/files/freebsd-sources-7.2-null.patch
@@ -0,0 +1,47 @@
+http://security.freebsd.org/advisories/FreeBSD-EN-09:05.null.asc
+
+Index: sys/kern/kern_exec.c
+===================================================================
+--- sys/kern/kern_exec.c	(revision 197682)
++++ sys/kern/kern_exec.c	(working copy)
+@@ -122,6 +122,11 @@
+ SYSCTL_ULONG(_kern, OID_AUTO, ps_arg_cache_limit, CTLFLAG_RW, 
+     &ps_arg_cache_limit, 0, "");
+ 
++static int map_at_zero = 1;
++TUNABLE_INT("security.bsd.map_at_zero", &map_at_zero);
++SYSCTL_INT(_security_bsd, OID_AUTO, map_at_zero, CTLFLAG_RW, &map_at_zero, 0,
++    "Permit processes to map an object at virtual address 0.");
++
+ static int
+ sysctl_kern_ps_strings(SYSCTL_HANDLER_ARGS)
+ {
+@@ -939,7 +944,7 @@
+ 	int error;
+ 	struct proc *p = imgp->proc;
+ 	struct vmspace *vmspace = p->p_vmspace;
+-	vm_offset_t stack_addr;
++	vm_offset_t sv_minuser, stack_addr;
+ 	vm_map_t map;
+ 	u_long ssiz;
+ 
+@@ -955,13 +960,17 @@
+ 	 * not disrupted
+ 	 */
+ 	map = &vmspace->vm_map;
+-	if (vmspace->vm_refcnt == 1 && vm_map_min(map) == sv->sv_minuser &&
++	if (map_at_zero)
++		sv_minuser = sv->sv_minuser;
++	else
++		sv_minuser = MAX(sv->sv_minuser, PAGE_SIZE);
++	if (vmspace->vm_refcnt == 1 && vm_map_min(map) == sv_minuser &&
+ 	    vm_map_max(map) == sv->sv_maxuser) {
+ 		shmexit(vmspace);
+ 		pmap_remove_pages(vmspace_pmap(vmspace));
+ 		vm_map_remove(map, vm_map_min(map), vm_map_max(map));
+ 	} else {
+-		error = vmspace_exec(p, sv->sv_minuser, sv->sv_maxuser);
++		error = vmspace_exec(p, sv_minuser, sv->sv_maxuser);
+ 		if (error)
+ 			return (error);
+ 		vmspace = p->p_vmspace;
diff --git a/sys-freebsd/freebsd-sources/freebsd-sources-7.2-r2.ebuild b/sys-freebsd/freebsd-sources/freebsd-sources-7.2-r2.ebuild
new file mode 100644
index 000000000000..52de4e553b71
--- /dev/null
+++ b/sys-freebsd/freebsd-sources/freebsd-sources-7.2-r2.ebuild
@@ -0,0 +1,109 @@
+# 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-r2.ebuild,v 1.1 2009/10/16 13:05:27 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"
+	epatch "${FILESDIR}/${PN}-7.2-devfs7.patch"
+	epatch "${FILESDIR}/${PN}-7.2-null.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
+}