From 4019a59827798816e6cac3d57428c583637f99d0 Mon Sep 17 00:00:00 2001 From: christos Date: Mon, 14 Jul 2008 23:01:32 +0000 Subject: update to openmotif 2.3.1 --- x11/openmotif/Makefile | 11 ++- x11/openmotif/PLIST | 171 ++++++++++++++++++++++++++++++++++------- x11/openmotif/buildlink3.mk | 6 +- x11/openmotif/distinfo | 36 ++++----- x11/openmotif/patches/patch-aa | 26 +++---- x11/openmotif/patches/patch-ad | 41 ++++------ x11/openmotif/patches/patch-af | 35 ++++----- x11/openmotif/patches/patch-ag | 22 ------ x11/openmotif/patches/patch-ah | 21 ++--- x11/openmotif/patches/patch-aj | 21 ++--- x11/openmotif/patches/patch-ak | 19 ++--- x11/openmotif/patches/patch-ba | 30 -------- x11/openmotif/patches/patch-bb | 13 ---- x11/openmotif/patches/patch-bc | 21 +---- x11/openmotif/patches/patch-bd | 13 ---- x11/openmotif/patches/patch-be | 59 -------------- x11/openmotif/patches/patch-bf | 13 ---- x11/openmotif/patches/patch-bg | 31 -------- x11/openmotif/patches/patch-bh | 170 ---------------------------------------- x11/openmotif/patches/patch-bi | 79 ------------------- x11/openmotif/patches/patch-bj | 29 ++----- x11/openmotif/patches/patch-bk | 16 ---- x11/openmotif/patches/patch-bm | 23 +++--- 23 files changed, 268 insertions(+), 638 deletions(-) delete mode 100644 x11/openmotif/patches/patch-ag delete mode 100644 x11/openmotif/patches/patch-ba delete mode 100644 x11/openmotif/patches/patch-bb delete mode 100644 x11/openmotif/patches/patch-bd delete mode 100644 x11/openmotif/patches/patch-be delete mode 100644 x11/openmotif/patches/patch-bf delete mode 100644 x11/openmotif/patches/patch-bg delete mode 100644 x11/openmotif/patches/patch-bh delete mode 100644 x11/openmotif/patches/patch-bi delete mode 100644 x11/openmotif/patches/patch-bk (limited to 'x11') diff --git a/x11/openmotif/Makefile b/x11/openmotif/Makefile index 445d65d1887..9e8c1dd2f7d 100644 --- a/x11/openmotif/Makefile +++ b/x11/openmotif/Makefile @@ -1,11 +1,10 @@ -# $NetBSD: Makefile,v 1.53 2007/10/27 12:31:15 rillig Exp $ +# $NetBSD: Makefile,v 1.54 2008/07/14 23:01:32 christos Exp $ -PKGVER= 2.2.3 -DISTNAME= openMotif-${PKGVER} -PKGNAME= openmotif-${PKGVER} -PKGREVISION= 3 +PKGVER= 2.3.1 +DISTNAME= openmotif-${PKGVER} +#PKGREVISION= 3 CATEGORIES= x11 -MASTER_SITES= http://ftp.motifzone.com/src/ +MASTER_SITES= ftp://ftp.ics.com/openmotif/2.3/2.3.1/ MAINTAINER= joerg@NetBSD.org HOMEPAGE= http://www.opengroup.org/openmotif/ diff --git a/x11/openmotif/PLIST b/x11/openmotif/PLIST index d1168b9c8fb..2ace4441843 100644 --- a/x11/openmotif/PLIST +++ b/x11/openmotif/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.6 2006/05/21 11:41:59 rillig Exp $ +@comment $NetBSD: PLIST,v 1.7 2008/07/14 23:01:32 christos Exp $ bin/mwm bin/uil bin/xmbind @@ -209,6 +209,8 @@ include/Xm/ToggleB.h include/Xm/ToggleBG.h include/Xm/ToggleBGP.h include/Xm/ToggleBP.h +include/Xm/ToolTipCT.h +include/Xm/ToolTipT.h include/Xm/TraitP.h include/Xm/Transfer.h include/Xm/TransferP.h @@ -232,6 +234,7 @@ include/Xm/XmIm.h include/Xm/XmP.h include/Xm/XmStrDefs.h include/Xm/XmStrDefs22.h +include/Xm/XmStrDefs23.h include/Xm/Xmfuncs.h include/Xm/XmosP.h include/Xm/Xmos_r.h @@ -280,6 +283,7 @@ man/man1/xmbind.1 man/man3/ApplicationShell.3 man/man3/Composite.3 man/man3/Constraint.3 +man/man3/XCore.3 man/man3/MrmCloseHierarchy.3 man/man3/MrmFetchBitmapLiteral.3 man/man3/MrmFetchColorLiteral.3 @@ -295,8 +299,10 @@ man/man3/MrmOpenHierarchyPerDisplay.3 man/man3/MrmRegisterClass.3 man/man3/MrmRegisterNames.3 man/man3/MrmRegisterNamesInHierarchy.3 +man/man3/XObject.3 man/man3/OverrideShell.3 man/man3/RectObj.3 +man/man3/XShell.3 man/man3/TopLevelShell.3 man/man3/TransientShell.3 man/man3/Uil.3 @@ -304,9 +310,6 @@ man/man3/UilDumpSymbolTable.3 man/man3/VendorShell.3 man/man3/VirtualBindings.3 man/man3/WMShell.3 -man/man3/XCore.3 -man/man3/XObject.3 -man/man3/XShell.3 man/man3/XmActivateProtocol.3 man/man3/XmActivateWMProtocol.3 man/man3/XmAddProtocolCallback.3 @@ -369,9 +372,12 @@ man/man3/XmCreateArrowButton.3 man/man3/XmCreateArrowButtonGadget.3 man/man3/XmCreateBulletinBoard.3 man/man3/XmCreateBulletinBoardDialog.3 +man/man3/XmCreateButtonBox.3 man/man3/XmCreateCascadeButton.3 man/man3/XmCreateCascadeButtonGadget.3 +man/man3/XmCreateDropDown.3 man/man3/XmCreateComboBox.3 +man/man3/XmCreateCombinationBox2.3 man/man3/XmCreateCommand.3 man/man3/XmCreateCommandDialog.3 man/man3/XmCreateContainer.3 @@ -379,7 +385,6 @@ man/man3/XmCreateDialogShell.3 man/man3/XmCreateDragIcon.3 man/man3/XmCreateDrawingArea.3 man/man3/XmCreateDrawnButton.3 -man/man3/XmCreateDropDown.3 man/man3/XmCreateDropDownComboBox.3 man/man3/XmCreateDropDownList.3 man/man3/XmCreateErrorDialog.3 @@ -388,6 +393,7 @@ man/man3/XmCreateFileSelectionDialog.3 man/man3/XmCreateForm.3 man/man3/XmCreateFormDialog.3 man/man3/XmCreateFrame.3 +man/man3/XmCreateHierarchy.3 man/man3/XmCreateIconGadget.3 man/man3/XmCreateInformationDialog.3 man/man3/XmCreateLabel.3 @@ -398,9 +404,9 @@ man/man3/XmCreateMenuBar.3 man/man3/XmCreateMenuShell.3 man/man3/XmCreateMessageBox.3 man/man3/XmCreateMessageDialog.3 -man/man3/XmCreateMultiList.3 man/man3/XmCreateNotebook.3 man/man3/XmCreateOptionMenu.3 +man/man3/XmCreateOutline.3 man/man3/XmCreatePanedWindow.3 man/man3/XmCreatePopupMenu.3 man/man3/XmCreatePromptDialog.3 @@ -443,6 +449,20 @@ man/man3/XmCvtXmStringTableToTextProperty.3 man/man3/XmCvtXmStringToByteStream.3 man/man3/XmCvtXmStringToCT.3 man/man3/XmDataField.3 +man/man3/XmDataFieldCopy.3 +man/man3/XmDataFieldCut.3 +man/man3/XmDataFieldPaste.3 +man/man3/XmDataFieldGetSelection.3 +man/man3/XmDataFieldGetSelectionPosition.3 +man/man3/XmDataFieldGetString.3 +man/man3/XmDataFieldGetStringWcs.3 +man/man3/XmDataFieldSetAddMode.3 +man/man3/XmDataFieldSetEditable.3 +man/man3/XmDataFieldSetHighlight.3 +man/man3/XmDataFieldSetInsertionPosition.3 +man/man3/XmDataFieldSetSelection.3 +man/man3/XmDataFieldSetString.3 +man/man3/XmDataFieldXYToPos.3 man/man3/XmDeactivateProtocol.3 man/man3/XmDeactivateWMProtocol.3 man/man3/XmDestroyPixmap.3 @@ -459,11 +479,7 @@ man/man3/XmDragStart.3 man/man3/XmDrawingArea.3 man/man3/XmDrawnButton.3 man/man3/XmDropDown.3 -man/man3/XmDropDownGetArrow.3 -man/man3/XmDropDownGetLabel.3 -man/man3/XmDropDownGetList.3 -man/man3/XmDropDownGetText.3 -man/man3/XmDropDownGetValue.3 +man/man3/XmDropDownGetChild.3 man/man3/XmDropSite.3 man/man3/XmDropSiteConfigureStackingOrder.3 man/man3/XmDropSiteEndUpdate.3 @@ -477,6 +493,19 @@ man/man3/XmDropSiteUpdate.3 man/man3/XmDropTransfer.3 man/man3/XmDropTransferAdd.3 man/man3/XmDropTransferStart.3 +man/man3/XmMultiList.3 +man/man3/XmMultiListDeselectItems.3 +man/man3/XmMultiListDeselectRow.3 +man/man3/XmMultiListGetSelectedRowArray.3 +man/man3/XmMultiListGetSelectedRows.3 +man/man3/XmMultiListMakeRowVisible.3 +man/man3/XmMultiListSelectAllItems.3 +man/man3/XmMultiListSelectItems.3 +man/man3/XmMultiListSelectRow.3 +man/man3/XmMultiListToggleRow.3 +man/man3/XmMultiListUnselectAllItems.3 +man/man3/XmMultiListUnselectItem.3 +man/man3/XmExt18List.3 man/man3/XmFileSelectionBox.3 man/man3/XmFileSelectionBoxGetChild.3 man/man3/XmFileSelectionDoSearch.3 @@ -517,7 +546,11 @@ man/man3/XmGetTearOffControl.3 man/man3/XmGetVisibility.3 man/man3/XmGetXmDisplay.3 man/man3/XmGetXmScreen.3 +man/man3/XmHierarchy.3 +man/man3/XmHierarchyGetChildNodes.3 +man/man3/XmHierarchyOpenAllAncestors.3 man/man3/XmIconBox.3 +man/man3/XmIconBoxIsCellEmpty.3 man/man3/XmIconButton.3 man/man3/XmIconGadget.3 man/man3/XmImCloseXIM.3 @@ -542,9 +575,9 @@ man/man3/XmLabel.3 man/man3/XmLabelGadget.3 man/man3/XmList.3 man/man3/XmListAddItem.3 -man/man3/XmListAddItemUnselected.3 man/man3/XmListAddItems.3 man/man3/XmListAddItemsUnselected.3 +man/man3/XmListAddItemUnselected.3 man/man3/XmListDeleteAllItems.3 man/man3/XmListDeleteItem.3 man/man3/XmListDeleteItems.3 @@ -588,23 +621,14 @@ man/man3/XmMenuPosition.3 man/man3/XmMenuShell.3 man/man3/XmMessageBox.3 man/man3/XmMessageBoxGetChild.3 -man/man3/XmMultiList.3 -man/man3/XmMultiListDeselectAllItems.3 -man/man3/XmMultiListDeselectItem.3 -man/man3/XmMultiListDeselectItems.3 -man/man3/XmMultiListDeselectRow.3 -man/man3/XmMultiListGetSelectedRowArray.3 -man/man3/XmMultiListGetSelectedRows.3 -man/man3/XmMultiListMakeRowVisible.3 -man/man3/XmMultiListSelectAllItems.3 -man/man3/XmMultiListSelectItems.3 -man/man3/XmMultiListSelectRow.3 -man/man3/XmMultiListToggleRow.3 man/man3/XmNotebook.3 man/man3/XmNotebookGetPageInfo.3 man/man3/XmObjectAtPoint.3 man/man3/XmOptionButtonGadget.3 man/man3/XmOptionLabelGadget.3 +man/man3/XmOutline.3 +man/man3/XmPaned.3 +man/man3/XmPanedGetPanes.3 man/man3/XmPanedWindow.3 man/man3/XmParseMapping.3 man/man3/XmParseMappingCreate.3 @@ -663,9 +687,9 @@ man/man3/XmScreen.3 man/man3/XmScrollBar.3 man/man3/XmScrollBarGetValues.3 man/man3/XmScrollBarSetValues.3 -man/man3/XmScrollVisible.3 man/man3/XmScrolledWindow.3 man/man3/XmScrolledWindowSetAreas.3 +man/man3/XmScrollVisible.3 man/man3/XmSelectionBox.3 man/man3/XmSelectionBoxGetChild.3 man/man3/XmSeparator.3 @@ -748,6 +772,9 @@ man/man3/XmTabListReplacePositions.3 man/man3/XmTabListTabCount.3 man/man3/XmTabSetValue.3 man/man3/XmTabStack.3 +man/man3/XmTabStackGetSelectedTab.3 +man/man3/XmTabStackSelectTab.3 +man/man3/XmTabStackXYToWidget.3 man/man3/XmTargetsAreCompatible.3 man/man3/XmText.3 man/man3/XmTextClearSelection.3 @@ -812,8 +839,8 @@ man/man3/XmTextInsert.3 man/man3/XmTextInsertWcs.3 man/man3/XmTextPaste.3 man/man3/XmTextPasteLink.3 -man/man3/XmTextPosToXY.3 man/man3/XmTextPosition.3 +man/man3/XmTextPosToXY.3 man/man3/XmTextRemove.3 man/man3/XmTextReplace.3 man/man3/XmTextReplaceWcs.3 @@ -848,12 +875,104 @@ man/man3/XmTranslateKey.3 man/man3/XmTree.3 man/man3/XmUninstallImage.3 man/man3/XmUpdateDisplay.3 +man/man3/XmVaCreateArrowButton.3 +man/man3/XmVaCreateArrowButtonGadget.3 +man/man3/XmVaCreateBulletinBoard.3 +man/man3/XmVaCreateButtonBox.3 +man/man3/XmVaCreateCascadeButton.3 +man/man3/XmVaCreateCascadeButtonGadget.3 +man/man3/XmVaCreateColorSelector.3 +man/man3/XmVaCreateColumn.3 +man/man3/XmVaCreateCombinationBox2.3 +man/man3/XmVaCreateComboBox.3 +man/man3/XmVaCreateCommand.3 +man/man3/XmVaCreateContainer.3 +man/man3/XmVaCreateDataField.3 +man/man3/XmVaCreateDrawingArea.3 +man/man3/XmVaCreateDrawnButton.3 +man/man3/XmVaCreateDropDown.3 +man/man3/XmVaCreateExt18List.3 +man/man3/XmVaCreateFileSelectionBox.3 +man/man3/XmVaCreateForm.3 +man/man3/XmVaCreateFrame.3 +man/man3/XmVaCreateHierarchy.3 +man/man3/XmVaCreateIconGadget.3 +man/man3/XmVaCreateLabel.3 +man/man3/XmVaCreateLabelGadget.3 +man/man3/XmVaCreateList.3 +man/man3/XmVaCreateMainWindow.3 +man/man3/XmVaCreateManagedArrowButton.3 +man/man3/XmVaCreateManagedArrowButtonGadget.3 +man/man3/XmVaCreateManagedBulletinBoard.3 +man/man3/XmVaCreateManagedButtonBox.3 +man/man3/XmVaCreateManagedCascadeButton.3 +man/man3/XmVaCreateManagedCascadeButtonGadget.3 +man/man3/XmVaCreateManagedColorSelector.3 +man/man3/XmVaCreateManagedColumn.3 +man/man3/XmVaCreateManagedComboBox.3 +man/man3/XmVaCreateManagedCombinationBox2.3 +man/man3/XmVaCreateManagedCommand.3 +man/man3/XmVaCreateManagedContainer.3 +man/man3/XmVaCreateManagedDataField.3 +man/man3/XmVaCreateManagedDrawingArea.3 +man/man3/XmVaCreateManagedDrawnButton.3 +man/man3/XmVaCreateManagedDropDown.3 +man/man3/XmVaCreateManagedExt18List.3 +man/man3/XmVaCreateManagedFileSelectionBox.3 +man/man3/XmVaCreateManagedForm.3 +man/man3/XmVaCreateManagedFrame.3 +man/man3/XmVaCreateManagedHierarchy.3 +man/man3/XmVaCreateManagedIconGadget.3 +man/man3/XmVaCreateManagedLabel.3 +man/man3/XmVaCreateManagedLabelGadget.3 +man/man3/XmVaCreateManagedList.3 +man/man3/XmVaCreateManagedMainWindow.3 +man/man3/XmVaCreateManagedMessageBox.3 +man/man3/XmVaCreateManagedMultiList.3 +man/man3/XmVaCreateManagedNotebook.3 +man/man3/XmVaCreateManagedOutline.3 +man/man3/XmVaCreateManagedPanedWindow.3 +man/man3/XmVaCreateManagedPushButton.3 +man/man3/XmVaCreateManagedPushButtonGadget.3 +man/man3/XmVaCreateManagedRowColumn.3 +man/man3/XmVaCreateManagedScale.3 +man/man3/XmVaCreateManagedScrollBar.3 +man/man3/XmVaCreateManagedScrolledWindow.3 +man/man3/XmVaCreateManagedSelectionBox.3 +man/man3/XmVaCreateManagedSeparatorGadget.3 +man/man3/XmVaCreateManagedSimpleSpinBox.3 +man/man3/XmVaCreateManagedSpinBox.3 +man/man3/XmVaCreateManagedTabStack.3 +man/man3/XmVaCreateManagedText.3 +man/man3/XmVaCreateManagedTextField.3 +man/man3/XmVaCreateManagedToggleButton.3 +man/man3/XmVaCreateManagedToggleButtonGadget.3 +man/man3/XmVaCreateMessageBox.3 +man/man3/XmVaCreateMultiList.3 +man/man3/XmVaCreateNotebook.3 +man/man3/XmVaCreateOutline.3 +man/man3/XmVaCreatePanedWindow.3 +man/man3/XmVaCreatePushButton.3 +man/man3/XmVaCreatePushButtonGadget.3 +man/man3/XmVaCreateRowColumn.3 +man/man3/XmVaCreateScale.3 +man/man3/XmVaCreateScrollBar.3 +man/man3/XmVaCreateScrolledWindow.3 +man/man3/XmVaCreateSelectionBox.3 +man/man3/XmVaCreateSeparatorGadget.3 man/man3/XmVaCreateSimpleCheckBox.3 man/man3/XmVaCreateSimpleMenuBar.3 man/man3/XmVaCreateSimpleOptionMenu.3 man/man3/XmVaCreateSimplePopupMenu.3 man/man3/XmVaCreateSimplePulldownMenu.3 man/man3/XmVaCreateSimpleRadioBox.3 +man/man3/XmVaCreateSimpleSpinBox.3 +man/man3/XmVaCreateSpinBox.3 +man/man3/XmVaCreateTabStack.3 +man/man3/XmVaCreateText.3 +man/man3/XmVaCreateTextField.3 +man/man3/XmVaCreateToggleButton.3 +man/man3/XmVaCreateToggleButtonGadget.3 man/man3/XmWidgetGetBaselines.3 man/man3/XmWidgetGetDisplayRect.3 man/man5/Traits.5 diff --git a/x11/openmotif/buildlink3.mk b/x11/openmotif/buildlink3.mk index d0790fa1943..f194d08f659 100644 --- a/x11/openmotif/buildlink3.mk +++ b/x11/openmotif/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.9 2006/11/06 10:32:18 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.10 2008/07/14 23:01:32 christos Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ OPENMOTIF_BUILDLINK3_MK:= ${OPENMOTIF_BUILDLINK3_MK}+ @@ -12,8 +12,8 @@ BUILDLINK_PACKAGES+= openmotif BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}openmotif .if !empty(OPENMOTIF_BUILDLINK3_MK:M+) -BUILDLINK_API_DEPENDS.openmotif+= openmotif>=2.2.3 -BUILDLINK_ABI_DEPENDS.openmotif?= openmotif>=2.2.3nb2 +BUILDLINK_API_DEPENDS.openmotif+= openmotif>=2.3.1 +BUILDLINK_ABI_DEPENDS.openmotif?= openmotif>=2.3.1 BUILDLINK_PKGSRCDIR.openmotif?= ../../x11/openmotif .endif # OPENMOTIF_BUILDLINK3_MK diff --git a/x11/openmotif/distinfo b/x11/openmotif/distinfo index a8358501ec0..3255876efe6 100644 --- a/x11/openmotif/distinfo +++ b/x11/openmotif/distinfo @@ -1,28 +1,18 @@ -$NetBSD: distinfo,v 1.25 2007/08/15 19:26:39 joerg Exp $ +$NetBSD: distinfo,v 1.26 2008/07/14 23:01:32 christos Exp $ -SHA1 (openMotif-2.2.3.tar.gz) = c463653d9f8e24b35522c3ba6363ddf7a282eab4 -RMD160 (openMotif-2.2.3.tar.gz) = b99230d508da57bca72b6920d28fce4187bf5179 -Size (openMotif-2.2.3.tar.gz) = 5149785 bytes -SHA1 (patch-aa) = 5c204036a831ca890b196c6f7d23be2fdb848980 +SHA1 (openmotif-2.3.1.tar.gz) = 7132493712111e6846deda241137f28a957b5878 +RMD160 (openmotif-2.3.1.tar.gz) = 8fe6f41a8b75636d9211d34cae96d47a7ed10ade +Size (openmotif-2.3.1.tar.gz) = 5932681 bytes +SHA1 (patch-aa) = bbd5e51128e565d36d4b88260ba634bf6a7df61c SHA1 (patch-ac) = 1c14d22f888859b15365bcba7edba78a1114c6ac -SHA1 (patch-ad) = 4903cbf3b9ac6e2dd2f8e327bb33f5743650787e +SHA1 (patch-ad) = 9ce8f34493a39dfe51260543726c1b5df7e6c4e4 SHA1 (patch-ae) = 00ffe019ea7a6950ed673f5a7907196b22a45f4e -SHA1 (patch-af) = 5ea54810105cfb2fc9d4a828e32208318e3c5d42 -SHA1 (patch-ag) = c7e461c35ef4bdbcc8917917a34ab546760cb5cc -SHA1 (patch-ah) = d94132709d6b69d437a37616834bda8cc42592ba -SHA1 (patch-aj) = 0f8ba09947dcbab85fa30fc5f126e07a9ebfb930 -SHA1 (patch-ak) = 8fe997bd930111cd04c051c5cffdf2b930f0c356 +SHA1 (patch-af) = d52e01e8b27b77e62274c5daef56399dee77c0f3 +SHA1 (patch-ah) = 8b895129f5b055d0f91d9e15e014759b358d3363 +SHA1 (patch-aj) = 28dd5d30ebbb7a4ea6da03a4befd026a7dd01cef +SHA1 (patch-ak) = 56e41891f92aabc31cb2fad0a68d3e6040a7c866 SHA1 (patch-az) = 2b389987baa5a278f93efe35528d94c8defcd48f -SHA1 (patch-ba) = c8a13cc06db7413ddb0abcc2b6e9781d4b9550ef -SHA1 (patch-bb) = 1d38da709ee1231323feb0e348be6dafd54d755d -SHA1 (patch-bc) = 87915f61d20e4defd6ac3a68667528515b6b88a0 -SHA1 (patch-bd) = 8f46473bb0380ce69b2eadc1c65322094d538bf8 -SHA1 (patch-be) = 35a24957def48a2f2771f34ebc53ecf83c827a66 -SHA1 (patch-bf) = 211d84bccf91ed474634658a75af5d8977b052d4 -SHA1 (patch-bg) = 582f455b066bd4f12160d719c885e9d8423632e5 -SHA1 (patch-bh) = 09401eb3e5e6e7e911a9268f2ba0cd6ddaeed3b4 -SHA1 (patch-bi) = 4dced20ce293f8635f121f77e9112e93766b9723 -SHA1 (patch-bj) = ac2b1d9fc09ff1bc712e776a3e2e469c1993c385 -SHA1 (patch-bk) = 3d8c264c8060616878dec5a7a21a479aa801e95d +SHA1 (patch-bc) = 3e02a245bb4d442b30200d6da2725ef84986d52e +SHA1 (patch-bj) = 87abfdc6593d3b4ba3c7a76c84c54522ad7a044b SHA1 (patch-bl) = 905bec86af6d8d139faa2ca185adf3e8b58c1dea -SHA1 (patch-bm) = 7d41d373b7428cd9eb53841b6636318431d40206 +SHA1 (patch-bm) = 0e1aaf8b9a474a43e1382caa09b2ac9050f3505c diff --git a/x11/openmotif/patches/patch-aa b/x11/openmotif/patches/patch-aa index 0e37c996f9d..65caa09cc55 100644 --- a/x11/openmotif/patches/patch-aa +++ b/x11/openmotif/patches/patch-aa @@ -1,18 +1,18 @@ -$NetBSD: patch-aa,v 1.3 2005/12/12 19:55:41 joerg Exp $ +$NetBSD: patch-aa,v 1.4 2008/07/14 23:01:32 christos Exp $ ---- lib/Xm/TextF.c.orig 2005-11-25 05:28:12.000000000 +0100 -+++ lib/Xm/TextF.c -@@ -89,11 +89,11 @@ static char rcsid[] = "$TOG: TextF.c /ma - #include /* for XmIsPrintShell */ +--- lib/Xm/TextF.c.orig 2008-04-22 12:34:22.000000000 -0400 ++++ lib/Xm/TextF.c 2008-06-28 16:44:37.000000000 -0400 +@@ -96,11 +96,11 @@ + #define FIX_1409 - --#if defined(__FreeBSD__) || defined(__APPLE__) || defined(__NetBSD__) || defined(__OpenBSD__) -+#if defined(__APPLE__) || defined(__OpenBSD__) + #if (defined(__FreeBSD__) && (__FreeBSD__ < 4)) || \ +- (defined(__APPLE__) || defined(__NetBSD__) || defined(__OpenBSD__)) ++ (defined(__APPLE__) || defined(__OpenBSD__)) /* * Modification by Integrated Computer Solutions, Inc. May 2000 * -- * FreeBSD, DARWIN, NetBSD, and OpenBSD do not include the necessary wide -+ * DARWIN, NetBSD before 1.6, and OpenBSD do not include the necessary wide - * character string functions. Use the internal _Xwc... routines and add the - * other missing functions as _Xmwc... routines. The new functions - * are added static to this file. +- * FreeBSD (pre-4.0), DARWIN, NetBSD, and OpenBSD do not include the necessary ++ * FreeBSD (pre-4.0), DARWIN, NetBSD before 1.6, and OpenBSD do not include the necessary + * wide character string functions. Use the internal _Xwc... routines and add + * the other missing functions as _Xmwc... routines. The new functions are + * added static to this file. diff --git a/x11/openmotif/patches/patch-ad b/x11/openmotif/patches/patch-ad index 4fcb76fc8dd..44cdb5ae452 100644 --- a/x11/openmotif/patches/patch-ad +++ b/x11/openmotif/patches/patch-ad @@ -1,28 +1,21 @@ -$NetBSD: patch-ad,v 1.3 2005/12/12 19:55:41 joerg Exp $ +$NetBSD: patch-ad,v 1.4 2008/07/14 23:01:32 christos Exp $ ---- lib/Xm/Makefile.in.orig 2004-04-06 19:50:27.000000000 +0200 -+++ lib/Xm/Makefile.in -@@ -100,8 +100,6 @@ INCLUDES = -I.. -I$(srcdir)/.. -DXMBINDD - - xmdir = $(includedir)/Xm - +--- lib/Xm/Makefile.in.orig 2008-05-04 00:30:45.000000000 -0400 ++++ lib/Xm/Makefile.in 2008-06-28 16:42:34.000000000 -0400 +@@ -237,7 +237,7 @@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ + INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LDFLAGS = -version-info @CURRENT@:@REVISION@:@AGE@ -- - lib_LTLIBRARIES = libXm.la - - TIP_SRCS = ToolTip.c -@@ -159,12 +157,13 @@ LTLIBRARIES = $(lib_LTLIBRARIES) - - DEFS = @DEFS@ -I. -I$(srcdir) -I../../include - CPPFLAGS = @CPPFLAGS@ +LDFLAGS = @LDFLAGS@ - LIBS = @LIBS@ - X_CFLAGS = @X_CFLAGS@ - X_LIBS = @X_LIBS@ - X_EXTRA_LIBS = @X_EXTRA_LIBS@ - X_PRE_LIBS = @X_PRE_LIBS@ --libXm_la_LDFLAGS = + LEX = @LEX@ + LEXLIB = @LEXLIB@ + LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ +@@ -383,6 +383,7 @@ + @OM_LIBPNG_TRUE@PNG_SRCS = Png.c + @OM_LIBPNG_FALSE@PNG_HDRS = + @OM_LIBPNG_TRUE@PNG_HDRS = PngI.h +libXm_la_LDFLAGS = -version-info @CURRENT@:@REVISION@:@AGE@ - libXm_la_DEPENDENCIES = - @OM_XMU_TRUE@libXm_la_OBJECTS = XmStrDefs.lo ArrowB.lo ArrowBG.lo \ - @OM_XMU_TRUE@BulletinB.lo CallbackI.lo CascadeB.lo CascadeBG.lo \ + libXm_la_LIBADD = ${X_LIBS} ${X_XMU} -lXt -lXext -lXp -lX11 ${X_EXTRA_LIBS} + noinst_HEADERS = BaseClassI.h \ + BitmapsI.h \ diff --git a/x11/openmotif/patches/patch-af b/x11/openmotif/patches/patch-af index f5a0accce23..b09373ed19a 100644 --- a/x11/openmotif/patches/patch-af +++ b/x11/openmotif/patches/patch-af @@ -1,22 +1,21 @@ -$NetBSD: patch-af,v 1.3 2005/12/12 19:55:41 joerg Exp $ +$NetBSD: patch-af,v 1.4 2008/07/14 23:01:32 christos Exp $ ---- lib/Mrm/Makefile.in.orig 2005-11-25 10:46:23.000000000 +0100 -+++ lib/Mrm/Makefile.in -@@ -101,7 +101,7 @@ mrmdir = $(includedir)/Mrm - - libMrm_la_LIBADD = ../Xm/libXm.la ${X_LIBS} -lXt ${X_PRE_LIBS} -lX11 ${X_EXTRA_LIBS} - +--- lib/Mrm/Makefile.in.orig 2008-05-04 00:30:45.000000000 -0400 ++++ lib/Mrm/Makefile.in 2008-06-28 16:38:02.000000000 -0400 +@@ -131,7 +131,7 @@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ + INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LDFLAGS = -version-info @CURRENT@:@REVISION@:@AGE@ +LDFLAGS = @LDFLAGS@ - - lib_LTLIBRARIES = libMrm.la - -@@ -131,7 +131,7 @@ X_CFLAGS = @X_CFLAGS@ - X_LIBS = @X_LIBS@ - X_EXTRA_LIBS = @X_EXTRA_LIBS@ - X_PRE_LIBS = @X_PRE_LIBS@ --libMrm_la_LDFLAGS = + LEX = @LEX@ + LEXLIB = @LEXLIB@ + LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ +@@ -234,6 +234,7 @@ + EXTRA_DIST = Mrm.msg Imakefile + INCLUDES = -I$(srcdir)/.. -I.. -I../Xm ${X_CFLAGS} + mrmdir = $(includedir)/Mrm +libMrm_la_LDFLAGS = -version-info @CURRENT@:@REVISION@:@AGE@ - libMrm_la_DEPENDENCIES = ../Xm/libXm.la - libMrm_la_OBJECTS = MrmIbuffer.lo MrmIentry.lo MrmIfile.lo \ - MrmIheader.lo MrmIindex.lo MrmIindexw.lo MrmIrid.lo MrmIswap.lo \ + libMrm_la_LIBADD = ../Xm/libXm.la ${X_LIBS} -lXt ${X_PRE_LIBS} -lX11 ${X_EXTRA_LIBS} + lib_LTLIBRARIES = libMrm.la + noinst_HEADERS = IDB.h \ diff --git a/x11/openmotif/patches/patch-ag b/x11/openmotif/patches/patch-ag deleted file mode 100644 index d4b59252c73..00000000000 --- a/x11/openmotif/patches/patch-ag +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-ag,v 1.5 2005/12/12 19:55:41 joerg Exp $ - ---- clients/uil/Makefile.in.orig 2005-11-25 10:50:34.000000000 +0100 -+++ clients/uil/Makefile.in -@@ -99,7 +99,7 @@ EXTRA_DIST = Uil.msg - # - bin_PROGRAMS = uil - --LDFLAGS = -version-info @CURRENT@:@REVISION@:@AGE@ -+LDFLAGS = @LDFLAGS@ - - libUil_la_LIBADD = UilParser.lo ../../lib/Mrm/libMrm.la ../../lib/Xm/libXm.la - -@@ -150,7 +150,7 @@ X_CFLAGS = @X_CFLAGS@ - X_LIBS = @X_LIBS@ - X_EXTRA_LIBS = @X_EXTRA_LIBS@ - X_PRE_LIBS = @X_PRE_LIBS@ --libUil_la_LDFLAGS = -+libUil_la_LDFLAGS = -version-info @CURRENT@:@REVISION@:@AGE@ - libUil_la_OBJECTS = UilCmd.lo UilDiags.lo UilKeyTab.lo UilLexAna.lo \ - UilLexPars.lo UilLstLst.lo UilP2Out.lo UilP2Reslv.lo UilSarComp.lo \ - UilSarExp.lo UilSarInc.lo UilSarMod.lo UilSarObj.lo UilSarProc.lo \ diff --git a/x11/openmotif/patches/patch-ah b/x11/openmotif/patches/patch-ah index 3647f3f10e0..2a147db0fa4 100644 --- a/x11/openmotif/patches/patch-ah +++ b/x11/openmotif/patches/patch-ah @@ -1,13 +1,14 @@ -$NetBSD: patch-ah,v 1.3 2005/12/12 19:55:41 joerg Exp $ +$NetBSD: patch-ah,v 1.4 2008/07/14 23:01:32 christos Exp $ ---- Makefile.in.orig 2005-11-25 16:33:30.000000000 +0100 -+++ Makefile.in -@@ -101,7 +101,7 @@ EXTRA_DIST = BUGREPORT COPY - MAINTAINERCLEANFILES = Makefile.in configure libtool config.guess config.sub config.log ltconfig ltmain.sh aclocal.m4 config.h.in install-sh missing mkinstalldirs - - --SUBDIRS = bindings bitmaps config localized lib include tools clients doc demos -+SUBDIRS = bindings bitmaps config localized lib include tools clients doc +--- Makefile.in.orig 2008-05-04 00:30:46.000000000 -0400 ++++ Makefile.in 2008-06-28 16:21:12.000000000 -0400 +@@ -245,8 +245,7 @@ + include \ + tools \ + clients \ +- doc \ +- demos ++ doc AUTOMAKE_OPTIONS = 1.4 - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + all: all-recursive diff --git a/x11/openmotif/patches/patch-aj b/x11/openmotif/patches/patch-aj index b976604017c..490882121f2 100644 --- a/x11/openmotif/patches/patch-aj +++ b/x11/openmotif/patches/patch-aj @@ -1,13 +1,14 @@ -$NetBSD: patch-aj,v 1.3 2005/12/12 19:55:41 joerg Exp $ +$NetBSD: patch-aj,v 1.4 2008/07/14 23:01:32 christos Exp $ ---- doc/man/man5/Makefile.in.orig 2005-11-25 17:24:35.000000000 +0100 -+++ doc/man/man5/Makefile.in -@@ -95,7 +95,7 @@ MAINTAINERCLEANFILES = Makefile.in +--- doc/man/man5/Makefile.in.orig 2008-05-04 00:30:45.000000000 -0400 ++++ doc/man/man5/Makefile.in 2008-06-28 16:33:21.000000000 -0400 +@@ -198,7 +198,8 @@ + man_MANS = \ + Traits.5 \ + UIL.5 \ +- WML.5 ++ WML.5 \ ++ mwmrc.5 - EXTRA_DIST = $(man_MANS) + all: all-am --man_MANS = Traits.5 UIL.5 WML.5 -+man_MANS = Traits.5 UIL.5 WML.5 mwmrc.5 - - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = ../../../include/config.h diff --git a/x11/openmotif/patches/patch-ak b/x11/openmotif/patches/patch-ak index fa260565d36..fb8b7c8fdd4 100644 --- a/x11/openmotif/patches/patch-ak +++ b/x11/openmotif/patches/patch-ak @@ -1,13 +1,14 @@ -$NetBSD: patch-ak,v 1.3 2005/12/12 19:55:41 joerg Exp $ +$NetBSD: patch-ak,v 1.4 2008/07/14 23:01:32 christos Exp $ ---- doc/man/man4/Makefile.in.orig 2005-11-25 17:25:13.000000000 +0100 -+++ doc/man/man4/Makefile.in -@@ -95,7 +95,7 @@ MAINTAINERCLEANFILES = Makefile.in - +--- doc/man/man4/Makefile.in.orig 2008-05-04 00:30:45.000000000 -0400 ++++ doc/man/man4/Makefile.in 2008-06-28 16:34:27.000000000 -0400 +@@ -195,8 +195,7 @@ + top_srcdir = @top_srcdir@ + MAINTAINERCLEANFILES = Makefile.in EXTRA_DIST = $(man_MANS) +-man_MANS = \ +- mwmrc.4 ++man_MANS = --man_MANS = mwmrc.4 -+man_MANS = + all: all-am - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = ../../../include/config.h diff --git a/x11/openmotif/patches/patch-ba b/x11/openmotif/patches/patch-ba deleted file mode 100644 index 591f6fb63df..00000000000 --- a/x11/openmotif/patches/patch-ba +++ /dev/null @@ -1,30 +0,0 @@ -$NetBSD: patch-ba,v 1.1 2004/12/18 00:39:31 tron Exp $ - ---- lib/Xm/XpmAttrib.c.orig 2000-04-28 16:05:22.000000000 +0100 -+++ lib/Xm/XpmAttrib.c 2004-12-17 23:20:38.000000000 +0000 -@@ -36,7 +36,7 @@ - #include "XpmI.h" - - /* 3.2 backward compatibility code */ --LFUNC(CreateOldColorTable, int, (XpmColor *ct, int ncolors, -+LFUNC(CreateOldColorTable, int, (XpmColor *ct, unsigned int ncolors, - XpmColor ***oldct)); - - LFUNC(FreeOldColorTable, void, (XpmColor **colorTable, int ncolors)); -@@ -47,12 +47,15 @@ - static int - CreateOldColorTable(ct, ncolors, oldct) - XpmColor *ct; -- int ncolors; -+ unsigned int ncolors; - XpmColor ***oldct; - { - XpmColor **colorTable, **color; - int a; - -+ if (ncolors >= SIZE_MAX / sizeof(XpmColor *)) -+ return XpmNoMemory; -+ - colorTable = (XpmColor **) XpmMalloc(ncolors * sizeof(XpmColor *)); - if (!colorTable) { - *oldct = NULL; diff --git a/x11/openmotif/patches/patch-bb b/x11/openmotif/patches/patch-bb deleted file mode 100644 index d47fa125c50..00000000000 --- a/x11/openmotif/patches/patch-bb +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-bb,v 1.1 2004/12/18 00:39:31 tron Exp $ - ---- lib/Xm/XpmCrDatFrI.c.orig 2000-04-28 16:05:22.000000000 +0100 -+++ lib/Xm/XpmCrDatFrI.c 2004-12-17 23:20:38.000000000 +0000 -@@ -129,6 +129,8 @@ - */ - header_nlines = 1 + image->ncolors; - header_size = sizeof(char *) * header_nlines; -+ if (header_size >= SIZE_MAX / sizeof(char *)) -+ return (XpmNoMemory); - header = (char **) XpmCalloc(header_size, sizeof(char *)); - if (!header) - return (XpmNoMemory); diff --git a/x11/openmotif/patches/patch-bc b/x11/openmotif/patches/patch-bc index 42b9935c849..c70c582ca11 100644 --- a/x11/openmotif/patches/patch-bc +++ b/x11/openmotif/patches/patch-bc @@ -1,8 +1,8 @@ -$NetBSD: patch-bc,v 1.1 2004/12/18 00:39:31 tron Exp $ +$NetBSD: patch-bc,v 1.2 2008/07/14 23:01:32 christos Exp $ ---- lib/Xm/XpmI.h.orig 2004-12-17 23:17:51.000000000 +0000 -+++ lib/Xm/XpmI.h 2004-12-17 23:21:35.000000000 +0000 -@@ -179,6 +179,18 @@ +--- lib/Xm/XpmI.h.orig 2005-12-05 11:31:46.000000000 -0500 ++++ lib/Xm/XpmI.h 2008-06-28 16:17:20.000000000 -0400 +@@ -182,6 +182,18 @@ boundCheckingCalloc((long)(nelem),(long) (elsize)) #endif @@ -21,16 +21,3 @@ $NetBSD: patch-bc,v 1.1 2004/12/18 00:39:31 tron Exp $ #define XPMMAXCMTLEN BUFSIZ typedef struct { unsigned int type; -@@ -276,9 +288,9 @@ - } *xpmHashAtom; - - typedef struct { -- int size; -- int limit; -- int used; -+ unsigned int size; -+ unsigned int limit; -+ unsigned int used; - xpmHashAtom *atomTable; - } xpmHashTable; - diff --git a/x11/openmotif/patches/patch-bd b/x11/openmotif/patches/patch-bd deleted file mode 100644 index fb26e70bc6a..00000000000 --- a/x11/openmotif/patches/patch-bd +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-bd,v 1.1 2004/12/18 00:39:31 tron Exp $ - ---- lib/Xm/XpmWrFFrI.c.orig 2000-04-28 16:05:22.000000000 +0100 -+++ lib/Xm/XpmWrFFrI.c 2004-12-17 23:20:38.000000000 +0000 -@@ -239,6 +239,8 @@ - unsigned int x, y, h; - - h = height - 1; -+ if (cpp != 0 && width >= (SIZE_MAX - 3)/cpp) -+ return XpmNoMemory; - p = buf = (char *) XpmMalloc(width * cpp + 3); - if (!buf) - return (XpmNoMemory); diff --git a/x11/openmotif/patches/patch-be b/x11/openmotif/patches/patch-be deleted file mode 100644 index b6cba819284..00000000000 --- a/x11/openmotif/patches/patch-be +++ /dev/null @@ -1,59 +0,0 @@ -$NetBSD: patch-be,v 1.1 2004/12/18 00:39:31 tron Exp $ - ---- lib/Xm/Xpmcreate.c.orig 2000-04-28 16:05:21.000000000 +0100 -+++ lib/Xm/Xpmcreate.c 2004-12-17 23:28:32.000000000 +0000 -@@ -1,4 +1,5 @@ - /* $XConsortium: Xpmcreate.c /main/8 1996/09/20 08:15:02 pascale $ */ -+/* $XdotOrg: pre-CVS proposed fix for CESA-2004-003 alanc 7/25/2004 $ */ - /* - * Copyright (C) 1989-95 GROUPE BULL - * -@@ -799,6 +800,9 @@ - - ErrorStatus = XpmSuccess; - -+ if (image->ncolors >= SIZE_MAX / sizeof(Pixel)) -+ return (XpmNoMemory); -+ - /* malloc pixels index tables */ - image_pixels = (Pixel *) XpmMalloc(sizeof(Pixel) * image->ncolors); - if (!image_pixels) -@@ -942,6 +946,8 @@ - return (XpmNoMemory); - - #ifndef FOR_MSW -+ if (height != 0 && (*image_return)->bytes_per_line >= SIZE_MAX / height) -+ return XpmNoMemory; - /* now that bytes_per_line must have been set properly alloc data */ - (*image_return)->data = - (char *) XpmMalloc((*image_return)->bytes_per_line * height); -@@ -1987,6 +1993,9 @@ - xpmGetCmt(data, &colors_cmt); - - /* malloc pixels index tables */ -+ if (ncolors >= SIZE_MAX / sizeof(Pixel)) -+ return XpmNoMemory; -+ - image_pixels = (Pixel *) XpmMalloc(sizeof(Pixel) * ncolors); - if (!image_pixels) - RETURN(XpmNoMemory); -@@ -2200,6 +2209,9 @@ - { - unsigned short colidx[256]; - -+ if (ncolors > 256) -+ return (XpmFileInvalid); -+ - bzero((char *)colidx, 256 * sizeof(short)); - for (a = 0; a < ncolors; a++) - colidx[(unsigned char)colorTable[a].string[0]] = a + 1; -@@ -2298,6 +2310,9 @@ - char *s; - char buf[BUFSIZ]; - -+ if (cpp >= sizeof(buf)) -+ return (XpmFileInvalid); -+ - buf[cpp] = '\0'; - if (USE_HASHTABLE) { - xpmHashAtom *slot; diff --git a/x11/openmotif/patches/patch-bf b/x11/openmotif/patches/patch-bf deleted file mode 100644 index 77a8e424cfa..00000000000 --- a/x11/openmotif/patches/patch-bf +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-bf,v 1.1 2004/12/18 00:39:31 tron Exp $ - ---- lib/Xm/Xpmdata.c.orig 2000-04-28 16:05:21.000000000 +0100 -+++ lib/Xm/Xpmdata.c 2004-12-17 23:29:37.000000000 +0000 -@@ -371,7 +371,7 @@ - { - if (!mdata->type) - *cmt = NULL; -- else if (mdata->CommentLength) { -+ else if (mdata->CommentLength != 0 && mdata->CommentLength < SIZE_MAX - 1) { - *cmt = (char *) XpmMalloc(mdata->CommentLength + 1); - strncpy(*cmt, mdata->Comment, mdata->CommentLength); - (*cmt)[mdata->CommentLength] = '\0'; diff --git a/x11/openmotif/patches/patch-bg b/x11/openmotif/patches/patch-bg deleted file mode 100644 index 820fd3e0c45..00000000000 --- a/x11/openmotif/patches/patch-bg +++ /dev/null @@ -1,31 +0,0 @@ -$NetBSD: patch-bg,v 1.1 2004/12/18 00:39:31 tron Exp $ - ---- lib/Xm/Xpmhashtab.c.orig 2000-04-28 16:05:22.000000000 +0100 -+++ lib/Xm/Xpmhashtab.c 2004-12-17 23:21:35.000000000 +0000 -@@ -136,7 +136,7 @@ - xpmHashTable *table; - { - xpmHashAtom *atomTable = table->atomTable; -- int size = table->size; -+ unsigned int size = table->size; - xpmHashAtom *t, *p; - int i; - int oldSize = size; -@@ -145,6 +145,8 @@ - HASH_TABLE_GROWS - table->size = size; - table->limit = size / 3; -+ if (size >= SIZE_MAX / sizeof(*atomTable)) -+ return (XpmNoMemory); - atomTable = (xpmHashAtom *) XpmMalloc(size * sizeof(*atomTable)); - if (!atomTable) - return (XpmNoMemory); -@@ -205,6 +207,8 @@ - table->size = INITIAL_HASH_SIZE; - table->limit = table->size / 3; - table->used = 0; -+ if (table->size >= SIZE_MAX / sizeof(*atomTable)) -+ return (XpmNoMemory); - atomTable = (xpmHashAtom *) XpmMalloc(table->size * sizeof(*atomTable)); - if (!atomTable) - return (XpmNoMemory); diff --git a/x11/openmotif/patches/patch-bh b/x11/openmotif/patches/patch-bh deleted file mode 100644 index 731321c7787..00000000000 --- a/x11/openmotif/patches/patch-bh +++ /dev/null @@ -1,170 +0,0 @@ -$NetBSD: patch-bh,v 1.2 2005/12/12 19:55:41 joerg Exp $ - ---- lib/Xm/Xpmparse.c.orig 2000-04-28 16:05:21.000000000 +0100 -+++ lib/Xm/Xpmparse.c 2004-12-18 00:31:35.000000000 +0000 -@@ -47,6 +47,15 @@ - #include "XpmI.h" - #include - -+#define STRLCAT(dst, src, dstsize) { \ -+ if ((strlen(dst) + strlen(src)) < (dstsize)) \ -+ strcat(dst, src); \ -+ else return (XpmFileInvalid); } -+#define STRLCPY(dst, src, dstsize) { \ -+ if (strlen(src) < (dstsize)) \ -+ strcpy(dst, src); \ -+ else return (XpmFileInvalid); } -+ - LFUNC(ParsePixels, int, (xpmData *data, unsigned int width, - unsigned int height, unsigned int ncolors, - unsigned int cpp, XpmColor *colorTable, -@@ -215,7 +224,7 @@ xpmParseValues(data, width, height, ncol - unsigned int *extensions; - { - unsigned int l; -- char buf[BUFSIZ]; -+ char buf[BUFSIZ+1]; - - if (!data->format) { /* XPM 2 or 3 */ - -@@ -324,10 +333,10 @@ xpmParseColors(data, ncolors, cpp, color - XpmColor **colorTablePtr; - xpmHashTable *hashtable; - { -- unsigned int key, l, a, b; -+ unsigned int key = 0, l, a, b, len; - unsigned int curkey; /* current color key */ - unsigned int lastwaskey; /* key read */ -- char buf[BUFSIZ]; -+ char buf[BUFSIZ+1]; - char curbuf[BUFSIZ]; /* current buffer */ - char **sptr, *s; - XpmColor *color; -@@ -335,6 +344,8 @@ xpmParseColors(data, ncolors, cpp, color - char **defaults; - int ErrorStatus; - -+ if (ncolors >= SIZE_MAX / sizeof(XpmColor)) -+ return (XpmNoMemory); - colorTable = (XpmColor *) XpmCalloc(ncolors, sizeof(XpmColor)); - if (!colorTable) - return (XpmNoMemory); -@@ -346,6 +357,10 @@ xpmParseColors(data, ncolors, cpp, color - /* - * read pixel value - */ -+ if (cpp >= SIZE_MAX - 1) { -+ xpmFreeColorTable(colorTable, ncolors); -+ return (XpmNoMemory); -+ } - color->string = (char *) XpmMalloc(cpp + 1); - if (!color->string) { - xpmFreeColorTable(colorTable, ncolors); -@@ -383,13 +398,14 @@ xpmParseColors(data, ncolors, cpp, color - } - if (!lastwaskey && key < NKEYS) { /* open new key */ - if (curkey) { /* flush string */ -- s = (char *) XpmMalloc(strlen(curbuf) + 1); -+ len = strlen(curbuf) + 1; -+ s = (char *) XpmMalloc(len); - if (!s) { - xpmFreeColorTable(colorTable, ncolors); - return (XpmNoMemory); - } - defaults[curkey] = s; -- strcpy(s, curbuf); -+ memcpy(s, curbuf, len); - } - curkey = key + 1; /* set new key */ - *curbuf = '\0'; /* reset curbuf */ -@@ -400,9 +416,9 @@ xpmParseColors(data, ncolors, cpp, color - return (XpmFileInvalid); - } - if (!lastwaskey) -- strcat(curbuf, " "); /* append space */ -+ STRLCAT(curbuf, " ", sizeof(curbuf)); /* append space */ - buf[l] = '\0'; -- strcat(curbuf, buf);/* append buf */ -+ STRLCAT(curbuf, buf, sizeof(curbuf));/* append buf */ - lastwaskey = 0; - } - } -@@ -410,12 +426,13 @@ xpmParseColors(data, ncolors, cpp, color - xpmFreeColorTable(colorTable, ncolors); - return (XpmFileInvalid); - } -- s = defaults[curkey] = (char *) XpmMalloc(strlen(curbuf) + 1); -+ len = strlen(curbuf) + 1; -+ s = defaults[curkey] = (char *) XpmMalloc(len); - if (!s) { - xpmFreeColorTable(colorTable, ncolors); - return (XpmNoMemory); - } -- strcpy(s, curbuf); -+ memcpy(s, curbuf, len); - } - } else { /* XPM 1 */ - /* get to the beginning of the first string */ -@@ -428,6 +445,10 @@ xpmParseColors(data, ncolors, cpp, color - /* - * read pixel value - */ -+ if (cpp >= SIZE_MAX - 1) { -+ xpmFreeColorTable(colorTable, ncolors); -+ return (XpmNoMemory); -+ } - color->string = (char *) XpmMalloc(cpp + 1); - if (!color->string) { - xpmFreeColorTable(colorTable, ncolors); -@@ -456,16 +477,17 @@ xpmParseColors(data, ncolors, cpp, color - *curbuf = '\0'; /* init curbuf */ - while ((l = xpmNextWord(data, buf, BUFSIZ))) { - if (*curbuf != '\0') -- strcat(curbuf, " ");/* append space */ -+ STRLCAT(curbuf, " ", sizeof(curbuf));/* append space */ - buf[l] = '\0'; -- strcat(curbuf, buf); /* append buf */ -+ STRLCAT(curbuf, buf, sizeof(curbuf)); /* append buf */ - } -- s = (char *) XpmMalloc(strlen(curbuf) + 1); -+ len = strlen(curbuf) + 1; -+ s = (char *) XpmMalloc(len); - if (!s) { - xpmFreeColorTable(colorTable, ncolors); - return (XpmNoMemory); - } -- strcpy(s, curbuf); -+ memcpy(s, curbuf, len); - color->c_color = s; - *curbuf = '\0'; /* reset curbuf */ - if (a < ncolors - 1) -@@ -490,6 +512,9 @@ ParsePixels(data, width, height, ncolors - unsigned int *iptr, *iptr2; - unsigned int a, x, y; - -+ if ((height > 0 && width >= SIZE_MAX / height) || -+ width * height >= SIZE_MAX / sizeof(unsigned int)) -+ return XpmNoMemory; - #ifndef FOR_MSW - iptr2 = (unsigned int *) XpmMalloc(sizeof(unsigned int) * width * height); - #else -@@ -513,6 +538,9 @@ ParsePixels(data, width, height, ncolors - { - unsigned short colidx[256]; - -+ if (ncolors > 256) -+ return (XpmFileInvalid); -+ - bzero((char *)colidx, 256 * sizeof(short)); - for (a = 0; a < ncolors; a++) - colidx[(unsigned char)colorTable[a].string[0]] = a + 1; -@@ -590,6 +618,9 @@ if (cidx[f]) XpmFree(cidx[f]);} - char *s; - char buf[BUFSIZ]; - -+ if (cpp >= sizeof(buf)) -+ return (XpmFileInvalid); -+ - buf[cpp] = '\0'; - if (USE_HASHTABLE) { - xpmHashAtom *slot; diff --git a/x11/openmotif/patches/patch-bi b/x11/openmotif/patches/patch-bi deleted file mode 100644 index 3b155991820..00000000000 --- a/x11/openmotif/patches/patch-bi +++ /dev/null @@ -1,79 +0,0 @@ -$NetBSD: patch-bi,v 1.2 2005/03/10 16:00:32 wiz Exp $ - ---- lib/Xm/Xpmscan.c.orig 2000-04-28 17:05:21.000000000 +0200 -+++ lib/Xm/Xpmscan.c -@@ -93,7 +93,8 @@ LFUNC(MSWGetImagePixels, int, (Display * - LFUNC(ScanTransparentColor, int, (XpmColor *color, unsigned int cpp, - XpmAttributes *attributes)); - --LFUNC(ScanOtherColors, int, (Display *display, XpmColor *colors, int ncolors, -+LFUNC(ScanOtherColors, int, (Display *display, XpmColor *colors, -+ unsigned int ncolors, - Pixel *pixels, unsigned int mask, - unsigned int cpp, XpmAttributes *attributes)); - -@@ -220,11 +221,17 @@ XpmCreateXpmImageFromImage(display, imag - else - cpp = 0; - -+ if ((height > 0 && width >= SIZE_MAX / height) || -+ width * height >= SIZE_MAX / sizeof(unsigned int)) -+ RETURN(XpmNoMemory); - pmap.pixelindex = - (unsigned int *) XpmCalloc(width * height, sizeof(unsigned int)); - if (!pmap.pixelindex) - RETURN(XpmNoMemory); - -+ if (pmap.size >= SIZE_MAX / sizeof(Pixel)) -+ RETURN(XpmNoMemory); -+ - pmap.pixels = (Pixel *) XpmMalloc(sizeof(Pixel) * pmap.size); - if (!pmap.pixels) - RETURN(XpmNoMemory); -@@ -279,7 +286,8 @@ XpmCreateXpmImageFromImage(display, imag - * get rgb values and a string of char, and possibly a name for each - * color - */ -- -+ if (pmap.ncolors >= SIZE_MAX / sizeof(XpmColor)) -+ RETURN(XpmNoMemory); - colorTable = (XpmColor *) XpmCalloc(pmap.ncolors, sizeof(XpmColor)); - if (!colorTable) - RETURN(XpmNoMemory); -@@ -327,6 +335,8 @@ ScanTransparentColor(color, cpp, attribu - - /* first get a character string */ - a = 0; -+ if (cpp >= SIZE_MAX - 1) -+ return (XpmNoMemory); - if (!(s = color->string = (char *) XpmMalloc(cpp + 1))) - return (XpmNoMemory); - *s++ = printable[c = a % MAXPRINTABLE]; -@@ -374,7 +384,7 @@ static int - ScanOtherColors(display, colors, ncolors, pixels, mask, cpp, attributes) - Display *display; - XpmColor *colors; -- int ncolors; -+ unsigned int ncolors; - Pixel *pixels; - unsigned int mask; - unsigned int cpp; -@@ -418,6 +428,8 @@ ScanOtherColors(display, colors, ncolors - } - - /* first get character strings and rgb values */ -+ if (ncolors >= SIZE_MAX / sizeof(XColor) || cpp >= SIZE_MAX - 1) -+ return (XpmNoMemory); - xcolors = (XColor *) XpmMalloc(sizeof(XColor) * ncolors); - if (!xcolors) - return (XpmNoMemory); -@@ -585,6 +597,9 @@ GetImagePixels(image, width, height, pma - ibpp = image->bits_per_pixel; - offset = image->xoffset; - -+ if (image->bitmap_unit < 0) -+ return (XpmNoMemory); -+ - if ((image->bits_per_pixel | image->depth) == 1) { - ibu = image->bitmap_unit; - for (y = 0; y < height; y++) diff --git a/x11/openmotif/patches/patch-bj b/x11/openmotif/patches/patch-bj index ed28348d89e..bca9b9e0c3e 100644 --- a/x11/openmotif/patches/patch-bj +++ b/x11/openmotif/patches/patch-bj @@ -1,23 +1,8 @@ -$NetBSD: patch-bj,v 1.3 2006/01/07 21:08:12 joerg Exp $ +$NetBSD: patch-bj,v 1.4 2008/07/14 23:01:32 christos Exp $ ---- clients/uil/UilDiags.c.orig 2006-01-06 20:46:16.000000000 +0100 -+++ clients/uil/UilDiags.c -@@ -293,12 +293,12 @@ void diag_issue_diagnostic - va_start(ap, l_start_column); - - #ifndef NO_MESSAGE_CATALOG -- vsprintf( msg_buffer, -+ vsnprintf( msg_buffer, sizeof(msg_buffer), - catgets(uil_catd, UIL_SET1, msg_cat_table[ message_number ], - diag_rz_msg_table[ message_number ].ac_text), - ap ); - #else -- vsprintf( msg_buffer, -+ vsnprintf( msg_buffer, sizeof(msg_buffer), - diag_rz_msg_table[ message_number ].ac_text, - ap ); - #endif -@@ -317,13 +317,13 @@ void diag_issue_diagnostic +--- clients/uil/UilDiags.c.orig 2006-04-06 09:24:06.000000000 -0400 ++++ clients/uil/UilDiags.c 2008-06-28 16:17:21.000000000 -0400 +@@ -317,13 +317,13 @@ */ #ifndef NO_MESSAGE_CATALOG @@ -33,7 +18,7 @@ $NetBSD: patch-bj,v 1.3 2006/01/07 21:08:12 joerg Exp $ "\t\t line: %d file: %s", az_src_rec->w_line_number, src_get_file_name( az_src_rec ) ); -@@ -371,7 +371,7 @@ void diag_issue_diagnostic +@@ -371,7 +371,7 @@ if (l_start_column != diag_k_no_column) #ifndef NO_MESSAGE_CATALOG @@ -42,7 +27,7 @@ $NetBSD: patch-bj,v 1.3 2006/01/07 21:08:12 joerg Exp $ catgets(uil_catd, UIL_SET_MISC, UIL_MISC_1, "\t\t line: %d position: %d file: %s"), -@@ -379,7 +379,7 @@ void diag_issue_diagnostic +@@ -379,7 +379,7 @@ l_start_column + 1, src_get_file_name( az_src_rec ) ); #else @@ -51,7 +36,7 @@ $NetBSD: patch-bj,v 1.3 2006/01/07 21:08:12 joerg Exp $ "\t\t line: %d position: %d file: %s", az_src_rec->w_line_number, l_start_column + 1, -@@ -387,13 +387,14 @@ void diag_issue_diagnostic +@@ -387,13 +387,14 @@ #endif else #ifndef NO_MESSAGE_CATALOG diff --git a/x11/openmotif/patches/patch-bk b/x11/openmotif/patches/patch-bk deleted file mode 100644 index 0ea84c1ff0b..00000000000 --- a/x11/openmotif/patches/patch-bk +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-bk,v 1.1 2006/01/07 21:08:12 joerg Exp $ - ---- clients/uil/UilSrcSrc.c.orig 2006-01-06 20:50:23.000000000 +0100 -+++ clients/uil/UilSrcSrc.c -@@ -629,8 +629,10 @@ open_source_file( XmConst char - char buffer[256]; - - -- /* place the file name in the expanded_name buffer */ -+ if (strlen(c_file_name) >= sizeof(buffer + 1)) -+ return src_k_open_error; - -+ /* place the file name in the expanded_name buffer */ - strcpy(buffer, c_file_name); - - /* Determine if this is the main file or an include file. */ diff --git a/x11/openmotif/patches/patch-bm b/x11/openmotif/patches/patch-bm index fbe27377754..8a9d6a609b7 100644 --- a/x11/openmotif/patches/patch-bm +++ b/x11/openmotif/patches/patch-bm @@ -1,20 +1,21 @@ -$NetBSD: patch-bm,v 1.1 2007/08/15 19:26:39 joerg Exp $ +$NetBSD: patch-bm,v 1.2 2008/07/14 23:01:32 christos Exp $ ---- config/util/Makefile.in.orig 2007-08-06 16:22:42.000000000 +0200 -+++ config/util/Makefile.in -@@ -197,9 +197,15 @@ distclean-libtool: - - maintainer-clean-libtool: - +--- config/util/Makefile.in.orig 2008-05-04 00:30:39.000000000 -0400 ++++ config/util/Makefile.in 2008-06-28 16:23:22.000000000 -0400 +@@ -258,9 +258,16 @@ + echo " rm -f $$p $$f"; \ + rm -f $$p $$f ; \ + done +ifndef CROSS_COMPILING - makestrs$(EXEEXT): $(makestrs_OBJECTS) $(makestrs_DEPENDENCIES) + makestrs$(EXEEXT): $(makestrs_OBJECTS) $(makestrs_DEPENDENCIES) @rm -f makestrs$(EXEEXT) - $(LINK) $(makestrs_LDFLAGS) $(makestrs_OBJECTS) $(makestrs_LDADD) $(LIBS) + $(LINK) $(makestrs_OBJECTS) $(makestrs_LDADD) $(LIBS) +else +makestrs$(EXEEXT): $(makestrs_SOURCES) $(makestrs_DEPENDENCIES) ++ @rm -f makestrs$(EXEEXT) + $(CC_FOR_BUILD) $(X_CFLAGS) $(CPPFLAGS_FOR_BUILD) \ + $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -o $@ makestrs.c +endif - tags: TAGS - + mostlyclean-compile: + -rm -f *.$(OBJEXT) -- cgit v1.2.3