Bug#718730: Please update xkb to version 2.8
Jackson Doak (2013-08-05): > Package: xkb-data > Priority: wishlist > Version: 2.5.1-3 > > The current debian version of xkb (2.5.1-3) is outdated, please update > to the current upstream version of 2.8, which can be found at > http://www.x.org/releases/individual/data/xkeyboard-config/xkeyboard-config-2.8.tar.bz2 Feel free to send patches. For starters: http://x.debian.net/reference/git-usage.html Mraw, KiBi. -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/20130804213813.ge23...@mraw.org
Bug#718730: Please update xkb to version 2.8
Package: xkb-data Priority: wishlist Version: 2.5.1-3 The current debian version of xkb (2.5.1-3) is outdated, please update to the current upstream version of 2.8, which can be found at http://www.x.org/releases/individual/data/xkeyboard-config/xkeyboard-config-2.8.tar.bz2 -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/CA+K2i_1=S4A8inwOCDGe48gGdJ8vQG=6mbtfpcsulkso0cr...@mail.gmail.com
Bug#718708: xserver-xorg-core: Keyboard shortcuts should be activated on release, not on keypress.
Package: xserver-xorg-core Version: 2:1.12.4-6 Severity: normal Tags: patch Dear Maintainer, When adding keyboard shortcuts that are incremental (alt+shift to change language; alt+shift+tab to reverse window switch), the shortcuts will clash. Because alt+shift changes language, alt+shift+tab will do nothing. This wasn't always the case (I had it set up like this in Debian 5.0). This bug was fixed in Ubuntu a couple of years ago; I added the lines from the Ubuntu patch to the 2:1.12.4-6 version of xserver (no clue if this is the correct way of doing it). To replicate the bug: Add alt+shift as a switch language shortcut. Try to use reverse alt+tab (if not configured, configure it in dconf). alt+tab stops working. -- Package-specific info: X server symlink status: lrwxrwxrwx 1 root root 13 May 17 07:57 /etc/X11/X -> /usr/bin/Xorg -rwxr-xr-x 1 root root 2048760 Aug 4 09:40 /usr/bin/Xorg Diversions concerning libGL are in place diversion of /usr/lib/libGL.so to /usr/lib/mesa-diverted/libGL.so by glx-diversions diversion of /usr/lib/libGL.so.1 to /usr/lib/mesa-diverted/libGL.so.1 by glx-diversions diversion of /usr/lib/i386-linux-gnu/libGL.so.1 to /usr/lib/mesa-diverted/i386-linux-gnu/libGL.so.1 by glx-diversions diversion of /usr/lib/x86_64-linux-gnu/libGL.so.1.2 to /usr/lib/mesa-diverted/x86_64-linux-gnu/libGL.so.1.2 by glx-diversions diversion of /usr/lib/i386-linux-gnu/libGL.so to /usr/lib/mesa-diverted/i386-linux-gnu/libGL.so by glx-diversions diversion of /usr/lib/i386-linux-gnu/libGL.so.1.2 to /usr/lib/mesa-diverted/i386-linux-gnu/libGL.so.1.2 by glx-diversions diversion of /usr/lib/x86_64-linux-gnu/libGL.so.1 to /usr/lib/mesa-diverted/x86_64-linux-gnu/libGL.so.1 by glx-diversions diversion of /usr/lib/libGL.so.1.2 to /usr/lib/mesa-diverted/libGL.so.1.2 by glx-diversions diversion of /usr/lib/x86_64-linux-gnu/libGL.so to /usr/lib/mesa-diverted/x86_64-linux-gnu/libGL.so by glx-diversions VGA-compatible devices on PCI bus: -- 00:02.0 VGA compatible controller [0300]: Intel Corporation 2nd Generation Core Processor Family Integrated Graphics Controller [8086:0126] (rev 09) 01:00.0 VGA compatible controller [0300]: NVIDIA Corporation Device [10de:124d] (rev ff) /etc/X11/xorg.conf does not exist. /etc/X11/xorg.conf.d does not exist. KMS configuration files: /etc/modprobe.d/radeon-kms.conf: options radeon modeset=1 Kernel version (/proc/version): --- Linux version 3.2.0-4-amd64 (debian-ker...@lists.debian.org) (gcc version 4.6.3 (Debian 4.6.3-14) ) #1 SMP Debian 3.2.46-1 Xorg X server log files on system: -- -rw-r--r-- 1 root bumblebee 14644 May 17 11:42 /var/log/Xorg.8.log -rw-r--r-- 1 root root 33570 Aug 4 06:47 /var/log/Xorg.1.log -rw-r--r-- 1 root root 30346 Aug 4 11:18 /var/log/Xorg.0.log Contents of most recent Xorg X server log file (/var/log/Xorg.0.log): - [16.888] X.Org X Server 1.12.4 Release Date: 2012-08-27 [16.888] X Protocol Version 11, Revision 0 [16.888] Build Operating System: Linux 3.2.0-4-amd64 x86_64 Debian [16.888] Current Operating System: Linux digger 3.2.0-4-amd64 #1 SMP Debian 3.2.46-1 x86_64 [16.888] Kernel command line: BOOT_IMAGE=/vmlinuz-3.2.0-4-amd64 root=/dev/mapper/digger-root ro quiet [16.888] Build Date: 04 August 2013 09:33:06AM [16.888] xorg-server 2:1.12.4-6.1 (Michael Biebl ) [16.888] Current version of pixman: 0.26.0 [16.888]Before reporting problems, check http://wiki.x.org to make sure that you have the latest version. [16.888] Markers: (--) probed, (**) from config file, (==) default setting, (++) from command line, (!!) notice, (II) informational, (WW) warning, (EE) error, (NI) not implemented, (??) unknown. [16.888] (==) Log file: "/var/log/Xorg.0.log", Time: Sun Aug 4 11:17:40 2013 [16.895] (==) Using system config directory "/usr/share/X11/xorg.conf.d" [16.896] (==) No Layout section. Using the first Screen section. [16.896] (==) No screen section available. Using defaults. [16.896] (**) |-->Screen "Default Screen Section" (0) [16.896] (**) | |-->Monitor "" [16.896] (==) No monitor specified for screen "Default Screen Section". Using a default monitor configuration. [16.896] (==) Automatically adding devices [16.896] (==) Automatically enabling devices [16.901] (WW) The directory "/usr/share/fonts/X11/cyrillic" does not exist. [16.901]Entry deleted from font path. [16.906] (WW) The directory "/var/lib/defoma/x-ttcidfont-conf.d/dirs/TrueType" does not exist. [16.906]Entry deleted from font path. [16.906] (==) FontPath set to: /usr/share/fonts/X11/misc, /usr/share/fonts/X11/100dpi/:unscaled, /
libxres: Changes to 'upstream-unstable'
configure.ac|8 +++-
src/Makefile.am |2 +-
src/XRes.c | 29 +
3 files changed, 33 insertions(+), 6 deletions(-)
New commits:
commit b51a7b0ccf0d5ccb53fbd5d34ed8fe57603d2604
Author: Alan Coopersmith
Date: Thu May 30 17:51:12 2013 -0700
libXres 1.0.7
Signed-off-by: Alan Coopersmith
diff --git a/configure.ac b/configure.ac
index 10e47d2..fc92739 100644
--- a/configure.ac
+++ b/configure.ac
@@ -29,7 +29,7 @@ AC_PREREQ([2.60])
# digit in the version number to track changes which don't affect the
# protocol, so XRes version l.n.m corresponds to protocol version l.n
#
-AC_INIT([libXres], [1.0.6],
+AC_INIT([libXres], [1.0.7],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libXres])
AC_CONFIG_SRCDIR([Makefile.am])
AC_CONFIG_HEADERS([config.h])
commit ad156a716a324ee60362c8ba66a5ed8c835c219b
Author: Alan Coopersmith
Date: Fri Apr 12 23:36:13 2013 -0700
integer overflow in XResQueryClientResources() [CVE-2013-1988 2/2]
The CARD32 rep.num_types needs to be bounds checked before multiplying
by sizeof(XResType) to avoid integer overflow leading to underallocation
and writing data from the network past the end of the allocated buffer.
Reported-by: Ilja Van Sprundel
Signed-off-by: Alan Coopersmith
diff --git a/src/XRes.c b/src/XRes.c
index 5117321..ff21dd4 100644
--- a/src/XRes.c
+++ b/src/XRes.c
@@ -186,7 +186,12 @@ Status XResQueryClientResources (
}
if(rep.num_types) {
-if((typs = Xmalloc(sizeof(XResType) * rep.num_types))) {
+if (rep.num_types < (INT_MAX / sizeof(XResType)))
+typs = Xmalloc(sizeof(XResType) * rep.num_types);
+else
+typs = NULL;
+
+if (typs != NULL) {
xXResType scratch;
int i;
commit 3ec2db9eeb9ba8fb561802b0c4b8bf79e321b7a2
Author: Alan Coopersmith
Date: Fri Apr 12 23:36:13 2013 -0700
integer overflow in XResQueryClients() [CVE-2013-1988 1/2]
The CARD32 rep.num_clients needs to be bounds checked before multiplying
by sizeof(XResClient) to avoid integer overflow leading to underallocation
and writing data from the network past the end of the allocated buffer.
Reported-by: Ilja Van Sprundel
Signed-off-by: Alan Coopersmith
diff --git a/src/XRes.c b/src/XRes.c
index ae86206..5117321 100644
--- a/src/XRes.c
+++ b/src/XRes.c
@@ -129,7 +129,12 @@ Status XResQueryClients (
}
if(rep.num_clients) {
-if((clnts = Xmalloc(sizeof(XResClient) * rep.num_clients))) {
+if (rep.num_clients < (INT_MAX / sizeof(XResClient)))
+clnts = Xmalloc(sizeof(XResClient) * rep.num_clients);
+else
+clnts = NULL;
+
+if (clnts != NULL) {
xXResClient scratch;
int i;
commit 95b352b0f4a1ab1bc254e78adbc73cd65223ded4
Author: Alan Coopersmith
Date: Sat Apr 13 10:34:22 2013 -0700
Use _XEatDataWords to avoid overflow of rep.length shifting
rep.length is a CARD32, so rep.length << 2 could overflow in 32-bit builds
Signed-off-by: Alan Coopersmith
diff --git a/configure.ac b/configure.ac
index bc4e8a6..10e47d2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -55,6 +55,12 @@ RES_VERSION=[`echo $VERSION | sed
's/^\([0-9][0-9]*\.[0-9][0-9]*\).*$/\1/'`]
# Obtain compiler/linker options for depedencies
PKG_CHECK_MODULES(XRES, x11 xext xextproto [resourceproto >= $RES_VERSION])
+# Check for _XEatDataWords function that may be patched into older Xlib release
+SAVE_LIBS="$LIBS"
+LIBS="$XRES_LIBS"
+AC_CHECK_FUNCS([_XEatDataWords])
+LIBS="$SAVE_LIBS"
+
AC_CONFIG_FILES([Makefile
src/Makefile
man/Makefile
diff --git a/src/XRes.c b/src/XRes.c
index 6091c96..ae86206 100644
--- a/src/XRes.c
+++ b/src/XRes.c
@@ -12,7 +12,18 @@
#include
#include
#include
+#include
+#ifndef HAVE__XEATDATAWORDS
+static inline void _XEatDataWords(Display *dpy, unsigned long n)
+{
+# ifndef LONG64
+if (n >= (ULONG_MAX >> 2))
+_XIOError(dpy);
+# endif
+_XEatData (dpy, n << 2);
+}
+#endif
static XExtensionInfo _xres_ext_info_data;
static XExtensionInfo *xres_ext_info = &_xres_ext_info_data;
@@ -131,7 +142,7 @@ Status XResQueryClients (
*num_clients = rep.num_clients;
result = 1;
} else {
-_XEatData(dpy, rep.length << 2);
+_XEatDataWords(dpy, rep.length);
}
}
@@ -183,7 +194,7 @@ Status XResQueryClientResources (
*num_types = rep.num_types;
result = 1;
} else {
-_XEatData(dpy, rep.length << 2);
+_XEatDataWords(dpy, rep.length);
}
}
commit d54acff47096cf52a9b8e018a26f7165e1092eb5
Author: Alan Coopersmith
Date: Fri Jan 18 23:06:20 2013 -0800
Replace deprecated Automake INCLUDES variable with AM_CPPFLAGS
Excerpt https://lists.gnu.org/archive/html/automake/2012-12/m
libxres: Changes to 'debian-unstable'
ChangeLog| 62 +++
configure.ac |8 ++-
debian/changelog | 16 ++
debian/compat|2 -
debian/control |3 +-
debian/rules | 23
src/Makefile.am |2 -
src/XRes.c | 29 ++---
8 files changed, 124 insertions(+), 21 deletions(-)
New commits:
commit 121aebcdc6418919e2c18857b8128cffd7b2d408
Author: Julien Cristau
Date: Sun Aug 4 14:51:09 2013 +0200
Bump Standards-Version to 3.9.4, no changes needed.
diff --git a/debian/changelog b/debian/changelog
index bd01c2f..0933a3a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ libxres (2:1.0.7-1) UNRELEASED; urgency=low
* Bump debhelper compat level to 7.
* Use dpkg-buildflags.
* Disable silent build rules.
+ * Bump Standards-Version to 3.9.4, no changes needed.
-- Julien Cristau Sun, 04 Aug 2013 12:50:07 +0200
diff --git a/debian/control b/debian/control
index 9229490..cea312a 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Build-Depends:
automake,
libtool,
xutils-dev (>= 1:7.5+4),
-Standards-Version: 3.8.3
+Standards-Version: 3.9.4
Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/libxres
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/libxres.git
commit 0c5aa272f60580b24d7876344b15b88d2ae1d6e6
Author: Julien Cristau
Date: Sun Aug 4 12:56:29 2013 +0200
Disable silent build rules.
diff --git a/debian/changelog b/debian/changelog
index 6610a66..bd01c2f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ libxres (2:1.0.7-1) UNRELEASED; urgency=low
* New upstream release.
* Bump debhelper compat level to 7.
* Use dpkg-buildflags.
+ * Disable silent build rules.
-- Julien Cristau Sun, 04 Aug 2013 12:50:07 +0200
diff --git a/debian/rules b/debian/rules
index 5e082e2..4547366 100755
--- a/debian/rules
+++ b/debian/rules
@@ -36,10 +36,14 @@ build-stamp: configure $(STAMP_DIR)/genscripts
dh_testdir
mkdir -p build
cd build && \
- ../configure --prefix=/usr --mandir=\$${prefix}/share/man \
---libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
---infodir=\$${prefix}/share/info $(confflags) \
-$(shell DEB_CFLAGS_MAINT_APPEND=-Wall dpkg-buildflags
--export=configure)
+ ../configure \
+ --prefix=/usr \
+ --mandir=\$${prefix}/share/man \
+ --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
+ --infodir=\$${prefix}/share/info \
+ --disable-silent-rules \
+ $(confflags) \
+ $(shell DEB_CFLAGS_MAINT_APPEND=-Wall dpkg-buildflags
--export=configure)
cd build && $(MAKE)
>$@
commit 79bdb577b7182cca0e9b5465cc31b0cbdf173cc2
Author: Julien Cristau
Date: Sun Aug 4 12:55:01 2013 +0200
Use dpkg-buildflags.
diff --git a/debian/changelog b/debian/changelog
index b8c9cf3..6610a66 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ libxres (2:1.0.7-1) UNRELEASED; urgency=low
* New upstream release.
* Bump debhelper compat level to 7.
+ * Use dpkg-buildflags.
-- Julien Cristau Sun, 04 Aug 2013 12:50:07 +0200
diff --git a/debian/control b/debian/control
index 74f0e45..9229490 100644
--- a/debian/control
+++ b/debian/control
@@ -4,6 +4,7 @@ Priority: optional
Maintainer: Debian X Strike Force
Uploaders: Drew Parsons , Cyril Brulebois
Build-Depends:
+ dpkg-dev (>= 1.16.1),
debhelper (>= 8.1.3),
libx11-dev (>= 1:0.99.2),
libxext-dev (>= 1:0.99.1),
diff --git a/debian/rules b/debian/rules
index 810a927..5e082e2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,12 +12,6 @@ PACKAGE = libxres1
include debian/xsfbs/xsfbs.mk
-CFLAGS = -Wall -g
-ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -O0
-else
- CFLAGS += -O2
-endif
ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
NUMJOBS = $(patsubst parallel=%,%,$(filter
parallel=%,$(DEB_BUILD_OPTIONS)))
MAKEFLAGS += -j$(NUMJOBS)
@@ -45,7 +39,7 @@ build-stamp: configure $(STAMP_DIR)/genscripts
../configure --prefix=/usr --mandir=\$${prefix}/share/man \
--libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
--infodir=\$${prefix}/share/info $(confflags) \
-CFLAGS="$(CFLAGS)"
+$(shell DEB_CFLAGS_MAINT_APPEND=-Wall dpkg-buildflags
--export=configure)
cd build && $(MAKE)
>$@
commit badf86ebe2347c1025d5df82cb50626c01444f28
Author: Julien Cristau
Date: Sun Aug 4 12:50:54 2013 +0200
Bump debhelper compat level to 7.
diff --git a/debian/changelog b/debian/changelog
index 8231a31..b8c9cf3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
libxres (2:1.0.7-1) UNRELEASED; urgency=low
* New upstream release.
+ * Bump debhelper compat level to 7.
-- Julien Cristau Sun, 04 Aug 2013 12:
