From 318aa842ef1b9911ec3df07e1a2e6d7ce7ff17d0 Mon Sep 17 00:00:00 2001 From: Chí-Thanh Christopher Nguyễn Date: Thu, 19 Jan 2012 14:19:47 +0000 Subject: Add patch for security bug #399347. (Portage version: 2.2.0_alpha84/cvs/Linux x86_64) --- x11-misc/xkeyboard-config/ChangeLog | 10 ++- .../files/xorg-cve-2012-0064.patch | 75 ++++++++++++++++++++++ .../xkeyboard-config-2.4.1-r3.ebuild | 55 ++++++++++++++++ 3 files changed, 138 insertions(+), 2 deletions(-) create mode 100644 x11-misc/xkeyboard-config/files/xorg-cve-2012-0064.patch create mode 100644 x11-misc/xkeyboard-config/xkeyboard-config-2.4.1-r3.ebuild (limited to 'x11-misc') diff --git a/x11-misc/xkeyboard-config/ChangeLog b/x11-misc/xkeyboard-config/ChangeLog index 03be3ffcb0cf..87ab74917804 100644 --- a/x11-misc/xkeyboard-config/ChangeLog +++ b/x11-misc/xkeyboard-config/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for x11-misc/xkeyboard-config -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/xkeyboard-config/ChangeLog,v 1.149 2011/12/27 21:12:16 maekke Exp $ +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/x11-misc/xkeyboard-config/ChangeLog,v 1.150 2012/01/19 14:19:47 chithanh Exp $ + +*xkeyboard-config-2.4.1-r3 (19 Jan 2012) + + 19 Jan 2012; Chí-Thanh Christopher Nguyễn + +xkeyboard-config-2.4.1-r3.ebuild, +files/xorg-cve-2012-0064.patch: + Add patch for security bug #399347. 27 Dec 2011; Markus Meier xkeyboard-config-2.4.1-r2.ebuild: diff --git a/x11-misc/xkeyboard-config/files/xorg-cve-2012-0064.patch b/x11-misc/xkeyboard-config/files/xorg-cve-2012-0064.patch new file mode 100644 index 000000000000..9c526af13ab7 --- /dev/null +++ b/x11-misc/xkeyboard-config/files/xorg-cve-2012-0064.patch @@ -0,0 +1,75 @@ +From 9966d0a83ad7cf5ea76a04f31912e92908f3da63 Mon Sep 17 00:00:00 2001 +From: Daniel Stone +Date: Thu, 19 Jan 2012 16:36:16 +1100 +Subject: [PATCH] Hide ClearGrab/CloseGrabs actions behind an option + +Similar to how we put the Terminate mapping behind an option rather than +enabling it by default, put the ClearGrab/CloseGrab action handlers +behind an option too, so we don't ship 'break my screensaver'. Oops. + +Signed-off-by: Daniel Stone +--- + compat/xfree86 | 15 +++++++++------ + rules/base.o_c.part | 1 + + rules/base.xml.in | 6 ++++++ + 3 files changed, 16 insertions(+), 6 deletions(-) + +diff --git a/compat/xfree86 b/compat/xfree86 +index cf4a8b2..52e661d 100644 +--- a/compat/xfree86 ++++ b/compat/xfree86 +@@ -41,12 +41,6 @@ default partial xkb_compatibility "basic" { + action = SwitchScreen(Screen=12, !SameServer); + }; + +- interpret XF86_Ungrab { +- action = Private(type=0x86, data="Ungrab"); +- }; +- interpret XF86_ClearGrab { +- action = Private(type=0x86, data="ClsGrb"); +- }; + interpret XF86LogGrabInfo { + action = Private(type=0x86, data="PrGrbs"); + }; +@@ -61,3 +55,12 @@ default partial xkb_compatibility "basic" { + action = Private(type=0x86, data="-VMode"); + }; + }; ++ ++partial xkb_compatibility "grab_break" { ++ interpret XF86_Ungrab { ++ action = Private(type=0x86, data="Ungrab"); ++ }; ++ interpret XF86_ClearGrab { ++ action = Private(type=0x86, data="ClsGrb"); ++ }; ++}; +diff --git a/rules/base.o_c.part b/rules/base.o_c.part +index 352f8b3..b80ab6d 100644 +--- a/rules/base.o_c.part ++++ b/rules/base.o_c.part +@@ -3,4 +3,5 @@ + grp_led:scroll = +ledscroll(group_lock) + japan:kana_lock = +japan(kana_lock) + caps:shiftlock = +ledcaps(shift_lock) ++ grab:break_actions = +xfree86(grab_break) + +diff --git a/rules/base.xml.in b/rules/base.xml.in +index 22b720f..6c17faa 100644 +--- a/rules/base.xml.in ++++ b/rules/base.xml.in +@@ -6278,6 +6278,12 @@ + <_description>Toggle PointerKeys with Shift + NumLock. + + ++ + + + +-- +1.7.8.3 diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.4.1-r3.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.4.1-r3.ebuild new file mode 100644 index 000000000000..59ee6f7fe5c1 --- /dev/null +++ b/x11-misc/xkeyboard-config/xkeyboard-config-2.4.1-r3.ebuild @@ -0,0 +1,55 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-misc/xkeyboard-config/xkeyboard-config-2.4.1-r3.ebuild,v 1.1 2012/01/19 14:19:47 chithanh Exp $ + +EAPI=4 + +XORG_STATIC=no +inherit xorg-2 + +EGIT_REPO_URI="git://anongit.freedesktop.org/git/xkeyboard-config" + +DESCRIPTION="X keyboard configuration database" +HOMEPAGE="http://www.freedesktop.org/wiki/Software/XKeyboardConfig" +[[ ${PV} == *9999* ]] || SRC_URI="${XORG_BASE_INDIVIDUAL_URI}/data/${P}.tar.bz2" + +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris" +IUSE="" + +LICENSE="MIT" +SLOT="0" + +RDEPEND=">=x11-apps/xkbcomp-1.2.1 + >=x11-libs/libX11-1.4.2" +DEPEND="${RDEPEND} + x11-proto/xproto + >=dev-util/intltool-0.30 + dev-perl/XML-Parser" + +XORG_CONFIGURE_OPTIONS=( + --with-xkb-base="${EPREFIX}/usr/share/X11/xkb" + --enable-compat-rules + # do not check for runtime deps + --disable-runtime-deps + --with-xkb-rules-symlink=xorg +) + +PATCHES=( + "${FILESDIR}"/${P}-extended-function-keys.patch + "${FILESDIR}"/${P}-shift-backspace.patch + "${FILESDIR}"/xorg-cve-2012-0064.patch +) + +src_prepare() { + xorg-2_src_prepare + if [[ ${XORG_EAUTORECONF} != no ]]; then + intltoolize --copy --automake || die + fi +} + +src_compile() { + # cleanup to make sure .dir files are regenerated + # bug #328455 c#26 + xorg-2_src_compile clean + xorg-2_src_compile +} -- cgit v1.2.3-65-gdbad