diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2015-03-14 14:12:58 +0000 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2015-03-14 14:12:58 +0000 |
| commit | 9e9ab0e26a1e065d5df22e12534a2b2528110b77 (patch) | |
| tree | f8cf7ad0018bb8051d676a9339213dd1118813fe /sys-freebsd | |
| parent | arm stable, bug #530652 (diff) | |
| download | gentoo-2-9e9ab0e26a1e065d5df22e12534a2b2528110b77.tar.gz gentoo-2-9e9ab0e26a1e065d5df22e12534a2b2528110b77.tar.bz2 gentoo-2-9e9ab0e26a1e065d5df22e12534a2b2528110b77.zip | |
Fix FreeBSD-EN-15:01.vt.asc, https://github.com/gentoo/gentoo-portage-rsync-mirror/pull/69 by nigoro.
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
Diffstat (limited to 'sys-freebsd')
| -rw-r--r-- | sys-freebsd/freebsd-sources/ChangeLog | 10 | ||||
| -rw-r--r-- | sys-freebsd/freebsd-sources/files/freebsd-sources-10.1-en-1501-vt.patch | 34 | ||||
| -rw-r--r-- | sys-freebsd/freebsd-sources/freebsd-sources-10.1-r1.ebuild (renamed from sys-freebsd/freebsd-sources/freebsd-sources-10.1.ebuild) | 5 |
3 files changed, 46 insertions, 3 deletions
diff --git a/sys-freebsd/freebsd-sources/ChangeLog b/sys-freebsd/freebsd-sources/ChangeLog index 5cd4acd958e2..fc94b605da89 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-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/ChangeLog,v 1.107 2015/03/08 14:01:56 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/ChangeLog,v 1.108 2015/03/14 14:12:58 mgorny Exp $ + +*freebsd-sources-10.1-r1 (14 Mar 2015) + + 14 Mar 2015; Michał Górny <mgorny@gentoo.org> + +files/freebsd-sources-10.1-en-1501-vt.patch, +freebsd-sources-10.1-r1.ebuild, + -freebsd-sources-10.1.ebuild: + Fix FreeBSD-EN-15:01.vt.asc, https://github.com/gentoo/gentoo-portage-rsync- + mirror/pull/69 by nigoro. *freebsd-sources-10.1 (08 Mar 2015) diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-10.1-en-1501-vt.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-10.1-en-1501-vt.patch new file mode 100644 index 000000000000..ef2d235240f3 --- /dev/null +++ b/sys-freebsd/freebsd-sources/files/freebsd-sources-10.1-en-1501-vt.patch @@ -0,0 +1,34 @@ +Index: sys/dev/vt/vt_core.c +=================================================================== +--- sys/dev/vt/vt_core.c (revision 278106) ++++ sys/dev/vt/vt_core.c (working copy) +@@ -1719,14 +1719,16 @@ skip_thunk: + } + VT_UNLOCK(vd); + return (EINVAL); +- case VT_WAITACTIVE: ++ case VT_WAITACTIVE: { ++ unsigned int idx; ++ + error = 0; + +- i = *(unsigned int *)data; +- if (i > VT_MAXWINDOWS) ++ idx = *(unsigned int *)data; ++ if (idx > VT_MAXWINDOWS) + return (EINVAL); +- if (i != 0) +- vw = vd->vd_windows[i - 1]; ++ if (idx > 0) ++ vw = vd->vd_windows[idx - 1]; + + VT_LOCK(vd); + while (vd->vd_curwindow != vw && error == 0) +@@ -1733,6 +1735,7 @@ skip_thunk: + error = cv_wait_sig(&vd->vd_winswitch, &vd->vd_lock); + VT_UNLOCK(vd); + return (error); ++ } + case VT_SETMODE: { /* set screen switcher mode */ + struct vt_mode *mode; + struct proc *p1; diff --git a/sys-freebsd/freebsd-sources/freebsd-sources-10.1.ebuild b/sys-freebsd/freebsd-sources/freebsd-sources-10.1-r1.ebuild index 6355c43f531e..909d5423859a 100644 --- a/sys-freebsd/freebsd-sources/freebsd-sources-10.1.ebuild +++ b/sys-freebsd/freebsd-sources/freebsd-sources-10.1-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/freebsd-sources-10.1.ebuild,v 1.1 2015/03/08 14:01:56 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/freebsd-sources-10.1-r1.ebuild,v 1.1 2015/03/14 14:12:58 mgorny Exp $ EAPI=5 @@ -45,7 +45,8 @@ PATCHES=( "${FILESDIR}/${PN}-9.0-disable-optimization.patch" "${FILESDIR}/${PN}-9.2-gentoo-gcc.patch" "${FILESDIR}/${PN}-10.1-cve-2014-8612.patch" "${FILESDIR}/${PN}-10.1-cve-2014-8613.patch" - "${FILESDIR}/${PN}-10.1-cve-2015-1414.patch" ) + "${FILESDIR}/${PN}-10.1-cve-2015-1414.patch" + "${FILESDIR}/${PN}-10.1-en-1501-vt.patch" ) pkg_setup() { # Force set CC=clang. when using gcc, aesni fails to build. |