Skip to Content.
Sympa Menu

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

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 (a8ca630d5ad528b9f268ff854902598345cc2d79)
  • Date: Sat, 12 Oct 2013 13:18:55 -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/HISTORY | 5 +++
xorg-xserver/xorg-server/PRE_BUILD | 3 -
xorg-xserver/xorg-server/gl_select.patch | 14 ++++----
4 files changed, 13 insertions(+), 34 deletions(-)

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

xorg-xserver/xorg-server: remove obsolete patch, refresh outdated patch

diff --git a/xorg-xserver/xorg-server/0001-fix-buffer-overflow.patch
b/xorg-xserver/xorg-server/0001-fix-buffer-overflow.patch
deleted file mode 100644
index 48ddfde..0000000
--- a/xorg-xserver/xorg-server/0001-fix-buffer-overflow.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-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/HISTORY
b/xorg-xserver/xorg-server/HISTORY
index 0b632a2..c36bcff 100644
--- a/xorg-xserver/xorg-server/HISTORY
+++ b/xorg-xserver/xorg-server/HISTORY
@@ -1,3 +1,8 @@
+2013-10-12 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * PRE_BUILD, 0001-fix-buffer-overflow.patch: remove obsolete
+ patch that prevents PRE_BUILD from succeeding
+ * gl_select.patch: renew patch so PRE_BUILD succeeds
+
2013-09-17 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: 1.14.3

diff --git a/xorg-xserver/xorg-server/PRE_BUILD
b/xorg-xserver/xorg-server/PRE_BUILD
index d6f51bf..710034f 100755
--- a/xorg-xserver/xorg-server/PRE_BUILD
+++ b/xorg-xserver/xorg-server/PRE_BUILD
@@ -2,5 +2,4 @@ default_pre_build &&
# required to build
glselect mesa &&
cd "$SOURCE_DIRECTORY" &&
-patch -p1 < $SPELL_DIRECTORY/gl_select.patch &&
-patch -p1 < $SPELL_DIRECTORY/0001-fix-buffer-overflow.patch
+patch -p1 < $SPELL_DIRECTORY/gl_select.patch
diff --git a/xorg-xserver/xorg-server/gl_select.patch
b/xorg-xserver/xorg-server/gl_select.patch
index aea0a57..fa7fb1b 100644
--- a/xorg-xserver/xorg-server/gl_select.patch
+++ b/xorg-xserver/xorg-server/gl_select.patch
@@ -1,6 +1,6 @@
-From e0d5c3f180a492ef474c048326d86aa1a0dbd68f Mon Sep 17 00:00:00 2001
+From f6b348700dcd99d4ab086a709e3309e610721822 Mon Sep 17 00:00:00 2001
From: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
-Date: Sat, 22 Dec 2012 11:54:34 +0100
+Date: Sat, 12 Oct 2013 19:47:22 +0200
Subject: [PATCH] gl_select

---
@@ -8,10 +8,10 @@ Subject: [PATCH] gl_select
1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/hw/xfree86/dixmods/Makefile.in b/hw/xfree86/dixmods/Makefile.in
-index 5932253..f53ac8b 100644
+index ce03745..ac0bee9 100644
--- a/hw/xfree86/dixmods/Makefile.in
+++ b/hw/xfree86/dixmods/Makefile.in
-@@ -516,7 +516,7 @@ module_LTLIBRARIES = libfb.la \
+@@ -515,7 +515,7 @@ module_LTLIBRARIES = libfb.la \
libshadow.la

extsmoduledir = $(moduledir)/extensions
@@ -20,7 +20,7 @@ index 5932253..f53ac8b 100644
AM_CFLAGS = @XORG_CFLAGS@ @DIX_CFLAGS@
INCLUDES = @XORG_INCS@ \
-I$(top_srcdir)/hw/xfree86/loader \
-@@ -578,6 +578,15 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@
$(am__aclocal_m4_deps)
+@@ -577,6 +577,15 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps)
$(am__aclocal_m4_deps):
install-extsmoduleLTLIBRARIES: $(extsmodule_LTLIBRARIES)
@$(NORMAL_INSTALL)
@@ -36,7 +36,7 @@ index 5932253..f53ac8b 100644
@list='$(extsmodule_LTLIBRARIES)'; test -n "$(extsmoduledir)" ||
list=; \
list2=; for p in $$list; do \
if test -f $$p; then \
-@@ -825,7 +834,7 @@ distdir: $(DISTFILES)
+@@ -824,7 +833,7 @@ distdir: $(DISTFILES)
done
check-am: all-am
check: check-am
@@ -46,5 +46,5 @@ index 5932253..f53ac8b 100644
for dir in "$(DESTDIR)$(extsmoduledir)" "$(DESTDIR)$(moduledir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
--
-1.8.0
+1.8.4.1




  • [SM-Commit] GIT changes to devel-xorg-modular grimoire by Florian Franzmann (a8ca630d5ad528b9f268ff854902598345cc2d79), Florian Franzmann, 10/12/2013

Archive powered by MHonArc 2.6.24.

Top of Page