- patch for screen-saver unlock via xkb debug key actions

Changed files:
    xkeyboard-config-CVE-2012-0064.patch -> 1.1
    xkeyboard-config.spec -> 1.39

diff --git a/xkeyboard-config-CVE-2012-0064.patch b/xkeyboard-config-CVE-2012-0064.patch
new file mode 100644 (file)
index 0000000..9c526af
--- /dev/null
+++ b/xkeyboard-config-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/xkeyboard-config.spec b/xkeyboard-config.spec
index d93b43bf017d8ed2fd08f4e1dc96c0e7a5ed2107..f5aa89c23cdc23f7ae3a036632de62b184d6283d 100644 (file)
--- a/xkeyboard-config.spec
+++ b/xkeyboard-config.spec
@@ -2,11 +2,12 @@ Summary:      X Keyboard Configuration Database
 Summary(pl.UTF-8):     Baza danych konfiguracji klawiatury pod X
 Name:          xkeyboard-config
 Version:       2.4.1
-Release:       2
+Release:       3
 License:       MIT
 Group:         X11/Development/Libraries
 Source0:       http://xorg.freedesktop.org/archive/individual/data/%{name}-%{version}.tar.bz2
 # Source0-md5: 9f6d7a37fd192264a3ca07ede5d183c3
+Patch0:                %{name}-CVE-2012-0064.patch
 URL:           http://www.freedesktop.org/wiki/Software/XKeyboardConfig
 BuildRequires: autoconf >= 2.57
 BuildRequires: automake
@@ -42,6 +43,8 @@ systemów opartych na XKB.
 %prep
 %setup -q
 
+%patch0 -p1
+
 %build
 %{__aclocal}
 %{__autoconf}