diff options
author | Naohiro Aota <naota@gentoo.org> | 2014-01-18 01:09:56 +0000 |
---|---|---|
committer | Naohiro Aota <naota@gentoo.org> | 2014-01-18 01:09:56 +0000 |
commit | 320d48482de5abdbc49c11f24c2a882d5cd1af4f (patch) | |
tree | 26fc075db8fdac088c30f1e6045e4c12de1453ac /sys-freebsd | |
parent | Add arm64 love. (diff) | |
download | gentoo-2-320d48482de5abdbc49c11f24c2a882d5cd1af4f.tar.gz gentoo-2-320d48482de5abdbc49c11f24c2a882d5cd1af4f.tar.bz2 gentoo-2-320d48482de5abdbc49c11f24c2a882d5cd1af4f.zip |
Add eratta patch. #498260
(Portage version: 2.2.8/cvs/Linux x86_64, signed Manifest commit with key F8551514)
Diffstat (limited to 'sys-freebsd')
-rw-r--r-- | sys-freebsd/freebsd-sources/ChangeLog | 12 | ||||
-rw-r--r-- | sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-mmap-2014.patch | 20 | ||||
-rw-r--r-- | sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-random.patch | 27 | ||||
-rw-r--r-- | sys-freebsd/freebsd-sources/freebsd-sources-9.1-r5.ebuild (renamed from sys-freebsd/freebsd-sources/freebsd-sources-9.1-r4.ebuild) | 8 |
4 files changed, 62 insertions, 5 deletions
diff --git a/sys-freebsd/freebsd-sources/ChangeLog b/sys-freebsd/freebsd-sources/ChangeLog index afdcb0d26000..ad321de0dd74 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-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/ChangeLog,v 1.101 2013/11/17 04:22:41 naota Exp $ +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/ChangeLog,v 1.102 2014/01/18 01:09:56 naota Exp $ + +*freebsd-sources-9.1-r5 (18 Jan 2014) + + 18 Jan 2014; Naohiro Aota <naota@gentoo.org> + +files/freebsd-sources-9.1-mmap-2014.patch, + +files/freebsd-sources-9.1-random.patch, +freebsd-sources-9.1-r5.ebuild, + -freebsd-sources-9.1-r4.ebuild: + Add eratta patch. #498260 *freebsd-sources-9.1-r4 (17 Nov 2013) diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-mmap-2014.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-mmap-2014.patch new file mode 100644 index 000000000000..fd4040a88166 --- /dev/null +++ b/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-mmap-2014.patch @@ -0,0 +1,20 @@ +Index: sys/vm/vm_map.c +=================================================================== +--- sys/vm/vm_map.c (revision 259950) ++++ sys/vm/vm_map.c (revision 259951) +@@ -1207,6 +1207,7 @@ charged: + } + else if ((prev_entry != &map->header) && + (prev_entry->eflags == protoeflags) && ++ (cow & (MAP_ENTRY_GROWS_DOWN | MAP_ENTRY_GROWS_UP)) == 0 && + (prev_entry->end == start) && + (prev_entry->wired_count == 0) && + (prev_entry->cred == cred || +@@ -3339,7 +3340,6 @@ vm_map_stack(vm_map_t map, vm_offset_t addrbos, vm + * NOTE: We explicitly allow bi-directional stacks. + */ + orient = cow & (MAP_STACK_GROWS_DOWN|MAP_STACK_GROWS_UP); +- cow &= ~orient; + KASSERT(orient != 0, ("No stack grow direction")); + + if (addrbos < vm_map_min(map) || diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-random.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-random.patch new file mode 100644 index 000000000000..bb3caba00137 --- /dev/null +++ b/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-random.patch @@ -0,0 +1,27 @@ +Index: sys/dev/random/probe.c +=================================================================== +--- sys/dev/random/probe.c (revision 260523) ++++ sys/dev/random/probe.c (working copy) +@@ -30,6 +30,8 @@ __FBSDID("$FreeBSD$"); + + #include <sys/types.h> + #include <sys/param.h> ++#include <sys/systm.h> ++#include <sys/kernel.h> + #include <sys/malloc.h> + #include <sys/random.h> + #include <sys/selinfo.h> +@@ -57,7 +59,12 @@ random_ident_hardware(struct random_systat *systat + /* Then go looking for hardware */ + #if defined(__amd64__) || (defined(__i386__) && !defined(PC98)) + if (via_feature_rng & VIA_HAS_RNG) { +- *systat = random_nehemiah; ++ int enable; ++ ++ enable = 0; ++ TUNABLE_INT_FETCH("hw.nehemiah_rng_enable", &enable); ++ if (enable) ++ *systat = random_nehemiah; + } + #endif + } diff --git a/sys-freebsd/freebsd-sources/freebsd-sources-9.1-r4.ebuild b/sys-freebsd/freebsd-sources/freebsd-sources-9.1-r5.ebuild index e84e8de60d4d..9d3dc868147b 100644 --- a/sys-freebsd/freebsd-sources/freebsd-sources-9.1-r4.ebuild +++ b/sys-freebsd/freebsd-sources/freebsd-sources-9.1-r5.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 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-r4.ebuild,v 1.1 2013/11/17 04:22:40 naota Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/freebsd-sources-9.1-r5.ebuild,v 1.1 2014/01/18 01:09:56 naota Exp $ inherit bsdmk freebsd flag-o-matic @@ -36,7 +36,9 @@ PATCHES=( "${FILESDIR}/${PN}-9.0-disable-optimization.patch" "${FILESDIR}/${PN}-9.1-cve-2013-3077.patch" "${FILESDIR}/${PN}-9.1-cve-2013-5209.patch" "${FILESDIR}/${PN}-9.1-cve-2013-5691.patch" - "${FILESDIR}/${PN}-9.1-cve-2013-5710.patch" ) + "${FILESDIR}/${PN}-9.1-cve-2013-5710.patch" + "${FILESDIR}/${PN}-9.1-random.patch" + "${FILESDIR}/${PN}-9.1-mmap-2014.patch" ) src_unpack() { freebsd_src_unpack |