head 1.7; access; symbols pkgsrc-2013Q2:1.7.0.10 pkgsrc-2013Q2-base:1.7 pkgsrc-2012Q4:1.7.0.8 pkgsrc-2012Q4-base:1.7 pkgsrc-2011Q4:1.7.0.6 pkgsrc-2011Q4-base:1.7 pkgsrc-2011Q2:1.7.0.4 pkgsrc-2011Q2-base:1.7 pkgsrc-2009Q4:1.7.0.2 pkgsrc-2009Q4-base:1.7 pkgsrc-2009Q3:1.6.0.40 pkgsrc-2009Q3-base:1.6 pkgsrc-2009Q2:1.6.0.38 pkgsrc-2009Q2-base:1.6 pkgsrc-2009Q1:1.6.0.36 pkgsrc-2009Q1-base:1.6 pkgsrc-2008Q4:1.6.0.34 pkgsrc-2008Q4-base:1.6 pkgsrc-2008Q3:1.6.0.32 pkgsrc-2008Q3-base:1.6 cube-native-xorg:1.6.0.30 cube-native-xorg-base:1.6 pkgsrc-2008Q2:1.6.0.28 pkgsrc-2008Q2-base:1.6 cwrapper:1.6.0.26 pkgsrc-2008Q1:1.6.0.24 pkgsrc-2008Q1-base:1.6 pkgsrc-2007Q4:1.6.0.22 pkgsrc-2007Q4-base:1.6 pkgsrc-2007Q3:1.6.0.20 pkgsrc-2007Q3-base:1.6 pkgsrc-2007Q2:1.6.0.18 pkgsrc-2007Q2-base:1.6 pkgsrc-2007Q1:1.6.0.16 pkgsrc-2007Q1-base:1.6 pkgsrc-2006Q4:1.6.0.14 pkgsrc-2006Q4-base:1.6 pkgsrc-2006Q3:1.6.0.12 pkgsrc-2006Q3-base:1.6 pkgsrc-2006Q2:1.6.0.10 pkgsrc-2006Q2-base:1.6 pkgsrc-2006Q1:1.6.0.8 pkgsrc-2006Q1-base:1.6 pkgsrc-2005Q4:1.6.0.6 pkgsrc-2005Q4-base:1.6 pkgsrc-2005Q3:1.6.0.4 pkgsrc-2005Q3-base:1.6 pkgsrc-2005Q2:1.6.0.2 pkgsrc-2005Q2-base:1.6 pkgsrc-2005Q1:1.5.0.6 pkgsrc-2005Q1-base:1.5 pkgsrc-2004Q4:1.5.0.4 pkgsrc-2004Q4-base:1.5 pkgsrc-2004Q3:1.5.0.2 pkgsrc-2004Q3-base:1.5 pkgsrc-2004Q2:1.4.0.8 pkgsrc-2004Q2-base:1.4 pkgsrc-2004Q1:1.4.0.6 pkgsrc-2004Q1-base:1.4 pkgsrc-2003Q4:1.4.0.4 pkgsrc-2003Q4-base:1.4 netbsd-1-6-1:1.4.0.2 netbsd-1-6-1-base:1.4 netbsd-1-6:1.3.0.8 netbsd-1-6-RELEASE-base:1.3 pkgviews:1.3.0.4 pkgviews-base:1.3 buildlink2-base:1.3 buildlink2:1.3.0.2; locks; strict; comment @# @; 1.7 date 2009.12.16.20.07.32; author joerg; state dead; branches; next 1.6; 1.6 date 2005.06.14.18.10.37; author jlam; state Exp; branches; next 1.5; 1.5 date 2004.09.16.15.09.01; author minskim; state Exp; branches; next 1.4; 1.4 date 2002.08.25.18.39.26; author jlam; state Exp; branches; next 1.3; 1.3 date 2002.05.24.14.57.32; author agc; state Exp; branches 1.3.2.1; next 1.2; 1.2 date 2002.05.24.13.32.41; author agc; state Exp; branches; next 1.1; 1.1 date 2002.05.12.22.38.38; author martin; state Exp; branches; next ; 1.3.2.1 date 2002.05.24.14.57.32; author jlam; state dead; branches; next 1.3.2.2; 1.3.2.2 date 2002.06.23.18.47.04; author jlam; state Exp; branches; next ; desc @@ 1.7 log @Retire old xpm package. Replaced by x11/libXpm. @ text @$NetBSD: patch-ad,v 1.6 2005/06/14 18:10:37 jlam Exp $ --- lib/XpmI.h.orig 1998-03-19 14:51:00.000000000 -0500 +++ lib/XpmI.h @@@@ -42,14 +42,17 @@@@ #ifndef XPMI_h #define XPMI_h +#include #include "xpm.h" /* * lets try to solve include files */ +#include #include #include +#include /* stdio.h doesn't declare popen on a Sequent DYNIX OS */ #ifdef sequent extern FILE *popen(); @@@@ -114,6 +117,18 @@@@ extern FILE *popen(); boundCheckingCalloc((long)(nelem),(long) (elsize)) #endif +#if defined(SCO) || defined(__USLC__) +#include /* For SIZE_MAX */ +#endif +#include +#ifndef SIZE_MAX +# ifdef ULONG_MAX +# define SIZE_MAX ULONG_MAX +# else +# define SIZE_MAX UINT_MAX +# endif +#endif + #define XPMMAXCMTLEN BUFSIZ typedef struct { unsigned int type; @@@@ -215,9 +230,9 @@@@ typedef struct _xpmHashAtom { } *xpmHashAtom; typedef struct { - int size; - int limit; - int used; + unsigned int size; + unsigned int limit; + unsigned int used; xpmHashAtom *atomTable; } xpmHashTable; @ 1.6 log @Apply fixes derived from the HEAD branch of X.Org (6.8.99) to address problems noted in CAN-2004-0914: Multiple vulnerabilities in libXpm for 6.8.1 and earlier, as used in XFree86 and other packages, include (1) multiple integer overflows, (2) out-of-bounds memory accesses, (3) directory traversal, (4) shell metacharacter, (5) endless loops, and (6) memory leaks, which could allow remote attackers to obtain sensitive information, cause a denial of service (application crash), or execute arbitary code via a certain XPM image file. Bump PKGREVISION to 4. Since this is a security-related fix, also bump the BUILDLINK_RECOMMENDED version for this package. @ text @d1 1 a1 1 $NetBSD$ @ 1.5 log @Incorporate security fixes of X.Org X11R6.8.1. Bump PKGREVISION. @ text @d3 1 a3 1 --- lib/XpmI.h.orig Thu Mar 19 13:51:00 1998 d5 1 a5 1 @@@@ -42,6 +42,7 @@@@ d13 11 a23 1 @@@@ -114,6 +115,18 @@@@ extern FILE *popen(); d28 1 a28 1 +#include /* For SIZE_MAX */ d42 1 a42 1 @@@@ -215,9 +228,9 @@@@ typedef struct _xpmHashAtom { @ 1.4 log @Merge changes in packages from the buildlink2 branch that have buildlink2.mk files back into the main trunk. This provides sufficient buildlink2 infrastructure to start merging other packages from the buildlink2 branch that have already been converted to use the buildlink2 framework. @ text @d1 1 a1 1 $NetBSD: patch-ad,v 1.3.2.1 2002/06/23 18:47:04 jlam Exp $ d3 2 a4 2 --- lib/XpmI.h.orig Thu Mar 19 20:51:00 1998 +++ lib/XpmI.h Mon May 13 00:33:23 2002 d13 32 @ 1.3 log @Revert previous change - Martin already made a much cleaner fix for this. @ text @d1 1 a1 1 $NetBSD: patch-ad,v 1.2 2002/05/24 13:32:41 agc Exp $ @ 1.3.2.1 log @file patch-ad was added on branch buildlink2 on 2002-06-23 18:47:04 +0000 @ text @d1 12 @ 1.3.2.2 log @Merge from pkgsrc-current to buildlink2 branch. @ text @a0 12 $NetBSD: patch-ad,v 1.3.2.1 2002/06/23 18:47:04 jlam Exp $ --- lib/XpmI.h.orig Thu Mar 19 20:51:00 1998 +++ lib/XpmI.h Mon May 13 00:33:23 2002 @@@@ -42,6 +42,7 @@@@ #ifndef XPMI_h #define XPMI_h +#include #include "xpm.h" /* @ 1.2 log @Apply fix from Lloyd Parkes in PR 16421 which recognises properly that sparc64 is a 64-bit architecture. @ text @d1 1 a1 1 $NetBSD: patch-ad,v 1.1 2002/05/12 22:38:38 martin Exp $ a12 9 @@@@ -82,7 +83,7 @@@@ #endif /* the following is defined in X11R6 but not in previous versions */ -#ifdef __alpha +#if defined(__alpha) || defined(__arch64__) #ifndef LONG64 #define LONG64 #endif @ 1.1 log @Add a missing include, so all 64bit archs are recognized correctly. Closes PR 16421 by Lloyd Parkes. @ text @d1 1 a1 1 $NetBSD$ d13 9 @