Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to devel-xorg-modular grimoire by Florian Franzmann (3fe4ad93ca90dd207d59a3d5a1546302dce53d55)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Florian Franzmann <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to devel-xorg-modular grimoire by Florian Franzmann (3fe4ad93ca90dd207d59a3d5a1546302dce53d55)
  • Date: Fri, 22 Mar 2013 13:52:01 -0500

GIT changes to devel-xorg-modular grimoire by Florian Franzmann
<siflfran AT hawo.stw.uni-erlangen.de>:

xorg-xserver/xorg-server/0001-fix-buffer-overflow.patch | 25
++++++++++++++++
xorg-xserver/xorg-server/DETAILS | 4 +-
xorg-xserver/xorg-server/HISTORY | 4 ++
xorg-xserver/xorg-server/PRE_BUILD | 3 +
4 files changed, 33 insertions(+), 3 deletions(-)

New commits:
commit 3fe4ad93ca90dd207d59a3d5a1546302dce53d55
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

xorg-xserver/xorg-server: fix off-by-one error

commit 696fda56677f2848de3c849ef2c1f7a7c821cf4a
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

xorg-xserver/xorg-server: version 1.14.0

diff --git a/xorg-xserver/xorg-server/0001-fix-buffer-overflow.patch
b/xorg-xserver/xorg-server/0001-fix-buffer-overflow.patch
new file mode 100644
index 0000000..48ddfde
--- /dev/null
+++ b/xorg-xserver/xorg-server/0001-fix-buffer-overflow.patch
@@ -0,0 +1,25 @@
+From cbcd12b69fcb66891bfdd4d24ecd925f815c0fa5 Mon Sep 17 00:00:00 2001
+From: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+Date: Fri, 22 Mar 2013 18:33:45 +0100
+Subject: [PATCH] fix buffer overflow
+
+---
+ hw/kdrive/src/kinput.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/hw/kdrive/src/kinput.c b/hw/kdrive/src/kinput.c
+index b1068bb..aa5436f 100644
+--- a/hw/kdrive/src/kinput.c
++++ b/hw/kdrive/src/kinput.c
+@@ -221,7 +221,7 @@ KdUnregisterFd(void *closure, int fd, Bool do_close)
+ if (do_close)
+ close(kdInputFds[i].fd);
+ kdNumInputFds--;
+- for (j = i; j < kdNumInputFds; j++)
++ for (j = i; j < kdNumInputFds - 1; j++)
+ kdInputFds[j] = kdInputFds[j + 1];
+ break;
+ }
+--
+1.8.1.3
+
diff --git a/xorg-xserver/xorg-server/DETAILS
b/xorg-xserver/xorg-server/DETAILS
index 039f150..8f10485c 100755
--- a/xorg-xserver/xorg-server/DETAILS
+++ b/xorg-xserver/xorg-server/DETAILS
@@ -1,6 +1,6 @@
SPELL=xorg-server
- VERSION=1.13.1
-
SOURCE_HASH=sha512:8732be86efdf430bfefe3fea02892042da214d0eb018f12496329b20d7282697d4d92cfb59e35ecabe6a6ca9b034cb12c02e67f44ab4538917c470064719fa45
+ VERSION=1.14.0
+
SOURCE_HASH=sha512:d727adfe828636be6c5e01dc8e7b57f0b193052e9bfa25230e90c0859bd70ae471d21a46f5cda791aae978fbb82601d2ec8f147a8992d7180cf6e10ee2a65d2d
SOURCE=$SPELL-$VERSION.tar.bz2
# SOURCE_GPG="gurus.gpg:$SOURCE.sig:UPSTREAM_HASH"

SOURCE_URL[0]=http://xorg.freedesktop.org/releases/individual/xserver/$SOURCE
diff --git a/xorg-xserver/xorg-server/HISTORY
b/xorg-xserver/xorg-server/HISTORY
index 6656418..b558d5e 100644
--- a/xorg-xserver/xorg-server/HISTORY
+++ b/xorg-xserver/xorg-server/HISTORY
@@ -1,3 +1,7 @@
+2013-03-22 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 1.14.0
+ * PRE_BUILD, 0001-fix-buffer-overflow.patch: fix off-by-one error
+
2012-11-04 Vlad Glagolev <stealth AT sourcemage.org>
* DEPENDS: added missing libxtst dependency
* REPAIR^all^SUB_DEPENDS: added
diff --git a/xorg-xserver/xorg-server/PRE_BUILD
b/xorg-xserver/xorg-server/PRE_BUILD
index 710034f..d6f51bf 100755
--- a/xorg-xserver/xorg-server/PRE_BUILD
+++ b/xorg-xserver/xorg-server/PRE_BUILD
@@ -2,4 +2,5 @@ default_pre_build &&
# required to build
glselect mesa &&
cd "$SOURCE_DIRECTORY" &&
-patch -p1 < $SPELL_DIRECTORY/gl_select.patch
+patch -p1 < $SPELL_DIRECTORY/gl_select.patch &&
+patch -p1 < $SPELL_DIRECTORY/0001-fix-buffer-overflow.patch



  • [SM-Commit] GIT changes to devel-xorg-modular grimoire by Florian Franzmann (3fe4ad93ca90dd207d59a3d5a1546302dce53d55), Florian Franzmann, 03/22/2013

Archive powered by MHonArc 2.6.24.

Top of Page