[arch-commits] Commit in xorg-server/trunk (PKGBUILD server-1.6.patch)

Jan de Groot jgc at archlinux.org
Wed Apr 15 07:06:54 EDT 2009


    Date: Wednesday, April 15, 2009 @ 07:06:54
  Author: jgc
Revision: 35676

upgpkg: xorg-server 1.6.1-1
    Update to 1.6.1, should reduce memory leaks

Modified:
  xorg-server/trunk/PKGBUILD
Deleted:
  xorg-server/trunk/server-1.6.patch

------------------+
 PKGBUILD         |   13 -
 server-1.6.patch |  563 -----------------------------------------------------
 2 files changed, 4 insertions(+), 572 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-04-15 05:33:42 UTC (rev 35675)
+++ PKGBUILD	2009-04-15 11:06:54 UTC (rev 35676)
@@ -3,14 +3,14 @@
 # Contributor: Jan de Groot <jgc at archlinux.org>
 
 pkgname=xorg-server
-pkgver=1.6.0
-pkgrel=3
+pkgver=1.6.1
+pkgrel=1
 pkgdesc="X.Org X servers"
 arch=('i686' 'x86_64')
 license=('custom')
 url="http://xorg.freedesktop.org"
 depends=('hal>=0.5.11' 'libgl' 'libxfont>=1.4.0' 'openssl>=0.9.8j' 'libpciaccess>=0.10.5' 'libxv>=1.0.4' 'pixman>=0.14.0' 'xcursor-themes' 'xkeyboard-config>=1.5' 'xorg-server-utils' 'xorg-fonts-misc' 'xbitmaps' 'diffutils' 'xf86-input-evdev>=2.1.3')
-makedepends=('libx11>=1.2' 'mesa>=7.4' 'xf86driproto>=2.0.4' 'xtrans>=1.2.3' 'libxkbfile>=1.0.5' 'randrproto>=1.3.0' 'renderproto>=0.9.3' 'xcmiscproto>=1.1.2' 'bigreqsproto>=1.0.2' 'resourceproto>=1.0.2' 'videoproto>=2.2.2' 'compositeproto>=0.4' 'scrnsaverproto>=1.1.0' 'resourceproto>=1.0.2' 'libxinerama>=1.0.3' 'xf86dgaproto>=2.0.3' 'recordproto>=1.13.2' 'libgl>=7.4' 'glproto>=1.4.9')
+makedepends=('libx11>=1.2' 'mesa>=7.4' 'xf86driproto>=2.0.4' 'xtrans>=1.2.3' 'libxkbfile>=1.0.5' 'randrproto>=1.3.0' 'renderproto>=0.9.3' 'xcmiscproto>=1.1.2' 'bigreqsproto>=1.0.2' 'resourceproto>=1.0.2' 'videoproto>=2.2.2' 'compositeproto>=0.4' 'scrnsaverproto>=1.1.0' 'libxinerama>=1.0.3' 'xf86dgaproto>=2.0.3' 'recordproto>=1.13.2' 'libgl>=7.4' 'glproto>=1.4.9')
 conflicts=('catalyst-utils<=9.2')
 options=('!libtool')
 provides=('x-server')
@@ -18,11 +18,9 @@
 install=xorg-server.install
 source=(${url}/releases/individual/xserver/${pkgname}-${pkgver}.tar.bz2
 	xorg-redhat-die-ugly-pattern-die-die-die.patch
-	server-1.6.patch
 	hal-wait.patch)
-md5sums=('aafe73f5807ce8bb534727ecb72467c7'
+md5sums=('ed0878bf32a24d4948c3b8a122a39eff'
          '1a336eb22e27cbf443ec5a2ecddfa93c'
-         '064559385557ad02432a1e800b92b14e'
          'f16d2caef84e1a9c4075b6c5e145512d')
 
 build() {
@@ -30,9 +28,6 @@
   # Get rid of the ugly pattern
   patch -Np3 -i "${srcdir}/xorg-redhat-die-ugly-pattern-die-die-die.patch" || return 1
 
-  # Upstream fixes from server-1.6 branch
-  patch -Np1 -i "${srcdir}/server-1.6.patch" || return 1
-
   # Revert waiting for hal, assume hal won't show up when initial connect fails
   patch -R -Np1 -i "${srcdir}/hal-wait.patch" || return 1
 

Deleted: server-1.6.patch
===================================================================
--- server-1.6.patch	2009-04-15 05:33:42 UTC (rev 35675)
+++ server-1.6.patch	2009-04-15 11:06:54 UTC (rev 35676)
@@ -1,563 +0,0 @@
-diff -ruN xserver-60c161545af80eb78eb790a05bde79409dfdf16e/Makefile.am xserver-38b0f9edca80e43b4c8c364cfebc25c835d24cbd/Makefile.am
---- xserver-60c161545af80eb78eb790a05bde79409dfdf16e/Makefile.am	2009-02-25 20:05:44.000000000 +0000
-+++ xserver-38b0f9edca80e43b4c8c364cfebc25c835d24cbd/Makefile.am	2009-03-27 20:49:45.000000000 +0000
-@@ -50,10 +50,12 @@
- 
- MAINTAINERCLEANFILES=ChangeLog
- 
-+DISTCLEANFILES = doltlibtool doltcompile
-+
- .PHONY: ChangeLog
- 
- ChangeLog:
--	(GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || \
-+	(GIT_DIR=$(top_srcdir)/.git git log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || \
- 	(touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
- 
- dist-hook: ChangeLog
-diff -ruN xserver-60c161545af80eb78eb790a05bde79409dfdf16e/Xext/xselinux.c xserver-38b0f9edca80e43b4c8c364cfebc25c835d24cbd/Xext/xselinux.c
---- xserver-60c161545af80eb78eb790a05bde79409dfdf16e/Xext/xselinux.c	2009-02-25 20:05:44.000000000 +0000
-+++ xserver-38b0f9edca80e43b4c8c364cfebc25c835d24cbd/Xext/xselinux.c	2009-03-27 20:49:45.000000000 +0000
-@@ -186,19 +186,19 @@
-     obj->poly = 1;
- 
-     /* Look in the mappings of names to contexts */
--    if (selabel_lookup(label_hnd, &ctx, name, map) == 0) {
-+    if (selabel_lookup_raw(label_hnd, &ctx, name, map) == 0) {
- 	obj->poly = 0;
-     } else if (errno != ENOENT) {
- 	ErrorF("SELinux: a property label lookup failed!\n");
- 	return BadValue;
--    } else if (selabel_lookup(label_hnd, &ctx, name, polymap) < 0) {
-+    } else if (selabel_lookup_raw(label_hnd, &ctx, name, polymap) < 0) {
- 	ErrorF("SELinux: a property label lookup failed!\n");
- 	return BadValue;
-     }
- 
-     /* Get a SID for context */
--    if (avc_context_to_sid(ctx, &obj->sid) < 0) {
--	ErrorF("SELinux: a context_to_SID call failed!\n");
-+    if (avc_context_to_sid_raw(ctx, &obj->sid) < 0) {
-+	ErrorF("SELinux: a context_to_SID_raw call failed!\n");
- 	rc = BadAlloc;
-     }
- 
-@@ -343,7 +343,7 @@
- 		  SELinuxObjectRec *sid_return)
- {
-     const char *name = LookupEventName(type);
--    security_context_t con;
-+    security_context_t ctx;
-     type &= 127;
- 
-     if (type >= numKnownEvents) {
-@@ -359,16 +359,16 @@
- 
-     if (!knownEvents[type]) {
- 	/* Look in the mappings of event names to contexts */
--	if (selabel_lookup(label_hnd, &con, name, SELABEL_X_EVENT) < 0) {
-+	if (selabel_lookup_raw(label_hnd, &ctx, name, SELABEL_X_EVENT) < 0) {
- 	    ErrorF("SELinux: an event label lookup failed!\n");
- 	    return BadValue;
- 	}
- 	/* Get a SID for context */
--	if (avc_context_to_sid(con, knownEvents + type) < 0) {
--	    ErrorF("SELinux: a context_to_SID call failed!\n");
-+	if (avc_context_to_sid_raw(ctx, knownEvents + type) < 0) {
-+	    ErrorF("SELinux: a context_to_SID_raw call failed!\n");
- 	    return BadAlloc;
- 	}
--	freecon(con);
-+	freecon(ctx);
-     }
- 
-     /* Perform a transition to obtain the final SID */
-@@ -474,7 +474,7 @@
-     /* Try to get a context from the socket */
-     if (fd < 0 || getpeercon_raw(fd, &ctx) < 0) {
- 	/* Otherwise, fall back to a default context */
--	if (selabel_lookup(label_hnd, &ctx, "remote", SELABEL_X_CLIENT) < 0)
-+	if (selabel_lookup_raw(label_hnd, &ctx, "remote", SELABEL_X_CLIENT) < 0)
- 	    FatalError("SELinux: failed to look up remote-client context\n");
-     }
- 
-@@ -509,8 +509,8 @@
- 
- finish:
-     /* Get a SID from the context */
--    if (avc_context_to_sid(ctx, &subj->sid) < 0)
--	FatalError("SELinux: client %d: context_to_sid(%s) failed\n",
-+    if (avc_context_to_sid_raw(ctx, &subj->sid) < 0)
-+	FatalError("SELinux: client %d: context_to_sid_raw(%s) failed\n",
- 		   client->index, ctx);
- 
-     sidget(obj->sid = subj->sid);
-@@ -541,7 +541,7 @@
- 	FatalError("SELinux: couldn't get context of X server process\n");
- 
-     /* Get a SID from the context */
--    if (avc_context_to_sid(ctx, &subj->sid) < 0)
-+    if (avc_context_to_sid_raw(ctx, &subj->sid) < 0)
- 	FatalError("SELinux: serverClient: context_to_sid(%s) failed\n", ctx);
- 
-     sidget(obj->sid = subj->sid);
-@@ -827,20 +827,20 @@
-     /* XXX there should be a separate callback for this */
-     if (obj->sid == unlabeled_sid) {
- 	const char *name = rec->ext->name;
--	security_context_t con;
-+	security_context_t ctx;
- 	security_id_t sid;
- 
- 	serv = dixLookupPrivate(&serverClient->devPrivates, subjectKey);
- 
- 	/* Look in the mappings of extension names to contexts */
--	if (selabel_lookup(label_hnd, &con, name, SELABEL_X_EXT) < 0) {
-+	if (selabel_lookup_raw(label_hnd, &ctx, name, SELABEL_X_EXT) < 0) {
- 	    ErrorF("SELinux: a property label lookup failed!\n");
- 	    rec->status = BadValue;
- 	    return;
- 	}
- 	/* Get a SID for context */
--	if (avc_context_to_sid(con, &sid) < 0) {
--	    ErrorF("SELinux: a context_to_SID call failed!\n");
-+	if (avc_context_to_sid_raw(ctx, &sid) < 0) {
-+	    ErrorF("SELinux: a context_to_SID_raw call failed!\n");
- 	    rec->status = BadAlloc;
- 	    return;
- 	}
-@@ -851,11 +851,11 @@
- 	if (avc_compute_create(serv->sid, sid, SECCLASS_X_EXTENSION,
- 			       &obj->sid) < 0) {
- 	    ErrorF("SELinux: a SID transition call failed!\n");
--	    freecon(con);
-+	    freecon(ctx);
- 	    rec->status = BadValue;
- 	    return;
- 	}
--	freecon(con);
-+	freecon(ctx);
-     }
- 
-     /* Perform the security check */
-@@ -1150,13 +1150,15 @@
- 
-     if (rec->type != RT_WINDOW)
- 	return;
-+    if (rec->state != ResourceStateAdding)
-+	return;
- 
-     pWin = (WindowPtr)rec->value;
-     subj = dixLookupPrivate(&wClient(pWin)->devPrivates, subjectKey);
- 
-     if (subj->sid) {
- 	security_context_t ctx;
--	int rc = avc_sid_to_context(subj->sid, &ctx);
-+	int rc = avc_sid_to_context_raw(subj->sid, &ctx);
- 	if (rc < 0)
- 	    FatalError("SELinux: Failed to get security context!\n");
- 	rc = dixChangeWindowProperty(serverClient,
-@@ -1172,7 +1174,7 @@
- 
-     if (obj->sid) {
- 	security_context_t ctx;
--	int rc = avc_sid_to_context(obj->sid, &ctx);
-+	int rc = avc_sid_to_context_raw(obj->sid, &ctx);
- 	if (rc < 0)
- 	    FatalError("SELinux: Failed to get security context!\n");
- 	rc = dixChangeWindowProperty(serverClient,
-@@ -1288,7 +1290,7 @@
-     int len = 0;
- 
-     if (sid) {
--	if (avc_sid_to_context(sid, &ctx) < 0)
-+	if (avc_sid_to_context_raw(sid, &ctx) < 0)
- 	    return BadValue;
- 	len = strlen(ctx) + 1;
-     }
-@@ -1347,9 +1349,9 @@
-     *pSid = NULL;
- 
-     if (stuff->context_len > 0) {
--	if (security_check_context(ctx) < 0)
-+	if (security_check_context_raw(ctx) < 0)
- 	    return BadValue;
--	if (avc_context_to_sid(ctx, pSid) < 0)
-+	if (avc_context_to_sid_raw(ctx, pSid) < 0)
- 	    return BadValue;
-     }
-     return Success;
-@@ -1393,9 +1395,9 @@
-     if (rc != Success)
- 	return rc;
- 
--    if (security_check_context(ctx) < 0)
-+    if (security_check_context_raw(ctx) < 0)
- 	return BadValue;
--    if (avc_context_to_sid(ctx, &sid) < 0)
-+    if (avc_context_to_sid_raw(ctx, &sid) < 0)
- 	return BadValue;
- 
-     subj = dixLookupPrivate(&dev->devPrivates, subjectKey);
-@@ -1511,9 +1513,9 @@
-     SELinuxObjectRec *obj = dixLookupPrivate(privPtr, objectKey);
-     SELinuxObjectRec *data = dixLookupPrivate(privPtr, dataKey);
- 
--    if (avc_sid_to_context(obj->sid, &i->octx) < 0)
-+    if (avc_sid_to_context_raw(obj->sid, &i->octx) < 0)
- 	return BadValue;
--    if (avc_sid_to_context(data->sid, &i->dctx) < 0)
-+    if (avc_sid_to_context_raw(data->sid, &i->dctx) < 0)
- 	return BadValue;
- 
-     i->id = id;
-@@ -1887,6 +1889,22 @@
-     }
- }
- 
-+#ifdef HAVE_AVC_NETLINK_ACQUIRE_FD
-+static int netlink_fd;
-+
-+static void
-+SELinuxBlockHandler(void *data, struct timeval **tv, void *read_mask)
-+{
-+}
-+
-+static void
-+SELinuxWakeupHandler(void *data, int err, void *read_mask)
-+{
-+    if (FD_ISSET(netlink_fd, (fd_set *)read_mask))
-+        avc_netlink_check_nb();
-+}
-+#endif
-+
- 
- /*
-  * Extension Setup / Teardown
-@@ -1917,6 +1935,12 @@
-     label_hnd = NULL;
- 
-     audit_close(audit_fd);
-+#ifdef HAVE_AVC_NETLINK_ACQUIRE_FD
-+    avc_netlink_release_fd();
-+    RemoveBlockAndWakeupHandlers(SELinuxBlockHandler, SELinuxWakeupHandler,
-+                                 NULL);
-+    RemoveGeneralSocket(netlink_fd);
-+#endif
- 
-     avc_destroy();
-     avc_active = 0;
-@@ -1941,7 +1965,7 @@
-     ExtensionEntry *extEntry;
-     struct selinux_opt selabel_option = { SELABEL_OPT_VALIDATE, (char *)1 };
-     struct selinux_opt avc_option = { AVC_OPT_SETENFORCE, (char *)0 };
--    security_context_t con;
-+    security_context_t ctx;
-     int ret = TRUE;
- 
-     /* Check SELinux mode on system */
-@@ -1988,11 +2012,11 @@
-     if (!label_hnd)
- 	FatalError("SELinux: Failed to open x_contexts mapping in policy\n");
- 
--    if (security_get_initial_context("unlabeled", &con) < 0)
-+    if (security_get_initial_context_raw("unlabeled", &ctx) < 0)
- 	FatalError("SELinux: Failed to look up unlabeled context\n");
--    if (avc_context_to_sid(con, &unlabeled_sid) < 0)
-+    if (avc_context_to_sid_raw(ctx, &unlabeled_sid) < 0)
- 	FatalError("SELinux: a context_to_SID call failed!\n");
--    freecon(con);
-+    freecon(ctx);
- 
-     /* Prepare for auditing */
-     audit_fd = audit_open();
-@@ -2013,6 +2037,13 @@
-     if (atom_client_ctx == BAD_RESOURCE)
- 	FatalError("SELinux: Failed to create atom\n");
- 
-+#ifdef HAVE_AVC_NETLINK_ACQUIRE_FD
-+    netlink_fd = avc_netlink_acquire_fd();
-+    AddGeneralSocket(netlink_fd);
-+    RegisterBlockAndWakeupHandlers(SELinuxBlockHandler, SELinuxWakeupHandler,
-+                                   NULL);
-+#endif
-+
-     /* Register callbacks */
-     ret &= dixRegisterPrivateInitFunc(subjectKey, SELinuxSubjectInit, NULL);
-     ret &= dixRegisterPrivateDeleteFunc(subjectKey, SELinuxSubjectFree, NULL);
-diff -ruN xserver-60c161545af80eb78eb790a05bde79409dfdf16e/Xi/xiproperty.c xserver-38b0f9edca80e43b4c8c364cfebc25c835d24cbd/Xi/xiproperty.c
---- xserver-60c161545af80eb78eb790a05bde79409dfdf16e/Xi/xiproperty.c	2009-02-25 20:05:44.000000000 +0000
-+++ xserver-38b0f9edca80e43b4c8c364cfebc25c835d24cbd/Xi/xiproperty.c	2009-03-27 20:49:45.000000000 +0000
-@@ -32,6 +32,7 @@
- #include "dix.h"
- #include "inputstr.h"
- #include <X11/extensions/XI.h>
-+#include <X11/Xatom.h>
- #include <X11/extensions/XIproto.h>
- #include "exglobals.h"
- #include "exevents.h"
-@@ -48,7 +49,8 @@
-     Atom type;
-     char *name;
- } dev_properties[] = {
--    {0, XI_PROP_ENABLED}
-+    {0, XI_PROP_ENABLED},
-+    {0, XATOM_FLOAT}
- };
- 
- static long XIPropHandlerID = 1;
-@@ -56,11 +58,17 @@
- /**
-  * Return the type assigned to the specified atom or 0 if the atom isn't known
-  * to the DIX.
-+ *
-+ * If name is NULL, None is returned.
-  */
- _X_EXPORT Atom
- XIGetKnownProperty(char *name)
- {
-     int i;
-+
-+    if (!name)
-+        return None;
-+
-     for (i = 0; i < (sizeof(dev_properties)/sizeof(struct dev_properties)); i++)
-     {
-         if (strcmp(name, dev_properties[i].name) == 0)
-@@ -71,6 +79,125 @@
- }
- 
- /**
-+ * Convert the given property's value(s) into @nelem_return integer values and
-+ * store them in @buf_return. If @nelem_return is larger than the number of
-+ * values in the property, @nelem_return is set to the number of values in the
-+ * property.
-+ *
-+ * If *@buf_return is NULL and @nelem_return is 0, memory is allocated
-+ * automatically and must be freed by the caller.
-+ *
-+ * Possible return codes.
-+ * Success ... No error.
-+ * BadMatch ... Wrong atom type, atom is not XA_INTEGER
-+ * BadAlloc ... NULL passed as buffer and allocation failed.
-+ * BadLength ... @buff is NULL but @nelem_return is non-zero.
-+ *
-+ * @param val The property value
-+ * @param nelem_return The maximum number of elements to return.
-+ * @param buf_return Pointer to an array of at least @nelem_return values.
-+ * @return Success or the error code if an error occured.
-+ */
-+_X_EXPORT int
-+XIPropToInt(XIPropertyValuePtr val, int *nelem_return, int **buf_return)
-+{
-+    int i;
-+    int *buf;
-+
-+    if (val->type != XA_INTEGER)
-+        return BadMatch;
-+    if (!*buf_return && *nelem_return)
-+        return BadLength;
-+
-+    switch(val->format)
-+    {
-+        case 8:
-+        case 16:
-+        case 32:
-+            break;
-+        default:
-+            return BadValue;
-+    }
-+
-+    buf = *buf_return;
-+
-+    if (!buf && !(*nelem_return))
-+    {
-+        buf = xcalloc(val->size, sizeof(int));
-+        if (!buf)
-+            return BadAlloc;
-+        *buf_return = buf;
-+        *nelem_return = val->size;
-+    } else if (val->size < *nelem_return)
-+        *nelem_return = val->size;
-+
-+    for (i = 0; i < val->size && i < *nelem_return; i++)
-+    {
-+        switch(val->format)
-+        {
-+            case 8:  buf[i] = ((CARD8*)val->data)[i]; break;
-+            case 16: buf[i] = ((CARD16*)val->data)[i]; break;
-+            case 32: buf[i] = ((CARD32*)val->data)[i]; break;
-+        }
-+    }
-+
-+    return Success;
-+}
-+
-+/**
-+ * Convert the given property's value(s) into @nelem_return float values and
-+ * store them in @buf_return. If @nelem_return is larger than the number of
-+ * values in the property, @nelem_return is set to the number of values in the
-+ * property.
-+ *
-+ * If *@buf_return is NULL and @nelem_return is 0, memory is allocated
-+ * automatically and must be freed by the caller.
-+ *
-+ * Possible errors returned:
-+ * Success
-+ * BadMatch ... Wrong atom type, atom is not XA_FLOAT
-+ * BadValue ... Wrong format, format is not 32
-+ * BadAlloc ... NULL passed as buffer and allocation failed.
-+ * BadLength ... @buff is NULL but @nelem_return is non-zero.
-+ *
-+ * @param val The property value
-+ * @param nelem_return The maximum number of elements to return.
-+ * @param buf_return Pointer to an array of at least @nelem_return values.
-+ * @return Success or the error code if an error occured.
-+ */
-+_X_EXPORT int
-+XIPropToFloat(XIPropertyValuePtr val, int *nelem_return, float **buf_return)
-+{
-+    int i;
-+    float *buf;
-+
-+    if (!val->type || val->type != XIGetKnownProperty(XATOM_FLOAT))
-+        return BadMatch;
-+
-+    if (val->format != 32)
-+        return BadValue;
-+    if (!*buf_return && *nelem_return)
-+        return BadLength;
-+
-+    buf = *buf_return;
-+
-+    if (!buf && !(*nelem_return))
-+    {
-+        buf = xcalloc(val->size, sizeof(float));
-+        if (!buf)
-+            return BadAlloc;
-+        *buf_return = buf;
-+        *nelem_return = val->size;
-+    } else if (val->size < *nelem_return)
-+        *nelem_return = val->size;
-+
-+    for (i = 0; i < val->size && i < *nelem_return; i++)
-+           buf[i] = ((float*)val->data)[i];
-+
-+    return Success;
-+}
-+
-+/**
-  * Init those properties that are allocated by the server and most likely used
-  * by the DIX or the DDX.
-  */
-diff -ruN xserver-60c161545af80eb78eb790a05bde79409dfdf16e/configure.ac xserver-38b0f9edca80e43b4c8c364cfebc25c835d24cbd/configure.ac
---- xserver-60c161545af80eb78eb790a05bde79409dfdf16e/configure.ac	2009-02-25 20:05:44.000000000 +0000
-+++ xserver-38b0f9edca80e43b4c8c364cfebc25c835d24cbd/configure.ac	2009-03-27 20:49:45.000000000 +0000
-@@ -921,6 +921,10 @@
- 	AC_CHECK_LIB(selinux, avc_init, [], AC_MSG_ERROR([SELinux library not found])) 
- 	AC_CHECK_HEADERS([libaudit.h], [], AC_MSG_ERROR([SELinux extension requires audit system headers]))
- 	AC_CHECK_LIB(audit, audit_open, [], AC_MSG_ERROR([SELinux extension requires audit system library]))
-+        AC_CHECK_DECL(avc_netlink_acquire_fd,
-+                      [AC_DEFINE(HAVE_AVC_NETLINK_ACQUIRE_FD, 1, "Have avc_netlink_acquire_fd")],
-+                      [],
-+                      [#include <selinux/avc.h>])
- 	AC_DEFINE(XSELINUX, 1, [Build SELinux extension])
- 	SELINUX_LIB="-lselinux -laudit"
- fi
-diff -ruN xserver-60c161545af80eb78eb790a05bde79409dfdf16e/hw/xfree86/modes/xf86Crtc.c xserver-38b0f9edca80e43b4c8c364cfebc25c835d24cbd/hw/xfree86/modes/xf86Crtc.c
---- xserver-60c161545af80eb78eb790a05bde79409dfdf16e/hw/xfree86/modes/xf86Crtc.c	2009-02-25 20:05:44.000000000 +0000
-+++ xserver-38b0f9edca80e43b4c8c364cfebc25c835d24cbd/hw/xfree86/modes/xf86Crtc.c	2009-03-27 20:49:45.000000000 +0000
-@@ -2061,9 +2061,9 @@
- 		     (float)config->output[p]->mm_height;
- 
- 	if (aspect)
--	    preferred_match[0] = bestModeForAspect(config, enabled, aspect);
-+	    preferred_match[p] = bestModeForAspect(config, enabled, aspect);
- 
--	if (preferred_match[0])
-+	if (preferred_match[p])
- 	    ret = TRUE;
- 
-     } while (0);
-diff -ruN xserver-60c161545af80eb78eb790a05bde79409dfdf16e/include/dix-config.h.in xserver-38b0f9edca80e43b4c8c364cfebc25c835d24cbd/include/dix-config.h.in
---- xserver-60c161545af80eb78eb790a05bde79409dfdf16e/include/dix-config.h.in	2009-02-25 20:05:44.000000000 +0000
-+++ xserver-38b0f9edca80e43b4c8c364cfebc25c835d24cbd/include/dix-config.h.in	2009-03-27 20:49:45.000000000 +0000
-@@ -434,4 +434,6 @@
- #include "dix-config-apple-verbatim.h"
- #endif
- 
-+#undef HAVE_AVC_NETLINK_ACQUIRE_FD
-+
- #endif /* _DIX_CONFIG_H_ */
-diff -ruN xserver-60c161545af80eb78eb790a05bde79409dfdf16e/include/exevents.h xserver-38b0f9edca80e43b4c8c364cfebc25c835d24cbd/include/exevents.h
---- xserver-60c161545af80eb78eb790a05bde79409dfdf16e/include/exevents.h	2009-02-25 20:05:44.000000000 +0000
-+++ xserver-38b0f9edca80e43b4c8c364cfebc25c835d24cbd/include/exevents.h	2009-03-27 20:49:45.000000000 +0000
-@@ -251,4 +251,16 @@
- 
- extern DeviceIntPtr XIGetDevice(xEvent *ev);
- 
-+extern _X_EXPORT int XIPropToInt(
-+        XIPropertyValuePtr val,
-+        int *nelem_return,
-+        int **buf_return
-+);
-+
-+extern _X_EXPORT int XIPropToFloat(
-+        XIPropertyValuePtr val,
-+        int *nelem_return,
-+        float **buf_return
-+);
-+
- #endif /* EXEVENTS_H */
-diff -ruN xserver-60c161545af80eb78eb790a05bde79409dfdf16e/include/xserver-properties.h xserver-38b0f9edca80e43b4c8c364cfebc25c835d24cbd/include/xserver-properties.h
---- xserver-60c161545af80eb78eb790a05bde79409dfdf16e/include/xserver-properties.h	2009-02-25 20:05:44.000000000 +0000
-+++ xserver-38b0f9edca80e43b4c8c364cfebc25c835d24cbd/include/xserver-properties.h	2009-03-27 20:49:45.000000000 +0000
-@@ -26,6 +26,10 @@
- #ifndef _XSERVER_PROPERTIES_H_
- #define _XSERVER_PROPERTIES_H_
- 
-+/* Type for a 4 byte float. Storage format IEEE 754 in client's default
-+ * byte-ordering. */
-+#define XATOM_FLOAT "FLOAT"
-+
- /* BOOL. 0 - device disabled, 1 - device enabled */
- #define XI_PROP_ENABLED      "Device Enabled"
- 
-diff -ruN xserver-60c161545af80eb78eb790a05bde79409dfdf16e/xkb/xkbUtils.c xserver-38b0f9edca80e43b4c8c364cfebc25c835d24cbd/xkb/xkbUtils.c
---- xserver-60c161545af80eb78eb790a05bde79409dfdf16e/xkb/xkbUtils.c	2009-02-25 20:05:44.000000000 +0000
-+++ xserver-38b0f9edca80e43b4c8c364cfebc25c835d24cbd/xkb/xkbUtils.c	2009-03-27 20:49:45.000000000 +0000
-@@ -2016,9 +2016,9 @@
- 
-             strcpy(dst->geom->label_font, src->geom->label_font);
-             i = XkbGeomColorIndex(src->geom, src->geom->label_color);
--            dst->geom->label_color = &(src->geom->colors[i]);
-+            dst->geom->label_color = &(dst->geom->colors[i]);
-             i = XkbGeomColorIndex(src->geom, src->geom->base_color);
--            dst->geom->base_color = &(src->geom->colors[i]);
-+            dst->geom->base_color = &(dst->geom->colors[i]);
-         }
-         else {
-             if (dst->geom->label_font) {
-From b7dc7374bbcb708eee6eec26ff141619f914d8eb Mon Sep 17 00:00:00 2001
-From: Eamon Walsh <ewalsh at tycho.nsa.gov>
-Date: Mon, 09 Mar 2009 21:28:40 +0000
-Subject: Correct access mode in call to dixLookupWindow() within RRSelectInput.
-
-Reported by Alan Coopersmith.
-(cherry picked from commit 6544490700051b3b5e88ac1890d71b35634c9100)
----
-diff --git a/randr/rrdispatch.c b/randr/rrdispatch.c
-index 5a2ea71..0925875 100644
---- a/randr/rrdispatch.c
-+++ b/randr/rrdispatch.c
-@@ -76,7 +76,7 @@ ProcRRSelectInput (ClientPtr client)
-     int		rc;
- 
-     REQUEST_SIZE_MATCH(xRRSelectInputReq);
--    rc = dixLookupWindow(&pWin, stuff->window, client, DixWriteAccess);
-+    rc = dixLookupWindow(&pWin, stuff->window, client, DixReceiveAccess);
-     if (rc != Success)
- 	return rc;
-     pHead = (RREventPtr *)SecurityLookupIDByType(client,
---
-cgit v0.8.2



More information about the arch-commits mailing list