diff options
| -rw-r--r-- | x11-misc/xkeyboard-config/ChangeLog | 10 | ||||
| -rw-r--r-- | x11-misc/xkeyboard-config/Manifest | 14 | ||||
| -rw-r--r-- | x11-misc/xkeyboard-config/files/xorg-cve-2012-0064.patch | 75 | ||||
| -rw-r--r-- | x11-misc/xkeyboard-config/xkeyboard-config-2.4.1-r3.ebuild | 55 |
4 files changed, 141 insertions, 13 deletions
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 <chithanh@gentoo.org> + +xkeyboard-config-2.4.1-r3.ebuild, +files/xorg-cve-2012-0064.patch: + Add patch for security bug #399347. 27 Dec 2011; Markus Meier <maekke@gentoo.org> xkeyboard-config-2.4.1-r2.ebuild: diff --git a/x11-misc/xkeyboard-config/Manifest b/x11-misc/xkeyboard-config/Manifest index 850ad45b9d6c..e0e9640def9b 100644 --- a/x11-misc/xkeyboard-config/Manifest +++ b/x11-misc/xkeyboard-config/Manifest @@ -1,8 +1,6 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX xkeyboard-config-2.4.1-extended-function-keys.patch 8001 RMD160 d9ce813b423462167112f17b04f8105eb9c67682 SHA1 9edcc0013c89d8e439dcdc49569f5522ddd5b35d SHA256 04c46922f2b495016230dbe8f4b85e4e5f520eb0dc649ab170039fda85120497 AUX xkeyboard-config-2.4.1-shift-backspace.patch 1397 RMD160 99df457599d66c9886241ab573b8cf451082ef3c SHA1 d8a5a2ec6fd63c33415d50dc1640027ab09d90a5 SHA256 b789e3fab3c4581f0b87a26ad4b38248cc6c69db48bd8a074b3289157f6b055e +AUX xorg-cve-2012-0064.patch 2492 RMD160 42ad7eb8b73f7adaa00a86bff0834c6f399fab68 SHA1 8d86a3910c60f1250518f56fbc31b7f8b506c42d SHA256 4a06188c20f4707afaffd95663d0277541c790eb34907e7ac0cb96202c003afd DIST xkeyboard-config-2.1.tar.bz2 699368 RMD160 235b20c991666a45f1af6d76633679e6eae08d81 SHA1 4e96e0704b2a17b291f98b2240611390e7a99f9e SHA256 f9ee8340f2afadd2397aa4402eaf854da3738977accdbf147bc47c1cc99a3075 DIST xkeyboard-config-2.2.1.tar.bz2 739766 RMD160 f9e6147e664a8834b49ddb36eb553c49c81ffd65 SHA1 3962f1e92e9defb0382ce46ec0cc86cc30ff897f SHA256 642feb6e39096be1e081c5ba952c93fdfd93d41355dd6f88c20458a8251c6bd0 DIST xkeyboard-config-2.3.tar.bz2 771953 RMD160 a89d10bfbab88c8c1f1330bcfe82cb38f32918f8 SHA1 a49c4cce9cfb7003aa04a32114f369c6bd7a9077 SHA256 d8a5dd169adca52dea3f751b99c500608c05894d759102521fd4ea9e8e284c80 @@ -11,12 +9,6 @@ EBUILD xkeyboard-config-2.1.ebuild 1103 RMD160 155ae87d8c1f97ff4d1f32b842a5421ae EBUILD xkeyboard-config-2.2.1-r1.ebuild 1334 RMD160 c7d1b60830c370e7d81b4ac1c20f925cbfb25d48 SHA1 e223aa5b78589a17df2499e08828792bdb0689a2 SHA256 5b62d2bc959ee5098cb1bc98a70cdb511b98e13997d4d0ff81dca609f81ab08d EBUILD xkeyboard-config-2.3.ebuild 1340 RMD160 1e43ea3af05c70acbf4aae1ad78e23fdb53107f9 SHA1 7d511eed3fed65869859579d8d81820aa44a7339 SHA256 57a04ac5d1a22c5e93bd93ffe1f91186969cd407039bab55145d5d86214b103d EBUILD xkeyboard-config-2.4.1-r2.ebuild 1450 RMD160 71bc277cee55664774ecc1f634310badea926169 SHA1 3cfac7b014cd4b5008853348498609e5e5dfca4d SHA256 b2c3fde50abb98485227f592d31a532b0a29c6f0d44a1f9cb96feb62c378b06c -MISC ChangeLog 21302 RMD160 b4cc49a535e5874a38a8147dd37d38cae31d0fe3 SHA1 33ace5a81f5e4d2e9d0ff9f106163893c0be1b3c SHA256 1d2f289223a625c835f42f5426bf67d8906813064be5542b21bbcf9170befc7a +EBUILD xkeyboard-config-2.4.1-r3.ebuild 1496 RMD160 6c3d51f8fd687163167f60151ea725d8ed0ad1f7 SHA1 c6703e136d03233124dec7d1c4413206444fb011 SHA256 90670a7229d78b9da7912047d3c676f64c10749ab0e813d933e1f5d9d0b27f17 +MISC ChangeLog 21524 RMD160 3a538c01c732714cdb05acc0cc09601d9529418f SHA1 83c6a64c6c0f25fc2feed48d573e060856050853 SHA256 fee2febb255ed9b85f4d96adc1fec63d06e46cd94c7b9b36cf26690b509affae MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (GNU/Linux) - -iEYEARECAAYFAk76NSMACgkQkKaRLQcq0GIGQQCeJ7g6IQRY5h04WFqKvmVlO167 -F8UAnROe/VvEvOBSXnI5jetDQsGjlO0H -=oZze ------END PGP SIGNATURE----- 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 <daniel@fooishbar.org> +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 <daniel@fooishbar.org> +--- + 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.</_description> + </configItem> + </option> ++ <option> ++ <configItem> ++ <name>grab:break_actions</name> ++ <_description>Allow breaking grabs with keyboard actions (warning: security risk)</_description> ++ </configItem> ++ </option> + </group> + <group allowMultipleSelection="true"> + <!-- Special shortcuts for the Euro character --> +-- +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 +} |