Update to 1.1.4:

(pkgsrc already contained the Coverity and GetDeviceControl patches)

Alan Coopersmith (1):
      Coverity #743/744: Returned without freeing storage bufp/savp

Matthieu Herrb (1):
      nuke RCS Ids

Peter Hutterer (2):
      GetDeviceControl: calculate the length field correctly.
      libXi 1.1.4

4 files changed, 6 insertions, 76 deletions

diff --git a/x11/libXi/Makefile b/x11/libXi/Makefile
index c73781c6bd8..3c87aa4b9e0 100644
--- a/x11/libXi/Makefile
+++ b/x11/libXi/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2008/05/24 21:45:15 tnn Exp $
+# $NetBSD: Makefile,v 1.9 2008/11/17 11:30:31 wiz Exp $
 #
 
-DISTNAME=		libXi-1.1.3
-PKGREVISION=		1
+DISTNAME=		libXi-1.1.4
 CATEGORIES=		x11 devel
 MASTER_SITES=		${MASTER_SITE_XORG:=lib/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/x11/libXi/distinfo b/x11/libXi/distinfo
index ac90c680910..42b41207b92 100644
--- a/x11/libXi/distinfo
+++ b/x11/libXi/distinfo
@@ -1,7 +1,5 @@
-$NetBSD: distinfo,v 1.8 2008/01/29 03:45:36 bjs Exp $
+$NetBSD: distinfo,v 1.9 2008/11/17 11:30:31 wiz Exp $
 
-SHA1 (libXi-1.1.3.tar.bz2) = 60608bcbebadc5fe0b51b5012e9301eb720988fe
-RMD160 (libXi-1.1.3.tar.bz2) = e6446f28a903eed54eccc5d4df685f9623942a0b
-Size (libXi-1.1.3.tar.bz2) = 248007 bytes
-SHA1 (patch-aa) = 2bf138eb5f8fa4e9602579a6842278a7e5446fc5
-SHA1 (patch-ab) = 169dc342cb2631f10b9390568e9e39c91b595303
+SHA1 (libXi-1.1.4.tar.bz2) = ee9fdfc55b44926d76b39c5ee58670f5ab0fafef
+RMD160 (libXi-1.1.4.tar.bz2) = 25069b7e4519d2170b63b1832b28cca6c77ca984
+Size (libXi-1.1.4.tar.bz2) = 272734 bytes
diff --git a/x11/libXi/patches/patch-aa b/x11/libXi/patches/patch-aa
deleted file mode 100644
index cc9ae47cbbb..00000000000
--- a/x11/libXi/patches/patch-aa
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2008/01/29 03:45:36 bjs Exp $
-
-Coverity #743/744: Returned without freeing storage bufp/savp
- 
-If either bufp or savp failed to malloc, we returned without freeing 
-the other.  (from GIT)
-
---- src/XGMotion.c.orig	2007-09-05 12:41:58.000000000 -0400
-+++ src/XGMotion.c
-@@ -115,6 +115,8 @@ Time stop;
-     savp = readp = (int *)Xmalloc(size);
-     bufp = (int *)Xmalloc(size2);
-     if (!bufp || !savp) {
-+	Xfree(bufp);
-+	Xfree(savp);
- 	*nEvents = 0;
- 	_XEatData(dpy, (unsigned long)size);
- 	UnlockDisplay(dpy);
diff --git a/x11/libXi/patches/patch-ab b/x11/libXi/patches/patch-ab
deleted file mode 100644
index 875840d02d9..00000000000
--- a/x11/libXi/patches/patch-ab
+++ /dev/null
@@ -1,49 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2008/01/29 03:45:36 bjs Exp $
-
-GetDeviceControl: calculate the length field correctly.
- 
-Length field should indicate the length of the struct in bytes, 
-not the length of the pointer to the struct. (from GIT)
-
---- src/XGetDCtl.c.orig	2007-09-05 12:41:58.000000000 -0400
-+++ src/XGetDCtl.c
-@@ -104,6 +104,12 @@ XGetDeviceControl(dpy, dev, control)
- 	sav = d;
- 	_XRead(dpy, (char *)d, nbytes);
- 
-+        /* In theory, we should just be able to use d->length to get the size.
-+         * Turns out that a number of X servers (up to and including server
-+         * 1.4) sent the wrong length value down the wire. So to not break
-+         * apps that run against older servers, we have to calculate the size
-+         * manually.
-+         */
- 	switch (d->control) {
- 	case DEVICE_RESOLUTION:
- 	{
-@@ -170,7 +176,7 @@ XGetDeviceControl(dpy, dev, control)
-             XDeviceAbsCalibState *C = (XDeviceAbsCalibState *) Device;
- 
-             C->control = DEVICE_ABS_CALIB;
--            C->length = sizeof(C);
-+            C->length = sizeof(XDeviceAbsCalibState);
-             C->min_x = c->min_x;
-             C->max_x = c->max_x;
-             C->min_y = c->min_y;
-@@ -188,7 +194,7 @@ XGetDeviceControl(dpy, dev, control)
-             XDeviceAbsAreaState *A = (XDeviceAbsAreaState *) Device;
- 
-             A->control = DEVICE_ABS_AREA;
--            A->length = sizeof(A);
-+            A->length = sizeof(XDeviceAbsAreaState);
-             A->offset_x = a->offset_x;
-             A->offset_y = a->offset_y;
-             A->width = a->width;
-@@ -204,7 +210,7 @@ XGetDeviceControl(dpy, dev, control)
-             XDeviceCoreState *C = (XDeviceCoreState *) Device;
- 
-             C->control = DEVICE_CORE;
--            C->length = sizeof(C);
-+            C->length = sizeof(XDeviceCoreState);
-             C->status = c->status;
-             C->iscore = c->iscore;
-