[arch-commits] CVS update of arch/build/x11/xorg-server (2 files)
Alexander Baldeck
alexander at archlinux.org
Thu Aug 9 18:08:10 UTC 2007
Date: Thursday, August 9, 2007 @ 14:08:10
Author: alexander
Path: /home/cvs-arch/arch/build/x11/xorg-server
Added: 1.2.0-properly-free-device-devprivates-memory-leak-fix.patch (1.1)
Modified: PKGBUILD (1.30 -> 1.31)
* fixed memleak
--------------------------------------------------------------+
1.2.0-properly-free-device-devprivates-memory-leak-fix.patch | 38 +++++++
PKGBUILD | 49 +++++-----
2 files changed, 64 insertions(+), 23 deletions(-)
Index: arch/build/x11/xorg-server/1.2.0-properly-free-device-devprivates-memory-leak-fix.patch
diff -u /dev/null arch/build/x11/xorg-server/1.2.0-properly-free-device-devprivates-memory-leak-fix.patch:1.1
--- /dev/null Thu Aug 9 14:08:09 2007
+++ arch/build/x11/xorg-server/1.2.0-properly-free-device-devprivates-memory-leak-fix.patch Thu Aug 9 14:08:09 2007
@@ -0,0 +1,38 @@
+http://gitweb.freedesktop.org/?p=xorg/xserver.git;a=commit;h=b5fde366e2e21234ac0b81222fd5c42ca3e49cba
+Properly free device devPrivates - memory leak fix.
+ author Eamon Walsh <ewalsh at tycho.nsa.gov>
+ Wed, 7 Mar 2007 17:29:55 +0000 (12:29 -0500)
+ committer Eamon Walsh <ewalsh at moss-uranus.epoch.ncsc.mil>
+ Wed, 7 Mar 2007 17:29:55 +0000 (12:29 -0500)
+ commit b5fde366e2e21234ac0b81222fd5c42ca3e49cba
+ tree 21c4d64fc97f8a7b0ec39f7e7a408540dd78691e tree
+ parent a3d2c5d622d9ca36d6fa2966aff09524e3ea39ac commit | commitdiff
+Properly free device devPrivates - memory leak fix.
+
+--- xorg-server-1.2.0.orig/dix/devices.c 2007-03-18 21:43:21.000000000 +0100
++++ xorg-server-1.2.0/dix/devices.c 2007-03-18 21:47:58.000000000 +0100
+@@ -268,20 +268,24 @@
+ if (l->xkb_sli)
+ XkbFreeSrvLedInfo(l->xkb_sli);
+ #endif
+ xfree(l);
+ }
+ #ifdef XKB
+ while (dev->xkb_interest) {
+ XkbRemoveResourceClient((DevicePtr)dev,dev->xkb_interest->resource);
+ }
+ #endif
++
++ if (dev->devPrivates)
++ xfree(dev->devPrivates);
++
+ xfree(dev->sync.event);
+ xfree(dev);
+ }
+
+ void
+ CloseDownDevices()
+ {
+ register DeviceIntPtr dev, next;
+
+ for (dev = inputInfo.devices; dev; dev = next)
Index: arch/build/x11/xorg-server/PKGBUILD
diff -u arch/build/x11/xorg-server/PKGBUILD:1.30 arch/build/x11/xorg-server/PKGBUILD:1.31
--- arch/build/x11/xorg-server/PKGBUILD:1.30 Sun Aug 5 13:35:49 2007
+++ arch/build/x11/xorg-server/PKGBUILD Thu Aug 9 14:08:10 2007
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD,v 1.30 2007/08/05 17:35:49 jgc Exp $
+# $Id: PKGBUILD,v 1.31 2007/08/09 18:08:10 alexander Exp $
# Maintainer: Alexander Baldeck <kth5 at archlinux.org>
# Contributor: Jan de Groot <jgc at archlinux.org>
pkgname=xorg-server
pkgver=1.3.0.0
-pkgrel=4
+pkgrel=5
_mesaver=7.0
pkgdesc="X.Org X servers"
arch=('i686' 'x86_64')
@@ -37,27 +37,8 @@
xorg-x11-server-1.1.1-no-scanpci.patch
xorg-x11-server-1.1.1-spurious-libxf1bpp-link.patch
xorg-server-1.3.0-mesa-6.5.3.patch
- xserver-xv-crash.patch)
-md5sums=('a51a7d482e3c689394755bb17bda8526'
- '50c371455fa7532c04aa0a970f9bc51f'
- '1a336eb22e27cbf443ec5a2ecddfa93c'
- '342a7d2fc0727b12f2840057c1feb2be'
- 'e49b4a78cdc47a379ee49663acbabedc'
- '0faff1bfae0c6378fae5d2875fb3972c'
- '016e4e9f4bf2296ac756b476ff2c0495'
- '8cae706ff61477f510f9f14b3d64fea9'
- '4303627243b853c38422334102d018c9'
- 'a6d376b50bf487e4f2aaddc064cf1070'
- '91d5eea40148b9e9db59c659b15fe443'
- '0199583988cf6025759b260f9e0ef58c'
- 'af7fa4cdac7216af86f84914226aecda'
- 'e162134c68230f7b168430fe73b4881a'
- 'db37f05c6f5b6bb7d72fbf7f70386bdc'
- '41424d3d8edb5f1fda1291675e274d0f'
- '43257d8ade0f087870426eca1f09005c'
- 'a4dde794b9e71749dfee55b4704f12f3'
- 'b435c8a83022e197fbee26f3b430a228'
- '9ec278cada5dbbb76dd1e95279ad46fb')
+ xserver-xv-crash.patch
+ 1.2.0-properly-free-device-devprivates-memory-leak-fix.patch)
build() {
cd ${startdir}/src/${pkgname}-${pkgver}
@@ -77,6 +58,7 @@
patch -Np1 -i ${startdir}/src/xorg-x11-server-1.1.1-no-scanpci.patch || return 1
patch -Np1 -i ${startdir}/src/xorg-x11-server-1.1.1-spurious-libxf1bpp-link.patch || return 1
patch -Np1 -i ${startdir}/src/xserver-1.2.0-honor-displaysize.patch || return 1
+ patch -Np1 -i ${startdir}/src/1.2.0-properly-free-device-devprivates-memory-leak-fix.patch || return 1
# Upstream patches backported from GIT:
patch -Np1 -i ${startdir}/src/xorg-server-1.3.0-mesa-6.5.3.patch || return 1
@@ -127,3 +109,24 @@
mv libGLcore.so libGLcore.xorg
mv libglx.so libglx.xorg
}
+md5sums=('a51a7d482e3c689394755bb17bda8526'
+ '50c371455fa7532c04aa0a970f9bc51f'
+ '1a336eb22e27cbf443ec5a2ecddfa93c'
+ '342a7d2fc0727b12f2840057c1feb2be'
+ 'e49b4a78cdc47a379ee49663acbabedc'
+ '0faff1bfae0c6378fae5d2875fb3972c'
+ '016e4e9f4bf2296ac756b476ff2c0495'
+ '8cae706ff61477f510f9f14b3d64fea9'
+ '4303627243b853c38422334102d018c9'
+ 'a6d376b50bf487e4f2aaddc064cf1070'
+ '91d5eea40148b9e9db59c659b15fe443'
+ '0199583988cf6025759b260f9e0ef58c'
+ 'af7fa4cdac7216af86f84914226aecda'
+ 'e162134c68230f7b168430fe73b4881a'
+ 'db37f05c6f5b6bb7d72fbf7f70386bdc'
+ '41424d3d8edb5f1fda1291675e274d0f'
+ '43257d8ade0f087870426eca1f09005c'
+ 'a4dde794b9e71749dfee55b4704f12f3'
+ 'b435c8a83022e197fbee26f3b430a228'
+ '9ec278cada5dbbb76dd1e95279ad46fb'
+ 'a4b32046f3cfde77ae5f964faabf0254')
More information about the arch-commits
mailing list