svn merge ^/branches/released .

1 files changed, 86 insertions, 0 deletions

diff --git a/libxkbfile/ChangeLog b/libxkbfile/ChangeLog
index 1b63c2b64..95ce0a774 100644
--- a/libxkbfile/ChangeLog
+++ b/libxkbfile/ChangeLog
@@ -1,3 +1,89 @@
+commit fa9520d5a63e181c05dd850223a1916e37e71a13
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Tue Oct 6 17:08:58 2009 -0700
+
+    libxkbfile 1.0.6
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
+
+commit a3d95aedf3a6d1859387fb08b46cd66cd61cec83
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Tue Oct 6 17:05:00 2009 -0700
+
+    Migrate to xorg macros 1.3 & XORG_DEFAULT_OPTIONS
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
+
+commit d36a99d961c6649ca1b0319c2aadc6763edb07ad
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Fri May 8 14:15:21 2009 -0400
+
+    Semi-revert 33b839e16fe681ba915658f824ceb1b252084ea4
+    
+    _XkbDupString() checks for NULL, strdup doesn't.  Still, implement in
+    terms of real strdup and skip the calloc.
+
+commit 29f27b16dbe511a27a0e953b32913f9d9bf24f2d
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Thu May 7 16:59:59 2009 -0400
+
+    Use flockfile if available.
+    
+    Not really a huge improvement, but we might as well.
+
+commit 33b839e16fe681ba915658f824ceb1b252084ea4
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Thu May 7 16:31:39 2009 -0400
+
+    s/_XkbDupString/strdup/
+    
+    Super special bonus lols edition: _XkbDupString would allocate the new
+    string with calloc, just to be extra sure.
+
+commit 4f8dd1aa10a36700bf1f2b05931cd29151b9fee4
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Mon Feb 2 20:34:39 2009 -0800
+
+    Add README with pointers to mailing list, bugzilla & git repos
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
+
+commit d17cd6e80f1ec78b69ba11ee55465420e6d7e9a9
+Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
+Date:   Thu Jan 29 19:52:34 2009 -0200
+
+    Janitor: distcheck, compiler warnings, .gitignore.
+
+commit dd9514fe714d81b881a1bd6bd88d4287adc5fc7e
+Author: Kees Cook <kees.cook@canonical.com>
+Date:   Tue Jan 13 15:40:37 2009 -0800
+
+    Fix static buffer overflow in "xkbcomp -C :0"
+    
+    This patch uses dynamically allocated strings instead of the fixed-length
+    buffers to avoid stack overflows.
+    
+    https://bugs.freedesktop.org/show_bug.cgi?id=19490
+    https://bugs.launchpad.net/ubuntu/+source/x11-xkb-utils/+bug/309013
+    
+    Signed-off-by: Kees Cook <kees.cook@canonical.com>
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit e695be2ab7eb1361b204f98c3da872eff58ad6b5
+Author: Alexey Ten <alexeyten+github@gmail.com>
+Date:   Thu Jan 15 01:39:01 2009 +0300
+
+    Apply partial matches for option (#19563)
+    
+    Rules which match star (*) and option, like one below, should be applied
+    
+    layout[2] option    = symbols
+    *         misc:typo = +typo(base)
+    
+    X.Org bug 19563 <http://bugs.freedesktop.org/show_bug.cgi?id=19563>
+    
+    Signed-off-by: Sergey V. Udaltsov <svu@gnome.org>
+
 commit 415a513387748e1763a477a486a9789f88784ec5
 Author: Alan Coopersmith <alan.coopersmith@sun.com>
 Date:   Mon Mar 17 19:44:07 2008 -0700