Update do libX11-1.1.2. Major changes include:

- fixed integer overflows [ patched before ]
- fixed file descriptor leak
- allow re-entrant Xlib calls from _XIOError for the sake of
  atexit handlers or ELF/C++ destructors
- define XTHREADLIB and XTHREAD_CFLAGS [ not perfect, but used for now ]
- Many constness and some 64bit issues fixed
- Added man apge for XKB

Add a NetBSD xsrc patch to unlock mutexes before destroying them.

5 files changed, 229 insertions, 97 deletions

diff --git a/x11/libX11/Makefile b/x11/libX11/Makefile
index f58a56ec422..3634e0d89e3 100644
--- a/x11/libX11/Makefile
+++ b/x11/libX11/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2007/07/03 13:35:49 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2007/07/12 15:01:59 joerg Exp $
 #
 
-DISTNAME=		libX11-1.1.1
-PKGREVISION=		1
+DISTNAME=		libX11-1.1.2
 CATEGORIES=		x11 devel
 MASTER_SITES=		http://xorg.freedesktop.org/releases/individual/lib/
 EXTRACT_SUFX=		.tar.bz2
diff --git a/x11/libX11/PLIST b/x11/libX11/PLIST
index 0b965765ae4..90d83e67cce 100644
--- a/x11/libX11/PLIST
+++ b/x11/libX11/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2007/01/23 19:47:53 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2007/07/12 15:02:00 joerg Exp $
 include/X11/ImUtil.h
 include/X11/XKBlib.h
 include/X11/Xcms.h
@@ -413,8 +413,8 @@ man/man3/XSetClipRectangles.3
 man/man3/XSetCloseDownMode.3
 man/man3/XSetCommand.3
 man/man3/XSetDashes.3
-man/man3/XSetEventQueueOwner.3
 man/man3/XSetErrorHandler.3
+man/man3/XSetEventQueueOwner.3
 man/man3/XSetFillRule.3
 man/man3/XSetFillStyle.3
 man/man3/XSetFont.3
@@ -562,6 +562,206 @@ man/man3/XcmsTekHVCQueryMaxV.3
 man/man3/XcmsTekHVCQueryMaxVC.3
 man/man3/XcmsTekHVCQueryMaxVSamples.3
 man/man3/XcmsTekHVCQueryMinV.3
+man/man3/XkbActionCtrls.3
+man/man3/XkbAddDeviceLedInfo.3
+man/man3/XkbAddGeomColor.3
+man/man3/XkbAddGeomDoodad.3
+man/man3/XkbAddGeomKey.3
+man/man3/XkbAddGeomKeyAlias.3
+man/man3/XkbAddGeomOutline.3
+man/man3/XkbAddGeomOverlay.3
+man/man3/XkbAddGeomOverlayKey.3
+man/man3/XkbAddGeomOverlayRow.3
+man/man3/XkbAddGeomProperty.3
+man/man3/XkbAddGeomRow.3
+man/man3/XkbAddGeomSection.3
+man/man3/XkbAddGeomShape.3
+man/man3/XkbAddSymInterpret.3
+man/man3/XkbAllocClientMap.3
+man/man3/XkbAllocCompatMap.3
+man/man3/XkbAllocControls.3
+man/man3/XkbAllocDeviceInfo.3
+man/man3/XkbAllocDeviceLedInfo.3
+man/man3/XkbAllocGeomColors.3
+man/man3/XkbAllocGeomDoodads.3
+man/man3/XkbAllocGeomKeyAliases.3
+man/man3/XkbAllocGeomKeys.3
+man/man3/XkbAllocGeomOutlines.3
+man/man3/XkbAllocGeomOverlayKey.3
+man/man3/XkbAllocGeomOverlayRows.3
+man/man3/XkbAllocGeomOverlays.3
+man/man3/XkbAllocGeomPoints.3
+man/man3/XkbAllocGeomProps.3
+man/man3/XkbAllocGeomRows.3
+man/man3/XkbAllocGeomSectionDoodads.3
+man/man3/XkbAllocGeomSections.3
+man/man3/XkbAllocGeomShapes.3
+man/man3/XkbAllocGeometry.3
+man/man3/XkbAllocIndicatorMaps.3
+man/man3/XkbAllocKeyboard.3
+man/man3/XkbAllocNames.3
+man/man3/XkbAllocServerMap.3
+man/man3/XkbApplyCompatMapToKey.3
+man/man3/XkbBell.3
+man/man3/XkbBellEvent.3
+man/man3/XkbChangeControls.3
+man/man3/XkbChangeDeviceInfo.3
+man/man3/XkbChangeEnabledControls.3
+man/man3/XkbChangeIndicators.3
+man/man3/XkbChangeMap.3
+man/man3/XkbChangeNames.3
+man/man3/XkbChangeTypesOfKey.3
+man/man3/XkbComputeRowBounds.3
+man/man3/XkbComputeSectionBounds.3
+man/man3/XkbComputeShapeBounds.3
+man/man3/XkbComputeShapeTop.3
+man/man3/XkbCopyKeyType.3
+man/man3/XkbCopyKeyTypes.3
+man/man3/XkbDeviceBell.3
+man/man3/XkbDeviceBellEvent.3
+man/man3/XkbFindOverlayForKey.3
+man/man3/XkbForceBell.3
+man/man3/XkbForceDeviceBell.3
+man/man3/XkbFreeClientMap.3
+man/man3/XkbFreeCompatMap.3
+man/man3/XkbFreeComponentList.3
+man/man3/XkbFreeControls.3
+man/man3/XkbFreeDeviceInfo.3
+man/man3/XkbFreeGeomColors.3
+man/man3/XkbFreeGeomDoodads.3
+man/man3/XkbFreeGeomKeyAliases.3
+man/man3/XkbFreeGeomKeys.3
+man/man3/XkbFreeGeomOutlines.3
+man/man3/XkbFreeGeomOverlayKeys.3
+man/man3/XkbFreeGeomOverlayRows.3
+man/man3/XkbFreeGeomOverlays.3
+man/man3/XkbFreeGeomPoints.3
+man/man3/XkbFreeGeomProperties.3
+man/man3/XkbFreeGeomRows.3
+man/man3/XkbFreeGeomSections.3
+man/man3/XkbFreeGeomShapes.3
+man/man3/XkbFreeGeometry.3
+man/man3/XkbFreeIndicatorMaps.3
+man/man3/XkbFreeKeyboard.3
+man/man3/XkbFreeNames.3
+man/man3/XkbFreeServerMap.3
+man/man3/XkbGetAccessXTimeout.3
+man/man3/XkbGetAutoRepeatRate.3
+man/man3/XkbGetAutoResetControls.3
+man/man3/XkbGetBounceKeysDelay.3
+man/man3/XkbGetCompatMap.3
+man/man3/XkbGetControls.3
+man/man3/XkbGetControlsChanges.3
+man/man3/XkbGetDetectableAutorepeat.3
+man/man3/XkbGetDeviceButtonActions.3
+man/man3/XkbGetDeviceInfo.3
+man/man3/XkbGetDeviceInfoChanges.3
+man/man3/XkbGetDeviceLedInfo.3
+man/man3/XkbGetGeometry.3
+man/man3/XkbGetIndicatorChanges.3
+man/man3/XkbGetIndicatorMap.3
+man/man3/XkbGetIndicatorState.3
+man/man3/XkbGetKeyActions.3
+man/man3/XkbGetKeyBehaviors.3
+man/man3/XkbGetKeyExplicitComponents.3
+man/man3/XkbGetKeyModifierMap.3
+man/man3/XkbGetKeySyms.3
+man/man3/XkbGetKeyTypes.3
+man/man3/XkbGetKeyVirtualModMap.3
+man/man3/XkbGetKeyboard.3
+man/man3/XkbGetKeyboardByName.3
+man/man3/XkbGetMap.3
+man/man3/XkbGetNameChanges.3
+man/man3/XkbGetNamedGeometry.3
+man/man3/XkbGetNamedIndicator.3
+man/man3/XkbGetNames.3
+man/man3/XkbGetSlowKeysDelay.3
+man/man3/XkbGetState.3
+man/man3/XkbGetStickyKeysOptions.3
+man/man3/XkbGetUpdatedMap.3
+man/man3/XkbGetVirtualMods.3
+man/man3/XkbGetXlibControls.3
+man/man3/XkbIgnoreExtension.3
+man/man3/XkbInitCanonicalKeyTypes.3
+man/man3/XkbKeyAction.3
+man/man3/XkbKeyActionEntry.3
+man/man3/XkbKeyActionsPtr.3
+man/man3/XkbKeyGroupInfo.3
+man/man3/XkbKeyGroupWidth.3
+man/man3/XkbKeyGroupsWidth.3
+man/man3/XkbKeyHasActions.3
+man/man3/XkbKeyNumActions.3
+man/man3/XkbKeyNumGroups.3
+man/man3/XkbKeyNumSyms.3
+man/man3/XkbKeySymEntry.3
+man/man3/XkbKeySymsOffset.3
+man/man3/XkbKeySymsPtr.3
+man/man3/XkbKeyType.3
+man/man3/XkbKeyTypeIndex.3
+man/man3/XkbKeyTypesForCoreSymbols.3
+man/man3/XkbKeycodeToKeysym.3
+man/man3/XkbKeysymToModifiers.3
+man/man3/XkbLatchGroup.3
+man/man3/XkbLatchModifiers.3
+man/man3/XkbLibraryVersion.3
+man/man3/XkbListComponents.3
+man/man3/XkbLockGroup.3
+man/man3/XkbLockModifiers.3
+man/man3/XkbLookupKeyBinding.3
+man/man3/XkbLookupKeySym.3
+man/man3/XkbModActionVMods.3
+man/man3/XkbNoteControlsChanges.3
+man/man3/XkbNoteDeviceChanges.3
+man/man3/XkbNoteIndicatorChanges.3
+man/man3/XkbNoteNameChanges.3
+man/man3/XkbOpenDisplay.3
+man/man3/XkbOutOfRangeGroupInfo.3
+man/man3/XkbOutOfRangeGroupNumber.3
+man/man3/XkbPtrActionX.3
+man/man3/XkbPtrActionY.3
+man/man3/XkbQueryExtension.3
+man/man3/XkbRefreshKeyboardMapping.3
+man/man3/XkbResizeDeviceButtonActions.3
+man/man3/XkbResizeKeyActions.3
+man/man3/XkbResizeKeySyms.3
+man/man3/XkbResizeKeyType.3
+man/man3/XkbSAActionSetCtrls.3
+man/man3/XkbSAGroup.3
+man/man3/XkbSAPtrDfltValue.3
+man/man3/XkbSARedirectSetVMods.3
+man/man3/XkbSARedirectSetVModsMask.3
+man/man3/XkbSARedirectVMods.3
+man/man3/XkbSARedirectVModsMask.3
+man/man3/XkbSAScreen.3
+man/man3/XkbSASetGroup.3
+man/man3/XkbSASetPtrDfltValue.3
+man/man3/XkbSASetScreen.3
+man/man3/XkbSelectEventDetails.3
+man/man3/XkbSelectEvents.3
+man/man3/XkbSetAccessXTimeout.3
+man/man3/XkbSetAutoRepeatRate.3
+man/man3/XkbSetAutoResetControls.3
+man/man3/XkbSetBounceKeysDelay.3
+man/man3/XkbSetCompatMap.3
+man/man3/XkbSetControls.3
+man/man3/XkbSetDebuggingFlags.3
+man/man3/XkbSetDetectableAutorepeat.3
+man/man3/XkbSetDeviceButtonActions.3
+man/man3/XkbSetDeviceInfo.3
+man/man3/XkbSetIgnoreLockMods.3
+man/man3/XkbSetIndicatorMap.3
+man/man3/XkbSetMap.3
+man/man3/XkbSetModActionVMods.3
+man/man3/XkbSetNamedIndicator.3
+man/man3/XkbSetNames.3
+man/man3/XkbSetPtrActionX.3
+man/man3/XkbSetPtrActionY.3
+man/man3/XkbSetServerInternalMods.3
+man/man3/XkbSetXlibControls.3
+man/man3/XkbTranslateKeyCode.3
+man/man3/XkbTranslateKeySym.3
+man/man3/XkbUpdateMapFromCore.3
+man/man3/XkbVirtualModsToReal.3
 man/man3/XmbDrawImageString.3
 man/man3/XmbDrawString.3
 man/man3/XmbDrawText.3
diff --git a/x11/libX11/distinfo b/x11/libX11/distinfo
index 0bcb2171c68..9e130243c5a 100644
--- a/x11/libX11/distinfo
+++ b/x11/libX11/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.3 2007/04/03 20:28:38 drochner Exp $
+$NetBSD: distinfo,v 1.4 2007/07/12 15:02:01 joerg Exp $
 
-SHA1 (libX11-1.1.1.tar.bz2) = 048dc3d850666010e81a86bbe0960a643557251a
-RMD160 (libX11-1.1.1.tar.bz2) = 99c2d2bd6823c09667dffa5e4265924e93e76eef
-Size (libX11-1.1.1.tar.bz2) = 1426405 bytes
-SHA1 (patch-aa) = f51b17bac7490edbfcf29f2aef3e04eca1647fe4
+SHA1 (libX11-1.1.2.tar.bz2) = 7190d36389eb7903831cd9541d919f55ac5098e9
+RMD160 (libX11-1.1.2.tar.bz2) = c722e1eaa04a3d753660496d4e527b695c68db38
+Size (libX11-1.1.2.tar.bz2) = 1523644 bytes
+SHA1 (patch-ab) = 000f81dd5d21cbabf38e91b5066e8f1ce43ff957
diff --git a/x11/libX11/patches/patch-aa b/x11/libX11/patches/patch-aa
deleted file mode 100644
index fe29a91c12d..00000000000
--- a/x11/libX11/patches/patch-aa
+++ /dev/null
@@ -1,87 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2007/04/03 20:28:38 drochner Exp $
-
---- src/ImUtil.c.orig	2007-04-03 19:08:57.000000000 +0200
-+++ src/ImUtil.c
-@@ -327,12 +327,13 @@ XImage *XCreateImage (dpy, visual, depth
- {
- 	register XImage *image;
- 	int bits_per_pixel = 1;
-+	int min_bytes_per_line;
- 
- 	if (depth == 0 || depth > 32 ||
- 	    (format != XYBitmap && format != XYPixmap && format != ZPixmap) ||
- 	    (format == XYBitmap && depth != 1) ||
- 	    (xpad != 8 && xpad != 16 && xpad != 32) ||
--	    offset < 0 || image_bytes_per_line < 0)
-+	    offset < 0)
- 	    return (XImage *) NULL;
- 	if ((image = (XImage *) Xcalloc(1, (unsigned) sizeof(XImage))) == NULL)
- 	    return (XImage *) NULL;
-@@ -363,16 +364,21 @@ XImage *XCreateImage (dpy, visual, depth
- 	/*
- 	 * compute per line accelerator.
- 	 */
--	if (image_bytes_per_line == 0)
- 	{
- 	if (format == ZPixmap)
--	    image->bytes_per_line = 
-+	    min_bytes_per_line = 
- 	       ROUNDUP((bits_per_pixel * width), image->bitmap_pad);
- 	else
--	    image->bytes_per_line =
-+	    min_bytes_per_line =
- 	        ROUNDUP((width + offset), image->bitmap_pad);
- 	}
--	else image->bytes_per_line = image_bytes_per_line;
-+	if (image_bytes_per_line == 0) {
-+	    image->bytes_per_line = min_bytes_per_line;
-+	} else if (image_bytes_per_line < min_bytes_per_line) {
-+	    return 0;
-+	} else {
-+	    image->bytes_per_line = image_bytes_per_line;
-+	}
- 
- 	image->bits_per_pixel = bits_per_pixel;
- 	image->obdata = NULL;
-@@ -384,7 +390,11 @@ XImage *XCreateImage (dpy, visual, depth
- Status XInitImage (image)
-     XImage *image;
- {
-+	int min_bytes_per_line;
-+
- 	if (image->depth == 0 || image->depth > 32 ||
-+	    image->bits_per_pixel > 32 || image->bitmap_unit > 32 ||
-+	    image->bits_per_pixel < 0 || image->bitmap_unit < 0 ||
- 	    (image->format != XYBitmap &&
- 	     image->format != XYPixmap &&
- 	     image->format != ZPixmap) ||
-@@ -392,21 +402,24 @@ Status XInitImage (image)
- 	    (image->bitmap_pad != 8 &&
- 	     image->bitmap_pad != 16 &&
- 	     image->bitmap_pad != 32) ||
--	    image->xoffset < 0 || image->bytes_per_line < 0)
-+	    image->xoffset < 0)
- 	    return 0;
- 
- 	/*
- 	 * compute per line accelerator.
- 	 */
--	if (image->bytes_per_line == 0)
--	{
- 	if (image->format == ZPixmap)
--	    image->bytes_per_line = 
-+	    min_bytes_per_line = 
- 	       ROUNDUP((image->bits_per_pixel * image->width),
- 		       image->bitmap_pad);
- 	else
--	    image->bytes_per_line =
-+	    min_bytes_per_line =
- 	        ROUNDUP((image->width + image->xoffset), image->bitmap_pad);
-+
-+	if (image->bytes_per_line == 0) {
-+	    image->bytes_per_line = min_bytes_per_line;
-+	} else if (image->bytes_per_line < min_bytes_per_line) {
-+	    return 0;
- 	}
- 
- 	_XInitImageFuncPtrs (image);
diff --git a/x11/libX11/patches/patch-ab b/x11/libX11/patches/patch-ab
new file mode 100644
index 00000000000..a0d6e6a4ee4
--- /dev/null
+++ b/x11/libX11/patches/patch-ab
@@ -0,0 +1,20 @@
+$NetBSD: patch-ab,v 1.1 2007/07/12 15:02:09 joerg Exp $
+
+--- src/Xrm.c.orig	2006-09-25 12:57:47.000000000 +0200
++++ src/Xrm.c
+@@ -808,6 +808,7 @@ void XrmCombineDatabase(
+ 	    }
+ 	}
+ 	(from->methods->destroy)(from->mbstate);
++	_XUnlockMutex(&from->linfo);
+ 	_XFreeMutex(&from->linfo);
+ 	Xfree((char *)from);
+ 	_XUnlockMutex(&(*into)->linfo);
+@@ -2656,6 +2657,7 @@ void XrmDestroyDatabase(
+ 	    else
+ 		DestroyNTable(table);
+ 	}
++	_XUnlockMutex(&db->linfo);
+ 	_XFreeMutex(&db->linfo);
+ 	(*db->methods->destroy)(db->mbstate);
+ 	Xfree((char *)db);