Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=31ad59f72503185a50109e15e2bbf624768cf917
commit 31ad59f72503185a50109e15e2bbf624768cf917
Author: crazy <[EMAIL PROTECTED]>
Date: Sun Jun 22 13:24:20 2008 +0200
xorg-server-1.4.2-1-x86_64
* Version bump
* closes FS#3175 in -current
diff --git a/source/x11/xorg-server/1.4-fix-dmx-build.patch
b/source/x11/xorg-server/1.4-fix-dmx-build.patch
deleted file mode 100644
index 07f43ab..0000000
--- a/source/x11/xorg-server/1.4-fix-dmx-build.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/hw/dmx/dmxinput.c b/hw/dmx/dmxinput.c
-index d644b5d..83f8a4a 100644
---- a/hw/dmx/dmxinput.c
-+++ b/hw/dmx/dmxinput.c
-@@ -105,3 +105,14 @@ void dmxUpdateWindowInfo(DMXUpdateType type, WindowPtr
pWindow)
- if (!dmxInput->detached && dmxInput->updateWindowInfo)
- dmxInput->updateWindowInfo(dmxInput, type, pWindow);
- }
-+
-+int
-+NewInputDeviceRequest (InputOption *options, DeviceIntPtr *pdev)
-+{
-+ return BadRequest;
-+}
-+
-+void
-+DeleteInputDeviceRequest(DeviceIntPtr pDev)
-+{
-+}
diff --git a/source/x11/xorg-server/1.4-fix-dmx-link.patch
b/source/x11/xorg-server/1.4-fix-dmx-link.patch
deleted file mode 100644
index 909442d..0000000
--- a/source/x11/xorg-server/1.4-fix-dmx-link.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/hw/dmx/Makefile.am b/hw/dmx/Makefile.am
-index 002ea11..15dc281 100644
---- a/hw/dmx/Makefile.am
-+++ b/hw/dmx/Makefile.am
-@@ -87,6 +87,7 @@ Xdmx_LDADD = $(XORG_CORE_LIBS) \
- $(GLX_LIBS) \
- input/libdmxinput.a \
- config/libdmxconfig.a \
-+ @XSERVER_LIBS@ \
- @DMXMODULES_LIBS@
-
- # Man page
diff --git a/source/x11/xorg-server/1.4-fix-xephyr-link.patch
b/source/x11/xorg-server/1.4-fix-xephyr-link.patch
deleted file mode 100644
index 35ca029..0000000
--- a/source/x11/xorg-server/1.4-fix-xephyr-link.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 62fdd78..7a37590 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1802,7 +1802,7 @@ if test "$KDRIVE" = yes; then
- XSDL_INCS="`sdl-config --cflags` $XSERVER_CFLAGS"
- fi
-
-- PKG_CHECK_MODULES(XEPHYR, x11 xext xfont xau xdmcp, [xephyr="yes"],
[xephyr="no"])
-+ PKG_CHECK_MODULES(XEPHYR, x11 xext xfont xau xdmcp $PIXMAN,
[xephyr="yes"], [xephyr="no"])
- if test "x$XEPHYR" = xauto; then
- XEPHYR=$xephyr
- fi
-diff --git a/hw/kdrive/ephyr/Makefile.am b/hw/kdrive/ephyr/Makefile.am
-index cc3019f..1738d0f 100644
---- a/hw/kdrive/ephyr/Makefile.am
-+++ b/hw/kdrive/ephyr/Makefile.am
-@@ -28,6 +28,7 @@ Xephyr_LDADD =
\
- libxephyr-hostx.a \
- ../../../exa/libexa.la \
- @KDRIVE_LIBS@ \
-+ @XSERVER_LIBS@ \
- @XEPHYR_LIBS@
-
- Xephyr_DEPENDENCIES = \
diff --git a/source/x11/xorg-server/CVE-2007-3069.patch
b/source/x11/xorg-server/CVE-2007-3069.patch
deleted file mode 100644
index 05e6c14..0000000
--- a/source/x11/xorg-server/CVE-2007-3069.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From: Kristian Høgsberg <[EMAIL PROTECTED]>
-Date: Thu, 17 Jan 2008 01:24:11 +0000 (-0500)
-Subject: Don't break grab and focus state for a window when redirecting it.
-X-Git-Url:
http://gitweb.freedesktop.org/?p=xorg/xserver.git;a=commitdiff;h=a6a7fadbb03ee99312dfb15ac478ab3c414c1c0b
-
-Don't break grab and focus state for a window when redirecting it.
-
-Composite uses an unmap/map cycle to trigger backing pixmap allocation
-and cliprect recomputation when a window is redirected or unredirected.
-To avoid protocol visible side effects, map and unmap events are
-disabled temporarily. However, when a window is unmapped it is also
-removed from grabs and loses focus, but these state changes are not
-disabled.
-
-This change supresses the unmap side effects during the composite
-unmap/map cycle and fixes this bug:
-
- http://bugzilla.gnome.org/show_bug.cgi?id=488264
-
-where compiz would cause gnome-screensaver to lose its grab when
-compiz unredirects the fullscreen lock window.
----
-
---- a/dix/window.c
-+++ b/dix/window.c
-@@ -2993,7 +2993,8 @@ UnrealizeTree(
- }
- #endif
- (* Unrealize)(pChild);
-- DeleteWindowFromAnyEvents(pChild, FALSE);
-+ if (MapUnmapEventsEnabled(pWin))
-+ DeleteWindowFromAnyEvents(pChild, FALSE);
- if (pChild->viewable)
- {
- #ifdef DO_SAVE_UNDERS
-
diff --git a/source/x11/xorg-server/CVE-2007-6429_3.patch
b/source/x11/xorg-server/CVE-2007-6429_3.patch
deleted file mode 100644
index 1fba567..0000000
--- a/source/x11/xorg-server/CVE-2007-6429_3.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From: Matthias Hopf <[EMAIL PROTECTED]>
-Date: Mon, 21 Jan 2008 15:13:21 +0000 (+0100)
-Subject: CVE-2007-6429: Always test for size+offset wrapping.
-X-Git-Url:
http://gitweb.freedesktop.org/?p=xorg/xserver.git;a=commitdiff;h=be6c17fcf9efebc0bbcc3d9a25f8c5a2450c2161
-
-CVE-2007-6429: Always test for size+offset wrapping.
----
-
---- a/Xext/shm.c
-+++ b/Xext/shm.c
-@@ -799,10 +799,10 @@ CreatePmap:
- if (sizeof(size) == 4 && BitsPerPixel(depth) > 8) {
- if (size < width * height)
- return BadAlloc;
-- /* thankfully, offset is unsigned */
-- if (stuff->offset + size < size)
-- return BadAlloc;
- }
-+ /* thankfully, offset is unsigned */
-+ if (stuff->offset + size < size)
-+ return BadAlloc;
-
- VERIFY_SHMSIZE(shmdesc, stuff->offset, size, client);
-
-@@ -1144,10 +1144,10 @@ CreatePmap:
- if (sizeof(size) == 4 && BitsPerPixel(depth) > 8) {
- if (size < width * height)
- return BadAlloc;
-- /* thankfully, offset is unsigned */
-- if (stuff->offset + size < size)
-- return BadAlloc;
- }
-+ /* thankfully, offset is unsigned */
-+ if (stuff->offset + size < size)
-+ return BadAlloc;
-
- VERIFY_SHMSIZE(shmdesc, stuff->offset, size, client);
- pMap = (*shmFuncs[pDraw->pScreen->myNum]->CreatePixmap)(
diff --git
a/source/x11/xorg-server/Fix-context-sharing-between-direct-indirect-contexts.patch
b/source/x11/xorg-server/Fix-context-sharing-between-direct-indirect-contexts.patch
deleted file mode 100644
index bd81c13..0000000
---
a/source/x11/xorg-server/Fix-context-sharing-between-direct-indirect-contexts.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From a65d4aed06acd839fb21153f74144498abda3e18 Mon Sep 17 00:00:00 2001
-From: Alan Hourihane <[EMAIL PROTECTED]>
-Date: Wed, 27 Feb 2008 16:49:34 +0000
-Subject: [PATCH] Fix context sharing between direct/indirect contexts
-
----
- GL/glx/glxdri.c | 8 ++++++++
- 1 files changed, 8 insertions(+), 0 deletions(-)
-
-diff --git a/GL/glx/glxdri.c b/GL/glx/glxdri.c
-index 685683d..09abca3 100644
---- a/GL/glx/glxdri.c
-+++ b/GL/glx/glxdri.c
-@@ -598,6 +598,9 @@ __glXDRIscreenCreateContext(__GLXscreen *baseScreen,
- else
- sharePrivate = NULL;
-
-+ if (baseShareContext && baseShareContext->isDirect)
-+ return NULL;
-+
- context = xalloc(sizeof *context);
- if (context == NULL)
- return NULL;
-@@ -617,6 +620,11 @@ __glXDRIscreenCreateContext(__GLXscreen *baseScreen,
- 0, /* render type */
- sharePrivate,
- &context->driContext);
-+
-+ if (!context->driContext.private) {
-+ xfree(context);
-+ return NULL;
-+ }
-
- context->driContext.mode = modes;
-
---
-1.5.4.3
-
diff --git
a/source/x11/xorg-server/Fix-rotation-for-multi-monitor-situation.patch
b/source/x11/xorg-server/Fix-rotation-for-multi-monitor-situation.patch
deleted file mode 100644
index 2cce9a2..0000000
--- a/source/x11/xorg-server/Fix-rotation-for-multi-monitor-situation.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From dc30ade6496c7cc24e38c419e229159525fe042f Mon Sep 17 00:00:00 2001
-From: Maarten Maathuis <[EMAIL PROTECTED]>
-Date: Sun, 17 Feb 2008 18:47:28 +0100
-Subject: [PATCH] Fix rotation for multi-monitor situation.
-
-- The (x,y)-coordinates of the crtc were not being passed as xFixed values,
which made it an obscure bug to find.
-- Fix bug #13787.
-(cherry picked from commit a48cc88ea2674c28b69b8d738b168cbafcf4001f)
----
- hw/xfree86/modes/xf86Rotate.c | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/hw/xfree86/modes/xf86Rotate.c b/hw/xfree86/modes/xf86Rotate.c
-index 380478f..dd0e659 100644
---- a/hw/xfree86/modes/xf86Rotate.c
-+++ b/hw/xfree86/modes/xf86Rotate.c
-@@ -579,9 +579,9 @@ xf86CrtcRotate (xf86CrtcPtr crtc, DisplayModePtr mode,
Rotation rotation)
- }
- else
- {
-- PictureTransformTranslate (&crtc_to_fb, &fb_to_crtc, crtc->x, crtc->y);
-+ PictureTransformTranslate (&crtc_to_fb, &fb_to_crtc, F(crtc->x),
F(crtc->y));
- PictureTransformIsInverse ("offset", &crtc_to_fb, &fb_to_crtc);
--
-+
- /*
- * these are the size of the shadow pixmap, which
- * matches the mode, not the pre-rotated copy in the
---
-1.5.4.3
-
diff --git a/source/x11/xorg-server/FrugalBuild
b/source/x11/xorg-server/FrugalBuild
index 4977666..c63395a 100644
--- a/source/x11/xorg-server/FrugalBuild
+++ b/source/x11/xorg-server/FrugalBuild
@@ -2,8 +2,8 @@
# Maintainer: Christian Hamar alias krix <[EMAIL PROTECTED]>
pkgname=xorg-server
-pkgver=1.4.0.90
-pkgrel=5
+pkgver=1.4.2
+pkgrel=1
mesaver=7.0.2
pkgdesc="Modular X.Org X Server"
groups=('x11' 'xorg-core')
@@ -27,18 +27,7 @@ backup=('etc/sysconfig/desktop')
Finclude sourceforge xorg
source=([EMAIL PROTECTED] \
http://$_F_sourceforge_mirror.dl.sourceforge.net/sourceforge/mesa3d/MesaLib-$mesaver.tar.bz2
\
-
ftp://ftp.freedesktop.org/pub/xorg/X11R7.3/patches/xorg-xserver-1.4-multiple-overflows-v2.diff
\
- CVE-2007-6429_3.patch \
- CVE-2007-3069.patch \
- bug13308-Verify-and-reject-obviously-broken-modes.patch \
- fix-bgPixel-unsigned-long-issues.patch \
- OS-Don-t-leak-connection-translation-table.patch \
- KDrive-Xephyr-Don-t-leak-screen-damage-structure.patch \
- Input-Don-t-reinit-devices.patch \
bug13511.patch \
- OS-IO-Zero-out-client-buffers.patch \
- XKB-XkbCopyKeymap-Don-t-leak-all-the-sections.patch \
- Xephyr-One-time-keyboard-leak-fix.patch \
01-kernel-headers-fix.patch \
02-access_c_skip_null_addresses.patch \
03-black-background.patch \
@@ -48,32 +37,11 @@ source=([EMAIL PROTECTED] \
mesa-build-config.patch \
F-xorg-x11-server-0.99.3-init-origins-fix.patch0 \
xprint-rc-files-fix.patch \
- no-aiglx.patch \
- 1.4-fix-dmx-build.patch \
- 1.4-fix-dmx-link.patch \
- 1.4-fix-kdrive-automake.patch \
- 1.4-fix-xephyr-link.patch \
- dix-set-the-correct-number-of-valuators-in-valuator.patch \
- Fix-context-sharing-between-direct-indirect-contexts.patch \
- Fix-rotation-for-multi-monitor-situation.patch \
- Resize-composite-overlay-window-when-the-root-window.patch \
- security-Fix-for-Bug-14480-untrusted-access-broke.patch \
- xkb-don-t-update-LEDs-if-they-don-t-exist.patch)
+ 1.4-fix-kdrive-automake.patch)
-sha1sums=('7c492ac32bd83b521f5c016e4728fccf9cba55db' \
+sha1sums=('385348721ecb6da4bc51a2b7ee5784de6be0a8b6' \
'd16eaeb1d9d95d11d3b6d289b1ba87108b88da90' \
- 'af92fd389e72a3bb59d25dbf9cbb06e827b75d7d' \
- '0dccea5821d612255d415fb994b69780a6c39c29' \
- 'eef5c663f5728e70969126d13c5a22ba3d0b08d1' \
- '838c1144516368be4b15ab1b22d1a557fc8261ba' \
- '03313ab37223329913354321449d7e818c69c937' \
- '4d35fe70d5af830ac732fe74260d8483c390461c' \
- 'a0c51b280ef74f64a4b4e885d2476fc6600197a4' \
- 'ee204c0d14f483bd2b3cd81b7c935c1b8e33b10e' \
'cc156003c1e8787b04f6949d4e12f859e939c5e6' \
- '3a65997e9bcf16614f6b67498d7bfd5cf1bc9299' \
- '553af71b1f799281c6f9ab2537107f017774e9fc' \
- '12b0b027976a64586ad5f014cdc796b93eaa301b' \
'f31702e0029b2d68018598e73ed55c4d6c58367b' \
'859b98a4049400be152032fc09ceff2afe9e6dcf' \
'863ad92892785c3785b122bf54d0def4d4d2732c' \
@@ -83,17 +51,7 @@ sha1sums=('7c492ac32bd83b521f5c016e4728fccf9cba55db' \
'f7f706ec568a80543c6d6096b3d8a833b80399ed' \
'2937d6a50155cc16f73ae44b1e5b6e26cabbb86a' \
'0eb64d46172b6f2f4462c02dad7964c6d7656076' \
- 'f53de93da5e110867db8b1655b5798d2049f43ae' \
- '0b627c0d98e50f0d29dacc3fa7e8e9d8b1ad3faf' \
- '41f686ef462e179f6c7e73a1babb7c0f2312d337' \
- 'f21a54aed8eae1e718f2f0c262c37c36ccccd152' \
- '352c55be4b91b29c84b192d806a90834d887fc22' \
- '03056cde78a8a64b44c756014f31222cee5075e1' \
- 'eadf66c1603dcc5a46dc14407cea0f1bc36b9594' \
- '8d3e9e5daaf2eca41a1aba90509a1b27acb3533e' \
- 'fcde0358b5b3c5489bcfe939fa742a1b122c3e96' \
- 'e48a9793ca50616e4de3e8fd51443aa90abf6365' \
- '0e677503b0dd377530ec799f2139f25b5fcd2de9')
+ 'f21a54aed8eae1e718f2f0c262c37c36ccccd152')
subpkgs=('libglx' \
"$pkgname-dmx" "$pkgname-ati" "$pkgname-chips" "$pkgname-xephyr" \
@@ -159,45 +117,10 @@ build() {
Fpatch F-xorg-x11-server-0.99.3-init-origins-fix.patch0
# Hack for init scripts and wrong install stuff for xprint
Fpatch xprint-rc-files-fix.patch
- ## this disables AIGLX by default , uncomment it to enable
- ## Fpatch no-aiglx.patch
- ## workaround ATI's closes source c***
- ## see https://bugs.freedesktop.org/show_bug.cgi?id=9367
- ##
- ## DISABLED for 1.4 (we will see whats up )
- #Fpatch bug-9367.patch
- #############
- Fpatch 1.4-fix-xephyr-link.patch
- Fpatch 1.4-fix-dmx-build.patch
- Fpatch 1.4-fix-dmx-link.patch
Fpatch 1.4-fix-kdrive-automake.patch
- ## SEC fixes - FS#2709
- Fpatch xorg-xserver-1.4-multiple-overflows-v2.diff
- ## the fix for the sec fix =)
- ##
http://gitweb.freedesktop.org/?p=xorg/xserver.git;a=commit;h=be6c17fcf9efebc0bbcc3d9a25f8c5a2450c2161
- Fpatch CVE-2007-6429_3.patch
- ## http://lists.freedesktop.org/archives/xorg/2008-January/032129.html
- Fpatch CVE-2007-3069.patch
## fixes from 1.4-branch
- Fpatch bug13308-Verify-and-reject-obviously-broken-modes.patch
- Fpatch fix-bgPixel-unsigned-long-issues.patch
- Fpatch OS-Don-t-leak-connection-translation-table.patch
- Fpatch KDrive-Xephyr-Don-t-leak-screen-damage-structure.patch
- Fpatch Input-Don-t-reinit-devices.patch
Fpatch bug13511.patch
- Fpatch OS-IO-Zero-out-client-buffers.patch
- Fpatch XKB-XkbCopyKeymap-Don-t-leak-all-the-sections.patch
- Fpatch Xephyr-One-time-keyboard-leak-fix.patch
- Fpatch dix-set-the-correct-number-of-valuators-in-valuator.patch
- Fpatch Fix-context-sharing-between-direct-indirect-contexts.patch
- Fpatch Fix-rotation-for-multi-monitor-situation.patch
- Fpatch Resize-composite-overlay-window-when-the-root-window.patch
- Fpatch security-Fix-for-Bug-14480-untrusted-access-broke.patch
- Fpatch xkb-don-t-update-LEDs-if-they-don-t-exist.patch
- ## GCC 4.2.0 bug do **NOT** remove this hack or it will kill your box!!
- ## http://gcc.gnu.org/bugzilla/show_bug.cgi?id=30052
- echo 'CFLAGS = @CFLAGS@ -O0' >> hw/xfree86/scanpci/Makefile.am
Fautoreconf
Fmake \
@@ -231,7 +154,7 @@ build() {
--enable-xcalibrate \
--enable-fontcache \
--enable-multibuffer \
- --disable-config-hal # DISABLED THIS for now , not really
complete now
+ --disable-config-hal # DISABLED THIS for now , not really
complete
Fmakeinstall
# TODO - Move away from here
Ffile /etc/sysconfig/desktop
diff --git a/source/x11/xorg-server/Input-Don-t-reinit-devices.patch
b/source/x11/xorg-server/Input-Don-t-reinit-devices.patch
deleted file mode 100644
index 9afdb4e..0000000
--- a/source/x11/xorg-server/Input-Don-t-reinit-devices.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 102c012c206cbb3bbf0fa5b0c8f0ce2ce9bba72a Mon Sep 17 00:00:00 2001
-From: Daniel Stone <[EMAIL PROTECTED]>
-Date: Fri, 28 Dec 2007 15:49:50 +0200
-Subject: [PATCH] Input: Don't reinit devices
-
-If a device is already initialised (i.e. the virtual core devices) during
-IASD, don't init them again. This fixes a leak.
-(cherry picked from commit 1f6015c8fe62c28cfaa82cc855b5b9c28fd34607)
----
- dix/devices.c | 3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
-
-diff --git a/dix/devices.c b/dix/devices.c
-index 287d730..f6f3c8e 100644
---- a/dix/devices.c
-+++ b/dix/devices.c
-@@ -473,7 +473,8 @@ InitAndStartDevices(void)
-
- for (dev = inputInfo.off_devices; dev; dev = dev->next) {
- DebugF("(dix) initialising device %d\n", dev->id);
-- ActivateDevice(dev);
-+ if (!dev->inited)
-+ ActivateDevice(dev);
- }
- for (dev = inputInfo.off_devices; dev; dev = next)
- {
---
-1.5.3.8
-
diff --git
a/source/x11/xorg-server/KDrive-Xephyr-Don-t-leak-screen-damage-structure.patch
b/source/x11/xorg-server/KDrive-Xephyr-Don-t-leak-screen-damage-structure.patch
deleted file mode 100644
index c8a321c..0000000
---
a/source/x11/xorg-server/KDrive-Xephyr-Don-t-leak-screen-damage-structure.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From a304fc1d4a7062f65161ef8748fd358639ec73de Mon Sep 17 00:00:00 2001
-From: Daniel Stone <[EMAIL PROTECTED]>
-Date: Fri, 28 Dec 2007 15:48:57 +0200
-Subject: [PATCH] KDrive: Xephyr: Don't leak screen damage structure
- (cherry picked from commit 0b03d97a244540824c922c300adbc3d3ae4855d5)
-
----
- hw/kdrive/ephyr/ephyr.c | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/hw/kdrive/ephyr/ephyr.c b/hw/kdrive/ephyr/ephyr.c
-index e8001df..27165a5 100644
---- a/hw/kdrive/ephyr/ephyr.c
-+++ b/hw/kdrive/ephyr/ephyr.c
-@@ -394,6 +394,7 @@ ephyrUnsetInternalDamage (ScreenPtr pScreen)
-
- pPixmap = (*pScreen->GetScreenPixmap) (pScreen);
- DamageUnregister (&pPixmap->drawable, scrpriv->pDamage);
-+ DamageDestroy (scrpriv->pDamage);
-
- RemoveBlockAndWakeupHandlers (ephyrInternalDamageBlockHandler,
- ephyrInternalDamageWakeupHandler,
---
-1.5.3.8
-
diff --git
a/source/x11/xorg-server/OS-Don-t-leak-connection-translation-table.patch
b/source/x11/xorg-server/OS-Don-t-leak-connection-translation-table.patch
deleted file mode 100644
index 351f884..0000000
--- a/source/x11/xorg-server/OS-Don-t-leak-connection-translation-table.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 38d8cfaaff0ae6273d9e921aae08b2706355f0d2 Mon Sep 17 00:00:00 2001
-From: Daniel Stone <[EMAIL PROTECTED]>
-Date: Fri, 28 Dec 2007 15:48:25 +0200
-Subject: [PATCH] OS: Don't leak connection translation table on regeneration
- (cherry picked from commit e868e0bc0d2318e62707d3ae68532b0029959154)
-
----
- os/connection.c | 3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
-
-diff --git a/os/connection.c b/os/connection.c
-index b944593..d1ba845 100644
---- a/os/connection.c
-+++ b/os/connection.c
-@@ -353,7 +353,8 @@ InitConnectionLimits(void)
- #endif
-
- #if !defined(WIN32)
-- ConnectionTranslation = (int *)xnfalloc(sizeof(int)*(lastfdesc + 1));
-+ if (!ConnectionTranslation)
-+ ConnectionTranslation = (int *)xnfalloc(sizeof(int)*(lastfdesc + 1));
- #else
- InitConnectionTranslation();
- #endif
---
-1.5.3.8
-
diff --git a/source/x11/xorg-server/OS-IO-Zero-out-client-buffers.patch
b/source/x11/xorg-server/OS-IO-Zero-out-client-buffers.patch
deleted file mode 100644
index 9f3dfe3..0000000
--- a/source/x11/xorg-server/OS-IO-Zero-out-client-buffers.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 02e805f0ff4b6af551372ba5fc5fb369c8834d1d Mon Sep 17 00:00:00 2001
-From: Daniel Stone <[EMAIL PROTECTED]>
-Date: Sat, 5 Jan 2008 10:38:16 +0200
-Subject: [PATCH] OS: IO: Zero out client buffers
-
-For alignment reasons, we can write out uninitialised bytes, so allocate
-the whole thing with xcalloc.
-(cherry picked from commit b99a43dfe97c1813e1c61f298b1c83c5d5ca88a2)
----
- os/io.c | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/os/io.c b/os/io.c
-index 9de75ee..a8b84fb 100644
---- a/os/io.c
-+++ b/os/io.c
-@@ -1197,7 +1197,7 @@ AllocateOutputBuffer(void)
- oco = (ConnectionOutputPtr)xalloc(sizeof(ConnectionOutput));
- if (!oco)
- return (ConnectionOutputPtr)NULL;
-- oco->buf = (unsigned char *) xalloc(BUFSIZE);
-+ oco->buf = (unsigned char *) xcalloc(1, BUFSIZE);
- if (!oco->buf)
- {
- xfree(oco);
---
-1.5.3.8
-
diff --git
a/source/x11/xorg-server/Resize-composite-overlay-window-when-the-root-window.patch
b/source/x11/xorg-server/Resize-composite-overlay-window-when-the-root-window.patch
deleted file mode 100644
index 22c8044..0000000
---
a/source/x11/xorg-server/Resize-composite-overlay-window-when-the-root-window.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From 3db5930c61aeb849de3b21e7ba0d86d3c0cf72bb Mon Sep 17 00:00:00 2001
-From: Maarten Maathuis <[EMAIL PROTECTED]>
-Date: Sun, 17 Feb 2008 11:21:01 +0100
-Subject: [PATCH] Resize composite overlay window when the root window changes.
-
-- This allows some compositing managers to work, even after randr12 has
changed the root window size.
-- Thanks to ajax for figuring out the best place to put this.
-- Example:
- - xf86RandR12SetMode() calls EnableDisableFBAccess().
- - That calls xf86SetRootClip() which in turn calls
ResizeChildrenWinSize().
- - The final step is the call to PositionWindow().
-(cherry picked from commit 70c0592a97c7dc9db0576d32b3bdbe4766520509)
----
- composite/compwindow.c | 25 +++++++++++++++++++++++++
- 1 files changed, 25 insertions(+), 0 deletions(-)
-
-diff --git a/composite/compwindow.c b/composite/compwindow.c
-index bfd2946..33192ad 100644
---- a/composite/compwindow.c
-+++ b/composite/compwindow.c
-@@ -165,6 +165,29 @@ compCheckRedirect (WindowPtr pWin)
- return TRUE;
- }
-
-+static int
-+updateOverlayWindow(ScreenPtr pScreen)
-+{
-+ CompScreenPtr cs;
-+ WindowPtr pWin; /* overlay window */
-+ XID vlist[2];
-+
-+ cs = GetCompScreen(pScreen);
-+ if ((pWin = cs->pOverlayWin) != NULL) {
-+ if ((pWin->drawable.width == pScreen->width) &&
-+ (pWin->drawable.height == pScreen->height))
-+ return Success;
-+
-+ /* Let's resize the overlay window. */
-+ vlist[0] = pScreen->width;
-+ vlist[1] = pScreen->height;
-+ return ConfigureWindow(pWin, CWWidth | CWHeight, vlist,
wClient(pWin));
-+ }
-+
-+ /* Let's be on the safe side and not assume an overlay window is always
allocated. */
-+ return Success;
-+}
-+
- Bool
- compPositionWindow (WindowPtr pWin, int x, int y)
- {
-@@ -203,6 +226,8 @@ compPositionWindow (WindowPtr pWin, int x, int y)
- cs->PositionWindow = pScreen->PositionWindow;
- pScreen->PositionWindow = compPositionWindow;
- compCheckTree (pWin->drawable.pScreen);
-+ if (updateOverlayWindow(pScreen) != Success)
-+ ret = FALSE;
- return ret;
- }
-
---
-1.5.4.3
-
diff --git
a/source/x11/xorg-server/XKB-XkbCopyKeymap-Don-t-leak-all-the-sections.patch
b/source/x11/xorg-server/XKB-XkbCopyKeymap-Don-t-leak-all-the-sections.patch
deleted file mode 100644
index d7d3a5d..0000000
--- a/source/x11/xorg-server/XKB-XkbCopyKeymap-Don-t-leak-all-the-sections.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 8a3acd3ec41b887b4aeaa0b2932265522c1e2836 Mon Sep 17 00:00:00 2001
-From: Daniel Stone <[EMAIL PROTECTED]>
-Date: Sat, 5 Jan 2008 10:43:53 +0200
-Subject: [PATCH] XKB: XkbCopyKeymap: Don't leak all the sections
-
-Previously, we'd just keep num_sections at 0, which would break the
-geometry and lead us to leak sections. Don't do that.
-(cherry picked from commit 0137b0394a248f694448a7d97c9a1a3efcf24e81)
----
- xkb/xkbUtils.c | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/xkb/xkbUtils.c b/xkb/xkbUtils.c
-index c7f9a26..e90df0d 100644
---- a/xkb/xkbUtils.c
-+++ b/xkb/xkbUtils.c
-@@ -1770,6 +1770,7 @@ XkbCopyKeymap(XkbDescPtr src, XkbDescPtr dst, Bool
sendNotifies)
- if (!tmp)
- return FALSE;
- dst->geom->sections = tmp;
-+ dst->geom->num_sections = src->geom->num_sections;
-
- for (i = 0,
- ssection = src->geom->sections,
---
-1.5.3.8
-
diff --git a/source/x11/xorg-server/Xephyr-One-time-keyboard-leak-fix.patch
b/source/x11/xorg-server/Xephyr-One-time-keyboard-leak-fix.patch
deleted file mode 100644
index 1cd1091..0000000
--- a/source/x11/xorg-server/Xephyr-One-time-keyboard-leak-fix.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 636aa9e7be2822a0148067a11499ad48fe682cd9 Mon Sep 17 00:00:00 2001
-From: Daniel Stone <[EMAIL PROTECTED]>
-Date: Sat, 5 Jan 2008 10:47:39 +0200
-Subject: [PATCH] Xephyr: One-time keyboard leak fix
-
-Don't leak the originally-allocated keysym map.
-(cherry picked from commit e85130c85f727466fc27be1cfa46c88b257499fb)
----
- hw/kdrive/ephyr/ephyr.c | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/hw/kdrive/ephyr/ephyr.c b/hw/kdrive/ephyr/ephyr.c
-index 27165a5..86e8f1f 100644
---- a/hw/kdrive/ephyr/ephyr.c
-+++ b/hw/kdrive/ephyr/ephyr.c
-@@ -915,6 +915,7 @@ EphyrKeyboardInit (KdKeyboardInfo *ki)
- ki->minScanCode = ki->keySyms.minKeyCode;
- ki->maxScanCode = ki->keySyms.maxKeyCode;
- ki->keySyms.mapWidth = ephyrKeySyms.mapWidth;
-+ xfree(ki->keySyms.map);
- ki->keySyms.map = ephyrKeySyms.map;
- ki->name = KdSaveString("Xephyr virtual keyboard");
- ephyrKbd = ki;
---
-1.5.3.8
-
diff --git a/source/x11/xorg-server/bug-9367.patch
b/source/x11/xorg-server/bug-9367.patch
deleted file mode 100644
index 906f186..0000000
--- a/source/x11/xorg-server/bug-9367.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- hw/xfree86/common/xf86Helper.c.orig 2006-12-13 16:21:35.000000000
+0100
-+++ hw/xfree86/common/xf86Helper.c 2006-12-13 18:23:53.000000000 +0100
-@@ -2386,22 +2386,29 @@
-
- _X_EXPORT pointer
- xf86LoadSubModule(ScrnInfoPtr pScrn, const char *name)
- {
- pointer ret;
- int errmaj = 0, errmin = 0;
-
- ret = LoadSubModule(pScrn->module, name, NULL, NULL, NULL, NULL,
- &errmaj, &errmin);
- if (!ret)
- LoaderErrorMsg(pScrn->name, name, errmaj, errmin);
-+
-+ /* "drm" module has been merged into "dri" module, but some drivers
-+ are still trying to load it explictely and fail if it doesn't exist
:-( */
-+ if (!ret && !strcmp(name,"drm")) {
-+ ret = (pointer) -1;
-+ }
-+
- return ret;
- }
-
- /*
- * xf86LoadOneModule loads a single module.
- */
- _X_EXPORT pointer
- xf86LoadOneModule(char *name, pointer opt)
- {
- int errmaj, errmin;
- char *Name;
diff --git
a/source/x11/xorg-server/bug13308-Verify-and-reject-obviously-broken-modes.patch
b/source/x11/xorg-server/bug13308-Verify-and-reject-obviously-broken-modes.patch
deleted file mode 100644
index fabc8d7..0000000
---
a/source/x11/xorg-server/bug13308-Verify-and-reject-obviously-broken-modes.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From f4bcb53e86bb103b6bcf8a3a170a36137c34d272 Mon Sep 17 00:00:00 2001
-From: Hong Liu <[EMAIL PROTECTED]>
-Date: Wed, 5 Dec 2007 17:48:28 +0100
-Subject: [PATCH] Bug 13308: Verify and reject obviously broken modes.
- (cherry picked from commit c6cfcd408df3e44d0094946c0a7d2fa944b4d2d1)
-
----
- hw/xfree86/modes/xf86EdidModes.c | 6 ++++++
- 1 files changed, 6 insertions(+), 0 deletions(-)
-
-diff --git a/hw/xfree86/modes/xf86EdidModes.c
b/hw/xfree86/modes/xf86EdidModes.c
-index 8b5e69d..e2ae665 100644
---- a/hw/xfree86/modes/xf86EdidModes.c
-+++ b/hw/xfree86/modes/xf86EdidModes.c
-@@ -239,6 +239,12 @@ DDCModeFromDetailedTiming(int scrnIndex, struct
detailed_timings *timing,
- Mode->VSyncEnd = Mode->VSyncStart + timing->v_sync_width;
- Mode->VTotal = timing->v_active + timing->v_blanking;
-
-+ /* perform basic check on the detail timing */
-+ if (Mode->HSyncEnd > Mode->HTotal || Mode->VSyncEnd > Mode->VTotal) {
-+ xfree(Mode);
-+ return NULL;
-+ }
-+
- xf86SetModeDefaultName(Mode);
-
- /* We ignore h/v_size and h/v_border for now. */
---
-1.5.3.8
-
diff --git
a/source/x11/xorg-server/dix-set-the-correct-number-of-valuators-in-valuator.patch
b/source/x11/xorg-server/dix-set-the-correct-number-of-valuators-in-valuator.patch
deleted file mode 100644
index b2399cf..0000000
---
a/source/x11/xorg-server/dix-set-the-correct-number-of-valuators-in-valuator.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From e98027c3ac7195fec665ef393d980b02870ca1b8 Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <[EMAIL PROTECTED]>
-Date: Tue, 18 Dec 2007 13:57:07 +1030
-Subject: [PATCH] dix: set the correct number of valuators in valuator events.
-
-(first_valuator + num_valuators) must never be larger than the number of axes,
-otherwise DIX freaks out. And from looking at libXI, anything larger than 6 is
-wrong too.
-(cherry picked from commit 9f6ae61ad12cc2813d04405458e1ca5aed8a539e)
----
- dix/getevents.c | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/dix/getevents.c b/dix/getevents.c
-index 12d8189..b7ba69b 100644
---- a/dix/getevents.c
-+++ b/dix/getevents.c
-@@ -344,7 +344,7 @@ getValuatorEvents(xEvent *events, DeviceIntPtr pDev, int
first_valuator,
- for (i = first_valuator; i < final_valuator; i += 6, xv++, events++) {
- xv->type = DeviceValuator;
- xv->first_valuator = i;
-- xv->num_valuators = num_valuators;
-+ xv->num_valuators = ((num_valuators - i) > 6) ? 6 : (num_valuators -
i);
- xv->deviceid = pDev->id;
- switch (final_valuator - i) {
- case 6:
---
-1.5.4.3
-
diff --git a/source/x11/xorg-server/fix-bgPixel-unsigned-long-issues.patch
b/source/x11/xorg-server/fix-bgPixel-unsigned-long-issues.patch
deleted file mode 100644
index 89ac69e..0000000
--- a/source/x11/xorg-server/fix-bgPixel-unsigned-long-issues.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 41f735fbe02f59bc7bcca335c6e743c72c2fc44c Mon Sep 17 00:00:00 2001
-From: Hong Liu <[EMAIL PROTECTED]>
-Date: Tue, 4 Sep 2007 08:46:46 +0100
-Subject: [PATCH] bgPixel (unsigned long) is 64-bit on x86_64, so -1 !=
0xffffffff
-
-This patch should fix bug 8080.
-(cherry picked from commit 9adea807038b64292403ede982075fe1dcfd4c9a)
----
- hw/xfree86/xaa/xaaGC.c | 9 +++++----
- 1 files changed, 5 insertions(+), 4 deletions(-)
-
-diff --git a/hw/xfree86/xaa/xaaGC.c b/hw/xfree86/xaa/xaaGC.c
-index f3434c9..b3dc83a 100644
---- a/hw/xfree86/xaa/xaaGC.c
-+++ b/hw/xfree86/xaa/xaaGC.c
-@@ -80,10 +80,11 @@ XAAValidateGC(
- }
-
- if(pGC->depth != 32) {
-- if(pGC->bgPixel == -1) /* -1 is reserved for transparency */
-- pGC->bgPixel = 0x7fffffff;
-- if(pGC->fgPixel == -1) /* -1 is reserved for transparency */
-- pGC->fgPixel = 0x7fffffff;
-+ /* 0xffffffff is reserved for transparency */
-+ if(pGC->bgPixel == 0xffffffff)
-+ pGC->bgPixel = 0x7fffffff;
-+ if(pGC->fgPixel == 0xffffffff)
-+ pGC->fgPixel = 0x7fffffff;
- }
-
- if((pDraw->type == DRAWABLE_PIXMAP) && !IS_OFFSCREEN_PIXMAP(pDraw)){
---
-1.5.3.8
-
diff --git a/source/x11/xorg-server/no-aiglx.patch
b/source/x11/xorg-server/no-aiglx.patch
deleted file mode 100644
index 6e8d3ea..0000000
--- a/source/x11/xorg-server/no-aiglx.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur xorg-server-1.1.99.903/configure.ac
xorg-server-1.1.99.903-no-aiglx/configure.ac
---- xorg-server-1.1.99.903/configure.ac 2006-12-02 00:44:38.000000000
+0100
-+++ xorg-server-1.1.99.903-no-aiglx/configure.ac 2006-12-09
02:15:12.000000000 +0100
-@@ -407,7 +407,7 @@
- AC_ARG_ENABLE(xdmcp, AS_HELP_STRING([--disable-xdmcp], [Build XDMCP
extension (default: auto)]), [XDMCP=$enableval], [XDMCP=auto])
- AC_ARG_ENABLE(xdm-auth-1, AS_HELP_STRING([--disable-xdm-auth-1], [Build
XDM-Auth-1 extension (default: auto)]), [XDMAUTH=$enableval], [XDMAUTH=auto])
- AC_ARG_ENABLE(glx, AS_HELP_STRING([--disable-glx], [Build GLX
extension (default: enabled)]), [GLX=$enableval], [GLX=yes])
--AC_ARG_ENABLE(aiglx, AS_HELP_STRING([--enable-aiglx], [Build
accelerated indirect GLX (default: enabled)]), [AIGLX=$enableval], [AIGLX=yes])
-+AC_ARG_ENABLE(aiglx, AS_HELP_STRING([--enable-aiglx], [Build
accelerated indirect GLX (default: disabled)]), [AIGLX=$enableval], [AIGLX=no])
- AC_ARG_ENABLE(glx-tls, AS_HELP_STRING([--enable-glx-tls], [Build GLX
with TLS support (default: disabled)]), [GLX_USE_TLS=$enableval],
[GLX_USE_TLS=no])
- AC_ARG_ENABLE(dri, AS_HELP_STRING([--enable-dri], [Build DRI
extension (default: auto)]), [DRI=$enableval])
- AC_ARG_ENABLE(xinerama, AS_HELP_STRING([--disable-xinerama],
[Build Xinerama extension (default: enabled)]), [XINERAMA=$enableval],
[XINERAMA=yes])
diff --git
a/source/x11/xorg-server/security-Fix-for-Bug-14480-untrusted-access-broke.patch
b/source/x11/xorg-server/security-Fix-for-Bug-14480-untrusted-access-broke.patch
deleted file mode 100644
index a7cc2bb..0000000
---
a/source/x11/xorg-server/security-Fix-for-Bug-14480-untrusted-access-broke.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 74b40bba327a2e97780e8e3f995f784add2d6231 Mon Sep 17 00:00:00 2001
-From: Eamon Walsh <[EMAIL PROTECTED]>
-Date: Thu, 14 Feb 2008 19:47:44 -0500
-Subject: [PATCH] security: Fix for Bug #14480: untrusted access broken in 7.3.
-
----
- Xext/security.c | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/Xext/security.c b/Xext/security.c
-index e9d48c9..14ad354 100644
---- a/Xext/security.c
-+++ b/Xext/security.c
-@@ -1014,7 +1014,7 @@ CALLBACK(SecurityCheckResourceIDAccess)
- }
- else /* server-owned resource - probably a default colormap or root
window */
- {
-- if (RT_WINDOW == rtype || RC_DRAWABLE == rtype)
-+ if (RC_DRAWABLE & rtype)
- {
- switch (reqtype)
- { /* the following operations are allowed on root windows */
---
-1.5.4.3
-
diff --git
a/source/x11/xorg-server/xkb-don-t-update-LEDs-if-they-don-t-exist.patch
b/source/x11/xorg-server/xkb-don-t-update-LEDs-if-they-don-t-exist.patch
deleted file mode 100644
index fd75f7e..0000000
--- a/source/x11/xorg-server/xkb-don-t-update-LEDs-if-they-don-t-exist.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From bc72ef3a159efd67067322c043bba444869dc356 Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <[EMAIL PROTECTED]>
-Date: Wed, 30 Jan 2008 10:39:54 +1030
-Subject: [PATCH] xkb: don't update LEDs if they don't exist. (Bug #13961)
-
-In some weird cases we call this function when there is no SrvLedInfo on the
-device. And it turns out null-pointer dereferences are bad.
-
-X.Org Bug 13961 <http://bugs.freedesktop.org/show_bug.cgi?id=13961>
-(cherry picked from commit d954f9c80348de294602d931d387e5cd1ef4b9a5)
----
- xkb/xkbLEDs.c | 3 +++
- 1 files changed, 3 insertions(+), 0 deletions(-)
-
-diff --git a/xkb/xkbLEDs.c b/xkb/xkbLEDs.c
-index d607d90..d28973c 100644
---- a/xkb/xkbLEDs.c
-+++ b/xkb/xkbLEDs.c
-@@ -63,6 +63,9 @@ XkbSrvLedInfoPtr sli;
-
- sli= XkbFindSrvLedInfo(dev,XkbDfltXIClass,XkbDfltXIId,0);
-
-+ if (!sli)
-+ return update;
-+
- if (state_changes&(XkbModifierStateMask|XkbGroupStateMask))
- update|= sli->usesEffective;
- if (state_changes&(XkbModifierBaseMask|XkbGroupBaseMask))
---
-1.5.4.3
-
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git
